416 files changed, 4236 insertions, 3081 deletions

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 38a286975c31..f8fecfec5df9 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -22,6 +22,7 @@
 #include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 #include <linux/pwm.h>
+#include <linux/suspend.h>
 #include <linux/delay.h>
 
 #include "internal.h"
@@ -946,9 +947,10 @@ static void lpss_iosf_exit_d3_state(void)
         mutex_unlock(&lpss_iosf_mutex);
 }
 
-static int acpi_lpss_suspend(struct device *dev, bool wakeup)
+static int acpi_lpss_suspend(struct device *dev, bool runtime)
 {
         struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
+        bool wakeup = runtime || device_may_wakeup(dev);
         int ret;
 
         if (pdata->dev_desc->flags & LPSS_SAVE_CTX)
@@ -961,13 +963,14 @@ static int acpi_lpss_suspend(struct device *dev, bool wakeup)
          * wrong status for devices being about to be powered off. See
          * lpss_iosf_enter_d3_state() for further information.
          */
-        if (lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())
+        if ((runtime || !pm_suspend_via_firmware()) &&
+            lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())
                 lpss_iosf_enter_d3_state();
 
         return ret;
 }
 
-static int acpi_lpss_resume(struct device *dev)
+static int acpi_lpss_resume(struct device *dev, bool runtime)
 {
         struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
         int ret;
@@ -976,7 +979,8 @@ static int acpi_lpss_resume(struct device *dev)
          * This call is kept first to be in symmetry with
          * acpi_lpss_runtime_suspend() one.
          */
-        if (lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())
+        if ((runtime || !pm_resume_via_firmware()) &&
+            lpss_quirks & LPSS_QUIRK_ALWAYS_POWER_ON && iosf_mbi_available())
                 lpss_iosf_exit_d3_state();
 
         ret = acpi_dev_resume(dev);
@@ -1000,12 +1004,12 @@ static int acpi_lpss_suspend_late(struct device *dev)
                 return 0;
 
         ret = pm_generic_suspend_late(dev);
-        return ret ? ret : acpi_lpss_suspend(dev, device_may_wakeup(dev));
+        return ret ? ret : acpi_lpss_suspend(dev, false);
 }
 
 static int acpi_lpss_resume_early(struct device *dev)
 {
-        int ret = acpi_lpss_resume(dev);
+        int ret = acpi_lpss_resume(dev, false);
 
         return ret ? ret : pm_generic_resume_early(dev);
 }
@@ -1020,7 +1024,7 @@ static int acpi_lpss_runtime_suspend(struct device *dev)
 
 static int acpi_lpss_runtime_resume(struct device *dev)
 {
-        int ret = acpi_lpss_resume(dev);
+        int ret = acpi_lpss_resume(dev, true);
 
         return ret ? ret : pm_generic_runtime_resume(dev);
 }
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index fc0c2e2328cd..fe9d46d81750 100644
--- a/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@ -51,16 +51,23 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state)
                 return_ACPI_STATUS(status);
         }
 
-        /*
-         * 1) Disable all GPEs
-         * 2) Enable all wakeup GPEs
-         */
+        /* Disable all GPEs */
         status = acpi_hw_disable_all_gpes();
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
+        /*
+         * If the target sleep state is S5, clear all GPEs and fixed events too
+         */
+        if (sleep_state == ACPI_STATE_S5) {
+                status = acpi_hw_clear_acpi_status();
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        }
         acpi_gbl_system_awake_and_running = FALSE;
 
+         /* Enable all wakeup GPEs */
         status = acpi_hw_enable_all_wakeup_gpes();
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
diff --git a/drivers/acpi/acpica/uterror.c b/drivers/acpi/acpica/uterror.c
index 5a64ddaed8a3..e47430272692 100644
--- a/drivers/acpi/acpica/uterror.c
+++ b/drivers/acpi/acpica/uterror.c
@@ -182,19 +182,19 @@ acpi_ut_prefixed_namespace_error(const char *module_name,
         switch (lookup_status) {
         case AE_ALREADY_EXISTS:
 
-                acpi_os_printf("\n" ACPI_MSG_BIOS_ERROR);
+                acpi_os_printf(ACPI_MSG_BIOS_ERROR);
                 message = "Failure creating";
                 break;
 
         case AE_NOT_FOUND:
 
-                acpi_os_printf("\n" ACPI_MSG_BIOS_ERROR);
+                acpi_os_printf(ACPI_MSG_BIOS_ERROR);
                 message = "Could not resolve";
                 break;
 
         default:
 
-                acpi_os_printf("\n" ACPI_MSG_ERROR);
+                acpi_os_printf(ACPI_MSG_ERROR);
                 message = "Failure resolving";
                 break;
         }
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index b0113a5802a3..d79ad844c78f 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -717,10 +717,11 @@ void battery_hook_register(struct acpi_battery_hook *hook)
                          */
                         pr_err("extension failed to load: %s", hook->name);
                         __battery_hook_unregister(hook, 0);
-                        return;
+                        goto end;
                 }
         }
         pr_info("new extension: %s\n", hook->name);
+end:
         mutex_unlock(&hook_mutex);
 }
 EXPORT_SYMBOL_GPL(battery_hook_register);
@@ -732,7 +733,7 @@ EXPORT_SYMBOL_GPL(battery_hook_register);
 */
 static void battery_hook_add_battery(struct acpi_battery *battery)
 {
-        struct acpi_battery_hook *hook_node;
+        struct acpi_battery_hook *hook_node, *tmp;
 
         mutex_lock(&hook_mutex);
         INIT_LIST_HEAD(&battery->list);
@@ -744,15 +745,15 @@ static void battery_hook_add_battery(struct acpi_battery *battery)
          * when a battery gets hotplugged or initialized
          * during the battery module initialization.
          */
-        list_for_each_entry(hook_node, &battery_hook_list, list) {
+        list_for_each_entry_safe(hook_node, tmp, &battery_hook_list, list) {
                 if (hook_node->add_battery(battery->bat)) {
                         /*
                          * The notification of the extensions has failed, to
                          * prevent further errors we will unload the extension.
                          */
-                        __battery_hook_unregister(hook_node, 0);
                         pr_err("error in extension, unloading: %s",
                                         hook_node->name);
+                        __battery_hook_unregister(hook_node, 0);
                 }
         }
         mutex_unlock(&hook_mutex);
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index bb94cf0731fe..442a9e24f439 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -2037,6 +2037,17 @@ static inline void acpi_ec_query_exit(void)
         }
 }
 
+static const struct dmi_system_id acpi_ec_no_wakeup[] = {
+        {
+                .ident = "Thinkpad X1 Carbon 6th",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "20KGS3JF01"),
+                },
+        },
+        { },
+};
+
 int __init acpi_ec_init(void)
 {
         int result;
@@ -2047,6 +2058,15 @@ int __init acpi_ec_init(void)
         if (result)
                 return result;
 
+        /*
+         * Disable EC wakeup on following systems to prevent periodic
+         * wakeup from EC GPE.
+         */
+        if (dmi_check_system(acpi_ec_no_wakeup)) {
+                ec_no_wakeup = true;
+                pr_debug("Disabling EC wakeup on suspend-to-idle\n");
+        }
+
         /* Drivers must be started after acpi_ec_query_init() */
         dsdt_fail = acpi_bus_register_driver(&acpi_ec_driver);
         /*
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index d15814e1727f..7c479002e798 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -408,6 +408,8 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
         const guid_t *guid;
         int rc, i;
 
+        if (cmd_rc)
+                *cmd_rc = -EINVAL;
         func = cmd;
         if (cmd == ND_CMD_CALL) {
                 call_pkg = buf;
@@ -518,6 +520,8 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
                  * If we return an error (like elsewhere) then caller wouldn't
                  * be able to rely upon data returned to make calculation.
                  */
+                if (cmd_rc)
+                        *cmd_rc = 0;
                 return 0;
         }
 
@@ -1273,7 +1277,7 @@ static ssize_t scrub_show(struct device *dev,
 
                 mutex_lock(&acpi_desc->init_mutex);
                 rc = sprintf(buf, "%d%s", acpi_desc->scrub_count,
-                                work_busy(&acpi_desc->dwork.work)
+                                acpi_desc->scrub_busy
                                 && !acpi_desc->cancel ? "+\n" : "\n");
                 mutex_unlock(&acpi_desc->init_mutex);
         }
@@ -2939,6 +2943,32 @@ static unsigned int __acpi_nfit_scrub(struct acpi_nfit_desc *acpi_desc,
         return 0;
 }
 
+static void __sched_ars(struct acpi_nfit_desc *acpi_desc, unsigned int tmo)
+{
+        lockdep_assert_held(&acpi_desc->init_mutex);
+
+        acpi_desc->scrub_busy = 1;
+        /* note this should only be set from within the workqueue */
+        if (tmo)
+                acpi_desc->scrub_tmo = tmo;
+        queue_delayed_work(nfit_wq, &acpi_desc->dwork, tmo * HZ);
+}
+
+static void sched_ars(struct acpi_nfit_desc *acpi_desc)
+{
+        __sched_ars(acpi_desc, 0);
+}
+
+static void notify_ars_done(struct acpi_nfit_desc *acpi_desc)
+{
+        lockdep_assert_held(&acpi_desc->init_mutex);
+
+        acpi_desc->scrub_busy = 0;
+        acpi_desc->scrub_count++;
+        if (acpi_desc->scrub_count_state)
+                sysfs_notify_dirent(acpi_desc->scrub_count_state);
+}
+
 static void acpi_nfit_scrub(struct work_struct *work)
 {
         struct acpi_nfit_desc *acpi_desc;
@@ -2949,14 +2979,10 @@ static void acpi_nfit_scrub(struct work_struct *work)
         mutex_lock(&acpi_desc->init_mutex);
         query_rc = acpi_nfit_query_poison(acpi_desc);
         tmo = __acpi_nfit_scrub(acpi_desc, query_rc);
-        if (tmo) {
-                queue_delayed_work(nfit_wq, &acpi_desc->dwork, tmo * HZ);
-                acpi_desc->scrub_tmo = tmo;
-        } else {
-                acpi_desc->scrub_count++;
-                if (acpi_desc->scrub_count_state)
-                        sysfs_notify_dirent(acpi_desc->scrub_count_state);
-        }
+        if (tmo)
+                __sched_ars(acpi_desc, tmo);
+        else
+                notify_ars_done(acpi_desc);
         memset(acpi_desc->ars_status, 0, acpi_desc->max_ars);
         mutex_unlock(&acpi_desc->init_mutex);
 }
@@ -3037,7 +3063,7 @@ static int acpi_nfit_register_regions(struct acpi_nfit_desc *acpi_desc)
                         break;
                 }
 
-        queue_delayed_work(nfit_wq, &acpi_desc->dwork, 0);
+        sched_ars(acpi_desc);
         return 0;
 }
 
@@ -3239,7 +3265,7 @@ int acpi_nfit_ars_rescan(struct acpi_nfit_desc *acpi_desc, unsigned long flags)
                 }
         }
         if (scheduled) {
-                queue_delayed_work(nfit_wq, &acpi_desc->dwork, 0);
+                sched_ars(acpi_desc);
                 dev_dbg(dev, "ars_scan triggered\n");
         }
         mutex_unlock(&acpi_desc->init_mutex);
diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h
index 7d15856a739f..a97ff42fe311 100644
--- a/drivers/acpi/nfit/nfit.h
+++ b/drivers/acpi/nfit/nfit.h
@@ -203,6 +203,7 @@ struct acpi_nfit_desc {
         unsigned int max_ars;
         unsigned int scrub_count;
         unsigned int scrub_mode;
+        unsigned int scrub_busy:1;
         unsigned int cancel:1;
         unsigned long dimm_cmd_force_en;
         unsigned long bus_cmd_force_en;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 7ca41bf023c9..8df9abfa947b 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -45,6 +45,8 @@
 #include <linux/uaccess.h>
 #include <linux/io-64-nonatomic-lo-hi.h>
 
+#include "acpica/accommon.h"
+#include "acpica/acnamesp.h"
 #include "internal.h"
 
 #define _COMPONENT              ACPI_OS_SERVICES
@@ -1490,6 +1492,76 @@ int acpi_check_region(resource_size_t start, resource_size_t n,
 }
 EXPORT_SYMBOL(acpi_check_region);
 
+static acpi_status acpi_deactivate_mem_region(acpi_handle handle, u32 level,
+                                              void *_res, void **return_value)
+{
+        struct acpi_mem_space_context **mem_ctx;
+        union acpi_operand_object *handler_obj;
+        union acpi_operand_object *region_obj2;
+        union acpi_operand_object *region_obj;
+        struct resource *res = _res;
+        acpi_status status;
+
+        region_obj = acpi_ns_get_attached_object(handle);
+        if (!region_obj)
+                return AE_OK;
+
+        handler_obj = region_obj->region.handler;
+        if (!handler_obj)
+                return AE_OK;
+
+        if (region_obj->region.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
+                return AE_OK;
+
+        if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE))
+                return AE_OK;
+
+        region_obj2 = acpi_ns_get_secondary_object(region_obj);
+        if (!region_obj2)
+                return AE_OK;
+
+        mem_ctx = (void *)&region_obj2->extra.region_context;
+
+        if (!(mem_ctx[0]->address >= res->start &&
+              mem_ctx[0]->address < res->end))
+                return AE_OK;
+
+        status = handler_obj->address_space.setup(region_obj,
+                                                  ACPI_REGION_DEACTIVATE,
+                                                  NULL, (void **)mem_ctx);
+        if (ACPI_SUCCESS(status))
+                region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);
+
+        return status;
+}
+
+/**
+ * acpi_release_memory - Release any mappings done to a memory region
+ * @handle: Handle to namespace node
+ * @res: Memory resource
+ * @level: A level that terminates the search
+ *
+ * Walks through @handle and unmaps all SystemMemory Operation Regions that
+ * overlap with @res and that have already been activated (mapped).
+ *
+ * This is a helper that allows drivers to place special requirements on memory
+ * region that may overlap with operation regions, primarily allowing them to
+ * safely map the region as non-cached memory.
+ *
+ * The unmapped Operation Regions will be automatically remapped next time they
+ * are called, so the drivers do not need to do anything else.
+ */
+acpi_status acpi_release_memory(acpi_handle handle, struct resource *res,
+                                u32 level)
+{
+        if (!(res->flags & IORESOURCE_MEM))
+                return AE_TYPE;
+
+        return acpi_walk_namespace(ACPI_TYPE_REGION, handle, level,
+                                   acpi_deactivate_mem_region, NULL, res, NULL);
+}
+EXPORT_SYMBOL_GPL(acpi_release_memory);
+
 /*
  * Let drivers know whether the resource checks are effective
  */
diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c
index e5ea1974d1e3..d1e26cb599bf 100644
--- a/drivers/acpi/pptt.c
+++ b/drivers/acpi/pptt.c
@@ -481,8 +481,14 @@ static int topology_get_acpi_cpu_tag(struct acpi_table_header *table,
         if (cpu_node) {
                 cpu_node = acpi_find_processor_package_id(table, cpu_node,
                                                           level, flag);
-                /* Only the first level has a guaranteed id */
-                if (level == 0)
+                /*
+                 * As per specification if the processor structure represents
+                 * an actual processor, then ACPI processor ID must be valid.
+                 * For processor containers ACPI_PPTT_ACPI_PROCESSOR_ID_VALID
+                 * should be set if the UID is valid
+                 */
+                if (level == 0 ||
+                    cpu_node->flags & ACPI_PPTT_ACPI_PROCESSOR_ID_VALID)
                         return cpu_node->acpi_processor_id;
                 return ACPI_PTR_DIFF(cpu_node, table);
         }
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 2b16e7c8fff3..39b181d6bd0d 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -398,7 +398,6 @@ config SATA_DWC_VDEBUG
 
 config SATA_HIGHBANK
         tristate "Calxeda Highbank SATA support"
-        depends on HAS_DMA
         depends on ARCH_HIGHBANK || COMPILE_TEST
         help
           This option enables support for the Calxeda Highbank SoC's
@@ -408,7 +407,6 @@ config SATA_HIGHBANK
 
 config SATA_MV
         tristate "Marvell SATA support"
-        depends on HAS_DMA
         depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \
                    ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
         select GENERIC_PHY
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 738fb22978dd..b2b9eba1d214 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -400,6 +400,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(INTEL, 0x0f23), board_ahci_mobile }, /* Bay Trail AHCI */
         { PCI_VDEVICE(INTEL, 0x22a3), board_ahci_mobile }, /* Cherry Tr. AHCI */
         { PCI_VDEVICE(INTEL, 0x5ae3), board_ahci_mobile }, /* ApolloLake AHCI */
+        { PCI_VDEVICE(INTEL, 0x34d3), board_ahci_mobile }, /* Ice Lake LP AHCI */
 
         /* JMicron 360/1/3/5/6, match class to avoid IDE function */
         { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -1280,6 +1281,59 @@ static bool ahci_broken_suspend(struct pci_dev *pdev)
         return strcmp(buf, dmi->driver_data) < 0;
 }
 
+static bool ahci_broken_lpm(struct pci_dev *pdev)
+{
+        static const struct dmi_system_id sysids[] = {
+                /* Various Lenovo 50 series have LPM issues with older BIOSen */
+                {
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X250"),
+                        },
+                        .driver_data = "20180406", /* 1.31 */
+                },
+                {
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L450"),
+                        },
+                        .driver_data = "20180420", /* 1.28 */
+                },
+                {
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T450s"),
+                        },
+                        .driver_data = "20180315", /* 1.33 */
+                },
+                {
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W541"),
+                        },
+                        /*
+                         * Note date based on release notes, 2.35 has been
+                         * reported to be good, but I've been unable to get
+                         * a hold of the reporter to get the DMI BIOS date.
+                         * TODO: fix this.
+                         */
+                        .driver_data = "20180310", /* 2.35 */
+                },
+                { }     /* terminate list */
+        };
+        const struct dmi_system_id *dmi = dmi_first_match(sysids);
+        int year, month, date;
+        char buf[9];
+
+        if (!dmi)
+                return false;
+
+        dmi_get_date(DMI_BIOS_DATE, &year, &month, &date);
+        snprintf(buf, sizeof(buf), "%04d%02d%02d", year, month, date);
+
+        return strcmp(buf, dmi->driver_data) < 0;
+}
+
 static bool ahci_broken_online(struct pci_dev *pdev)
 {
 #define ENCODE_BUSDEVFN(bus, slot, func)                        \
@@ -1694,6 +1748,12 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                         "quirky BIOS, skipping spindown on poweroff\n");
         }
 
+        if (ahci_broken_lpm(pdev)) {
+                pi.flags |= ATA_FLAG_NO_LPM;
+                dev_warn(&pdev->dev,
+                         "BIOS update required for Link Power Management support\n");
+        }
+
         if (ahci_broken_suspend(pdev)) {
                 hpriv->flags |= AHCI_HFLAG_NO_SUSPEND;
                 dev_warn(&pdev->dev,
diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index 0045dacd814b..72d90b4c3aae 100644
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -82,7 +82,7 @@ static void ahci_mvebu_regret_option(struct ahci_host_priv *hpriv)
  *
  * Return: 0 on success; Error code otherwise.
  */
-int ahci_mvebu_stop_engine(struct ata_port *ap)
+static int ahci_mvebu_stop_engine(struct ata_port *ap)
 {
         void __iomem *port_mmio = ahci_port_base(ap);
         u32 tmp, port_fbs;
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 965842a08743..09620c2ffa0f 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -35,6 +35,7 @@
 #include <linux/kernel.h>
 #include <linux/gfp.h>
 #include <linux/module.h>
+#include <linux/nospec.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -1146,10 +1147,12 @@ static ssize_t ahci_led_store(struct ata_port *ap, const char *buf,
 
         /* get the slot number from the message */
         pmp = (state & EM_MSG_LED_PMP_SLOT) >> 8;
-        if (pmp < EM_MAX_SLOTS)
+        if (pmp < EM_MAX_SLOTS) {
+                pmp = array_index_nospec(pmp, EM_MAX_SLOTS);
                 emp = &pp->em_priv[pmp];
-        else
+        } else {
                 return -EINVAL;
+        }
 
         /* mask off the activity bits if we are in sw_activity
          * mode, user should turn off sw_activity before setting
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 27d15ed7fa3d..cc71c63df381 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2493,6 +2493,9 @@ int ata_dev_configure(struct ata_device *dev)
             (id[ATA_ID_SATA_CAPABILITY] & 0xe) == 0x2)
                 dev->horkage |= ATA_HORKAGE_NOLPM;
 
+        if (ap->flags & ATA_FLAG_NO_LPM)
+                dev->horkage |= ATA_HORKAGE_NOLPM;
+
         if (dev->horkage & ATA_HORKAGE_NOLPM) {
                 ata_dev_warn(dev, "LPM support broken, forcing max_power\n");
                 dev->link->ap->target_lpm_policy = ATA_LPM_MAX_POWER;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index d5412145d76d..01306c018398 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -614,8 +614,7 @@ void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap,
                 list_for_each_entry_safe(scmd, tmp, eh_work_q, eh_entry) {
                         struct ata_queued_cmd *qc;
 
-                        for (i = 0; i < ATA_MAX_QUEUE; i++) {
-                                qc = __ata_qc_from_tag(ap, i);
+                        ata_qc_for_each_raw(ap, qc, i) {
                                 if (qc->flags & ATA_QCFLAG_ACTIVE &&
                                     qc->scsicmd == scmd)
                                         break;
@@ -818,14 +817,13 @@ EXPORT_SYMBOL_GPL(ata_port_wait_eh);
 
 static int ata_eh_nr_in_flight(struct ata_port *ap)
 {
+        struct ata_queued_cmd *qc;
         unsigned int tag;
         int nr = 0;
 
         /* count only non-internal commands */
-        for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
-                if (ata_tag_internal(tag))
-                        continue;
-                if (ata_qc_from_tag(ap, tag))
+        ata_qc_for_each(ap, qc, tag) {
+                if (qc)
                         nr++;
         }
 
@@ -847,13 +845,13 @@ void ata_eh_fastdrain_timerfn(struct timer_list *t)
                 goto out_unlock;
 
         if (cnt == ap->fastdrain_cnt) {
+                struct ata_queued_cmd *qc;
                 unsigned int tag;
 
                 /* No progress during the last interval, tag all
                  * in-flight qcs as timed out and freeze the port.
                  */
-                for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
-                        struct ata_queued_cmd *qc = ata_qc_from_tag(ap, tag);
+                ata_qc_for_each(ap, qc, tag) {
                         if (qc)
                                 qc->err_mask |= AC_ERR_TIMEOUT;
                 }
@@ -999,6 +997,7 @@ void ata_port_schedule_eh(struct ata_port *ap)
 
 static int ata_do_link_abort(struct ata_port *ap, struct ata_link *link)
 {
+        struct ata_queued_cmd *qc;
         int tag, nr_aborted = 0;
 
         WARN_ON(!ap->ops->error_handler);
@@ -1007,9 +1006,7 @@ static int ata_do_link_abort(struct ata_port *ap, struct ata_link *link)
         ata_eh_set_pending(ap, 0);
 
         /* include internal tag in iteration */
-        for (tag = 0; tag <= ATA_MAX_QUEUE; tag++) {
-                struct ata_queued_cmd *qc = ata_qc_from_tag(ap, tag);
-
+        ata_qc_for_each_with_internal(ap, qc, tag) {
                 if (qc && (!link || qc->dev->link == link)) {
                         qc->flags |= ATA_QCFLAG_FAILED;
                         ata_qc_complete(qc);
@@ -1712,9 +1709,7 @@ void ata_eh_analyze_ncq_error(struct ata_link *link)
                 return;
 
         /* has LLDD analyzed already? */
-        for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
-                qc = __ata_qc_from_tag(ap, tag);
-
+        ata_qc_for_each_raw(ap, qc, tag) {
                 if (!(qc->flags & ATA_QCFLAG_FAILED))
                         continue;
 
@@ -2136,6 +2131,7 @@ static void ata_eh_link_autopsy(struct ata_link *link)
 {
         struct ata_port *ap = link->ap;
         struct ata_eh_context *ehc = &link->eh_context;
+        struct ata_queued_cmd *qc;
         struct ata_device *dev;
         unsigned int all_err_mask = 0, eflags = 0;
         int tag, nr_failed = 0, nr_quiet = 0;
@@ -2168,9 +2164,7 @@ static void ata_eh_link_autopsy(struct ata_link *link)
 
         all_err_mask |= ehc->i.err_mask;
 
-        for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
-                struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);
-
+        ata_qc_for_each_raw(ap, qc, tag) {
                 if (!(qc->flags & ATA_QCFLAG_FAILED) ||
                     ata_dev_phys_link(qc->dev) != link)
                         continue;
@@ -2436,6 +2430,7 @@ static void ata_eh_link_report(struct ata_link *link)
 {
         struct ata_port *ap = link->ap;
         struct ata_eh_context *ehc = &link->eh_context;
+        struct ata_queued_cmd *qc;
         const char *frozen, *desc;
         char tries_buf[6] = "";
         int tag, nr_failed = 0;
@@ -2447,9 +2442,7 @@ static void ata_eh_link_report(struct ata_link *link)
         if (ehc->i.desc[0] != '\0')
                 desc = ehc->i.desc;
 
-        for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
-                struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);
-
+        ata_qc_for_each_raw(ap, qc, tag) {
                 if (!(qc->flags & ATA_QCFLAG_FAILED) ||
                     ata_dev_phys_link(qc->dev) != link ||
                     ((qc->flags & ATA_QCFLAG_QUIET) &&
@@ -2511,8 +2504,7 @@ static void ata_eh_link_report(struct ata_link *link)
                   ehc->i.serror & SERR_DEV_XCHG ? "DevExch " : "");
 #endif
 
-        for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
-                struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);
+        ata_qc_for_each_raw(ap, qc, tag) {
                 struct ata_taskfile *cmd = &qc->tf, *res = &qc->result_tf;
                 char data_buf[20] = "";
                 char cdb_buf[70] = "";
@@ -3992,12 +3984,11 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
  */
 void ata_eh_finish(struct ata_port *ap)
 {
+        struct ata_queued_cmd *qc;
         int tag;
 
         /* retry or finish qcs */
-        for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
-                struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);
-
+        ata_qc_for_each_raw(ap, qc, tag) {
                 if (!(qc->flags & ATA_QCFLAG_FAILED))
                         continue;
 
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 6a91d04351d9..aad1b01447de 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3805,10 +3805,20 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc)
                  */
                 goto invalid_param_len;
         }
-        if (block > dev->n_sectors)
-                goto out_of_range;
 
         all = cdb[14] & 0x1;
+        if (all) {
+                /*
+                 * Ignore the block address (zone ID) as defined by ZBC.
+                 */
+                block = 0;
+        } else if (block >= dev->n_sectors) {
+                /*
+                 * Block must be a valid zone ID (a zone start LBA).
+                 */
+                fp = 2;
+                goto invalid_fld;
+        }
 
         if (ata_ncq_enabled(qc->dev) &&
             ata_fpdma_zac_mgmt_out_supported(qc->dev)) {
@@ -3837,10 +3847,6 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc)
  invalid_fld:
         ata_scsi_set_invalid_field(qc->dev, scmd, fp, 0xff);
         return 1;
- out_of_range:
-        /* "Logical Block Address out of range" */
-        ata_scsi_set_sense(qc->dev, scmd, ILLEGAL_REQUEST, 0x21, 0x00);
-        return 1;
 invalid_param_len:
         /* "Parameter list length error" */
         ata_scsi_set_sense(qc->dev, scmd, ILLEGAL_REQUEST, 0x1a, 0x0);
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index b8d9cfc60374..4dc528bf8e85 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -395,12 +395,6 @@ static inline unsigned int sata_fsl_tag(unsigned int tag,
 {
         /* We let libATA core do actual (queue) tag allocation */
 
-        /* all non NCQ/queued commands should have tag#0 */
-        if (ata_tag_internal(tag)) {
-                DPRINTK("mapping internal cmds to tag#0\n");
-                return 0;
-        }
-
         if (unlikely(tag >= SATA_FSL_QUEUE_DEPTH)) {
                 DPRINTK("tag %d invalid : out of range\n", tag);
                 return 0;
@@ -1229,8 +1223,7 @@ static void sata_fsl_host_intr(struct ata_port *ap)
 
         /* Workaround for data length mismatch errata */
         if (unlikely(hstatus & INT_ON_DATA_LENGTH_MISMATCH)) {
-                for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
-                        qc = ata_qc_from_tag(ap, tag);
+                ata_qc_for_each_with_internal(ap, qc, tag) {
                         if (qc && ata_is_atapi(qc->tf.protocol)) {
                                 u32 hcontrol;
                                 /* Set HControl[27] to clear error registers */
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 10ae11aa1926..72c9b922a77b 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -675,7 +675,6 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
         struct ata_port *ap = ata_shost_to_port(sdev->host);
         struct nv_adma_port_priv *pp = ap->private_data;
         struct nv_adma_port_priv *port0, *port1;
-        struct scsi_device *sdev0, *sdev1;
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         unsigned long segment_boundary, flags;
         unsigned short sg_tablesize;
@@ -736,8 +735,6 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
 
         port0 = ap->host->ports[0]->private_data;
         port1 = ap->host->ports[1]->private_data;
-        sdev0 = ap->host->ports[0]->link.device[0].sdev;
-        sdev1 = ap->host->ports[1]->link.device[0].sdev;
         if ((port0->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) ||
             (port1->flags & NV_ADMA_ATAPI_SETUP_COMPLETE)) {
                 /*
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index ff81a576347e..82532c299bb5 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -1618,7 +1618,7 @@ static int rx_init(struct atm_dev *dev)
         skb_queue_head_init(&iadev->rx_dma_q);  
         iadev->rx_free_desc_qhead = NULL;   
 
-        iadev->rx_open = kcalloc(4, iadev->num_vc, GFP_KERNEL);
+        iadev->rx_open = kcalloc(iadev->num_vc, sizeof(void *), GFP_KERNEL);
         if (!iadev->rx_open) {
                 printk(KERN_ERR DEV_LABEL "itf %d couldn't get free page\n",
                 dev->number);  
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index a8d2eb0ceb8d..2c288d1f42bb 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -1483,6 +1483,8 @@ static int zatm_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
                                         return -EFAULT;
                                 if (pool < 0 || pool > ZATM_LAST_POOL)
                                         return -EINVAL;
+                                pool = array_index_nospec(pool,
+                                                          ZATM_LAST_POOL + 1);
                                 if (copy_from_user(&info,
                                     &((struct zatm_pool_req __user *) arg)->info,
                                     sizeof(info))) return -EFAULT;
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index b074f242a435..704f44295810 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -8,10 +8,7 @@ obj-y			:= component.o core.o bus.o dd.o syscore.o \
                            topology.o container.o property.o cacheinfo.o \
                            devcon.o
 obj-$(CONFIG_DEVTMPFS)  += devtmpfs.o
-obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
 obj-y                   += power/
-obj-$(CONFIG_HAS_DMA)   += dma-mapping.o
-obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
 obj-$(CONFIG_ISA_BUS_API)       += isa.o
 obj-y                           += firmware_loader/
 obj-$(CONFIG_NUMA)      += node.o
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 36622b52e419..df3e1a44707a 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -236,6 +236,13 @@ struct device_link *device_link_add(struct device *consumer,
                         link->rpm_active = true;
                 }
                 pm_runtime_new_link(consumer);
+                /*
+                 * If the link is being added by the consumer driver at probe
+                 * time, balance the decrementation of the supplier's runtime PM
+                 * usage counter after consumer probe in driver_probe_device().
+                 */
+                if (consumer->links.status == DL_DEV_PROBING)
+                        pm_runtime_get_noresume(supplier);
         }
         get_device(supplier);
         link->supplier = supplier;
@@ -255,12 +262,12 @@ struct device_link *device_link_add(struct device *consumer,
                         switch (consumer->links.status) {
                         case DL_DEV_PROBING:
                                 /*
-                                 * Balance the decrementation of the supplier's
-                                 * runtime PM usage counter after consumer probe
-                                 * in driver_probe_device().
+                                 * Some callers expect the link creation during
+                                 * consumer driver probe to resume the supplier
+                                 * even without DL_FLAG_RPM_ACTIVE.
                                  */
                                 if (flags & DL_FLAG_PM_RUNTIME)
-                                        pm_runtime_get_sync(supplier);
+                                        pm_runtime_resume(supplier);
 
                                 link->status = DL_STATE_CONSUMER_PROBE;
                                 break;
diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c
deleted file mode 100644
index 597d40893862..000000000000
--- a/drivers/base/dma-coherent.c
+++ /dev/null
@@ -1,434 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Coherent per-device memory handling.
- * Borrowed from i386
- */
-#include <linux/io.h>
-#include <linux/slab.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/dma-mapping.h>
-
-struct dma_coherent_mem {
-        void            *virt_base;
-        dma_addr_t      device_base;
-        unsigned long   pfn_base;
-        int             size;
-        int             flags;
-        unsigned long   *bitmap;
-        spinlock_t      spinlock;
-        bool            use_dev_dma_pfn_offset;
-};
-
-static struct dma_coherent_mem *dma_coherent_default_memory __ro_after_init;
-
-static inline struct dma_coherent_mem *dev_get_coherent_memory(struct device *dev)
-{
-        if (dev && dev->dma_mem)
-                return dev->dma_mem;
-        return NULL;
-}
-
-static inline dma_addr_t dma_get_device_base(struct device *dev,
-                                             struct dma_coherent_mem * mem)
-{
-        if (mem->use_dev_dma_pfn_offset)
-                return (mem->pfn_base - dev->dma_pfn_offset) << PAGE_SHIFT;
-        else
-                return mem->device_base;
-}
-
-static int dma_init_coherent_memory(
-        phys_addr_t phys_addr, dma_addr_t device_addr, size_t size, int flags,
-        struct dma_coherent_mem **mem)
-{
-        struct dma_coherent_mem *dma_mem = NULL;
-        void __iomem *mem_base = NULL;
-        int pages = size >> PAGE_SHIFT;
-        int bitmap_size = BITS_TO_LONGS(pages) * sizeof(long);
-        int ret;
-
-        if (!size) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        mem_base = memremap(phys_addr, size, MEMREMAP_WC);
-        if (!mem_base) {
-                ret = -EINVAL;
-                goto out;
-        }
-        dma_mem = kzalloc(sizeof(struct dma_coherent_mem), GFP_KERNEL);
-        if (!dma_mem) {
-                ret = -ENOMEM;
-                goto out;
-        }
-        dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
-        if (!dma_mem->bitmap) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        dma_mem->virt_base = mem_base;
-        dma_mem->device_base = device_addr;
-        dma_mem->pfn_base = PFN_DOWN(phys_addr);
-        dma_mem->size = pages;
-        dma_mem->flags = flags;
-        spin_lock_init(&dma_mem->spinlock);
-
-        *mem = dma_mem;
-        return 0;
-
-out:
-        kfree(dma_mem);
-        if (mem_base)
-                memunmap(mem_base);
-        return ret;
-}
-
-static void dma_release_coherent_memory(struct dma_coherent_mem *mem)
-{
-        if (!mem)
-                return;
-
-        memunmap(mem->virt_base);
-        kfree(mem->bitmap);
-        kfree(mem);
-}
-
-static int dma_assign_coherent_memory(struct device *dev,
-                                      struct dma_coherent_mem *mem)
-{
-        if (!dev)
-                return -ENODEV;
-
-        if (dev->dma_mem)
-                return -EBUSY;
-
-        dev->dma_mem = mem;
-        return 0;
-}
-
-int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
-                                dma_addr_t device_addr, size_t size, int flags)
-{
-        struct dma_coherent_mem *mem;
-        int ret;
-
-        ret = dma_init_coherent_memory(phys_addr, device_addr, size, flags, &mem);
-        if (ret)
-                return ret;
-
-        ret = dma_assign_coherent_memory(dev, mem);
-        if (ret)
-                dma_release_coherent_memory(mem);
-        return ret;
-}
-EXPORT_SYMBOL(dma_declare_coherent_memory);
-
-void dma_release_declared_memory(struct device *dev)
-{
-        struct dma_coherent_mem *mem = dev->dma_mem;
-
-        if (!mem)
-                return;
-        dma_release_coherent_memory(mem);
-        dev->dma_mem = NULL;
-}
-EXPORT_SYMBOL(dma_release_declared_memory);
-
-void *dma_mark_declared_memory_occupied(struct device *dev,
-                                        dma_addr_t device_addr, size_t size)
-{
-        struct dma_coherent_mem *mem = dev->dma_mem;
-        unsigned long flags;
-        int pos, err;
-
-        size += device_addr & ~PAGE_MASK;
-
-        if (!mem)
-                return ERR_PTR(-EINVAL);
-
-        spin_lock_irqsave(&mem->spinlock, flags);
-        pos = PFN_DOWN(device_addr - dma_get_device_base(dev, mem));
-        err = bitmap_allocate_region(mem->bitmap, pos, get_order(size));
-        spin_unlock_irqrestore(&mem->spinlock, flags);
-
-        if (err != 0)
-                return ERR_PTR(err);
-        return mem->virt_base + (pos << PAGE_SHIFT);
-}
-EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
-
-static void *__dma_alloc_from_coherent(struct dma_coherent_mem *mem,
-                ssize_t size, dma_addr_t *dma_handle)
-{
-        int order = get_order(size);
-        unsigned long flags;
-        int pageno;
-        void *ret;
-
-        spin_lock_irqsave(&mem->spinlock, flags);
-
-        if (unlikely(size > (mem->size << PAGE_SHIFT)))
-                goto err;
-
-        pageno = bitmap_find_free_region(mem->bitmap, mem->size, order);
-        if (unlikely(pageno < 0))
-                goto err;
-
-        /*
-         * Memory was found in the coherent area.
-         */
-        *dma_handle = mem->device_base + (pageno << PAGE_SHIFT);
-        ret = mem->virt_base + (pageno << PAGE_SHIFT);
-        spin_unlock_irqrestore(&mem->spinlock, flags);
-        memset(ret, 0, size);
-        return ret;
-err:
-        spin_unlock_irqrestore(&mem->spinlock, flags);
-        return NULL;
-}
-
-/**
- * dma_alloc_from_dev_coherent() - allocate memory from device coherent pool
- * @dev:        device from which we allocate memory
- * @size:       size of requested memory area
- * @dma_handle: This will be filled with the correct dma handle
- * @ret:        This pointer will be filled with the virtual address
- *              to allocated area.
- *
- * This function should be only called from per-arch dma_alloc_coherent()
- * to support allocation from per-device coherent memory pools.
- *
- * Returns 0 if dma_alloc_coherent should continue with allocating from
- * generic memory areas, or !0 if dma_alloc_coherent should return @ret.
- */
-int dma_alloc_from_dev_coherent(struct device *dev, ssize_t size,
-                dma_addr_t *dma_handle, void **ret)
-{
-        struct dma_coherent_mem *mem = dev_get_coherent_memory(dev);
-
-        if (!mem)
-                return 0;
-
-        *ret = __dma_alloc_from_coherent(mem, size, dma_handle);
-        if (*ret)
-                return 1;
-
-        /*
-         * In the case where the allocation can not be satisfied from the
-         * per-device area, try to fall back to generic memory if the
-         * constraints allow it.
-         */
-        return mem->flags & DMA_MEMORY_EXCLUSIVE;
-}
-EXPORT_SYMBOL(dma_alloc_from_dev_coherent);
-
-void *dma_alloc_from_global_coherent(ssize_t size, dma_addr_t *dma_handle)
-{
-        if (!dma_coherent_default_memory)
-                return NULL;
-
-        return __dma_alloc_from_coherent(dma_coherent_default_memory, size,
-                        dma_handle);
-}
-
-static int __dma_release_from_coherent(struct dma_coherent_mem *mem,
-                                       int order, void *vaddr)
-{
-        if (mem && vaddr >= mem->virt_base && vaddr <
-                   (mem->virt_base + (mem->size << PAGE_SHIFT))) {
-                int page = (vaddr - mem->virt_base) >> PAGE_SHIFT;
-                unsigned long flags;
-
-                spin_lock_irqsave(&mem->spinlock, flags);
-                bitmap_release_region(mem->bitmap, page, order);
-                spin_unlock_irqrestore(&mem->spinlock, flags);
-                return 1;
-        }
-        return 0;
-}
-
-/**
- * dma_release_from_dev_coherent() - free memory to device coherent memory pool
- * @dev:        device from which the memory was allocated
- * @order:      the order of pages allocated
- * @vaddr:      virtual address of allocated pages
- *
- * This checks whether the memory was allocated from the per-device
- * coherent memory pool and if so, releases that memory.
- *
- * Returns 1 if we correctly released the memory, or 0 if the caller should
- * proceed with releasing memory from generic pools.
- */
-int dma_release_from_dev_coherent(struct device *dev, int order, void *vaddr)
-{
-        struct dma_coherent_mem *mem = dev_get_coherent_memory(dev);
-
-        return __dma_release_from_coherent(mem, order, vaddr);
-}
-EXPORT_SYMBOL(dma_release_from_dev_coherent);
-
-int dma_release_from_global_coherent(int order, void *vaddr)
-{
-        if (!dma_coherent_default_memory)
-                return 0;
-
-        return __dma_release_from_coherent(dma_coherent_default_memory, order,
-                        vaddr);
-}
-
-static int __dma_mmap_from_coherent(struct dma_coherent_mem *mem,
-                struct vm_area_struct *vma, void *vaddr, size_t size, int *ret)
-{
-        if (mem && vaddr >= mem->virt_base && vaddr + size <=
-                   (mem->virt_base + (mem->size << PAGE_SHIFT))) {
-                unsigned long off = vma->vm_pgoff;
-                int start = (vaddr - mem->virt_base) >> PAGE_SHIFT;
-                int user_count = vma_pages(vma);
-                int count = PAGE_ALIGN(size) >> PAGE_SHIFT;
-
-                *ret = -ENXIO;
-                if (off < count && user_count <= count - off) {
-                        unsigned long pfn = mem->pfn_base + start + off;
-                        *ret = remap_pfn_range(vma, vma->vm_start, pfn,
-                                               user_count << PAGE_SHIFT,
-                                               vma->vm_page_prot);
-                }
-                return 1;
-        }
-        return 0;
-}
-
-/**
- * dma_mmap_from_dev_coherent() - mmap memory from the device coherent pool
- * @dev:        device from which the memory was allocated
- * @vma:        vm_area for the userspace memory
- * @vaddr:      cpu address returned by dma_alloc_from_dev_coherent
- * @size:       size of the memory buffer allocated
- * @ret:        result from remap_pfn_range()
- *
- * This checks whether the memory was allocated from the per-device
- * coherent memory pool and if so, maps that memory to the provided vma.
- *
- * Returns 1 if @vaddr belongs to the device coherent pool and the caller
- * should return @ret, or 0 if they should proceed with mapping memory from
- * generic areas.
- */
-int dma_mmap_from_dev_coherent(struct device *dev, struct vm_area_struct *vma,
-                           void *vaddr, size_t size, int *ret)
-{
-        struct dma_coherent_mem *mem = dev_get_coherent_memory(dev);
-
-        return __dma_mmap_from_coherent(mem, vma, vaddr, size, ret);
-}
-EXPORT_SYMBOL(dma_mmap_from_dev_coherent);
-
-int dma_mmap_from_global_coherent(struct vm_area_struct *vma, void *vaddr,
-                                   size_t size, int *ret)
-{
-        if (!dma_coherent_default_memory)
-                return 0;
-
-        return __dma_mmap_from_coherent(dma_coherent_default_memory, vma,
-                                        vaddr, size, ret);
-}
-
-/*
- * Support for reserved memory regions defined in device tree
- */
-#ifdef CONFIG_OF_RESERVED_MEM
-#include <linux/of.h>
-#include <linux/of_fdt.h>
-#include <linux/of_reserved_mem.h>
-
-static struct reserved_mem *dma_reserved_default_memory __initdata;
-
-static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev)
-{
-        struct dma_coherent_mem *mem = rmem->priv;
-        int ret;
-
-        if (!mem) {
-                ret = dma_init_coherent_memory(rmem->base, rmem->base,
-                                               rmem->size,
-                                               DMA_MEMORY_EXCLUSIVE, &mem);
-                if (ret) {
-                        pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
-                                &rmem->base, (unsigned long)rmem->size / SZ_1M);
-                        return ret;
-                }
-        }
-        mem->use_dev_dma_pfn_offset = true;
-        rmem->priv = mem;
-        dma_assign_coherent_memory(dev, mem);
-        return 0;
-}
-
-static void rmem_dma_device_release(struct reserved_mem *rmem,
-                                    struct device *dev)
-{
-        if (dev)
-                dev->dma_mem = NULL;
-}
-
-static const struct reserved_mem_ops rmem_dma_ops = {
-        .device_init    = rmem_dma_device_init,
-        .device_release = rmem_dma_device_release,
-};
-
-static int __init rmem_dma_setup(struct reserved_mem *rmem)
-{
-        unsigned long node = rmem->fdt_node;
-
-        if (of_get_flat_dt_prop(node, "reusable", NULL))
-                return -EINVAL;
-
-#ifdef CONFIG_ARM
-        if (!of_get_flat_dt_prop(node, "no-map", NULL)) {
-                pr_err("Reserved memory: regions without no-map are not yet supported\n");
-                return -EINVAL;
-        }
-
-        if (of_get_flat_dt_prop(node, "linux,dma-default", NULL)) {
-                WARN(dma_reserved_default_memory,
-                     "Reserved memory: region for default DMA coherent area is redefined\n");
-                dma_reserved_default_memory = rmem;
-        }
-#endif
-
-        rmem->ops = &rmem_dma_ops;
-        pr_info("Reserved memory: created DMA memory pool at %pa, size %ld MiB\n",
-                &rmem->base, (unsigned long)rmem->size / SZ_1M);
-        return 0;
-}
-
-static int __init dma_init_reserved_memory(void)
-{
-        const struct reserved_mem_ops *ops;
-        int ret;
-
-        if (!dma_reserved_default_memory)
-                return -ENOMEM;
-
-        ops = dma_reserved_default_memory->ops;
-
-        /*
-         * We rely on rmem_dma_device_init() does not propagate error of
-         * dma_assign_coherent_memory() for "NULL" device.
-         */
-        ret = ops->device_init(dma_reserved_default_memory, NULL);
-
-        if (!ret) {
-                dma_coherent_default_memory = dma_reserved_default_memory->priv;
-                pr_info("DMA: default coherent area is set\n");
-        }
-
-        return ret;
-}
-
-core_initcall(dma_init_reserved_memory);
-
-RESERVEDMEM_OF_DECLARE(dma, "shared-dma-pool", rmem_dma_setup);
-#endif
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
deleted file mode 100644
index d987dcd1bd56..000000000000
--- a/drivers/base/dma-contiguous.c
+++ /dev/null
@@ -1,278 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Contiguous Memory Allocator for DMA mapping framework
- * Copyright (c) 2010-2011 by Samsung Electronics.
- * Written by:
- *      Marek Szyprowski <m.szyprowski@samsung.com>
- *      Michal Nazarewicz <mina86@mina86.com>
- */
-
-#define pr_fmt(fmt) "cma: " fmt
-
-#ifdef CONFIG_CMA_DEBUG
-#ifndef DEBUG
-#  define DEBUG
-#endif
-#endif
-
-#include <asm/page.h>
-#include <asm/dma-contiguous.h>
-
-#include <linux/memblock.h>
-#include <linux/err.h>
-#include <linux/sizes.h>
-#include <linux/dma-contiguous.h>
-#include <linux/cma.h>
-
-#ifdef CONFIG_CMA_SIZE_MBYTES
-#define CMA_SIZE_MBYTES CONFIG_CMA_SIZE_MBYTES
-#else
-#define CMA_SIZE_MBYTES 0
-#endif
-
-struct cma *dma_contiguous_default_area;
-
-/*
- * Default global CMA area size can be defined in kernel's .config.
- * This is useful mainly for distro maintainers to create a kernel
- * that works correctly for most supported systems.
- * The size can be set in bytes or as a percentage of the total memory
- * in the system.
- *
- * Users, who want to set the size of global CMA area for their system
- * should use cma= kernel parameter.
- */
-static const phys_addr_t size_bytes = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M;
-static phys_addr_t size_cmdline = -1;
-static phys_addr_t base_cmdline;
-static phys_addr_t limit_cmdline;
-
-static int __init early_cma(char *p)
-{
-        pr_debug("%s(%s)\n", __func__, p);
-        size_cmdline = memparse(p, &p);
-        if (*p != '@')
-                return 0;
-        base_cmdline = memparse(p + 1, &p);
-        if (*p != '-') {
-                limit_cmdline = base_cmdline + size_cmdline;
-                return 0;
-        }
-        limit_cmdline = memparse(p + 1, &p);
-
-        return 0;
-}
-early_param("cma", early_cma);
-
-#ifdef CONFIG_CMA_SIZE_PERCENTAGE
-
-static phys_addr_t __init __maybe_unused cma_early_percent_memory(void)
-{
-        struct memblock_region *reg;
-        unsigned long total_pages = 0;
-
-        /*
-         * We cannot use memblock_phys_mem_size() here, because
-         * memblock_analyze() has not been called yet.
-         */
-        for_each_memblock(memory, reg)
-                total_pages += memblock_region_memory_end_pfn(reg) -
-                               memblock_region_memory_base_pfn(reg);
-
-        return (total_pages * CONFIG_CMA_SIZE_PERCENTAGE / 100) << PAGE_SHIFT;
-}
-
-#else
-
-static inline __maybe_unused phys_addr_t cma_early_percent_memory(void)
-{
-        return 0;
-}
-
-#endif
-
-/**
- * dma_contiguous_reserve() - reserve area(s) for contiguous memory handling
- * @limit: End address of the reserved memory (optional, 0 for any).
- *
- * This function reserves memory from early allocator. It should be
- * called by arch specific code once the early allocator (memblock or bootmem)
- * has been activated and all other subsystems have already allocated/reserved
- * memory.
- */
-void __init dma_contiguous_reserve(phys_addr_t limit)
-{
-        phys_addr_t selected_size = 0;
-        phys_addr_t selected_base = 0;
-        phys_addr_t selected_limit = limit;
-        bool fixed = false;
-
-        pr_debug("%s(limit %08lx)\n", __func__, (unsigned long)limit);
-
-        if (size_cmdline != -1) {
-                selected_size = size_cmdline;
-                selected_base = base_cmdline;
-                selected_limit = min_not_zero(limit_cmdline, limit);
-                if (base_cmdline + size_cmdline == limit_cmdline)
-                        fixed = true;
-        } else {
-#ifdef CONFIG_CMA_SIZE_SEL_MBYTES
-                selected_size = size_bytes;
-#elif defined(CONFIG_CMA_SIZE_SEL_PERCENTAGE)
-                selected_size = cma_early_percent_memory();
-#elif defined(CONFIG_CMA_SIZE_SEL_MIN)
-                selected_size = min(size_bytes, cma_early_percent_memory());
-#elif defined(CONFIG_CMA_SIZE_SEL_MAX)
-                selected_size = max(size_bytes, cma_early_percent_memory());
-#endif
-        }
-
-        if (selected_size && !dma_contiguous_default_area) {
-                pr_debug("%s: reserving %ld MiB for global area\n", __func__,
-                         (unsigned long)selected_size / SZ_1M);
-
-                dma_contiguous_reserve_area(selected_size, selected_base,
-                                            selected_limit,
-                                            &dma_contiguous_default_area,
-                                            fixed);
-        }
-}
-
-/**
- * dma_contiguous_reserve_area() - reserve custom contiguous area
- * @size: Size of the reserved area (in bytes),
- * @base: Base address of the reserved area optional, use 0 for any
- * @limit: End address of the reserved memory (optional, 0 for any).
- * @res_cma: Pointer to store the created cma region.
- * @fixed: hint about where to place the reserved area
- *
- * This function reserves memory from early allocator. It should be
- * called by arch specific code once the early allocator (memblock or bootmem)
- * has been activated and all other subsystems have already allocated/reserved
- * memory. This function allows to create custom reserved areas for specific
- * devices.
- *
- * If @fixed is true, reserve contiguous area at exactly @base.  If false,
- * reserve in range from @base to @limit.
- */
-int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
-                                       phys_addr_t limit, struct cma **res_cma,
-                                       bool fixed)
-{
-        int ret;
-
-        ret = cma_declare_contiguous(base, size, limit, 0, 0, fixed,
-                                        "reserved", res_cma);
-        if (ret)
-                return ret;
-
-        /* Architecture specific contiguous memory fixup. */
-        dma_contiguous_early_fixup(cma_get_base(*res_cma),
-                                cma_get_size(*res_cma));
-
-        return 0;
-}
-
-/**
- * dma_alloc_from_contiguous() - allocate pages from contiguous area
- * @dev:   Pointer to device for which the allocation is performed.
- * @count: Requested number of pages.
- * @align: Requested alignment of pages (in PAGE_SIZE order).
- * @gfp_mask: GFP flags to use for this allocation.
- *
- * This function allocates memory buffer for specified device. It uses
- * device specific contiguous memory area if available or the default
- * global one. Requires architecture specific dev_get_cma_area() helper
- * function.
- */
-struct page *dma_alloc_from_contiguous(struct device *dev, size_t count,
-                                       unsigned int align, gfp_t gfp_mask)
-{
-        if (align > CONFIG_CMA_ALIGNMENT)
-                align = CONFIG_CMA_ALIGNMENT;
-
-        return cma_alloc(dev_get_cma_area(dev), count, align, gfp_mask);
-}
-
-/**
- * dma_release_from_contiguous() - release allocated pages
- * @dev:   Pointer to device for which the pages were allocated.
- * @pages: Allocated pages.
- * @count: Number of allocated pages.
- *
- * This function releases memory allocated by dma_alloc_from_contiguous().
- * It returns false when provided pages do not belong to contiguous area and
- * true otherwise.
- */
-bool dma_release_from_contiguous(struct device *dev, struct page *pages,
-                                 int count)
-{
-        return cma_release(dev_get_cma_area(dev), pages, count);
-}
-
-/*
- * Support for reserved memory regions defined in device tree
- */
-#ifdef CONFIG_OF_RESERVED_MEM
-#include <linux/of.h>
-#include <linux/of_fdt.h>
-#include <linux/of_reserved_mem.h>
-
-#undef pr_fmt
-#define pr_fmt(fmt) fmt
-
-static int rmem_cma_device_init(struct reserved_mem *rmem, struct device *dev)
-{
-        dev_set_cma_area(dev, rmem->priv);
-        return 0;
-}
-
-static void rmem_cma_device_release(struct reserved_mem *rmem,
-                                    struct device *dev)
-{
-        dev_set_cma_area(dev, NULL);
-}
-
-static const struct reserved_mem_ops rmem_cma_ops = {
-        .device_init    = rmem_cma_device_init,
-        .device_release = rmem_cma_device_release,
-};
-
-static int __init rmem_cma_setup(struct reserved_mem *rmem)
-{
-        phys_addr_t align = PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order);
-        phys_addr_t mask = align - 1;
-        unsigned long node = rmem->fdt_node;
-        struct cma *cma;
-        int err;
-
-        if (!of_get_flat_dt_prop(node, "reusable", NULL) ||
-            of_get_flat_dt_prop(node, "no-map", NULL))
-                return -EINVAL;
-
-        if ((rmem->base & mask) || (rmem->size & mask)) {
-                pr_err("Reserved memory: incorrect alignment of CMA region\n");
-                return -EINVAL;
-        }
-
-        err = cma_init_reserved_mem(rmem->base, rmem->size, 0, rmem->name, &cma);
-        if (err) {
-                pr_err("Reserved memory: unable to setup CMA region\n");
-                return err;
-        }
-        /* Architecture specific contiguous memory fixup. */
-        dma_contiguous_early_fixup(rmem->base, rmem->size);
-
-        if (of_get_flat_dt_prop(node, "linux,cma-default", NULL))
-                dma_contiguous_set_default(cma);
-
-        rmem->ops = &rmem_cma_ops;
-        rmem->priv = cma;
-
-        pr_info("Reserved memory: created CMA memory pool at %pa, size %ld MiB\n",
-                &rmem->base, (unsigned long)rmem->size / SZ_1M);
-
-        return 0;
-}
-RESERVEDMEM_OF_DECLARE(cma, "shared-dma-pool", rmem_cma_setup);
-#endif
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
deleted file mode 100644
index f831a582209c..000000000000
--- a/drivers/base/dma-mapping.c
+++ /dev/null
@@ -1,345 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * drivers/base/dma-mapping.c - arch-independent dma-mapping routines
- *
- * Copyright (c) 2006  SUSE Linux Products GmbH
- * Copyright (c) 2006  Tejun Heo <teheo@suse.de>
- */
-
-#include <linux/acpi.h>
-#include <linux/dma-mapping.h>
-#include <linux/export.h>
-#include <linux/gfp.h>
-#include <linux/of_device.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-
-/*
- * Managed DMA API
- */
-struct dma_devres {
-        size_t          size;
-        void            *vaddr;
-        dma_addr_t      dma_handle;
-        unsigned long   attrs;
-};
-
-static void dmam_release(struct device *dev, void *res)
-{
-        struct dma_devres *this = res;
-
-        dma_free_attrs(dev, this->size, this->vaddr, this->dma_handle,
-                        this->attrs);
-}
-
-static int dmam_match(struct device *dev, void *res, void *match_data)
-{
-        struct dma_devres *this = res, *match = match_data;
-
-        if (this->vaddr == match->vaddr) {
-                WARN_ON(this->size != match->size ||
-                        this->dma_handle != match->dma_handle);
-                return 1;
-        }
-        return 0;
-}
-
-/**
- * dmam_alloc_coherent - Managed dma_alloc_coherent()
- * @dev: Device to allocate coherent memory for
- * @size: Size of allocation
- * @dma_handle: Out argument for allocated DMA handle
- * @gfp: Allocation flags
- *
- * Managed dma_alloc_coherent().  Memory allocated using this function
- * will be automatically released on driver detach.
- *
- * RETURNS:
- * Pointer to allocated memory on success, NULL on failure.
- */
-void *dmam_alloc_coherent(struct device *dev, size_t size,
-                           dma_addr_t *dma_handle, gfp_t gfp)
-{
-        struct dma_devres *dr;
-        void *vaddr;
-
-        dr = devres_alloc(dmam_release, sizeof(*dr), gfp);
-        if (!dr)
-                return NULL;
-
-        vaddr = dma_alloc_coherent(dev, size, dma_handle, gfp);
-        if (!vaddr) {
-                devres_free(dr);
-                return NULL;
-        }
-
-        dr->vaddr = vaddr;
-        dr->dma_handle = *dma_handle;
-        dr->size = size;
-
-        devres_add(dev, dr);
-
-        return vaddr;
-}
-EXPORT_SYMBOL(dmam_alloc_coherent);
-
-/**
- * dmam_free_coherent - Managed dma_free_coherent()
- * @dev: Device to free coherent memory for
- * @size: Size of allocation
- * @vaddr: Virtual address of the memory to free
- * @dma_handle: DMA handle of the memory to free
- *
- * Managed dma_free_coherent().
- */
-void dmam_free_coherent(struct device *dev, size_t size, void *vaddr,
-                        dma_addr_t dma_handle)
-{
-        struct dma_devres match_data = { size, vaddr, dma_handle };
-
-        dma_free_coherent(dev, size, vaddr, dma_handle);
-        WARN_ON(devres_destroy(dev, dmam_release, dmam_match, &match_data));
-}
-EXPORT_SYMBOL(dmam_free_coherent);
-
-/**
- * dmam_alloc_attrs - Managed dma_alloc_attrs()
- * @dev: Device to allocate non_coherent memory for
- * @size: Size of allocation
- * @dma_handle: Out argument for allocated DMA handle
- * @gfp: Allocation flags
- * @attrs: Flags in the DMA_ATTR_* namespace.
- *
- * Managed dma_alloc_attrs().  Memory allocated using this function will be
- * automatically released on driver detach.
- *
- * RETURNS:
- * Pointer to allocated memory on success, NULL on failure.
- */
-void *dmam_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,
-                gfp_t gfp, unsigned long attrs)
-{
-        struct dma_devres *dr;
-        void *vaddr;
-
-        dr = devres_alloc(dmam_release, sizeof(*dr), gfp);
-        if (!dr)
-                return NULL;
-
-        vaddr = dma_alloc_attrs(dev, size, dma_handle, gfp, attrs);
-        if (!vaddr) {
-                devres_free(dr);
-                return NULL;
-        }
-
-        dr->vaddr = vaddr;
-        dr->dma_handle = *dma_handle;
-        dr->size = size;
-        dr->attrs = attrs;
-
-        devres_add(dev, dr);
-
-        return vaddr;
-}
-EXPORT_SYMBOL(dmam_alloc_attrs);
-
-#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
-
-static void dmam_coherent_decl_release(struct device *dev, void *res)
-{
-        dma_release_declared_memory(dev);
-}
-
-/**
- * dmam_declare_coherent_memory - Managed dma_declare_coherent_memory()
- * @dev: Device to declare coherent memory for
- * @phys_addr: Physical address of coherent memory to be declared
- * @device_addr: Device address of coherent memory to be declared
- * @size: Size of coherent memory to be declared
- * @flags: Flags
- *
- * Managed dma_declare_coherent_memory().
- *
- * RETURNS:
- * 0 on success, -errno on failure.
- */
-int dmam_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
-                                 dma_addr_t device_addr, size_t size, int flags)
-{
-        void *res;
-        int rc;
-
-        res = devres_alloc(dmam_coherent_decl_release, 0, GFP_KERNEL);
-        if (!res)
-                return -ENOMEM;
-
-        rc = dma_declare_coherent_memory(dev, phys_addr, device_addr, size,
-                                         flags);
-        if (!rc)
-                devres_add(dev, res);
-        else
-                devres_free(res);
-
-        return rc;
-}
-EXPORT_SYMBOL(dmam_declare_coherent_memory);
-
-/**
- * dmam_release_declared_memory - Managed dma_release_declared_memory().
- * @dev: Device to release declared coherent memory for
- *
- * Managed dmam_release_declared_memory().
- */
-void dmam_release_declared_memory(struct device *dev)
-{
-        WARN_ON(devres_destroy(dev, dmam_coherent_decl_release, NULL, NULL));
-}
-EXPORT_SYMBOL(dmam_release_declared_memory);
-
-#endif
-
-/*
- * Create scatter-list for the already allocated DMA buffer.
- */
-int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
-                 void *cpu_addr, dma_addr_t handle, size_t size)
-{
-        struct page *page = virt_to_page(cpu_addr);
-        int ret;
-
-        ret = sg_alloc_table(sgt, 1, GFP_KERNEL);
-        if (unlikely(ret))
-                return ret;
-
-        sg_set_page(sgt->sgl, page, PAGE_ALIGN(size), 0);
-        return 0;
-}
-EXPORT_SYMBOL(dma_common_get_sgtable);
-
-/*
- * Create userspace mapping for the DMA-coherent memory.
- */
-int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
-                    void *cpu_addr, dma_addr_t dma_addr, size_t size)
-{
-        int ret = -ENXIO;
-#ifndef CONFIG_ARCH_NO_COHERENT_DMA_MMAP
-        unsigned long user_count = vma_pages(vma);
-        unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT;
-        unsigned long off = vma->vm_pgoff;
-
-        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-
-        if (dma_mmap_from_dev_coherent(dev, vma, cpu_addr, size, &ret))
-                return ret;
-
-        if (off < count && user_count <= (count - off))
-                ret = remap_pfn_range(vma, vma->vm_start,
-                                      page_to_pfn(virt_to_page(cpu_addr)) + off,
-                                      user_count << PAGE_SHIFT,
-                                      vma->vm_page_prot);
-#endif  /* !CONFIG_ARCH_NO_COHERENT_DMA_MMAP */
-
-        return ret;
-}
-EXPORT_SYMBOL(dma_common_mmap);
-
-#ifdef CONFIG_MMU
-static struct vm_struct *__dma_common_pages_remap(struct page **pages,
-                        size_t size, unsigned long vm_flags, pgprot_t prot,
-                        const void *caller)
-{
-        struct vm_struct *area;
-
-        area = get_vm_area_caller(size, vm_flags, caller);
-        if (!area)
-                return NULL;
-
-        if (map_vm_area(area, prot, pages)) {
-                vunmap(area->addr);
-                return NULL;
-        }
-
-        return area;
-}
-
-/*
- * remaps an array of PAGE_SIZE pages into another vm_area
- * Cannot be used in non-sleeping contexts
- */
-void *dma_common_pages_remap(struct page **pages, size_t size,
-                        unsigned long vm_flags, pgprot_t prot,
-                        const void *caller)
-{
-        struct vm_struct *area;
-
-        area = __dma_common_pages_remap(pages, size, vm_flags, prot, caller);
-        if (!area)
-                return NULL;
-
-        area->pages = pages;
-
-        return area->addr;
-}
-
-/*
- * remaps an allocated contiguous region into another vm_area.
- * Cannot be used in non-sleeping contexts
- */
-
-void *dma_common_contiguous_remap(struct page *page, size_t size,
-                        unsigned long vm_flags,
-                        pgprot_t prot, const void *caller)
-{
-        int i;
-        struct page **pages;
-        struct vm_struct *area;
-
-        pages = kmalloc(sizeof(struct page *) << get_order(size), GFP_KERNEL);
-        if (!pages)
-                return NULL;
-
-        for (i = 0; i < (size >> PAGE_SHIFT); i++)
-                pages[i] = nth_page(page, i);
-
-        area = __dma_common_pages_remap(pages, size, vm_flags, prot, caller);
-
-        kfree(pages);
-
-        if (!area)
-                return NULL;
-        return area->addr;
-}
-
-/*
- * unmaps a range previously mapped by dma_common_*_remap
- */
-void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags)
-{
-        struct vm_struct *area = find_vm_area(cpu_addr);
-
-        if (!area || (area->flags & vm_flags) != vm_flags) {
-                WARN(1, "trying to free invalid coherent area: %p\n", cpu_addr);
-                return;
-        }
-
-        unmap_kernel_range((unsigned long)cpu_addr, PAGE_ALIGN(size));
-        vunmap(cpu_addr);
-}
-#endif
-
-/*
- * enables DMA API use for a device
- */
-int dma_configure(struct device *dev)
-{
-        if (dev->bus->dma_configure)
-                return dev->bus->dma_configure(dev);
-        return 0;
-}
-
-void dma_deconfigure(struct device *dev)
-{
-        of_dma_deconfigure(dev);
-        acpi_dma_deconfigure(dev);
-}
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 4925af5c4cf0..9e8484189034 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2235,7 +2235,7 @@ static void genpd_dev_pm_sync(struct device *dev)
 }
 
 static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np,
-                                 unsigned int index)
+                                 unsigned int index, bool power_on)
 {
         struct of_phandle_args pd_args;
         struct generic_pm_domain *pd;
@@ -2271,9 +2271,11 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device_node *np,
         dev->pm_domain->detach = genpd_dev_pm_detach;
         dev->pm_domain->sync = genpd_dev_pm_sync;
 
-        genpd_lock(pd);
-        ret = genpd_power_on(pd, 0);
-        genpd_unlock(pd);
+        if (power_on) {
+                genpd_lock(pd);
+                ret = genpd_power_on(pd, 0);
+                genpd_unlock(pd);
+        }
 
         if (ret)
                 genpd_remove_device(pd, dev);
@@ -2307,7 +2309,7 @@ int genpd_dev_pm_attach(struct device *dev)
                                        "#power-domain-cells") != 1)
                 return 0;
 
-        return __genpd_dev_pm_attach(dev, dev->of_node, 0);
+        return __genpd_dev_pm_attach(dev, dev->of_node, 0, true);
 }
 EXPORT_SYMBOL_GPL(genpd_dev_pm_attach);
 
@@ -2359,14 +2361,14 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev,
         }
 
         /* Try to attach the device to the PM domain at the specified index. */
-        ret = __genpd_dev_pm_attach(genpd_dev, dev->of_node, index);
+        ret = __genpd_dev_pm_attach(genpd_dev, dev->of_node, index, false);
         if (ret < 1) {
                 device_unregister(genpd_dev);
                 return ret ? ERR_PTR(ret) : NULL;
         }
 
-        pm_runtime_set_active(genpd_dev);
         pm_runtime_enable(genpd_dev);
+        genpd_queue_power_off_work(dev_to_genpd(genpd_dev));
 
         return genpd_dev;
 }
@@ -2487,10 +2489,9 @@ EXPORT_SYMBOL_GPL(of_genpd_parse_idle_states);
  * power domain corresponding to a DT node's "required-opps" property.
  *
  * @dev: Device for which the performance-state needs to be found.
- * @opp_node: DT node where the "required-opps" property is present. This can be
+ * @np: DT node where the "required-opps" property is present. This can be
  *      the device node itself (if it doesn't have an OPP table) or a node
  *      within the OPP table of a device (if device has an OPP table).
- * @state: Pointer to return performance state.
  *
  * Returns performance state corresponding to the "required-opps" property of
  * a DT node. This calls platform specific genpd->opp_to_performance_state()
@@ -2499,7 +2500,7 @@ EXPORT_SYMBOL_GPL(of_genpd_parse_idle_states);
  * Returns performance state on success and 0 on failure.
  */
 unsigned int of_genpd_opp_to_performance_state(struct device *dev,
-                                               struct device_node *opp_node)
+                                               struct device_node *np)
 {
         struct generic_pm_domain *genpd;
         struct dev_pm_opp *opp;
@@ -2514,7 +2515,7 @@ unsigned int of_genpd_opp_to_performance_state(struct device *dev,
 
         genpd_lock(genpd);
 
-        opp = of_dev_pm_opp_find_required_opp(&genpd->dev, opp_node);
+        opp = of_dev_pm_opp_find_required_opp(&genpd->dev, np);
         if (IS_ERR(opp)) {
                 dev_err(dev, "Failed to find required OPP: %ld\n",
                         PTR_ERR(opp));
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index a47e4987ee46..d146fedc38bb 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1244,8 +1244,8 @@ drbd_request_prepare(struct drbd_device *device, struct bio *bio, unsigned long
         _drbd_start_io_acct(device, req);
 
         /* process discards always from our submitter thread */
-        if ((bio_op(bio) & REQ_OP_WRITE_ZEROES) ||
-            (bio_op(bio) & REQ_OP_DISCARD))
+        if (bio_op(bio) == REQ_OP_WRITE_ZEROES ||
+            bio_op(bio) == REQ_OP_DISCARD)
                 goto queue_for_submitter_thread;
 
         if (rw == WRITE && req->private_bio && req->i.size
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 1476cb3439f4..5e793dd7adfb 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -282,8 +282,8 @@ void drbd_request_endio(struct bio *bio)
                 what = COMPLETED_OK;
         }
 
-        bio_put(req->private_bio);
         req->private_bio = ERR_PTR(blk_status_to_errno(bio->bi_status));
+        bio_put(bio);
 
         /* not req_mod(), we need irqsave here! */
         spin_lock_irqsave(&device->resource->req_lock, flags);
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index d6b6f434fd4b..4cb1d1be3cfb 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1613,6 +1613,7 @@ static int lo_compat_ioctl(struct block_device *bdev, fmode_t mode,
                 arg = (unsigned long) compat_ptr(arg);
         case LOOP_SET_FD:
         case LOOP_CHANGE_FD:
+        case LOOP_SET_BLOCK_SIZE:
                 err = lo_ioctl(bdev, mode, cmd, arg);
                 break;
         default:
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 3b7083b8ecbb..74a05561b620 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -76,6 +76,7 @@ struct link_dead_args {
 #define NBD_HAS_CONFIG_REF              4
 #define NBD_BOUND                       5
 #define NBD_DESTROY_ON_DISCONNECT       6
+#define NBD_DISCONNECT_ON_CLOSE         7
 
 struct nbd_config {
         u32 flags;
@@ -138,6 +139,7 @@ static void nbd_config_put(struct nbd_device *nbd);
 static void nbd_connect_reply(struct genl_info *info, int index);
 static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info);
 static void nbd_dead_link_work(struct work_struct *work);
+static void nbd_disconnect_and_put(struct nbd_device *nbd);
 
 static inline struct device *nbd_to_dev(struct nbd_device *nbd)
 {
@@ -1305,6 +1307,12 @@ out:
 static void nbd_release(struct gendisk *disk, fmode_t mode)
 {
         struct nbd_device *nbd = disk->private_data;
+        struct block_device *bdev = bdget_disk(disk, 0);
+
+        if (test_bit(NBD_DISCONNECT_ON_CLOSE, &nbd->config->runtime_flags) &&
+                        bdev->bd_openers == 0)
+                nbd_disconnect_and_put(nbd);
+
         nbd_config_put(nbd);
         nbd_put(nbd);
 }
@@ -1705,6 +1713,10 @@ again:
                                 &config->runtime_flags);
                         put_dev = true;
                 }
+                if (flags & NBD_CFLAG_DISCONNECT_ON_CLOSE) {
+                        set_bit(NBD_DISCONNECT_ON_CLOSE,
+                                &config->runtime_flags);
+                }
         }
 
         if (info->attrs[NBD_ATTR_SOCKETS]) {
@@ -1749,6 +1761,17 @@ out:
         return ret;
 }
 
+static void nbd_disconnect_and_put(struct nbd_device *nbd)
+{
+        mutex_lock(&nbd->config_lock);
+        nbd_disconnect(nbd);
+        nbd_clear_sock(nbd);
+        mutex_unlock(&nbd->config_lock);
+        if (test_and_clear_bit(NBD_HAS_CONFIG_REF,
+                               &nbd->config->runtime_flags))
+                nbd_config_put(nbd);
+}
+
 static int nbd_genl_disconnect(struct sk_buff *skb, struct genl_info *info)
 {
         struct nbd_device *nbd;
@@ -1781,13 +1804,7 @@ static int nbd_genl_disconnect(struct sk_buff *skb, struct genl_info *info)
                 nbd_put(nbd);
                 return 0;
         }
-        mutex_lock(&nbd->config_lock);
-        nbd_disconnect(nbd);
-        nbd_clear_sock(nbd);
-        mutex_unlock(&nbd->config_lock);
-        if (test_and_clear_bit(NBD_HAS_CONFIG_REF,
-                               &nbd->config->runtime_flags))
-                nbd_config_put(nbd);
+        nbd_disconnect_and_put(nbd);
         nbd_config_put(nbd);
         nbd_put(nbd);
         return 0;
@@ -1798,7 +1815,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
         struct nbd_device *nbd = NULL;
         struct nbd_config *config;
         int index;
-        int ret = -EINVAL;
+        int ret = 0;
         bool put_dev = false;
 
         if (!netlink_capable(skb, CAP_SYS_ADMIN))
@@ -1838,6 +1855,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
             !nbd->task_recv) {
                 dev_err(nbd_to_dev(nbd),
                         "not configured, cannot reconfigure\n");
+                ret = -EINVAL;
                 goto out;
         }
 
@@ -1862,6 +1880,14 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
                                                &config->runtime_flags))
                                 refcount_inc(&nbd->refs);
                 }
+
+                if (flags & NBD_CFLAG_DISCONNECT_ON_CLOSE) {
+                        set_bit(NBD_DISCONNECT_ON_CLOSE,
+                                        &config->runtime_flags);
+                } else {
+                        clear_bit(NBD_DISCONNECT_ON_CLOSE,
+                                        &config->runtime_flags);
+                }
         }
 
         if (info->attrs[NBD_ATTR_SOCKETS]) {
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index 7948049f6c43..042c778e5a4e 100644
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -1365,7 +1365,7 @@ static blk_qc_t null_queue_bio(struct request_queue *q, struct bio *bio)
 static enum blk_eh_timer_return null_rq_timed_out_fn(struct request *rq)
 {
         pr_info("null: rq %p timed out\n", rq);
-        blk_mq_complete_request(rq);
+        __blk_complete_request(rq);
         return BLK_EH_DONE;
 }
 
diff --git a/drivers/bluetooth/hci_nokia.c b/drivers/bluetooth/hci_nokia.c
index 14d159e2042d..2dc33e65d2d0 100644
--- a/drivers/bluetooth/hci_nokia.c
+++ b/drivers/bluetooth/hci_nokia.c
@@ -29,7 +29,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <linux/unaligned/le_struct.h>
+#include <asm/unaligned.h>
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 1cc29629d238..80d60f43db56 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -169,9 +169,9 @@ static int sysc_get_clocks(struct sysc *ddata)
         const char *name;
         int nr_fck = 0, nr_ick = 0, i, error = 0;
 
-        ddata->clock_roles = devm_kzalloc(ddata->dev,
-                                          sizeof(*ddata->clock_roles) *
+        ddata->clock_roles = devm_kcalloc(ddata->dev,
                                           SYSC_MAX_CLOCKS,
+                                          sizeof(*ddata->clock_roles),
                                           GFP_KERNEL);
         if (!ddata->clock_roles)
                 return -ENOMEM;
@@ -200,8 +200,8 @@ static int sysc_get_clocks(struct sysc *ddata)
                 return -EINVAL;
         }
 
-        ddata->clocks = devm_kzalloc(ddata->dev,
-                                     sizeof(*ddata->clocks) * ddata->nr_clocks,
+        ddata->clocks = devm_kcalloc(ddata->dev,
+                                     ddata->nr_clocks, sizeof(*ddata->clocks),
                                      GFP_KERNEL);
         if (!ddata->clocks)
                 return -ENOMEM;
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 91bb98c42a1c..aaf9e5afaad4 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -516,11 +516,18 @@ EXPORT_SYMBOL_GPL(hwrng_register);
 
 void hwrng_unregister(struct hwrng *rng)
 {
+        int err;
+
         mutex_lock(&rng_mutex);
 
         list_del(&rng->list);
-        if (current_rng == rng)
-                enable_best_rng();
+        if (current_rng == rng) {
+                err = enable_best_rng();
+                if (err) {
+                        drop_current_rng();
+                        cur_rng_set_by_user = 0;
+                }
+        }
 
         if (list_empty(&rng_list)) {
                 mutex_unlock(&rng_mutex);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index ad353be871bf..90ec010bffbd 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2088,8 +2088,10 @@ static int try_smi_init(struct smi_info *new_smi)
         return 0;
 
 out_err:
-        ipmi_unregister_smi(new_smi->intf);
-        new_smi->intf = NULL;
+        if (new_smi->intf) {
+                ipmi_unregister_smi(new_smi->intf);
+                new_smi->intf = NULL;
+        }
 
         kfree(init_name);
 
diff --git a/drivers/char/ipmi/kcs_bmc.c b/drivers/char/ipmi/kcs_bmc.c
index fbfc05e3f3d1..bb882ab161fe 100644
--- a/drivers/char/ipmi/kcs_bmc.c
+++ b/drivers/char/ipmi/kcs_bmc.c
@@ -210,34 +210,23 @@ static void kcs_bmc_handle_cmd(struct kcs_bmc *kcs_bmc)
 int kcs_bmc_handle_event(struct kcs_bmc *kcs_bmc)
 {
         unsigned long flags;
-        int ret = 0;
+        int ret = -ENODATA;
         u8 status;
 
         spin_lock_irqsave(&kcs_bmc->lock, flags);
 
-        if (!kcs_bmc->running) {
-                kcs_force_abort(kcs_bmc);
-                ret = -ENODEV;
-                goto out_unlock;
-        }
-
-        status = read_status(kcs_bmc) & (KCS_STATUS_IBF | KCS_STATUS_CMD_DAT);
-
-        switch (status) {
-        case KCS_STATUS_IBF | KCS_STATUS_CMD_DAT:
-                kcs_bmc_handle_cmd(kcs_bmc);
-                break;
-
-        case KCS_STATUS_IBF:
-                kcs_bmc_handle_data(kcs_bmc);
-                break;
+        status = read_status(kcs_bmc);
+        if (status & KCS_STATUS_IBF) {
+                if (!kcs_bmc->running)
+                        kcs_force_abort(kcs_bmc);
+                else if (status & KCS_STATUS_CMD_DAT)
+                        kcs_bmc_handle_cmd(kcs_bmc);
+                else
+                        kcs_bmc_handle_data(kcs_bmc);
 
-        default:
-                ret = -ENODATA;
-                break;
+                ret = 0;
         }
 
-out_unlock:
         spin_unlock_irqrestore(&kcs_bmc->lock, flags);
 
         return ret;
diff --git a/drivers/char/random.c b/drivers/char/random.c
index a8fb0020ba5c..cd888d4ee605 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -402,7 +402,8 @@ static struct poolinfo {
 /*
  * Static global variables
  */
-static DECLARE_WAIT_QUEUE_HEAD(random_wait);
+static DECLARE_WAIT_QUEUE_HEAD(random_read_wait);
+static DECLARE_WAIT_QUEUE_HEAD(random_write_wait);
 static struct fasync_struct *fasync;
 
 static DEFINE_SPINLOCK(random_ready_list_lock);
@@ -721,8 +722,8 @@ retry:
 
                 /* should we wake readers? */
                 if (entropy_bits >= random_read_wakeup_bits &&
-                    wq_has_sleeper(&random_wait)) {
-                        wake_up_interruptible_poll(&random_wait, POLLIN);
+                    wq_has_sleeper(&random_read_wait)) {
+                        wake_up_interruptible(&random_read_wait);
                         kill_fasync(&fasync, SIGIO, POLL_IN);
                 }
                 /* If the input pool is getting full, send some
@@ -1396,7 +1397,7 @@ retry:
         trace_debit_entropy(r->name, 8 * ibytes);
         if (ibytes &&
             (r->entropy_count >> ENTROPY_SHIFT) < random_write_wakeup_bits) {
-                wake_up_interruptible_poll(&random_wait, POLLOUT);
+                wake_up_interruptible(&random_write_wait);
                 kill_fasync(&fasync, SIGIO, POLL_OUT);
         }
 
@@ -1838,7 +1839,7 @@ _random_read(int nonblock, char __user *buf, size_t nbytes)
                 if (nonblock)
                         return -EAGAIN;
 
-                wait_event_interruptible(random_wait,
+                wait_event_interruptible(random_read_wait,
                         ENTROPY_BITS(&input_pool) >=
                         random_read_wakeup_bits);
                 if (signal_pending(current))
@@ -1875,17 +1876,14 @@ urandom_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
         return ret;
 }
 
-static struct wait_queue_head *
-random_get_poll_head(struct file *file, __poll_t events)
-{
-        return &random_wait;
-}
-
 static __poll_t
-random_poll_mask(struct file *file, __poll_t events)
+random_poll(struct file *file, poll_table * wait)
 {
-        __poll_t mask = 0;
+        __poll_t mask;
 
+        poll_wait(file, &random_read_wait, wait);
+        poll_wait(file, &random_write_wait, wait);
+        mask = 0;
         if (ENTROPY_BITS(&input_pool) >= random_read_wakeup_bits)
                 mask |= EPOLLIN | EPOLLRDNORM;
         if (ENTROPY_BITS(&input_pool) < random_write_wakeup_bits)
@@ -1992,8 +1990,7 @@ static int random_fasync(int fd, struct file *filp, int on)
 const struct file_operations random_fops = {
         .read  = random_read,
         .write = random_write,
-        .get_poll_head  = random_get_poll_head,
-        .poll_mask  = random_poll_mask,
+        .poll  = random_poll,
         .unlocked_ioctl = random_ioctl,
         .fasync = random_fasync,
         .llseek = noop_llseek,
@@ -2326,7 +2323,7 @@ void add_hwgenerator_randomness(const char *buffer, size_t count,
          * We'll be woken up again once below random_write_wakeup_thresh,
          * or when the calling thread is about to terminate.
          */
-        wait_event_interruptible(random_wait, kthread_should_stop() ||
+        wait_event_interruptible(random_write_wait, kthread_should_stop() ||
                         ENTROPY_BITS(&input_pool) <= random_write_wakeup_bits);
         mix_pool_bytes(poolp, buffer, count);
         credit_entropy_bits(poolp, entropy);
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index ae40cbe770f0..0bb25dd009d1 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -96,7 +96,7 @@ obj-$(CONFIG_ARCH_SPRD)			+= sprd/
 obj-$(CONFIG_ARCH_STI)                  += st/
 obj-$(CONFIG_ARCH_STRATIX10)            += socfpga/
 obj-$(CONFIG_ARCH_SUNXI)                += sunxi/
-obj-$(CONFIG_ARCH_SUNXI)                += sunxi-ng/
+obj-$(CONFIG_SUNXI_CCU)                 += sunxi-ng/
 obj-$(CONFIG_ARCH_TEGRA)                += tegra/
 obj-y                                   += ti/
 obj-$(CONFIG_CLK_UNIPHIER)              += uniphier/
diff --git a/drivers/clk/davinci/da8xx-cfgchip.c b/drivers/clk/davinci/da8xx-cfgchip.c
index aae62a5b8734..d1bbee19ed0f 100644
--- a/drivers/clk/davinci/da8xx-cfgchip.c
+++ b/drivers/clk/davinci/da8xx-cfgchip.c
@@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap)
 
         usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap);
         if (IS_ERR(usb1)) {
-                if (PTR_ERR(usb0) == -EPROBE_DEFER)
+                if (PTR_ERR(usb1) == -EPROBE_DEFER)
                         return -EPROBE_DEFER;
 
                 dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n",
diff --git a/drivers/clk/davinci/psc.h b/drivers/clk/davinci/psc.h
index 6a42529d31a9..cc5614567a70 100644
--- a/drivers/clk/davinci/psc.h
+++ b/drivers/clk/davinci/psc.h
@@ -107,7 +107,7 @@ extern const struct davinci_psc_init_data of_da850_psc1_init_data;
 #ifdef CONFIG_ARCH_DAVINCI_DM355
 extern const struct davinci_psc_init_data dm355_psc_init_data;
 #endif
-#ifdef CONFIG_ARCH_DAVINCI_DM356
+#ifdef CONFIG_ARCH_DAVINCI_DM365
 extern const struct davinci_psc_init_data dm365_psc_init_data;
 #endif
 #ifdef CONFIG_ARCH_DAVINCI_DM644x
diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile
index acaa14cfa25c..49454700f2e5 100644
--- a/drivers/clk/sunxi-ng/Makefile
+++ b/drivers/clk/sunxi-ng/Makefile
@@ -1,24 +1,24 @@
 # SPDX-License-Identifier: GPL-2.0
 # Common objects
-lib-$(CONFIG_SUNXI_CCU)         += ccu_common.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_mmc_timing.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_reset.o
+obj-y                           += ccu_common.o
+obj-y                           += ccu_mmc_timing.o
+obj-y                           += ccu_reset.o
 
 # Base clock types
-lib-$(CONFIG_SUNXI_CCU)         += ccu_div.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_frac.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_gate.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_mux.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_mult.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_phase.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_sdm.o
+obj-y                           += ccu_div.o
+obj-y                           += ccu_frac.o
+obj-y                           += ccu_gate.o
+obj-y                           += ccu_mux.o
+obj-y                           += ccu_mult.o
+obj-y                           += ccu_phase.o
+obj-y                           += ccu_sdm.o
 
 # Multi-factor clocks
-lib-$(CONFIG_SUNXI_CCU)         += ccu_nk.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_nkm.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_nkmp.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_nm.o
-lib-$(CONFIG_SUNXI_CCU)         += ccu_mp.o
+obj-y                           += ccu_nk.o
+obj-y                           += ccu_nkm.o
+obj-y                           += ccu_nkmp.o
+obj-y                           += ccu_nm.o
+obj-y                           += ccu_mp.o
 
 # SoC support
 obj-$(CONFIG_SUN50I_A64_CCU)    += ccu-sun50i-a64.o
@@ -38,12 +38,3 @@ obj-$(CONFIG_SUN8I_R40_CCU)	+= ccu-sun8i-r40.o
 obj-$(CONFIG_SUN9I_A80_CCU)     += ccu-sun9i-a80.o
 obj-$(CONFIG_SUN9I_A80_CCU)     += ccu-sun9i-a80-de.o
 obj-$(CONFIG_SUN9I_A80_CCU)     += ccu-sun9i-a80-usb.o
-
-# The lib-y file goals is supposed to work only in arch/*/lib or lib/. In our
-# case, we want to use that goal, but even though lib.a will be properly
-# generated, it will not be linked in, eventually resulting in a linker error
-# for missing symbols.
-#
-# We can work around that by explicitly adding lib.a to the obj-y goal. This is
-# an undocumented behaviour, but works well for now.
-obj-$(CONFIG_SUNXI_CCU)         += lib.a
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 57cb2f00fc07..d8c7f5750cdb 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -735,7 +735,7 @@ static void __arch_timer_setup(unsigned type,
                 clk->features |= CLOCK_EVT_FEAT_DYNIRQ;
                 clk->name = "arch_mem_timer";
                 clk->rating = 400;
-                clk->cpumask = cpu_all_mask;
+                clk->cpumask = cpu_possible_mask;
                 if (arch_timer_mem_use_virtual) {
                         clk->set_state_shutdown = arch_timer_shutdown_virt_mem;
                         clk->set_state_oneshot_stopped = arch_timer_shutdown_virt_mem;
diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c
index e5cdc3af684c..2717f88c7904 100644
--- a/drivers/clocksource/timer-stm32.c
+++ b/drivers/clocksource/timer-stm32.c
@@ -304,8 +304,10 @@ static int __init stm32_timer_init(struct device_node *node)
 
         to->private_data = kzalloc(sizeof(struct stm32_timer_private),
                                    GFP_KERNEL);
-        if (!to->private_data)
+        if (!to->private_data) {
+                ret = -ENOMEM;
                 goto deinit;
+        }
 
         rstc = of_reset_control_get(node, NULL);
         if (!IS_ERR(rstc)) {
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 1de5ec8d5ea3..ece120da3353 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -294,6 +294,7 @@ struct pstate_funcs {
 static struct pstate_funcs pstate_funcs __read_mostly;
 
 static int hwp_active __read_mostly;
+static int hwp_mode_bdw __read_mostly;
 static bool per_cpu_limits __read_mostly;
 static bool hwp_boost __read_mostly;
 
@@ -1413,7 +1414,15 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
         cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
         cpu->pstate.scaling = pstate_funcs.get_scaling();
         cpu->pstate.max_freq = cpu->pstate.max_pstate * cpu->pstate.scaling;
-        cpu->pstate.turbo_freq = cpu->pstate.turbo_pstate * cpu->pstate.scaling;
+
+        if (hwp_active && !hwp_mode_bdw) {
+                unsigned int phy_max, current_max;
+
+                intel_pstate_get_hwp_max(cpu->cpu, &phy_max, &current_max);
+                cpu->pstate.turbo_freq = phy_max * cpu->pstate.scaling;
+        } else {
+                cpu->pstate.turbo_freq = cpu->pstate.turbo_pstate * cpu->pstate.scaling;
+        }
 
         if (pstate_funcs.get_aperf_mperf_shift)
                 cpu->aperf_mperf_shift = pstate_funcs.get_aperf_mperf_shift();
@@ -2467,28 +2476,36 @@ static inline bool intel_pstate_has_acpi_ppc(void) { return false; }
 static inline void intel_pstate_request_control_from_smm(void) {}
 #endif /* CONFIG_ACPI */
 
+#define INTEL_PSTATE_HWP_BROADWELL      0x01
+
+#define ICPU_HWP(model, hwp_mode) \
+        { X86_VENDOR_INTEL, 6, model, X86_FEATURE_HWP, hwp_mode }
+
 static const struct x86_cpu_id hwp_support_ids[] __initconst = {
-        { X86_VENDOR_INTEL, 6, X86_MODEL_ANY, X86_FEATURE_HWP },
+        ICPU_HWP(INTEL_FAM6_BROADWELL_X, INTEL_PSTATE_HWP_BROADWELL),
+        ICPU_HWP(INTEL_FAM6_BROADWELL_XEON_D, INTEL_PSTATE_HWP_BROADWELL),
+        ICPU_HWP(X86_MODEL_ANY, 0),
         {}
 };
 
 static int __init intel_pstate_init(void)
 {
+        const struct x86_cpu_id *id;
         int rc;
 
         if (no_load)
                 return -ENODEV;
 
-        if (x86_match_cpu(hwp_support_ids)) {
+        id = x86_match_cpu(hwp_support_ids);
+        if (id) {
                 copy_cpu_funcs(&core_funcs);
                 if (!no_hwp) {
                         hwp_active++;
+                        hwp_mode_bdw = id->driver_data;
                         intel_pstate.attr = hwp_cpufreq_attrs;
                         goto hwp_cpu_matched;
                 }
         } else {
-                const struct x86_cpu_id *id;
-
                 id = x86_match_cpu(intel_pstate_cpu_ids);
                 if (!id)
                         return -ENODEV;
diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
index d049fe4b80c4..29389accf3e9 100644
--- a/drivers/cpufreq/qcom-cpufreq-kryo.c
+++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
@@ -42,6 +42,8 @@ enum _msm8996_version {
         NUM_OF_MSM8996_VERSIONS,
 };
 
+struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev;
+
 static enum _msm8996_version __init qcom_cpufreq_kryo_get_msm_id(void)
 {
         size_t len;
@@ -74,7 +76,6 @@ static enum _msm8996_version __init qcom_cpufreq_kryo_get_msm_id(void)
 static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
 {
         struct opp_table *opp_tables[NR_CPUS] = {0};
-        struct platform_device *cpufreq_dt_pdev;
         enum _msm8996_version msm8996_version;
         struct nvmem_cell *speedbin_nvmem;
         struct device_node *np;
@@ -86,8 +87,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
         int ret;
 
         cpu_dev = get_cpu_device(0);
-        if (NULL == cpu_dev)
-                ret = -ENODEV;
+        if (!cpu_dev)
+                return -ENODEV;
 
         msm8996_version = qcom_cpufreq_kryo_get_msm_id();
         if (NUM_OF_MSM8996_VERSIONS == msm8996_version) {
@@ -96,8 +97,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
         }
 
         np = dev_pm_opp_of_get_opp_desc_node(cpu_dev);
-        if (IS_ERR(np))
-                return PTR_ERR(np);
+        if (!np)
+                return -ENOENT;
 
         ret = of_device_is_compatible(np, "operating-points-v2-kryo-cpu");
         if (!ret) {
@@ -115,6 +116,8 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
 
         speedbin = nvmem_cell_read(speedbin_nvmem, &len);
         nvmem_cell_put(speedbin_nvmem);
+        if (IS_ERR(speedbin))
+                return PTR_ERR(speedbin);
 
         switch (msm8996_version) {
         case MSM8996_V3:
@@ -127,6 +130,7 @@ static int qcom_cpufreq_kryo_probe(struct platform_device *pdev)
                 BUG();
                 break;
         }
+        kfree(speedbin);
 
         for_each_possible_cpu(cpu) {
                 cpu_dev = get_cpu_device(cpu);
@@ -162,8 +166,15 @@ free_opp:
         return ret;
 }
 
+static int qcom_cpufreq_kryo_remove(struct platform_device *pdev)
+{
+        platform_device_unregister(cpufreq_dt_pdev);
+        return 0;
+}
+
 static struct platform_driver qcom_cpufreq_kryo_driver = {
         .probe = qcom_cpufreq_kryo_probe,
+        .remove = qcom_cpufreq_kryo_remove,
         .driver = {
                 .name = "qcom-cpufreq-kryo",
         },
@@ -198,8 +209,9 @@ static int __init qcom_cpufreq_kryo_init(void)
         if (unlikely(ret < 0))
                 return ret;
 
-        ret = PTR_ERR_OR_ZERO(platform_device_register_simple(
-                "qcom-cpufreq-kryo", -1, NULL, 0));
+        kryo_cpufreq_pdev = platform_device_register_simple(
+                "qcom-cpufreq-kryo", -1, NULL, 0);
+        ret = PTR_ERR_OR_ZERO(kryo_cpufreq_pdev);
         if (0 == ret)
                 return 0;
 
@@ -208,5 +220,12 @@ static int __init qcom_cpufreq_kryo_init(void)
 }
 module_init(qcom_cpufreq_kryo_init);
 
+static void __init qcom_cpufreq_kryo_exit(void)
+{
+        platform_device_unregister(kryo_cpufreq_pdev);
+        platform_driver_unregister(&qcom_cpufreq_kryo_driver);
+}
+module_exit(qcom_cpufreq_kryo_exit);
+
 MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Kryo CPUfreq driver");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/crypto/chelsio/chtls/chtls_io.c b/drivers/crypto/chelsio/chtls/chtls_io.c
index 00c7aab8e7d0..afebbd87c4aa 100644
--- a/drivers/crypto/chelsio/chtls/chtls_io.c
+++ b/drivers/crypto/chelsio/chtls/chtls_io.c
@@ -1548,15 +1548,14 @@ skip_copy:
                         tp->urg_data = 0;
 
                 if ((avail + offset) >= skb->len) {
-                        if (likely(skb))
-                                chtls_free_skb(sk, skb);
-                        buffers_freed++;
                         if (ULP_SKB_CB(skb)->flags & ULPCB_FLAG_TLS_HDR) {
                                 tp->copied_seq += skb->len;
                                 hws->rcvpld = skb->hdr_len;
                         } else {
                                 tp->copied_seq += hws->rcvpld;
                         }
+                        chtls_free_skb(sk, skb);
+                        buffers_freed++;
                         hws->copied_seq = 0;
                         if (copied >= target &&
                             !skb_peek(&sk->sk_receive_queue))
diff --git a/drivers/dax/device.c b/drivers/dax/device.c
index de2f8297a210..108c37fca782 100644
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c
@@ -189,14 +189,16 @@ static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma,
 
         /* prevent private mappings from being established */
         if ((vma->vm_flags & VM_MAYSHARE) != VM_MAYSHARE) {
-                dev_info(dev, "%s: %s: fail, attempted private mapping\n",
+                dev_info_ratelimited(dev,
+                                "%s: %s: fail, attempted private mapping\n",
                                 current->comm, func);
                 return -EINVAL;
         }
 
         mask = dax_region->align - 1;
         if (vma->vm_start & mask || vma->vm_end & mask) {
-                dev_info(dev, "%s: %s: fail, unaligned vma (%#lx - %#lx, %#lx)\n",
+                dev_info_ratelimited(dev,
+                                "%s: %s: fail, unaligned vma (%#lx - %#lx, %#lx)\n",
                                 current->comm, func, vma->vm_start, vma->vm_end,
                                 mask);
                 return -EINVAL;
@@ -204,13 +206,15 @@ static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma,
 
         if ((dax_region->pfn_flags & (PFN_DEV|PFN_MAP)) == PFN_DEV
                         && (vma->vm_flags & VM_DONTCOPY) == 0) {
-                dev_info(dev, "%s: %s: fail, dax range requires MADV_DONTFORK\n",
+                dev_info_ratelimited(dev,
+                                "%s: %s: fail, dax range requires MADV_DONTFORK\n",
                                 current->comm, func);
                 return -EINVAL;
         }
 
         if (!vma_is_dax(vma)) {
-                dev_info(dev, "%s: %s: fail, vma is not DAX capable\n",
+                dev_info_ratelimited(dev,
+                                "%s: %s: fail, vma is not DAX capable\n",
                                 current->comm, func);
                 return -EINVAL;
         }
diff --git a/drivers/dax/super.c b/drivers/dax/super.c
index 903d9c473749..45276abf03aa 100644
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@ -86,6 +86,7 @@ bool __bdev_dax_supported(struct block_device *bdev, int blocksize)
 {
         struct dax_device *dax_dev;
         bool dax_enabled = false;
+        struct request_queue *q;
         pgoff_t pgoff;
         int err, id;
         void *kaddr;
@@ -99,6 +100,13 @@ bool __bdev_dax_supported(struct block_device *bdev, int blocksize)
                 return false;
         }
 
+        q = bdev_get_queue(bdev);
+        if (!q || !blk_queue_dax(q)) {
+                pr_debug("%s: error: request queue doesn't support dax\n",
+                                bdevname(bdev, buf));
+                return false;
+        }
+
         err = bdev_dax_pgoff(bdev, 0, PAGE_SIZE, &pgoff);
         if (err) {
                 pr_debug("%s: error: unaligned partition for dax\n",
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index fa31cccbe04f..6bfa217ed6d0 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -794,7 +794,7 @@ static struct dma_chan *k3_of_dma_simple_xlate(struct of_phandle_args *dma_spec,
         struct k3_dma_dev *d = ofdma->of_dma_data;
         unsigned int request = dma_spec->args[0];
 
-        if (request > d->dma_requests)
+        if (request >= d->dma_requests)
                 return NULL;
 
         return dma_get_slave_channel(&(d->chans[request].vc.chan));
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index defcdde4d358..de0957fe9668 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -3033,7 +3033,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
         pd->src_addr_widths = PL330_DMA_BUSWIDTHS;
         pd->dst_addr_widths = PL330_DMA_BUSWIDTHS;
         pd->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
-        pd->residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT;
+        pd->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
         pd->max_burst = ((pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP) ?
                          1 : PL330_MAX_BURST);
 
diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
index 9b5ca8691f27..a4a931ddf6f6 100644
--- a/drivers/dma/ti/omap-dma.c
+++ b/drivers/dma/ti/omap-dma.c
@@ -1485,7 +1485,11 @@ static int omap_dma_probe(struct platform_device *pdev)
         od->ddev.src_addr_widths = OMAP_DMA_BUSWIDTHS;
         od->ddev.dst_addr_widths = OMAP_DMA_BUSWIDTHS;
         od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
-        od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
+        if (__dma_omap15xx(od->plat->dma_attr))
+                od->ddev.residue_granularity =
+                                DMA_RESIDUE_GRANULARITY_DESCRIPTOR;
+        else
+                od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
         od->ddev.max_burst = SZ_16M - 1; /* CCEN: 24bit unsigned */
         od->ddev.dev = &pdev->dev;
         INIT_LIST_HEAD(&od->ddev.channels);
diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
index 951b6c79f166..624a11cb07e2 100644
--- a/drivers/firmware/dmi-id.c
+++ b/drivers/firmware/dmi-id.c
@@ -47,6 +47,7 @@ DEFINE_DMI_ATTR_WITH_SHOW(product_name,		0444, DMI_PRODUCT_NAME);
 DEFINE_DMI_ATTR_WITH_SHOW(product_version,      0444, DMI_PRODUCT_VERSION);
 DEFINE_DMI_ATTR_WITH_SHOW(product_serial,       0400, DMI_PRODUCT_SERIAL);
 DEFINE_DMI_ATTR_WITH_SHOW(product_uuid,         0400, DMI_PRODUCT_UUID);
+DEFINE_DMI_ATTR_WITH_SHOW(product_sku,          0444, DMI_PRODUCT_SKU);
 DEFINE_DMI_ATTR_WITH_SHOW(product_family,       0444, DMI_PRODUCT_FAMILY);
 DEFINE_DMI_ATTR_WITH_SHOW(board_vendor,         0444, DMI_BOARD_VENDOR);
 DEFINE_DMI_ATTR_WITH_SHOW(board_name,           0444, DMI_BOARD_NAME);
@@ -193,6 +194,7 @@ static void __init dmi_id_init_attr_table(void)
         ADD_DMI_ATTR(product_serial,    DMI_PRODUCT_SERIAL);
         ADD_DMI_ATTR(product_uuid,      DMI_PRODUCT_UUID);
         ADD_DMI_ATTR(product_family,    DMI_PRODUCT_FAMILY);
+        ADD_DMI_ATTR(product_sku,       DMI_PRODUCT_SKU);
         ADD_DMI_ATTR(board_vendor,      DMI_BOARD_VENDOR);
         ADD_DMI_ATTR(board_name,        DMI_BOARD_NAME);
         ADD_DMI_ATTR(board_version,     DMI_BOARD_VERSION);
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 54e66adef252..f2483548cde9 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -447,6 +447,7 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
                 dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
                 dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
                 dmi_save_uuid(dm, DMI_PRODUCT_UUID, 8);
+                dmi_save_ident(dm, DMI_PRODUCT_SKU, 25);
                 dmi_save_ident(dm, DMI_PRODUCT_FAMILY, 26);
                 break;
         case 2:         /* Base Board Information */
diff --git a/drivers/firmware/efi/libstub/tpm.c b/drivers/firmware/efi/libstub/tpm.c
index caa37a6dd9d4..a90b0b8fc69a 100644
--- a/drivers/firmware/efi/libstub/tpm.c
+++ b/drivers/firmware/efi/libstub/tpm.c
@@ -64,7 +64,7 @@ static void efi_retrieve_tpm2_eventlog_1_2(efi_system_table_t *sys_table_arg)
         efi_guid_t tcg2_guid = EFI_TCG2_PROTOCOL_GUID;
         efi_guid_t linux_eventlog_guid = LINUX_EFI_TPM_EVENT_LOG_GUID;
         efi_status_t status;
-        efi_physical_addr_t log_location, log_last_entry;
+        efi_physical_addr_t log_location = 0, log_last_entry = 0;
         struct linux_efi_tpm_eventlog *log_tbl = NULL;
         unsigned long first_entry_addr, last_entry_addr;
         size_t log_size, last_entry_size;
diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
index dd4edd8f22ce..7fa793672a7a 100644
--- a/drivers/fpga/altera-cvp.c
+++ b/drivers/fpga/altera-cvp.c
@@ -455,8 +455,10 @@ static int altera_cvp_probe(struct pci_dev *pdev,
 
         mgr = fpga_mgr_create(&pdev->dev, conf->mgr_name,
                               &altera_cvp_ops, conf);
-        if (!mgr)
-                return -ENOMEM;
+        if (!mgr) {
+                ret = -ENOMEM;
+                goto err_unmap;
+        }
 
         pci_set_drvdata(pdev, mgr);
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index a59c07590cee..7dcbac8af9a7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -190,6 +190,7 @@ struct amdgpu_job;
 struct amdgpu_irq_src;
 struct amdgpu_fpriv;
 struct amdgpu_bo_va_mapping;
+struct amdgpu_atif;
 
 enum amdgpu_cp_irq {
         AMDGPU_CP_IRQ_GFX_EOP = 0,
@@ -1269,43 +1270,6 @@ struct amdgpu_vram_scratch {
 /*
  * ACPI
  */
-struct amdgpu_atif_notification_cfg {
-        bool enabled;
-        int command_code;
-};
-
-struct amdgpu_atif_notifications {
-        bool display_switch;
-        bool expansion_mode_change;
-        bool thermal_state;
-        bool forced_power_state;
-        bool system_power_state;
-        bool display_conf_change;
-        bool px_gfx_switch;
-        bool brightness_change;
-        bool dgpu_display_event;
-};
-
-struct amdgpu_atif_functions {
-        bool system_params;
-        bool sbios_requests;
-        bool select_active_disp;
-        bool lid_state;
-        bool get_tv_standard;
-        bool set_tv_standard;
-        bool get_panel_expansion_mode;
-        bool set_panel_expansion_mode;
-        bool temperature_change;
-        bool graphics_device_types;
-};
-
-struct amdgpu_atif {
-        struct amdgpu_atif_notifications notifications;
-        struct amdgpu_atif_functions functions;
-        struct amdgpu_atif_notification_cfg notification_cfg;
-        struct amdgpu_encoder *encoder_for_bl;
-};
-
 struct amdgpu_atcs_functions {
         bool get_ext_state;
         bool pcie_perf_req;
@@ -1466,7 +1430,7 @@ struct amdgpu_device {
 #if defined(CONFIG_DEBUG_FS)
         struct dentry                   *debugfs_regs[AMDGPU_DEBUGFS_MAX_COMPONENTS];
 #endif
-        struct amdgpu_atif              atif;
+        struct amdgpu_atif              *atif;
         struct amdgpu_atcs              atcs;
         struct mutex                    srbm_mutex;
         /* GRBM index mutex. Protects concurrent access to GRBM index */
@@ -1894,6 +1858,12 @@ static inline bool amdgpu_atpx_dgpu_req_power_for_displays(void) { return false;
 static inline bool amdgpu_has_atpx(void) { return false; }
 #endif
 
+#if defined(CONFIG_VGA_SWITCHEROO) && defined(CONFIG_ACPI)
+void *amdgpu_atpx_get_dhandle(void);
+#else
+static inline void *amdgpu_atpx_get_dhandle(void) { return NULL; }
+#endif
+
 /*
  * KMS
  */
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index 8fa850a070e0..0d8c3fc6eace 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@ -34,6 +34,45 @@
 #include "amd_acpi.h"
 #include "atom.h"
 
+struct amdgpu_atif_notification_cfg {
+        bool enabled;
+        int command_code;
+};
+
+struct amdgpu_atif_notifications {
+        bool display_switch;
+        bool expansion_mode_change;
+        bool thermal_state;
+        bool forced_power_state;
+        bool system_power_state;
+        bool display_conf_change;
+        bool px_gfx_switch;
+        bool brightness_change;
+        bool dgpu_display_event;
+};
+
+struct amdgpu_atif_functions {
+        bool system_params;
+        bool sbios_requests;
+        bool select_active_disp;
+        bool lid_state;
+        bool get_tv_standard;
+        bool set_tv_standard;
+        bool get_panel_expansion_mode;
+        bool set_panel_expansion_mode;
+        bool temperature_change;
+        bool graphics_device_types;
+};
+
+struct amdgpu_atif {
+        acpi_handle handle;
+
+        struct amdgpu_atif_notifications notifications;
+        struct amdgpu_atif_functions functions;
+        struct amdgpu_atif_notification_cfg notification_cfg;
+        struct amdgpu_encoder *encoder_for_bl;
+};
+
 /* Call the ATIF method
  */
 /**
@@ -46,8 +85,9 @@
  * Executes the requested ATIF function (all asics).
  * Returns a pointer to the acpi output buffer.
  */
-static union acpi_object *amdgpu_atif_call(acpi_handle handle, int function,
-                struct acpi_buffer *params)
+static union acpi_object *amdgpu_atif_call(struct amdgpu_atif *atif,
+                                           int function,
+                                           struct acpi_buffer *params)
 {
         acpi_status status;
         union acpi_object atif_arg_elements[2];
@@ -70,7 +110,8 @@ static union acpi_object *amdgpu_atif_call(acpi_handle handle, int function,
                 atif_arg_elements[1].integer.value = 0;
         }
 
-        status = acpi_evaluate_object(handle, "ATIF", &atif_arg, &buffer);
+        status = acpi_evaluate_object(atif->handle, NULL, &atif_arg,
+                                      &buffer);
 
         /* Fail only if calling the method fails and ATIF is supported */
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
@@ -141,15 +182,14 @@ static void amdgpu_atif_parse_functions(struct amdgpu_atif_functions *f, u32 mas
  * (all asics).
  * returns 0 on success, error on failure.
  */
-static int amdgpu_atif_verify_interface(acpi_handle handle,
-                struct amdgpu_atif *atif)
+static int amdgpu_atif_verify_interface(struct amdgpu_atif *atif)
 {
         union acpi_object *info;
         struct atif_verify_interface output;
         size_t size;
         int err = 0;
 
-        info = amdgpu_atif_call(handle, ATIF_FUNCTION_VERIFY_INTERFACE, NULL);
+        info = amdgpu_atif_call(atif, ATIF_FUNCTION_VERIFY_INTERFACE, NULL);
         if (!info)
                 return -EIO;
 
@@ -176,6 +216,35 @@ out:
         return err;
 }
 
+static acpi_handle amdgpu_atif_probe_handle(acpi_handle dhandle)
+{
+        acpi_handle handle = NULL;
+        char acpi_method_name[255] = { 0 };
+        struct acpi_buffer buffer = { sizeof(acpi_method_name), acpi_method_name };
+        acpi_status status;
+
+        /* For PX/HG systems, ATIF and ATPX are in the iGPU's namespace, on dGPU only
+         * systems, ATIF is in the dGPU's namespace.
+         */
+        status = acpi_get_handle(dhandle, "ATIF", &handle);
+        if (ACPI_SUCCESS(status))
+                goto out;
+
+        if (amdgpu_has_atpx()) {
+                status = acpi_get_handle(amdgpu_atpx_get_dhandle(), "ATIF",
+                                         &handle);
+                if (ACPI_SUCCESS(status))
+                        goto out;
+        }
+
+        DRM_DEBUG_DRIVER("No ATIF handle found\n");
+        return NULL;
+out:
+        acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
+        DRM_DEBUG_DRIVER("Found ATIF handle %s\n", acpi_method_name);
+        return handle;
+}
+
 /**
  * amdgpu_atif_get_notification_params - determine notify configuration
  *
@@ -188,15 +257,16 @@ out:
  * where n is specified in the result if a notifier is used.
  * Returns 0 on success, error on failure.
  */
-static int amdgpu_atif_get_notification_params(acpi_handle handle,
-                struct amdgpu_atif_notification_cfg *n)
+static int amdgpu_atif_get_notification_params(struct amdgpu_atif *atif)
 {
         union acpi_object *info;
+        struct amdgpu_atif_notification_cfg *n = &atif->notification_cfg;
         struct atif_system_params params;
         size_t size;
         int err = 0;
 
-        info = amdgpu_atif_call(handle, ATIF_FUNCTION_GET_SYSTEM_PARAMETERS, NULL);
+        info = amdgpu_atif_call(atif, ATIF_FUNCTION_GET_SYSTEM_PARAMETERS,
+                                NULL);
         if (!info) {
                 err = -EIO;
                 goto out;
@@ -250,14 +320,15 @@ out:
  * (all asics).
  * Returns 0 on success, error on failure.
  */
-static int amdgpu_atif_get_sbios_requests(acpi_handle handle,
-                struct atif_sbios_requests *req)
+static int amdgpu_atif_get_sbios_requests(struct amdgpu_atif *atif,
+                                          struct atif_sbios_requests *req)
 {
         union acpi_object *info;
         size_t size;
         int count = 0;
 
-        info = amdgpu_atif_call(handle, ATIF_FUNCTION_GET_SYSTEM_BIOS_REQUESTS, NULL);
+        info = amdgpu_atif_call(atif, ATIF_FUNCTION_GET_SYSTEM_BIOS_REQUESTS,
+                                NULL);
         if (!info)
                 return -EIO;
 
@@ -290,11 +361,10 @@ out:
  * Returns NOTIFY code
  */
 static int amdgpu_atif_handler(struct amdgpu_device *adev,
-                        struct acpi_bus_event *event)
+                               struct acpi_bus_event *event)
 {
-        struct amdgpu_atif *atif = &adev->atif;
+        struct amdgpu_atif *atif = adev->atif;
         struct atif_sbios_requests req;
-        acpi_handle handle;
         int count;
 
         DRM_DEBUG_DRIVER("event, device_class = %s, type = %#x\n",
@@ -303,14 +373,14 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev,
         if (strcmp(event->device_class, ACPI_VIDEO_CLASS) != 0)
                 return NOTIFY_DONE;
 
-        if (!atif->notification_cfg.enabled ||
+        if (!atif ||
+            !atif->notification_cfg.enabled ||
             event->type != atif->notification_cfg.command_code)
                 /* Not our event */
                 return NOTIFY_DONE;
 
         /* Check pending SBIOS requests */
-        handle = ACPI_HANDLE(&adev->pdev->dev);
-        count = amdgpu_atif_get_sbios_requests(handle, &req);
+        count = amdgpu_atif_get_sbios_requests(atif, &req);
 
         if (count <= 0)
                 return NOTIFY_DONE;
@@ -641,8 +711,8 @@ static int amdgpu_acpi_event(struct notifier_block *nb,
  */
 int amdgpu_acpi_init(struct amdgpu_device *adev)
 {
-        acpi_handle handle;
-        struct amdgpu_atif *atif = &adev->atif;
+        acpi_handle handle, atif_handle;
+        struct amdgpu_atif *atif;
         struct amdgpu_atcs *atcs = &adev->atcs;
         int ret;
 
@@ -658,12 +728,26 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)
                 DRM_DEBUG_DRIVER("Call to ATCS verify_interface failed: %d\n", ret);
         }
 
+        /* Probe for ATIF, and initialize it if found */
+        atif_handle = amdgpu_atif_probe_handle(handle);
+        if (!atif_handle)
+                goto out;
+
+        atif = kzalloc(sizeof(*atif), GFP_KERNEL);
+        if (!atif) {
+                DRM_WARN("Not enough memory to initialize ATIF\n");
+                goto out;
+        }
+        atif->handle = atif_handle;
+
         /* Call the ATIF method */
-        ret = amdgpu_atif_verify_interface(handle, atif);
+        ret = amdgpu_atif_verify_interface(atif);
         if (ret) {
                 DRM_DEBUG_DRIVER("Call to ATIF verify_interface failed: %d\n", ret);
+                kfree(atif);
                 goto out;
         }
+        adev->atif = atif;
 
         if (atif->notifications.brightness_change) {
                 struct drm_encoder *tmp;
@@ -693,8 +777,7 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)
         }
 
         if (atif->functions.system_params) {
-                ret = amdgpu_atif_get_notification_params(handle,
-                                &atif->notification_cfg);
+                ret = amdgpu_atif_get_notification_params(atif);
                 if (ret) {
                         DRM_DEBUG_DRIVER("Call to GET_SYSTEM_PARAMS failed: %d\n",
                                         ret);
@@ -720,4 +803,6 @@ out:
 void amdgpu_acpi_fini(struct amdgpu_device *adev)
 {
         unregister_acpi_notifier(&adev->acpi_nb);
+        if (adev->atif)
+                kfree(adev->atif);
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
index daa06e7c5bb7..9ab89371d9e8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
@@ -90,6 +90,12 @@ bool amdgpu_atpx_dgpu_req_power_for_displays(void) {
         return amdgpu_atpx_priv.atpx.dgpu_req_power_for_displays;
 }
 
+#if defined(CONFIG_ACPI)
+void *amdgpu_atpx_get_dhandle(void) {
+        return amdgpu_atpx_priv.dhandle;
+}
+#endif
+
 /**
  * amdgpu_atpx_call - call an ATPX method
  *
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 3317d1536f4f..6e5284e6c028 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2158,10 +2158,18 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)
         switch (asic_type) {
 #if defined(CONFIG_DRM_AMD_DC)
         case CHIP_BONAIRE:
-        case CHIP_HAWAII:
         case CHIP_KAVERI:
         case CHIP_KABINI:
         case CHIP_MULLINS:
+                /*
+                 * We have systems in the wild with these ASICs that require
+                 * LVDS and VGA support which is not supported with DC.
+                 *
+                 * Fallback to the non-DC driver here by default so as not to
+                 * cause regressions.
+                 */
+                return amdgpu_dc > 0;
+        case CHIP_HAWAII:
         case CHIP_CARRIZO:
         case CHIP_STONEY:
         case CHIP_POLARIS10:
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 39ec6b8890a1..e74d620d9699 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -376,7 +376,7 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,
         struct amdgpu_device *adev = ring->adev;
         uint64_t index;
 
-        if (ring != &adev->uvd.inst[ring->me].ring) {
+        if (ring->funcs->type != AMDGPU_RING_TYPE_UVD) {
                 ring->fence_drv.cpu_addr = &adev->wb.wb[ring->fence_offs];
                 ring->fence_drv.gpu_addr = adev->wb.gpu_addr + (ring->fence_offs * 4);
         } else {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index f70eeed9ed76..7aaa263ad8c7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -231,6 +231,12 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         if (ib->flags & AMDGPU_IB_FLAG_TC_WB_NOT_INVALIDATE)
                 fence_flags |= AMDGPU_FENCE_FLAG_TC_WB_ONLY;
 
+        /* wrap the last IB with fence */
+        if (job && job->uf_addr) {
+                amdgpu_ring_emit_fence(ring, job->uf_addr, job->uf_sequence,
+                                       fence_flags | AMDGPU_FENCE_FLAG_64BIT);
+        }
+
         r = amdgpu_fence_emit(ring, f, fence_flags);
         if (r) {
                 dev_err(adev->dev, "failed to emit fence (%d)\n", r);
@@ -243,12 +249,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         if (ring->funcs->insert_end)
                 ring->funcs->insert_end(ring);
 
-        /* wrap the last IB with fence */
-        if (job && job->uf_addr) {
-                amdgpu_ring_emit_fence(ring, job->uf_addr, job->uf_sequence,
-                                       fence_flags | AMDGPU_FENCE_FLAG_64BIT);
-        }
-
         if (patch_offset != ~0 && ring->funcs->patch_cond_exec)
                 amdgpu_ring_patch_cond_exec(ring, patch_offset);
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 5e4e1bd90383..3526efa8960e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -762,8 +762,7 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
         domain = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);
         if (domain == AMDGPU_GEM_DOMAIN_VRAM) {
                 adev->vram_pin_size += amdgpu_bo_size(bo);
-                if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)
-                        adev->invisible_pin_size += amdgpu_bo_size(bo);
+                adev->invisible_pin_size += amdgpu_vram_mgr_bo_invisible_size(bo);
         } else if (domain == AMDGPU_GEM_DOMAIN_GTT) {
                 adev->gart_pin_size += amdgpu_bo_size(bo);
         }
@@ -790,25 +789,22 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo)
         bo->pin_count--;
         if (bo->pin_count)
                 return 0;
-        for (i = 0; i < bo->placement.num_placement; i++) {
-                bo->placements[i].lpfn = 0;
-                bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;
-        }
-        r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
-        if (unlikely(r)) {
-                dev_err(adev->dev, "%p validate failed for unpin\n", bo);
-                goto error;
-        }
 
         if (bo->tbo.mem.mem_type == TTM_PL_VRAM) {
                 adev->vram_pin_size -= amdgpu_bo_size(bo);
-                if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)
-                        adev->invisible_pin_size -= amdgpu_bo_size(bo);
+                adev->invisible_pin_size -= amdgpu_vram_mgr_bo_invisible_size(bo);
         } else if (bo->tbo.mem.mem_type == TTM_PL_TT) {
                 adev->gart_pin_size -= amdgpu_bo_size(bo);
         }
 
-error:
+        for (i = 0; i < bo->placement.num_placement; i++) {
+                bo->placements[i].lpfn = 0;
+                bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;
+        }
+        r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
+        if (unlikely(r))
+                dev_err(adev->dev, "%p validate failed for unpin\n", bo);
+
         return r;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index b455da487782..fc818b4d849c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -1882,7 +1882,7 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)
                 if (!amdgpu_device_has_dc_support(adev)) {
                         mutex_lock(&adev->pm.mutex);
                         amdgpu_dpm_get_active_displays(adev);
-                        adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtcs;
+                        adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtc_count;
                         adev->pm.pm_display_cfg.vrefresh = amdgpu_dpm_get_vrefresh(adev);
                         adev->pm.pm_display_cfg.min_vblank_time = amdgpu_dpm_get_vblank_time(adev);
                         /* we have issues with mclk switching with refresh rates over 120 hz on the non-DC code. */
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
index e969c879d87e..e5da4654b630 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -73,6 +73,7 @@ bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem);
 uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man);
 int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man);
 
+u64 amdgpu_vram_mgr_bo_invisible_size(struct amdgpu_bo *bo);
 uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man);
 uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man);
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index bcf68f80bbf0..3ff08e326838 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -130,7 +130,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
         unsigned version_major, version_minor, family_id;
         int i, j, r;
 
-        INIT_DELAYED_WORK(&adev->uvd.inst->idle_work, amdgpu_uvd_idle_work_handler);
+        INIT_DELAYED_WORK(&adev->uvd.idle_work, amdgpu_uvd_idle_work_handler);
 
         switch (adev->asic_type) {
 #ifdef CONFIG_DRM_AMDGPU_CIK
@@ -314,12 +314,12 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev)
         void *ptr;
         int i, j;
 
+        cancel_delayed_work_sync(&adev->uvd.idle_work);
+
         for (j = 0; j < adev->uvd.num_uvd_inst; ++j) {
                 if (adev->uvd.inst[j].vcpu_bo == NULL)
                         continue;
 
-                cancel_delayed_work_sync(&adev->uvd.inst[j].idle_work);
-
                 /* only valid for physical mode */
                 if (adev->asic_type < CHIP_POLARIS10) {
                         for (i = 0; i < adev->uvd.max_handles; ++i)
@@ -1145,7 +1145,7 @@ int amdgpu_uvd_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,
 static void amdgpu_uvd_idle_work_handler(struct work_struct *work)
 {
         struct amdgpu_device *adev =
-                container_of(work, struct amdgpu_device, uvd.inst->idle_work.work);
+                container_of(work, struct amdgpu_device, uvd.idle_work.work);
         unsigned fences = 0, i, j;
 
         for (i = 0; i < adev->uvd.num_uvd_inst; ++i) {
@@ -1167,7 +1167,7 @@ static void amdgpu_uvd_idle_work_handler(struct work_struct *work)
                                                                AMD_CG_STATE_GATE);
                 }
         } else {
-                schedule_delayed_work(&adev->uvd.inst->idle_work, UVD_IDLE_TIMEOUT);
+                schedule_delayed_work(&adev->uvd.idle_work, UVD_IDLE_TIMEOUT);
         }
 }
 
@@ -1179,7 +1179,7 @@ void amdgpu_uvd_ring_begin_use(struct amdgpu_ring *ring)
         if (amdgpu_sriov_vf(adev))
                 return;
 
-        set_clocks = !cancel_delayed_work_sync(&adev->uvd.inst->idle_work);
+        set_clocks = !cancel_delayed_work_sync(&adev->uvd.idle_work);
         if (set_clocks) {
                 if (adev->pm.dpm_enabled) {
                         amdgpu_dpm_enable_uvd(adev, true);
@@ -1196,7 +1196,7 @@ void amdgpu_uvd_ring_begin_use(struct amdgpu_ring *ring)
 void amdgpu_uvd_ring_end_use(struct amdgpu_ring *ring)
 {
         if (!amdgpu_sriov_vf(ring->adev))
-                schedule_delayed_work(&ring->adev->uvd.inst->idle_work, UVD_IDLE_TIMEOUT);
+                schedule_delayed_work(&ring->adev->uvd.idle_work, UVD_IDLE_TIMEOUT);
 }
 
 /**
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
index b1579fba134c..8b23a1b00c76 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h
@@ -44,7 +44,6 @@ struct amdgpu_uvd_inst {
         void                    *saved_bo;
         atomic_t                handles[AMDGPU_MAX_UVD_HANDLES];
         struct drm_file         *filp[AMDGPU_MAX_UVD_HANDLES];
-        struct delayed_work     idle_work;
         struct amdgpu_ring      ring;
         struct amdgpu_ring      ring_enc[AMDGPU_MAX_UVD_ENC_RINGS];
         struct amdgpu_irq_src   irq;
@@ -62,6 +61,7 @@ struct amdgpu_uvd {
         bool                    address_64_bit;
         bool                    use_ctx_buf;
         struct amdgpu_uvd_inst          inst[AMDGPU_MAX_UVD_INSTANCES];
+        struct delayed_work     idle_work;
 };
 
 int amdgpu_uvd_sw_init(struct amdgpu_device *adev);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 127e87b470ff..1b4ad9b2a755 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -52,7 +52,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
         unsigned long bo_size;
         const char *fw_name;
         const struct common_firmware_header *hdr;
-        unsigned version_major, version_minor, family_id;
+        unsigned char fw_check;
         int r;
 
         INIT_DELAYED_WORK(&adev->vcn.idle_work, amdgpu_vcn_idle_work_handler);
@@ -83,12 +83,33 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
 
         hdr = (const struct common_firmware_header *)adev->vcn.fw->data;
         adev->vcn.fw_version = le32_to_cpu(hdr->ucode_version);
-        family_id = le32_to_cpu(hdr->ucode_version) & 0xff;
-        version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;
-        version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;
-        DRM_INFO("Found VCN firmware Version: %hu.%hu Family ID: %hu\n",
-                version_major, version_minor, family_id);
 
+        /* Bit 20-23, it is encode major and non-zero for new naming convention.
+         * This field is part of version minor and DRM_DISABLED_FLAG in old naming
+         * convention. Since the l:wq!atest version minor is 0x5B and DRM_DISABLED_FLAG
+         * is zero in old naming convention, this field is always zero so far.
+         * These four bits are used to tell which naming convention is present.
+         */
+        fw_check = (le32_to_cpu(hdr->ucode_version) >> 20) & 0xf;
+        if (fw_check) {
+                unsigned int dec_ver, enc_major, enc_minor, vep, fw_rev;
+
+                fw_rev = le32_to_cpu(hdr->ucode_version) & 0xfff;
+                enc_minor = (le32_to_cpu(hdr->ucode_version) >> 12) & 0xff;
+                enc_major = fw_check;
+                dec_ver = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xf;
+                vep = (le32_to_cpu(hdr->ucode_version) >> 28) & 0xf;
+                DRM_INFO("Found VCN firmware Version ENC: %hu.%hu DEC: %hu VEP: %hu Revision: %hu\n",
+                        enc_major, enc_minor, dec_ver, vep, fw_rev);
+        } else {
+                unsigned int version_major, version_minor, family_id;
+
+                family_id = le32_to_cpu(hdr->ucode_version) & 0xff;
+                version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;
+                version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;
+                DRM_INFO("Found VCN firmware Version: %hu.%hu Family ID: %hu\n",
+                        version_major, version_minor, family_id);
+        }
 
         bo_size = AMDGPU_GPU_PAGE_ALIGN(le32_to_cpu(hdr->ucode_size_bytes) + 8)
                   +  AMDGPU_VCN_STACK_SIZE + AMDGPU_VCN_HEAP_SIZE
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index b0eb2f537392..edf16b2b957a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1463,7 +1463,9 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
                         uint64_t count;
 
                         max_entries = min(max_entries, 16ull * 1024ull);
-                        for (count = 1; count < max_entries; ++count) {
+                        for (count = 1;
+                             count < max_entries / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE);
+                             ++count) {
                                 uint64_t idx = pfn + count;
 
                                 if (pages_addr[idx] !=
@@ -1476,7 +1478,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
                                 dma_addr = pages_addr;
                         } else {
                                 addr = pages_addr[pfn];
-                                max_entries = count;
+                                max_entries = count * (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE);
                         }
 
                 } else if (flags & AMDGPU_PTE_VALID) {
@@ -1491,7 +1493,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
                 if (r)
                         return r;
 
-                pfn += last - start + 1;
+                pfn += (last - start + 1) / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE);
                 if (nodes && nodes->size == pfn) {
                         pfn = 0;
                         ++nodes;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index 9aca653bec07..b6333f92ba45 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -97,6 +97,38 @@ static u64 amdgpu_vram_mgr_vis_size(struct amdgpu_device *adev,
 }
 
 /**
+ * amdgpu_vram_mgr_bo_invisible_size - CPU invisible BO size
+ *
+ * @bo: &amdgpu_bo buffer object (must be in VRAM)
+ *
+ * Returns:
+ * How much of the given &amdgpu_bo buffer object lies in CPU invisible VRAM.
+ */
+u64 amdgpu_vram_mgr_bo_invisible_size(struct amdgpu_bo *bo)
+{
+        struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
+        struct ttm_mem_reg *mem = &bo->tbo.mem;
+        struct drm_mm_node *nodes = mem->mm_node;
+        unsigned pages = mem->num_pages;
+        u64 usage = 0;
+
+        if (adev->gmc.visible_vram_size == adev->gmc.real_vram_size)
+                return 0;
+
+        if (mem->start >= adev->gmc.visible_vram_size >> PAGE_SHIFT)
+                return amdgpu_bo_size(bo);
+
+        while (nodes && pages) {
+                usage += nodes->size << PAGE_SHIFT;
+                usage -= amdgpu_vram_mgr_vis_size(adev, nodes);
+                pages -= nodes->size;
+                ++nodes;
+        }
+
+        return usage;
+}
+
+/**
  * amdgpu_vram_mgr_new - allocate new ranges
  *
  * @man: TTM memory type manager
@@ -135,7 +167,8 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
                 num_nodes = DIV_ROUND_UP(mem->num_pages, pages_per_node);
         }
 
-        nodes = kcalloc(num_nodes, sizeof(*nodes), GFP_KERNEL);
+        nodes = kvmalloc_array(num_nodes, sizeof(*nodes),
+                               GFP_KERNEL | __GFP_ZERO);
         if (!nodes)
                 return -ENOMEM;
 
@@ -190,7 +223,7 @@ error:
                 drm_mm_remove_node(&nodes[i]);
         spin_unlock(&mgr->lock);
 
-        kfree(nodes);
+        kvfree(nodes);
         return r == -ENOSPC ? 0 : r;
 }
 
@@ -229,7 +262,7 @@ static void amdgpu_vram_mgr_del(struct ttm_mem_type_manager *man,
         atomic64_sub(usage, &mgr->usage);
         atomic64_sub(vis_usage, &mgr->vis_usage);
 
-        kfree(mem->mm_node);
+        kvfree(mem->mm_node);
         mem->mm_node = NULL;
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
index 0999c843f623..a71b97519cc0 100644
--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
@@ -900,7 +900,7 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_phys_funcs = {
         .emit_frame_size =
                 4 + /* vce_v3_0_emit_pipeline_sync */
                 6, /* amdgpu_vce_ring_emit_fence x1 no user fence */
-        .emit_ib_size = 5, /* vce_v3_0_ring_emit_ib */
+        .emit_ib_size = 4, /* amdgpu_vce_ring_emit_ib */
         .emit_ib = amdgpu_vce_ring_emit_ib,
         .emit_fence = amdgpu_vce_ring_emit_fence,
         .test_ring = amdgpu_vce_ring_test_ring,
@@ -924,7 +924,7 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_vm_funcs = {
                 6 + /* vce_v3_0_emit_vm_flush */
                 4 + /* vce_v3_0_emit_pipeline_sync */
                 6 + 6, /* amdgpu_vce_ring_emit_fence x2 vm fence */
-        .emit_ib_size = 4, /* amdgpu_vce_ring_emit_ib */
+        .emit_ib_size = 5, /* vce_v3_0_ring_emit_ib */
         .emit_ib = vce_v3_0_ring_emit_ib,
         .emit_vm_flush = vce_v3_0_emit_vm_flush,
         .emit_pipeline_sync = vce_v3_0_emit_pipeline_sync,
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index f9add85157e7..770c6b24be0b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2175,6 +2175,46 @@ get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing)
         return color_space;
 }
 
+static void reduce_mode_colour_depth(struct dc_crtc_timing *timing_out)
+{
+        if (timing_out->display_color_depth <= COLOR_DEPTH_888)
+                return;
+
+        timing_out->display_color_depth--;
+}
+
+static void adjust_colour_depth_from_display_info(struct dc_crtc_timing *timing_out,
+                                                const struct drm_display_info *info)
+{
+        int normalized_clk;
+        if (timing_out->display_color_depth <= COLOR_DEPTH_888)
+                return;
+        do {
+                normalized_clk = timing_out->pix_clk_khz;
+                /* YCbCr 4:2:0 requires additional adjustment of 1/2 */
+                if (timing_out->pixel_encoding == PIXEL_ENCODING_YCBCR420)
+                        normalized_clk /= 2;
+                /* Adjusting pix clock following on HDMI spec based on colour depth */
+                switch (timing_out->display_color_depth) {
+                case COLOR_DEPTH_101010:
+                        normalized_clk = (normalized_clk * 30) / 24;
+                        break;
+                case COLOR_DEPTH_121212:
+                        normalized_clk = (normalized_clk * 36) / 24;
+                        break;
+                case COLOR_DEPTH_161616:
+                        normalized_clk = (normalized_clk * 48) / 24;
+                        break;
+                default:
+                        return;
+                }
+                if (normalized_clk <= info->max_tmds_clock)
+                        return;
+                reduce_mode_colour_depth(timing_out);
+
+        } while (timing_out->display_color_depth > COLOR_DEPTH_888);
+
+}
 /*****************************************************************************/
 
 static void
@@ -2183,6 +2223,7 @@ fill_stream_properties_from_drm_display_mode(struct dc_stream_state *stream,
                                              const struct drm_connector *connector)
 {
         struct dc_crtc_timing *timing_out = &stream->timing;
+        const struct drm_display_info *info = &connector->display_info;
 
         memset(timing_out, 0, sizeof(struct dc_crtc_timing));
 
@@ -2191,8 +2232,10 @@ fill_stream_properties_from_drm_display_mode(struct dc_stream_state *stream,
         timing_out->v_border_top = 0;
         timing_out->v_border_bottom = 0;
         /* TODO: un-hardcode */
-
-        if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCRCB444)
+        if (drm_mode_is_420_only(info, mode_in)
+                        && stream->sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A)
+                timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420;
+        else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCRCB444)
                         && stream->sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A)
                 timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR444;
         else
@@ -2228,6 +2271,8 @@ fill_stream_properties_from_drm_display_mode(struct dc_stream_state *stream,
 
         stream->out_transfer_func->type = TF_TYPE_PREDEFINED;
         stream->out_transfer_func->tf = TRANSFER_FUNCTION_SRGB;
+        if (stream->sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A)
+                adjust_colour_depth_from_display_info(timing_out, info);
 }
 
 static void fill_audio_info(struct audio_info *audio_info,
@@ -3928,10 +3973,11 @@ static void amdgpu_dm_do_flip(struct drm_crtc *crtc,
         if (acrtc->base.state->event)
                 prepare_flip_isr(acrtc);
 
+        spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
+
         surface_updates->surface = dc_stream_get_status(acrtc_state->stream)->plane_states[0];
         surface_updates->flip_addr = &addr;
 
-
         dc_commit_updates_for_stream(adev->dm.dc,
                                              surface_updates,
                                              1,
@@ -3944,9 +3990,6 @@ static void amdgpu_dm_do_flip(struct drm_crtc *crtc,
                          __func__,
                          addr.address.grph.addr.high_part,
                          addr.address.grph.addr.low_part);
-
-
-        spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
 }
 
 /*
@@ -4206,6 +4249,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
         struct drm_connector *connector;
         struct drm_connector_state *old_con_state, *new_con_state;
         struct dm_crtc_state *dm_old_crtc_state, *dm_new_crtc_state;
+        int crtc_disable_count = 0;
 
         drm_atomic_helper_update_legacy_modeset_state(dev, state);
 
@@ -4410,6 +4454,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
                 struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
                 bool modeset_needed;
 
+                if (old_crtc_state->active && !new_crtc_state->active)
+                        crtc_disable_count++;
+
                 dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
                 dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);
                 modeset_needed = modeset_required(
@@ -4463,11 +4510,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
          * so we can put the GPU into runtime suspend if we're not driving any
          * displays anymore
          */
+        for (i = 0; i < crtc_disable_count; i++)
+                pm_runtime_put_autosuspend(dev->dev);
         pm_runtime_mark_last_busy(dev->dev);
-        for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
-                if (old_crtc_state->active && !new_crtc_state->active)
-                        pm_runtime_put_autosuspend(dev->dev);
-        }
 }
 
 
diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h
index 092d800b703a..33b4de4ad66e 100644
--- a/drivers/gpu/drm/amd/include/atomfirmware.h
+++ b/drivers/gpu/drm/amd/include/atomfirmware.h
@@ -1433,7 +1433,10 @@ struct atom_smc_dpm_info_v4_1
         uint8_t  acggfxclkspreadpercent;
         uint16_t acggfxclkspreadfreq;
 
-        uint32_t boardreserved[10];
+        uint8_t Vr2_I2C_address;
+        uint8_t padding_vr2[3];
+
+        uint32_t boardreserved[9];
 };
 
 /* 
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c
index 5325661fedff..d27c1c9df286 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c
@@ -512,14 +512,82 @@ int pp_atomfwctrl_get_clk_information_by_clkid(struct pp_hwmgr *hwmgr, BIOS_CLKI
         return 0;
 }
 
+static void pp_atomfwctrl_copy_vbios_bootup_values_3_2(struct pp_hwmgr *hwmgr,
+                        struct pp_atomfwctrl_bios_boot_up_values *boot_values,
+                        struct atom_firmware_info_v3_2 *fw_info)
+{
+        uint32_t frequency = 0;
+
+        boot_values->ulRevision = fw_info->firmware_revision;
+        boot_values->ulGfxClk   = fw_info->bootup_sclk_in10khz;
+        boot_values->ulUClk     = fw_info->bootup_mclk_in10khz;
+        boot_values->usVddc     = fw_info->bootup_vddc_mv;
+        boot_values->usVddci    = fw_info->bootup_vddci_mv;
+        boot_values->usMvddc    = fw_info->bootup_mvddc_mv;
+        boot_values->usVddGfx   = fw_info->bootup_vddgfx_mv;
+        boot_values->ucCoolingID = fw_info->coolingsolution_id;
+        boot_values->ulSocClk   = 0;
+        boot_values->ulDCEFClk   = 0;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_SOCCLK_ID, &frequency))
+                boot_values->ulSocClk   = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_DCEFCLK_ID, &frequency))
+                boot_values->ulDCEFClk  = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_ECLK_ID, &frequency))
+                boot_values->ulEClk     = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_VCLK_ID, &frequency))
+                boot_values->ulVClk     = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU11_SYSPLL0_DCLK_ID, &frequency))
+                boot_values->ulDClk     = frequency;
+}
+
+static void pp_atomfwctrl_copy_vbios_bootup_values_3_1(struct pp_hwmgr *hwmgr,
+                        struct pp_atomfwctrl_bios_boot_up_values *boot_values,
+                        struct atom_firmware_info_v3_1 *fw_info)
+{
+        uint32_t frequency = 0;
+
+        boot_values->ulRevision = fw_info->firmware_revision;
+        boot_values->ulGfxClk   = fw_info->bootup_sclk_in10khz;
+        boot_values->ulUClk     = fw_info->bootup_mclk_in10khz;
+        boot_values->usVddc     = fw_info->bootup_vddc_mv;
+        boot_values->usVddci    = fw_info->bootup_vddci_mv;
+        boot_values->usMvddc    = fw_info->bootup_mvddc_mv;
+        boot_values->usVddGfx   = fw_info->bootup_vddgfx_mv;
+        boot_values->ucCoolingID = fw_info->coolingsolution_id;
+        boot_values->ulSocClk   = 0;
+        boot_values->ulDCEFClk   = 0;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_SOCCLK_ID, &frequency))
+                boot_values->ulSocClk   = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_DCEFCLK_ID, &frequency))
+                boot_values->ulDCEFClk  = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_ECLK_ID, &frequency))
+                boot_values->ulEClk     = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_VCLK_ID, &frequency))
+                boot_values->ulVClk     = frequency;
+
+        if (!pp_atomfwctrl_get_clk_information_by_clkid(hwmgr, SMU9_SYSPLL0_DCLK_ID, &frequency))
+                boot_values->ulDClk     = frequency;
+}
+
 int pp_atomfwctrl_get_vbios_bootup_values(struct pp_hwmgr *hwmgr,
                         struct pp_atomfwctrl_bios_boot_up_values *boot_values)
 {
-        struct atom_firmware_info_v3_1 *info = NULL;
+        struct atom_firmware_info_v3_2 *fwinfo_3_2;
+        struct atom_firmware_info_v3_1 *fwinfo_3_1;
+        struct atom_common_table_header *info = NULL;
         uint16_t ix;
 
         ix = GetIndexIntoMasterDataTable(firmwareinfo);
-        info = (struct atom_firmware_info_v3_1 *)
+        info = (struct atom_common_table_header *)
                 smu_atom_get_data_table(hwmgr->adev,
                                 ix, NULL, NULL, NULL);
 
@@ -528,16 +596,18 @@ int pp_atomfwctrl_get_vbios_bootup_values(struct pp_hwmgr *hwmgr,
                 return -EINVAL;
         }
 
-        boot_values->ulRevision = info->firmware_revision;
-        boot_values->ulGfxClk   = info->bootup_sclk_in10khz;
-        boot_values->ulUClk     = info->bootup_mclk_in10khz;
-        boot_values->usVddc     = info->bootup_vddc_mv;
-        boot_values->usVddci    = info->bootup_vddci_mv;
-        boot_values->usMvddc    = info->bootup_mvddc_mv;
-        boot_values->usVddGfx   = info->bootup_vddgfx_mv;
-        boot_values->ucCoolingID = info->coolingsolution_id;
-        boot_values->ulSocClk   = 0;
-        boot_values->ulDCEFClk   = 0;
+        if ((info->format_revision == 3) && (info->content_revision == 2)) {
+                fwinfo_3_2 = (struct atom_firmware_info_v3_2 *)info;
+                pp_atomfwctrl_copy_vbios_bootup_values_3_2(hwmgr,
+                                boot_values, fwinfo_3_2);
+        } else if ((info->format_revision == 3) && (info->content_revision == 1)) {
+                fwinfo_3_1 = (struct atom_firmware_info_v3_1 *)info;
+                pp_atomfwctrl_copy_vbios_bootup_values_3_1(hwmgr,
+                                boot_values, fwinfo_3_1);
+        } else {
+                pr_info("Fw info table revision does not match!");
+                return -EINVAL;
+        }
 
         return 0;
 }
@@ -629,5 +699,7 @@ int pp_atomfwctrl_get_smc_dpm_information(struct pp_hwmgr *hwmgr,
         param->acggfxclkspreadpercent = info->acggfxclkspreadpercent;
         param->acggfxclkspreadfreq = info->acggfxclkspreadfreq;
 
+        param->Vr2_I2C_address = info->Vr2_I2C_address;
+
         return 0;
 }
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h
index fe10aa4db5e6..22e21668c93a 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h
@@ -136,6 +136,9 @@ struct pp_atomfwctrl_bios_boot_up_values {
         uint32_t   ulUClk;
         uint32_t   ulSocClk;
         uint32_t   ulDCEFClk;
+        uint32_t   ulEClk;
+        uint32_t   ulVClk;
+        uint32_t   ulDClk;
         uint16_t   usVddc;
         uint16_t   usVddci;
         uint16_t   usMvddc;
@@ -207,6 +210,8 @@ struct pp_atomfwctrl_smc_dpm_parameters
         uint8_t  acggfxclkspreadenabled;
         uint8_t  acggfxclkspreadpercent;
         uint16_t acggfxclkspreadfreq;
+
+        uint8_t Vr2_I2C_address;
 };
 
 int pp_atomfwctrl_get_gpu_pll_dividers_vega10(struct pp_hwmgr *hwmgr,
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c
index dbe4b1f66784..22364875a943 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c
@@ -1090,7 +1090,7 @@ static int vega10_disable_se_edc_config(struct pp_hwmgr *hwmgr)
 static int vega10_enable_psm_gc_edc_config(struct pp_hwmgr *hwmgr)
 {
         struct amdgpu_device *adev = hwmgr->adev;
-        int result;
+        int result = 0;
         uint32_t num_se = 0;
         uint32_t count, data;
 
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
index 782e2098824d..c98e5de777cd 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c
@@ -81,6 +81,7 @@ static void vega12_set_default_registry_data(struct pp_hwmgr *hwmgr)
 
         data->registry_data.disallowed_features = 0x0;
         data->registry_data.od_state_in_dc_support = 0;
+        data->registry_data.thermal_support = 1;
         data->registry_data.skip_baco_hardware = 0;
 
         data->registry_data.log_avfs_param = 0;
@@ -803,6 +804,9 @@ static int vega12_init_smc_table(struct pp_hwmgr *hwmgr)
                 data->vbios_boot_state.soc_clock = boot_up_values.ulSocClk;
                 data->vbios_boot_state.dcef_clock = boot_up_values.ulDCEFClk;
                 data->vbios_boot_state.uc_cooling_id = boot_up_values.ucCoolingID;
+                data->vbios_boot_state.eclock = boot_up_values.ulEClk;
+                data->vbios_boot_state.dclock = boot_up_values.ulDClk;
+                data->vbios_boot_state.vclock = boot_up_values.ulVClk;
                 smum_send_msg_to_smc_with_parameter(hwmgr,
                                 PPSMC_MSG_SetMinDeepSleepDcefclk,
                         (uint32_t)(data->vbios_boot_state.dcef_clock / 100));
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h
index e81ded1ec198..49b38df8c7f2 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h
@@ -167,6 +167,9 @@ struct vega12_vbios_boot_state {
         uint32_t    mem_clock;
         uint32_t    soc_clock;
         uint32_t    dcef_clock;
+        uint32_t    eclock;
+        uint32_t    dclock;
+        uint32_t    vclock;
 };
 
 #define DPMTABLE_OD_UPDATE_SCLK     0x00000001
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.c
index 888ddca902d8..29914700ee82 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_processpptables.c
@@ -230,6 +230,8 @@ static int append_vbios_pptable(struct pp_hwmgr *hwmgr, PPTable_t *ppsmc_pptable
                 ppsmc_pptable->AcgThresholdFreqLow = 0xFFFF;
         }
 
+        ppsmc_pptable->Vr2_I2C_address = smc_dpm_table.Vr2_I2C_address;
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/powerplay/inc/vega12/smu9_driver_if.h b/drivers/gpu/drm/amd/powerplay/inc/vega12/smu9_driver_if.h
index 2f8a3b983cce..b08526fd1619 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/vega12/smu9_driver_if.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/vega12/smu9_driver_if.h
@@ -499,7 +499,10 @@ typedef struct {
         uint8_t      AcgGfxclkSpreadPercent;
         uint16_t     AcgGfxclkSpreadFreq;
 
-        uint32_t     BoardReserved[10];
+  uint8_t      Vr2_I2C_address;
+  uint8_t      padding_vr2[3];
+
+  uint32_t     BoardReserved[9];
 
 
   uint32_t     MmHubPadding[7];
diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index 8d20faa198cf..0a788d76ed5f 100644
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -278,7 +278,6 @@ static int malidp_init(struct drm_device *drm)
 
 static void malidp_fini(struct drm_device *drm)
 {
-        drm_atomic_helper_shutdown(drm);
         drm_mode_config_cleanup(drm);
 }
 
@@ -646,6 +645,7 @@ vblank_fail:
         malidp_de_irq_fini(drm);
         drm->irq_enabled = false;
 irq_init_fail:
+        drm_atomic_helper_shutdown(drm);
         component_unbind_all(dev, drm);
 bind_fail:
         of_node_put(malidp->crtc.port);
@@ -681,6 +681,7 @@ static void malidp_unbind(struct device *dev)
         malidp_se_irq_fini(drm);
         malidp_de_irq_fini(drm);
         drm->irq_enabled = false;
+        drm_atomic_helper_shutdown(drm);
         component_unbind_all(dev, drm);
         of_node_put(malidp->crtc.port);
         malidp->crtc.port = NULL;
diff --git a/drivers/gpu/drm/arm/malidp_hw.c b/drivers/gpu/drm/arm/malidp_hw.c
index d789b46dc817..069783e715f1 100644
--- a/drivers/gpu/drm/arm/malidp_hw.c
+++ b/drivers/gpu/drm/arm/malidp_hw.c
@@ -634,7 +634,8 @@ const struct malidp_hw malidp_device[MALIDP_MAX_DEVICES] = {
                                 .vsync_irq = MALIDP500_DE_IRQ_VSYNC,
                         },
                         .se_irq_map = {
-                                .irq_mask = MALIDP500_SE_IRQ_CONF_MODE,
+                                .irq_mask = MALIDP500_SE_IRQ_CONF_MODE |
+                                            MALIDP500_SE_IRQ_GLOBAL,
                                 .vsync_irq = 0,
                         },
                         .dc_irq_map = {
diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c
index 7a44897c50fe..29409a65d864 100644
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -23,6 +23,7 @@
 
 /* Layer specific register offsets */
 #define MALIDP_LAYER_FORMAT             0x000
+#define   LAYER_FORMAT_MASK             0x3f
 #define MALIDP_LAYER_CONTROL            0x004
 #define   LAYER_ENABLE                  (1 << 0)
 #define   LAYER_FLOWCFG_MASK            7
@@ -235,8 +236,8 @@ static int malidp_de_plane_check(struct drm_plane *plane,
         if (state->rotation & MALIDP_ROTATED_MASK) {
                 int val;
 
-                val = mp->hwdev->hw->rotmem_required(mp->hwdev, state->crtc_h,
-                                                     state->crtc_w,
+                val = mp->hwdev->hw->rotmem_required(mp->hwdev, state->crtc_w,
+                                                     state->crtc_h,
                                                      fb->format->format);
                 if (val < 0)
                         return val;
@@ -337,7 +338,9 @@ static void malidp_de_plane_update(struct drm_plane *plane,
         dest_w = plane->state->crtc_w;
         dest_h = plane->state->crtc_h;
 
-        malidp_hw_write(mp->hwdev, ms->format, mp->layer->base);
+        val = malidp_hw_read(mp->hwdev, mp->layer->base);
+        val = (val & ~LAYER_FORMAT_MASK) | ms->format;
+        malidp_hw_write(mp->hwdev, val, mp->layer->base);
 
         for (i = 0; i < ms->n_planes; i++) {
                 /* calculate the offset for the layer's plane registers */
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index 73c875db45f4..47e0992f3908 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@ -839,7 +839,7 @@ static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane)
                         return ret;
         }
 
-        if (desc->layout.xstride && desc->layout.pstride) {
+        if (desc->layout.xstride[0] && desc->layout.pstride[0]) {
                 int ret;
 
                 ret = drm_plane_create_rotation_property(&plane->base,
diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c
index 7ab36042a822..a6e8f4591e63 100644
--- a/drivers/gpu/drm/bridge/sil-sii8620.c
+++ b/drivers/gpu/drm/bridge/sil-sii8620.c
@@ -14,6 +14,7 @@
 #include <drm/bridge/mhl.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_encoder.h>
 
 #include <linux/clk.h>
 #include <linux/delay.h>
@@ -36,8 +37,11 @@
 
 #define SII8620_BURST_BUF_LEN 288
 #define VAL_RX_HDMI_CTRL2_DEFVAL VAL_RX_HDMI_CTRL2_IDLE_CNT(3)
-#define MHL1_MAX_LCLK 225000
-#define MHL3_MAX_LCLK 600000
+
+#define MHL1_MAX_PCLK 75000
+#define MHL1_MAX_PCLK_PP_MODE 150000
+#define MHL3_MAX_PCLK 200000
+#define MHL3_MAX_PCLK_PP_MODE 300000
 
 enum sii8620_mode {
         CM_DISCONNECTED,
@@ -69,9 +73,7 @@ struct sii8620 {
         struct regulator_bulk_data supplies[2];
         struct mutex lock; /* context lock, protects fields below */
         int error;
-        int pixel_clock;
         unsigned int use_packed_pixel:1;
-        int video_code;
         enum sii8620_mode mode;
         enum sii8620_sink_type sink_type;
         u8 cbus_status;
@@ -79,7 +81,9 @@ struct sii8620 {
         u8 xstat[MHL_XDS_SIZE];
         u8 devcap[MHL_DCAP_SIZE];
         u8 xdevcap[MHL_XDC_SIZE];
-        u8 avif[HDMI_INFOFRAME_SIZE(AVI)];
+        bool feature_complete;
+        bool devcap_read;
+        bool sink_detected;
         struct edid *edid;
         unsigned int gen2_write_burst:1;
         enum sii8620_mt_state mt_state;
@@ -476,7 +480,7 @@ static void sii8620_update_array(u8 *dst, u8 *src, int count)
         }
 }
 
-static void sii8620_sink_detected(struct sii8620 *ctx, int ret)
+static void sii8620_identify_sink(struct sii8620 *ctx)
 {
         static const char * const sink_str[] = {
                 [SINK_NONE] = "NONE",
@@ -487,7 +491,7 @@ static void sii8620_sink_detected(struct sii8620 *ctx, int ret)
         char sink_name[20];
         struct device *dev = ctx->dev;
 
-        if (ret < 0)
+        if (!ctx->sink_detected || !ctx->devcap_read)
                 return;
 
         sii8620_fetch_edid(ctx);
@@ -496,6 +500,7 @@ static void sii8620_sink_detected(struct sii8620 *ctx, int ret)
                 sii8620_mhl_disconnected(ctx);
                 return;
         }
+        sii8620_set_upstream_edid(ctx);
 
         if (drm_detect_hdmi_monitor(ctx->edid))
                 ctx->sink_type = SINK_HDMI;
@@ -508,53 +513,6 @@ static void sii8620_sink_detected(struct sii8620 *ctx, int ret)
                  sink_str[ctx->sink_type], sink_name);
 }
 
-static void sii8620_hsic_init(struct sii8620 *ctx)
-{
-        if (!sii8620_is_mhl3(ctx))
-                return;
-
-        sii8620_write(ctx, REG_FCGC,
-                BIT_FCGC_HSIC_HOSTMODE | BIT_FCGC_HSIC_ENABLE);
-        sii8620_setbits(ctx, REG_HRXCTRL3,
-                BIT_HRXCTRL3_HRX_STAY_RESET | BIT_HRXCTRL3_STATUS_EN, ~0);
-        sii8620_setbits(ctx, REG_TTXNUMB, MSK_TTXNUMB_TTX_NUMBPS, 4);
-        sii8620_setbits(ctx, REG_TRXCTRL, BIT_TRXCTRL_TRX_FROM_SE_COC, ~0);
-        sii8620_setbits(ctx, REG_HTXCTRL, BIT_HTXCTRL_HTX_DRVCONN1, 0);
-        sii8620_setbits(ctx, REG_KEEPER, MSK_KEEPER_MODE, VAL_KEEPER_MODE_HOST);
-        sii8620_write_seq_static(ctx,
-                REG_TDMLLCTL, 0,
-                REG_UTSRST, BIT_UTSRST_HRX_SRST | BIT_UTSRST_HTX_SRST |
-                        BIT_UTSRST_KEEPER_SRST | BIT_UTSRST_FC_SRST,
-                REG_UTSRST, BIT_UTSRST_HRX_SRST | BIT_UTSRST_HTX_SRST,
-                REG_HRXINTL, 0xff,
-                REG_HRXINTH, 0xff,
-                REG_TTXINTL, 0xff,
-                REG_TTXINTH, 0xff,
-                REG_TRXINTL, 0xff,
-                REG_TRXINTH, 0xff,
-                REG_HTXINTL, 0xff,
-                REG_HTXINTH, 0xff,
-                REG_FCINTR0, 0xff,
-                REG_FCINTR1, 0xff,
-                REG_FCINTR2, 0xff,
-                REG_FCINTR3, 0xff,
-                REG_FCINTR4, 0xff,
-                REG_FCINTR5, 0xff,
-                REG_FCINTR6, 0xff,
-                REG_FCINTR7, 0xff
-        );
-}
-
-static void sii8620_edid_read(struct sii8620 *ctx, int ret)
-{
-        if (ret < 0)
-                return;
-
-        sii8620_set_upstream_edid(ctx);
-        sii8620_hsic_init(ctx);
-        sii8620_enable_hpd(ctx);
-}
-
 static void sii8620_mr_devcap(struct sii8620 *ctx)
 {
         u8 dcap[MHL_DCAP_SIZE];
@@ -570,6 +528,8 @@ static void sii8620_mr_devcap(struct sii8620 *ctx)
                  dcap[MHL_DCAP_ADOPTER_ID_H], dcap[MHL_DCAP_ADOPTER_ID_L],
                  dcap[MHL_DCAP_DEVICE_ID_H], dcap[MHL_DCAP_DEVICE_ID_L]);
         sii8620_update_array(ctx->devcap, dcap, MHL_DCAP_SIZE);
+        ctx->devcap_read = true;
+        sii8620_identify_sink(ctx);
 }
 
 static void sii8620_mr_xdevcap(struct sii8620 *ctx)
@@ -807,6 +767,7 @@ static void sii8620_burst_rx_all(struct sii8620 *ctx)
 static void sii8620_fetch_edid(struct sii8620 *ctx)
 {
         u8 lm_ddc, ddc_cmd, int3, cbus;
+        unsigned long timeout;
         int fetched, i;
         int edid_len = EDID_LENGTH;
         u8 *edid;
@@ -856,23 +817,31 @@ static void sii8620_fetch_edid(struct sii8620 *ctx)
                         REG_DDC_CMD, ddc_cmd | VAL_DDC_CMD_ENH_DDC_READ_NO_ACK
                 );
 
-                do {
-                        int3 = sii8620_readb(ctx, REG_INTR3);
+                int3 = 0;
+                timeout = jiffies + msecs_to_jiffies(200);
+                for (;;) {
                         cbus = sii8620_readb(ctx, REG_CBUS_STATUS);
-
-                        if (int3 & BIT_DDC_CMD_DONE)
-                                break;
-
-                        if (!(cbus & BIT_CBUS_STATUS_CBUS_CONNECTED)) {
+                        if (~cbus & BIT_CBUS_STATUS_CBUS_CONNECTED) {
+                                kfree(edid);
+                                edid = NULL;
+                                goto end;
+                        }
+                        if (int3 & BIT_DDC_CMD_DONE) {
+                                if (sii8620_readb(ctx, REG_DDC_DOUT_CNT)
+                                    >= FETCH_SIZE)
+                                        break;
+                        } else {
+                                int3 = sii8620_readb(ctx, REG_INTR3);
+                        }
+                        if (time_is_before_jiffies(timeout)) {
+                                ctx->error = -ETIMEDOUT;
+                                dev_err(ctx->dev, "timeout during EDID read\n");
                                 kfree(edid);
                                 edid = NULL;
                                 goto end;
                         }
-                } while (1);
-
-                sii8620_readb(ctx, REG_DDC_STATUS);
-                while (sii8620_readb(ctx, REG_DDC_DOUT_CNT) < FETCH_SIZE)
                         usleep_range(10, 20);
+                }
 
                 sii8620_read_buf(ctx, REG_DDC_DATA, edid + fetched, FETCH_SIZE);
                 if (fetched + FETCH_SIZE == EDID_LENGTH) {
@@ -971,8 +940,17 @@ static int sii8620_hw_on(struct sii8620 *ctx)
         ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
         if (ret)
                 return ret;
+
         usleep_range(10000, 20000);
-        return clk_prepare_enable(ctx->clk_xtal);
+        ret = clk_prepare_enable(ctx->clk_xtal);
+        if (ret)
+                return ret;
+
+        msleep(100);
+        gpiod_set_value(ctx->gpio_reset, 0);
+        msleep(100);
+
+        return 0;
 }
 
 static int sii8620_hw_off(struct sii8620 *ctx)
@@ -982,17 +960,6 @@ static int sii8620_hw_off(struct sii8620 *ctx)
         return regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
 }
 
-static void sii8620_hw_reset(struct sii8620 *ctx)
-{
-        usleep_range(10000, 20000);
-        gpiod_set_value(ctx->gpio_reset, 0);
-        usleep_range(5000, 20000);
-        gpiod_set_value(ctx->gpio_reset, 1);
-        usleep_range(10000, 20000);
-        gpiod_set_value(ctx->gpio_reset, 0);
-        msleep(300);
-}
-
 static void sii8620_cbus_reset(struct sii8620 *ctx)
 {
         sii8620_write(ctx, REG_PWD_SRST, BIT_PWD_SRST_CBUS_RST
@@ -1055,23 +1022,23 @@ static void sii8620_set_format(struct sii8620 *ctx)
                                 BIT_M3_P0CTRL_MHL3_P0_PIXEL_MODE_PACKED,
                                 ctx->use_packed_pixel ? ~0 : 0);
         } else {
-                if (ctx->use_packed_pixel)
+                if (ctx->use_packed_pixel) {
                         sii8620_write_seq_static(ctx,
                                 REG_VID_MODE, BIT_VID_MODE_M1080P,
                                 REG_MHL_TOP_CTL, BIT_MHL_TOP_CTL_MHL_PP_SEL | 1,
                                 REG_MHLTX_CTL6, 0x60
                         );
-                else
+                } else {
                         sii8620_write_seq_static(ctx,
                                 REG_VID_MODE, 0,
                                 REG_MHL_TOP_CTL, 1,
                                 REG_MHLTX_CTL6, 0xa0
                         );
+                }
         }
 
         if (ctx->use_packed_pixel)
-                out_fmt = VAL_TPI_FORMAT(YCBCR422, FULL) |
-                        BIT_TPI_OUTPUT_CSCMODE709;
+                out_fmt = VAL_TPI_FORMAT(YCBCR422, FULL);
         else
                 out_fmt = VAL_TPI_FORMAT(RGB, FULL);
 
@@ -1128,18 +1095,28 @@ static ssize_t mhl3_infoframe_pack(struct mhl3_infoframe *frame,
         return frm_len;
 }
 
-static void sii8620_set_infoframes(struct sii8620 *ctx)
+static void sii8620_set_infoframes(struct sii8620 *ctx,
+                                   struct drm_display_mode *mode)
 {
         struct mhl3_infoframe mhl_frm;
         union hdmi_infoframe frm;
         u8 buf[31];
         int ret;
 
+        ret = drm_hdmi_avi_infoframe_from_display_mode(&frm.avi,
+                                                       mode,
+                                                       true);
+        if (ctx->use_packed_pixel)
+                frm.avi.colorspace = HDMI_COLORSPACE_YUV422;
+
+        if (!ret)
+                ret = hdmi_avi_infoframe_pack(&frm.avi, buf, ARRAY_SIZE(buf));
+        if (ret > 0)
+                sii8620_write_buf(ctx, REG_TPI_AVI_CHSUM, buf + 3, ret - 3);
+
         if (!sii8620_is_mhl3(ctx) || !ctx->use_packed_pixel) {
                 sii8620_write(ctx, REG_TPI_SC,
                         BIT_TPI_SC_TPI_OUTPUT_MODE_0_HDMI);
-                sii8620_write_buf(ctx, REG_TPI_AVI_CHSUM, ctx->avif + 3,
-                        ARRAY_SIZE(ctx->avif) - 3);
                 sii8620_write(ctx, REG_PKT_FILTER_0,
                         BIT_PKT_FILTER_0_DROP_CEA_GAMUT_PKT |
                         BIT_PKT_FILTER_0_DROP_MPEG_PKT |
@@ -1148,16 +1125,6 @@ static void sii8620_set_infoframes(struct sii8620 *ctx)
                 return;
         }
 
-        ret = hdmi_avi_infoframe_init(&frm.avi);
-        frm.avi.colorspace = HDMI_COLORSPACE_YUV422;
-        frm.avi.active_aspect = HDMI_ACTIVE_ASPECT_PICTURE;
-        frm.avi.picture_aspect = HDMI_PICTURE_ASPECT_16_9;
-        frm.avi.colorimetry = HDMI_COLORIMETRY_ITU_709;
-        frm.avi.video_code = ctx->video_code;
-        if (!ret)
-                ret = hdmi_avi_infoframe_pack(&frm.avi, buf, ARRAY_SIZE(buf));
-        if (ret > 0)
-                sii8620_write_buf(ctx, REG_TPI_AVI_CHSUM, buf + 3, ret - 3);
         sii8620_write(ctx, REG_PKT_FILTER_0,
                 BIT_PKT_FILTER_0_DROP_CEA_GAMUT_PKT |
                 BIT_PKT_FILTER_0_DROP_MPEG_PKT |
@@ -1177,6 +1144,9 @@ static void sii8620_set_infoframes(struct sii8620 *ctx)
 
 static void sii8620_start_video(struct sii8620 *ctx)
 {
+        struct drm_display_mode *mode =
+                &ctx->bridge.encoder->crtc->state->adjusted_mode;
+
         if (!sii8620_is_mhl3(ctx))
                 sii8620_stop_video(ctx);
 
@@ -1195,8 +1165,14 @@ static void sii8620_start_video(struct sii8620 *ctx)
         sii8620_set_format(ctx);
 
         if (!sii8620_is_mhl3(ctx)) {
-                sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),
-                        MHL_DST_LM_CLK_MODE_NORMAL | MHL_DST_LM_PATH_ENABLED);
+                u8 link_mode = MHL_DST_LM_PATH_ENABLED;
+
+                if (ctx->use_packed_pixel)
+                        link_mode |= MHL_DST_LM_CLK_MODE_PACKED_PIXEL;
+                else
+                        link_mode |= MHL_DST_LM_CLK_MODE_NORMAL;
+
+                sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE), link_mode);
                 sii8620_set_auto_zone(ctx);
         } else {
                 static const struct {
@@ -1213,10 +1189,10 @@ static void sii8620_start_video(struct sii8620 *ctx)
                           MHL_XDS_LINK_RATE_6_0_GBPS, 0x40 },
                 };
                 u8 p0_ctrl = BIT_M3_P0CTRL_MHL3_P0_PORT_EN;
-                int clk = ctx->pixel_clock * (ctx->use_packed_pixel ? 2 : 3);
+                int clk = mode->clock * (ctx->use_packed_pixel ? 2 : 3);
                 int i;
 
-                for (i = 0; i < ARRAY_SIZE(clk_spec); ++i)
+                for (i = 0; i < ARRAY_SIZE(clk_spec) - 1; ++i)
                         if (clk < clk_spec[i].max_clk)
                                 break;
 
@@ -1242,7 +1218,7 @@ static void sii8620_start_video(struct sii8620 *ctx)
                         clk_spec[i].link_rate);
         }
 
-        sii8620_set_infoframes(ctx);
+        sii8620_set_infoframes(ctx, mode);
 }
 
 static void sii8620_disable_hpd(struct sii8620 *ctx)
@@ -1534,6 +1510,16 @@ static void sii8620_set_mode(struct sii8620 *ctx, enum sii8620_mode mode)
         );
 }
 
+static void sii8620_hpd_unplugged(struct sii8620 *ctx)
+{
+        sii8620_disable_hpd(ctx);
+        ctx->sink_type = SINK_NONE;
+        ctx->sink_detected = false;
+        ctx->feature_complete = false;
+        kfree(ctx->edid);
+        ctx->edid = NULL;
+}
+
 static void sii8620_disconnect(struct sii8620 *ctx)
 {
         sii8620_disable_gen2_write_burst(ctx);
@@ -1561,7 +1547,7 @@ static void sii8620_disconnect(struct sii8620 *ctx)
                 REG_MHL_DP_CTL6, 0x2A,
                 REG_MHL_DP_CTL7, 0x03
         );
-        sii8620_disable_hpd(ctx);
+        sii8620_hpd_unplugged(ctx);
         sii8620_write_seq_static(ctx,
                 REG_M3_CTRL, VAL_M3_CTRL_MHL3_VALUE,
                 REG_MHL_COC_CTL1, 0x07,
@@ -1609,10 +1595,8 @@ static void sii8620_disconnect(struct sii8620 *ctx)
         memset(ctx->xstat, 0, sizeof(ctx->xstat));
         memset(ctx->devcap, 0, sizeof(ctx->devcap));
         memset(ctx->xdevcap, 0, sizeof(ctx->xdevcap));
+        ctx->devcap_read = false;
         ctx->cbus_status = 0;
-        ctx->sink_type = SINK_NONE;
-        kfree(ctx->edid);
-        ctx->edid = NULL;
         sii8620_mt_cleanup(ctx);
 }
 
@@ -1699,17 +1683,18 @@ static void sii8620_status_dcap_ready(struct sii8620 *ctx)
 
 static void sii8620_status_changed_path(struct sii8620 *ctx)
 {
-        if (ctx->stat[MHL_DST_LINK_MODE] & MHL_DST_LM_PATH_ENABLED) {
-                sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),
-                                      MHL_DST_LM_CLK_MODE_NORMAL
-                                      | MHL_DST_LM_PATH_ENABLED);
-                if (!sii8620_is_mhl3(ctx))
-                        sii8620_mt_read_devcap(ctx, false);
-                sii8620_mt_set_cont(ctx, sii8620_sink_detected);
-        } else {
-                sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),
-                                      MHL_DST_LM_CLK_MODE_NORMAL);
-        }
+        u8 link_mode;
+
+        if (ctx->use_packed_pixel)
+                link_mode = MHL_DST_LM_CLK_MODE_PACKED_PIXEL;
+        else
+                link_mode = MHL_DST_LM_CLK_MODE_NORMAL;
+
+        if (ctx->stat[MHL_DST_LINK_MODE] & MHL_DST_LM_PATH_ENABLED)
+                link_mode |= MHL_DST_LM_PATH_ENABLED;
+
+        sii8620_mt_write_stat(ctx, MHL_DST_REG(LINK_MODE),
+                              link_mode);
 }
 
 static void sii8620_msc_mr_write_stat(struct sii8620 *ctx)
@@ -1722,9 +1707,14 @@ static void sii8620_msc_mr_write_stat(struct sii8620 *ctx)
         sii8620_update_array(ctx->stat, st, MHL_DST_SIZE);
         sii8620_update_array(ctx->xstat, xst, MHL_XDS_SIZE);
 
-        if (ctx->stat[MHL_DST_CONNECTED_RDY] & MHL_DST_CONN_DCAP_RDY)
+        if (ctx->stat[MHL_DST_CONNECTED_RDY] & st[MHL_DST_CONNECTED_RDY] &
+            MHL_DST_CONN_DCAP_RDY) {
                 sii8620_status_dcap_ready(ctx);
 
+                if (!sii8620_is_mhl3(ctx))
+                        sii8620_mt_read_devcap(ctx, false);
+        }
+
         if (st[MHL_DST_LINK_MODE] & MHL_DST_LM_PATH_ENABLED)
                 sii8620_status_changed_path(ctx);
 }
@@ -1808,8 +1798,11 @@ static void sii8620_msc_mr_set_int(struct sii8620 *ctx)
         }
         if (ints[MHL_INT_RCHANGE] & MHL_INT_RC_FEAT_REQ)
                 sii8620_send_features(ctx);
-        if (ints[MHL_INT_RCHANGE] & MHL_INT_RC_FEAT_COMPLETE)
-                sii8620_edid_read(ctx, 0);
+        if (ints[MHL_INT_RCHANGE] & MHL_INT_RC_FEAT_COMPLETE) {
+                ctx->feature_complete = true;
+                if (ctx->edid)
+                        sii8620_enable_hpd(ctx);
+        }
 }
 
 static struct sii8620_mt_msg *sii8620_msc_msg_first(struct sii8620 *ctx)
@@ -1884,6 +1877,15 @@ static void sii8620_irq_msc(struct sii8620 *ctx)
         if (stat & BIT_CBUS_MSC_MR_WRITE_STAT)
                 sii8620_msc_mr_write_stat(ctx);
 
+        if (stat & BIT_CBUS_HPD_CHG) {
+                if (ctx->cbus_status & BIT_CBUS_STATUS_CBUS_HPD) {
+                        ctx->sink_detected = true;
+                        sii8620_identify_sink(ctx);
+                } else {
+                        sii8620_hpd_unplugged(ctx);
+                }
+        }
+
         if (stat & BIT_CBUS_MSC_MR_SET_INT)
                 sii8620_msc_mr_set_int(ctx);
 
@@ -1931,14 +1933,6 @@ static void sii8620_irq_edid(struct sii8620 *ctx)
                 ctx->mt_state = MT_STATE_DONE;
 }
 
-static void sii8620_scdt_high(struct sii8620 *ctx)
-{
-        sii8620_write_seq_static(ctx,
-                REG_INTR8_MASK, BIT_CEA_NEW_AVI | BIT_CEA_NEW_VSI,
-                REG_TPI_SC, BIT_TPI_SC_TPI_OUTPUT_MODE_0_HDMI,
-        );
-}
-
 static void sii8620_irq_scdt(struct sii8620 *ctx)
 {
         u8 stat = sii8620_readb(ctx, REG_INTR5);
@@ -1946,53 +1940,13 @@ static void sii8620_irq_scdt(struct sii8620 *ctx)
         if (stat & BIT_INTR_SCDT_CHANGE) {
                 u8 cstat = sii8620_readb(ctx, REG_TMDS_CSTAT_P3);
 
-                if (cstat & BIT_TMDS_CSTAT_P3_SCDT) {
-                        if (ctx->sink_type == SINK_HDMI)
-                                /* enable infoframe interrupt */
-                                sii8620_scdt_high(ctx);
-                        else
-                                sii8620_start_video(ctx);
-                }
+                if (cstat & BIT_TMDS_CSTAT_P3_SCDT)
+                        sii8620_start_video(ctx);
         }
 
         sii8620_write(ctx, REG_INTR5, stat);
 }
 
-static void sii8620_new_vsi(struct sii8620 *ctx)
-{
-        u8 vsif[11];
-
-        sii8620_write(ctx, REG_RX_HDMI_CTRL2,
-                      VAL_RX_HDMI_CTRL2_DEFVAL |
-                      BIT_RX_HDMI_CTRL2_VSI_MON_SEL_VSI);
-        sii8620_read_buf(ctx, REG_RX_HDMI_MON_PKT_HEADER1, vsif,
-                         ARRAY_SIZE(vsif));
-}
-
-static void sii8620_new_avi(struct sii8620 *ctx)
-{
-        sii8620_write(ctx, REG_RX_HDMI_CTRL2, VAL_RX_HDMI_CTRL2_DEFVAL);
-        sii8620_read_buf(ctx, REG_RX_HDMI_MON_PKT_HEADER1, ctx->avif,
-                         ARRAY_SIZE(ctx->avif));
-}
-
-static void sii8620_irq_infr(struct sii8620 *ctx)
-{
-        u8 stat = sii8620_readb(ctx, REG_INTR8)
-                & (BIT_CEA_NEW_VSI | BIT_CEA_NEW_AVI);
-
-        sii8620_write(ctx, REG_INTR8, stat);
-
-        if (stat & BIT_CEA_NEW_VSI)
-                sii8620_new_vsi(ctx);
-
-        if (stat & BIT_CEA_NEW_AVI)
-                sii8620_new_avi(ctx);
-
-        if (stat & (BIT_CEA_NEW_VSI | BIT_CEA_NEW_AVI))
-                sii8620_start_video(ctx);
-}
-
 static void sii8620_got_xdevcap(struct sii8620 *ctx, int ret)
 {
         if (ret < 0)
@@ -2043,11 +1997,11 @@ static void sii8620_irq_ddc(struct sii8620 *ctx)
 
         if (stat & BIT_DDC_CMD_DONE) {
                 sii8620_write(ctx, REG_INTR3_MASK, 0);
-                if (sii8620_is_mhl3(ctx))
+                if (sii8620_is_mhl3(ctx) && !ctx->feature_complete)
                         sii8620_mt_set_int(ctx, MHL_INT_REG(RCHANGE),
                                            MHL_INT_RC_FEAT_REQ);
                 else
-                        sii8620_edid_read(ctx, 0);
+                        sii8620_enable_hpd(ctx);
         }
         sii8620_write(ctx, REG_INTR3, stat);
 }
@@ -2074,7 +2028,6 @@ static irqreturn_t sii8620_irq_thread(int irq, void *data)
                 { BIT_FAST_INTR_STAT_EDID, sii8620_irq_edid },
                 { BIT_FAST_INTR_STAT_DDC, sii8620_irq_ddc },
                 { BIT_FAST_INTR_STAT_SCDT, sii8620_irq_scdt },
-                { BIT_FAST_INTR_STAT_INFR, sii8620_irq_infr },
         };
         struct sii8620 *ctx = data;
         u8 stats[LEN_FAST_INTR_STAT];
@@ -2112,7 +2065,6 @@ static void sii8620_cable_in(struct sii8620 *ctx)
                 dev_err(dev, "Error powering on, %d.\n", ret);
                 return;
         }
-        sii8620_hw_reset(ctx);
 
         sii8620_read_buf(ctx, REG_VND_IDL, ver, ARRAY_SIZE(ver));
         ret = sii8620_clear_error(ctx);
@@ -2268,17 +2220,43 @@ static void sii8620_detach(struct drm_bridge *bridge)
         rc_unregister_device(ctx->rc_dev);
 }
 
+static int sii8620_is_packing_required(struct sii8620 *ctx,
+                                       const struct drm_display_mode *mode)
+{
+        int max_pclk, max_pclk_pp_mode;
+
+        if (sii8620_is_mhl3(ctx)) {
+                max_pclk = MHL3_MAX_PCLK;
+                max_pclk_pp_mode = MHL3_MAX_PCLK_PP_MODE;
+        } else {
+                max_pclk = MHL1_MAX_PCLK;
+                max_pclk_pp_mode = MHL1_MAX_PCLK_PP_MODE;
+        }
+
+        if (mode->clock < max_pclk)
+                return 0;
+        else if (mode->clock < max_pclk_pp_mode)
+                return 1;
+        else
+                return -1;
+}
+
 static enum drm_mode_status sii8620_mode_valid(struct drm_bridge *bridge,
                                          const struct drm_display_mode *mode)
 {
         struct sii8620 *ctx = bridge_to_sii8620(bridge);
+        int pack_required = sii8620_is_packing_required(ctx, mode);
         bool can_pack = ctx->devcap[MHL_DCAP_VID_LINK_MODE] &
                         MHL_DCAP_VID_LINK_PPIXEL;
-        unsigned int max_pclk = sii8620_is_mhl3(ctx) ? MHL3_MAX_LCLK :
-                                                       MHL1_MAX_LCLK;
-        max_pclk /= can_pack ? 2 : 3;
 
-        return (mode->clock > max_pclk) ? MODE_CLOCK_HIGH : MODE_OK;
+        switch (pack_required) {
+        case 0:
+                return MODE_OK;
+        case 1:
+                return (can_pack) ? MODE_OK : MODE_CLOCK_HIGH;
+        default:
+                return MODE_CLOCK_HIGH;
+        }
 }
 
 static bool sii8620_mode_fixup(struct drm_bridge *bridge,
@@ -2286,43 +2264,14 @@ static bool sii8620_mode_fixup(struct drm_bridge *bridge,
                                struct drm_display_mode *adjusted_mode)
 {
         struct sii8620 *ctx = bridge_to_sii8620(bridge);
-        int max_lclk;
-        bool ret = true;
 
         mutex_lock(&ctx->lock);
 
-        max_lclk = sii8620_is_mhl3(ctx) ? MHL3_MAX_LCLK : MHL1_MAX_LCLK;
-        if (max_lclk > 3 * adjusted_mode->clock) {
-                ctx->use_packed_pixel = 0;
-                goto end;
-        }
-        if ((ctx->devcap[MHL_DCAP_VID_LINK_MODE] & MHL_DCAP_VID_LINK_PPIXEL) &&
-            max_lclk > 2 * adjusted_mode->clock) {
-                ctx->use_packed_pixel = 1;
-                goto end;
-        }
-        ret = false;
-end:
-        if (ret) {
-                u8 vic = drm_match_cea_mode(adjusted_mode);
-
-                if (!vic) {
-                        union hdmi_infoframe frm;
-                        u8 mhl_vic[] = { 0, 95, 94, 93, 98 };
-
-                        /* FIXME: We need the connector here */
-                        drm_hdmi_vendor_infoframe_from_display_mode(
-                                &frm.vendor.hdmi, NULL, adjusted_mode);
-                        vic = frm.vendor.hdmi.vic;
-                        if (vic >= ARRAY_SIZE(mhl_vic))
-                                vic = 0;
-                        vic = mhl_vic[vic];
-                }
-                ctx->video_code = vic;
-                ctx->pixel_clock = adjusted_mode->clock;
-        }
+        ctx->use_packed_pixel = sii8620_is_packing_required(ctx, adjusted_mode);
+
         mutex_unlock(&ctx->lock);
-        return ret;
+
+        return true;
 }
 
 static const struct drm_bridge_funcs sii8620_bridge_funcs = {
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index b553a6f2ff0e..7af748ed1c58 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -369,13 +369,6 @@ EXPORT_SYMBOL(drm_dev_exit);
  */
 void drm_dev_unplug(struct drm_device *dev)
 {
-        drm_dev_unregister(dev);
-
-        mutex_lock(&drm_global_mutex);
-        if (dev->open_count == 0)
-                drm_dev_put(dev);
-        mutex_unlock(&drm_global_mutex);
-
         /*
          * After synchronizing any critical read section is guaranteed to see
          * the new value of ->unplugged, and any critical section which might
@@ -384,6 +377,13 @@ void drm_dev_unplug(struct drm_device *dev)
          */
         dev->unplugged = true;
         synchronize_srcu(&drm_unplug_srcu);
+
+        drm_dev_unregister(dev);
+
+        mutex_lock(&drm_global_mutex);
+        if (dev->open_count == 0)
+                drm_dev_put(dev);
+        mutex_unlock(&drm_global_mutex);
 }
 EXPORT_SYMBOL(drm_dev_unplug);
 
diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c
index 1f8031e30f53..cdb10f885a4f 100644
--- a/drivers/gpu/drm/drm_property.c
+++ b/drivers/gpu/drm/drm_property.c
@@ -532,7 +532,7 @@ static void drm_property_free_blob(struct kref *kref)
 
         drm_mode_object_unregister(blob->dev, &blob->base);
 
-        kfree(blob);
+        kvfree(blob);
 }
 
 /**
@@ -559,7 +559,7 @@ drm_property_create_blob(struct drm_device *dev, size_t length,
         if (!length || length > ULONG_MAX - sizeof(struct drm_property_blob))
                 return ERR_PTR(-EINVAL);
 
-        blob = kzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL);
+        blob = kvzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL);
         if (!blob)
                 return ERR_PTR(-ENOMEM);
 
@@ -576,7 +576,7 @@ drm_property_create_blob(struct drm_device *dev, size_t length,
         ret = __drm_mode_object_add(dev, &blob->base, DRM_MODE_OBJECT_BLOB,
                                     true, drm_property_free_blob);
         if (ret) {
-                kfree(blob);
+                kvfree(blob);
                 return ERR_PTR(-EINVAL);
         }
 
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index e5013a999147..540b59fb4103 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -631,8 +631,11 @@ static struct platform_driver etnaviv_platform_driver = {
         },
 };
 
+static struct platform_device *etnaviv_drm;
+
 static int __init etnaviv_init(void)
 {
+        struct platform_device *pdev;
         int ret;
         struct device_node *np;
 
@@ -644,7 +647,7 @@ static int __init etnaviv_init(void)
 
         ret = platform_driver_register(&etnaviv_platform_driver);
         if (ret != 0)
-                platform_driver_unregister(&etnaviv_gpu_driver);
+                goto unregister_gpu_driver;
 
         /*
          * If the DT contains at least one available GPU device, instantiate
@@ -653,20 +656,33 @@ static int __init etnaviv_init(void)
         for_each_compatible_node(np, NULL, "vivante,gc") {
                 if (!of_device_is_available(np))
                         continue;
-
-                platform_device_register_simple("etnaviv", -1, NULL, 0);
+                pdev = platform_device_register_simple("etnaviv", -1,
+                                                       NULL, 0);
+                if (IS_ERR(pdev)) {
+                        ret = PTR_ERR(pdev);
+                        of_node_put(np);
+                        goto unregister_platform_driver;
+                }
+                etnaviv_drm = pdev;
                 of_node_put(np);
                 break;
         }
 
+        return 0;
+
+unregister_platform_driver:
+        platform_driver_unregister(&etnaviv_platform_driver);
+unregister_gpu_driver:
+        platform_driver_unregister(&etnaviv_gpu_driver);
         return ret;
 }
 module_init(etnaviv_init);
 
 static void __exit etnaviv_exit(void)
 {
-        platform_driver_unregister(&etnaviv_gpu_driver);
+        platform_device_unregister(etnaviv_drm);
         platform_driver_unregister(&etnaviv_platform_driver);
+        platform_driver_unregister(&etnaviv_gpu_driver);
 }
 module_exit(etnaviv_exit);
 
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
index dd430f0f8ff5..90f17ff7888e 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
@@ -131,6 +131,9 @@ struct etnaviv_gpu {
         struct work_struct sync_point_work;
         int sync_point_event;
 
+        /* hang detection */
+        u32 hangcheck_dma_addr;
+
         void __iomem *mmio;
         int irq;
 
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
index a74eb57af15b..50d6b88cb7aa 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
@@ -10,6 +10,7 @@
 #include "etnaviv_gem.h"
 #include "etnaviv_gpu.h"
 #include "etnaviv_sched.h"
+#include "state.xml.h"
 
 static int etnaviv_job_hang_limit = 0;
 module_param_named(job_hang_limit, etnaviv_job_hang_limit, int , 0444);
@@ -85,6 +86,29 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job)
 {
         struct etnaviv_gem_submit *submit = to_etnaviv_submit(sched_job);
         struct etnaviv_gpu *gpu = submit->gpu;
+        u32 dma_addr;
+        int change;
+
+        /*
+         * If the GPU managed to complete this jobs fence, the timout is
+         * spurious. Bail out.
+         */
+        if (fence_completed(gpu, submit->out_fence->seqno))
+                return;
+
+        /*
+         * If the GPU is still making forward progress on the front-end (which
+         * should never loop) we shift out the timeout to give it a chance to
+         * finish the job.
+         */
+        dma_addr = gpu_read(gpu, VIVS_FE_DMA_ADDRESS);
+        change = dma_addr - gpu->hangcheck_dma_addr;
+        if (change < 0 || change > 16) {
+                gpu->hangcheck_dma_addr = dma_addr;
+                schedule_delayed_work(&sched_job->work_tdr,
+                                      sched_job->sched->timeout);
+                return;
+        }
 
         /* block scheduler */
         kthread_park(gpu->sched.thread);
diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 82c95c34447f..e868773ea509 100644
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -265,7 +265,7 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win,
         unsigned long val;
 
         val = readl(ctx->addr + DECON_WINCONx(win));
-        val &= ~WINCONx_BPPMODE_MASK;
+        val &= WINCONx_ENWIN_F;
 
         switch (fb->format->format) {
         case DRM_FORMAT_XRGB1555:
@@ -356,8 +356,8 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
                 writel(val, ctx->addr + DECON_VIDOSDxB(win));
         }
 
-        val = VIDOSD_Wx_ALPHA_R_F(0x0) | VIDOSD_Wx_ALPHA_G_F(0x0) |
-                VIDOSD_Wx_ALPHA_B_F(0x0);
+        val = VIDOSD_Wx_ALPHA_R_F(0xff) | VIDOSD_Wx_ALPHA_G_F(0xff) |
+                VIDOSD_Wx_ALPHA_B_F(0xff);
         writel(val, ctx->addr + DECON_VIDOSDxC(win));
 
         val = VIDOSD_Wx_ALPHA_R_F(0x0) | VIDOSD_Wx_ALPHA_G_F(0x0) |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index a81b4a5e24a7..ed3cc2989f93 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -420,7 +420,7 @@ err_mode_config_cleanup:
 err_free_private:
         kfree(private);
 err_free_drm:
-        drm_dev_unref(drm);
+        drm_dev_put(drm);
 
         return ret;
 }
@@ -444,7 +444,7 @@ static void exynos_drm_unbind(struct device *dev)
         drm->dev_private = NULL;
         dev_set_drvdata(dev, NULL);
 
-        drm_dev_unref(drm);
+        drm_dev_put(drm);
 }
 
 static const struct component_master_ops exynos_drm_ops = {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index 7fcc1a7ab1a0..27b7d34d776c 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -138,7 +138,7 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
 
 err:
         while (i--)
-                drm_gem_object_unreference_unlocked(&exynos_gem[i]->base);
+                drm_gem_object_put_unlocked(&exynos_gem[i]->base);
 
         return ERR_PTR(ret);
 }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
index 6127ef25acd6..e8d0670bb5f8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
@@ -470,17 +470,18 @@ static void fimc_src_set_transf(struct fimc_context *ctx, unsigned int rotation)
 static void fimc_set_window(struct fimc_context *ctx,
                             struct exynos_drm_ipp_buffer *buf)
 {
+        unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0];
         u32 cfg, h1, h2, v1, v2;
 
         /* cropped image */
         h1 = buf->rect.x;
-        h2 = buf->buf.width - buf->rect.w - buf->rect.x;
+        h2 = real_width - buf->rect.w - buf->rect.x;
         v1 = buf->rect.y;
         v2 = buf->buf.height - buf->rect.h - buf->rect.y;
 
         DRM_DEBUG_KMS("x[%d]y[%d]w[%d]h[%d]hsize[%d]vsize[%d]\n",
                 buf->rect.x, buf->rect.y, buf->rect.w, buf->rect.h,
-                buf->buf.width, buf->buf.height);
+                real_width, buf->buf.height);
         DRM_DEBUG_KMS("h1[%d]h2[%d]v1[%d]v2[%d]\n", h1, h2, v1, v2);
 
         /*
@@ -503,12 +504,13 @@ static void fimc_set_window(struct fimc_context *ctx,
 static void fimc_src_set_size(struct fimc_context *ctx,
                               struct exynos_drm_ipp_buffer *buf)
 {
+        unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0];
         u32 cfg;
 
-        DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", buf->buf.width, buf->buf.height);
+        DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", real_width, buf->buf.height);
 
         /* original size */
-        cfg = (EXYNOS_ORGISIZE_HORIZONTAL(buf->buf.width) |
+        cfg = (EXYNOS_ORGISIZE_HORIZONTAL(real_width) |
                 EXYNOS_ORGISIZE_VERTICAL(buf->buf.height));
 
         fimc_write(ctx, cfg, EXYNOS_ORGISIZE);
@@ -529,7 +531,7 @@ static void fimc_src_set_size(struct fimc_context *ctx,
          * for now, we support only ITU601 8 bit mode
          */
         cfg = (EXYNOS_CISRCFMT_ITU601_8BIT |
-                EXYNOS_CISRCFMT_SOURCEHSIZE(buf->buf.width) |
+                EXYNOS_CISRCFMT_SOURCEHSIZE(real_width) |
                 EXYNOS_CISRCFMT_SOURCEVSIZE(buf->buf.height));
         fimc_write(ctx, cfg, EXYNOS_CISRCFMT);
 
@@ -842,12 +844,13 @@ static void fimc_set_scaler(struct fimc_context *ctx, struct fimc_scaler *sc)
 static void fimc_dst_set_size(struct fimc_context *ctx,
                              struct exynos_drm_ipp_buffer *buf)
 {
+        unsigned int real_width = buf->buf.pitch[0] / buf->format->cpp[0];
         u32 cfg, cfg_ext;
 
-        DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", buf->buf.width, buf->buf.height);
+        DRM_DEBUG_KMS("hsize[%d]vsize[%d]\n", real_width, buf->buf.height);
 
         /* original size */
-        cfg = (EXYNOS_ORGOSIZE_HORIZONTAL(buf->buf.width) |
+        cfg = (EXYNOS_ORGOSIZE_HORIZONTAL(real_width) |
                 EXYNOS_ORGOSIZE_VERTICAL(buf->buf.height));
 
         fimc_write(ctx, cfg, EXYNOS_ORGOSIZE);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 6e1494fa71b4..bdf5a7655228 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -143,7 +143,7 @@ static int exynos_drm_gem_handle_create(struct drm_gem_object *obj,
         DRM_DEBUG_KMS("gem handle = 0x%x\n", *handle);
 
         /* drop reference from allocate - handle holds it now. */
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return 0;
 }
@@ -186,7 +186,7 @@ unsigned long exynos_drm_gem_get_size(struct drm_device *dev,
 
         exynos_gem = to_exynos_gem(obj);
 
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return exynos_gem->size;
 }
@@ -329,13 +329,13 @@ void exynos_drm_gem_put_dma_addr(struct drm_device *dev,
                 return;
         }
 
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         /*
          * decrease obj->refcount one more time because we has already
          * increased it at exynos_drm_gem_get_dma_addr().
          */
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 }
 
 static int exynos_drm_gem_mmap_buffer(struct exynos_drm_gem *exynos_gem,
@@ -383,7 +383,7 @@ int exynos_drm_gem_get_ioctl(struct drm_device *dev, void *data,
         args->flags = exynos_gem->flags;
         args->size = exynos_gem->size;
 
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index 35ac66730563..7ba414b52faa 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -492,21 +492,25 @@ static void gsc_src_set_fmt(struct gsc_context *ctx, u32 fmt)
                         GSC_IN_CHROMA_ORDER_CRCB);
                 break;
         case DRM_FORMAT_NV21:
+                cfg |= (GSC_IN_CHROMA_ORDER_CRCB | GSC_IN_YUV420_2P);
+                break;
         case DRM_FORMAT_NV61:
-                cfg |= (GSC_IN_CHROMA_ORDER_CRCB |
-                        GSC_IN_YUV420_2P);
+                cfg |= (GSC_IN_CHROMA_ORDER_CRCB | GSC_IN_YUV422_2P);
                 break;
         case DRM_FORMAT_YUV422:
                 cfg |= GSC_IN_YUV422_3P;
                 break;
         case DRM_FORMAT_YUV420:
+                cfg |= (GSC_IN_CHROMA_ORDER_CBCR | GSC_IN_YUV420_3P);
+                break;
         case DRM_FORMAT_YVU420:
-                cfg |= GSC_IN_YUV420_3P;
+                cfg |= (GSC_IN_CHROMA_ORDER_CRCB | GSC_IN_YUV420_3P);
                 break;
         case DRM_FORMAT_NV12:
+                cfg |= (GSC_IN_CHROMA_ORDER_CBCR | GSC_IN_YUV420_2P);
+                break;
         case DRM_FORMAT_NV16:
-                cfg |= (GSC_IN_CHROMA_ORDER_CBCR |
-                        GSC_IN_YUV420_2P);
+                cfg |= (GSC_IN_CHROMA_ORDER_CBCR | GSC_IN_YUV422_2P);
                 break;
         }
 
@@ -523,30 +527,30 @@ static void gsc_src_set_transf(struct gsc_context *ctx, unsigned int rotation)
 
         switch (degree) {
         case DRM_MODE_ROTATE_0:
-                if (rotation & DRM_MODE_REFLECT_Y)
-                        cfg |= GSC_IN_ROT_XFLIP;
                 if (rotation & DRM_MODE_REFLECT_X)
+                        cfg |= GSC_IN_ROT_XFLIP;
+                if (rotation & DRM_MODE_REFLECT_Y)
                         cfg |= GSC_IN_ROT_YFLIP;
                 break;
         case DRM_MODE_ROTATE_90:
                 cfg |= GSC_IN_ROT_90;
-                if (rotation & DRM_MODE_REFLECT_Y)
-                        cfg |= GSC_IN_ROT_XFLIP;
                 if (rotation & DRM_MODE_REFLECT_X)
+                        cfg |= GSC_IN_ROT_XFLIP;
+                if (rotation & DRM_MODE_REFLECT_Y)
                         cfg |= GSC_IN_ROT_YFLIP;
                 break;
         case DRM_MODE_ROTATE_180:
                 cfg |= GSC_IN_ROT_180;
-                if (rotation & DRM_MODE_REFLECT_Y)
-                        cfg &= ~GSC_IN_ROT_XFLIP;
                 if (rotation & DRM_MODE_REFLECT_X)
+                        cfg &= ~GSC_IN_ROT_XFLIP;
+                if (rotation & DRM_MODE_REFLECT_Y)
                         cfg &= ~GSC_IN_ROT_YFLIP;
                 break;
         case DRM_MODE_ROTATE_270:
                 cfg |= GSC_IN_ROT_270;
-                if (rotation & DRM_MODE_REFLECT_Y)
-                        cfg &= ~GSC_IN_ROT_XFLIP;
                 if (rotation & DRM_MODE_REFLECT_X)
+                        cfg &= ~GSC_IN_ROT_XFLIP;
+                if (rotation & DRM_MODE_REFLECT_Y)
                         cfg &= ~GSC_IN_ROT_YFLIP;
                 break;
         }
@@ -577,7 +581,7 @@ static void gsc_src_set_size(struct gsc_context *ctx,
         cfg &= ~(GSC_SRCIMG_HEIGHT_MASK |
                 GSC_SRCIMG_WIDTH_MASK);
 
-        cfg |= (GSC_SRCIMG_WIDTH(buf->buf.width) |
+        cfg |= (GSC_SRCIMG_WIDTH(buf->buf.pitch[0] / buf->format->cpp[0]) |
                 GSC_SRCIMG_HEIGHT(buf->buf.height));
 
         gsc_write(cfg, GSC_SRCIMG_SIZE);
@@ -672,18 +676,25 @@ static void gsc_dst_set_fmt(struct gsc_context *ctx, u32 fmt)
                         GSC_OUT_CHROMA_ORDER_CRCB);
                 break;
         case DRM_FORMAT_NV21:
-        case DRM_FORMAT_NV61:
                 cfg |= (GSC_OUT_CHROMA_ORDER_CRCB | GSC_OUT_YUV420_2P);
                 break;
+        case DRM_FORMAT_NV61:
+                cfg |= (GSC_OUT_CHROMA_ORDER_CRCB | GSC_OUT_YUV422_2P);
+                break;
         case DRM_FORMAT_YUV422:
+                cfg |= GSC_OUT_YUV422_3P;
+                break;
         case DRM_FORMAT_YUV420:
+                cfg |= (GSC_OUT_CHROMA_ORDER_CBCR | GSC_OUT_YUV420_3P);
+                break;
         case DRM_FORMAT_YVU420:
-                cfg |= GSC_OUT_YUV420_3P;
+                cfg |= (GSC_OUT_CHROMA_ORDER_CRCB | GSC_OUT_YUV420_3P);
                 break;
         case DRM_FORMAT_NV12:
+                cfg |= (GSC_OUT_CHROMA_ORDER_CBCR | GSC_OUT_YUV420_2P);
+                break;
         case DRM_FORMAT_NV16:
-                cfg |= (GSC_OUT_CHROMA_ORDER_CBCR |
-                        GSC_OUT_YUV420_2P);
+                cfg |= (GSC_OUT_CHROMA_ORDER_CBCR | GSC_OUT_YUV422_2P);
                 break;
         }
 
@@ -868,7 +879,7 @@ static void gsc_dst_set_size(struct gsc_context *ctx,
         /* original size */
         cfg = gsc_read(GSC_DSTIMG_SIZE);
         cfg &= ~(GSC_DSTIMG_HEIGHT_MASK | GSC_DSTIMG_WIDTH_MASK);
-        cfg |= GSC_DSTIMG_WIDTH(buf->buf.width) |
+        cfg |= GSC_DSTIMG_WIDTH(buf->buf.pitch[0] / buf->format->cpp[0]) |
                GSC_DSTIMG_HEIGHT(buf->buf.height);
         gsc_write(cfg, GSC_DSTIMG_SIZE);
 
@@ -1341,7 +1352,7 @@ static const struct drm_exynos_ipp_limit gsc_5420_limits[] = {
 };
 
 static const struct drm_exynos_ipp_limit gsc_5433_limits[] = {
-        { IPP_SIZE_LIMIT(BUFFER, .h = { 32, 8191, 2 }, .v = { 16, 8191, 2 }) },
+        { IPP_SIZE_LIMIT(BUFFER, .h = { 32, 8191, 16 }, .v = { 16, 8191, 2 }) },
         { IPP_SIZE_LIMIT(AREA, .h = { 16, 4800, 1 }, .v = { 8, 3344, 1 }) },
         { IPP_SIZE_LIMIT(ROTATED, .h = { 32, 2047 }, .v = { 8, 8191 }) },
         { IPP_SCALE_LIMIT(.h = { (1 << 16) / 16, (1 << 16) * 8 },
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 26374e58c557..b435db8fc916 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -345,27 +345,6 @@ static int exynos_drm_ipp_task_setup_buffer(struct exynos_drm_ipp_buffer *buf,
         int ret = 0;
         int i;
 
-        /* basic checks */
-        if (buf->buf.width == 0 || buf->buf.height == 0)
-                return -EINVAL;
-        buf->format = drm_format_info(buf->buf.fourcc);
-        for (i = 0; i < buf->format->num_planes; i++) {
-                unsigned int width = (i == 0) ? buf->buf.width :
-                             DIV_ROUND_UP(buf->buf.width, buf->format->hsub);
-
-                if (buf->buf.pitch[i] == 0)
-                        buf->buf.pitch[i] = width * buf->format->cpp[i];
-                if (buf->buf.pitch[i] < width * buf->format->cpp[i])
-                        return -EINVAL;
-                if (!buf->buf.gem_id[i])
-                        return -ENOENT;
-        }
-
-        /* pitch for additional planes must match */
-        if (buf->format->num_planes > 2 &&
-            buf->buf.pitch[1] != buf->buf.pitch[2])
-                return -EINVAL;
-
         /* get GEM buffers and check their size */
         for (i = 0; i < buf->format->num_planes; i++) {
                 unsigned int height = (i == 0) ? buf->buf.height :
@@ -428,7 +407,7 @@ enum drm_ipp_size_id {
         IPP_LIMIT_BUFFER, IPP_LIMIT_AREA, IPP_LIMIT_ROTATED, IPP_LIMIT_MAX
 };
 
-static const enum drm_ipp_size_id limit_id_fallback[IPP_LIMIT_MAX][4] = {
+static const enum drm_exynos_ipp_limit_type limit_id_fallback[IPP_LIMIT_MAX][4] = {
         [IPP_LIMIT_BUFFER]  = { DRM_EXYNOS_IPP_LIMIT_SIZE_BUFFER },
         [IPP_LIMIT_AREA]    = { DRM_EXYNOS_IPP_LIMIT_SIZE_AREA,
                                 DRM_EXYNOS_IPP_LIMIT_SIZE_BUFFER },
@@ -495,12 +474,13 @@ static int exynos_drm_ipp_check_size_limits(struct exynos_drm_ipp_buffer *buf,
         enum drm_ipp_size_id id = rotate ? IPP_LIMIT_ROTATED : IPP_LIMIT_AREA;
         struct drm_ipp_limit l;
         struct drm_exynos_ipp_limit_val *lh = &l.h, *lv = &l.v;
+        int real_width = buf->buf.pitch[0] / buf->format->cpp[0];
 
         if (!limits)
                 return 0;
 
         __get_size_limit(limits, num_limits, IPP_LIMIT_BUFFER, &l);
-        if (!__size_limit_check(buf->buf.width, &l.h) ||
+        if (!__size_limit_check(real_width, &l.h) ||
             !__size_limit_check(buf->buf.height, &l.v))
                 return -EINVAL;
 
@@ -560,10 +540,62 @@ static int exynos_drm_ipp_check_scale_limits(
         return 0;
 }
 
+static int exynos_drm_ipp_check_format(struct exynos_drm_ipp_task *task,
+                                       struct exynos_drm_ipp_buffer *buf,
+                                       struct exynos_drm_ipp_buffer *src,
+                                       struct exynos_drm_ipp_buffer *dst,
+                                       bool rotate, bool swap)
+{
+        const struct exynos_drm_ipp_formats *fmt;
+        int ret, i;
+
+        fmt = __ipp_format_get(task->ipp, buf->buf.fourcc, buf->buf.modifier,
+                               buf == src ? DRM_EXYNOS_IPP_FORMAT_SOURCE :
+                                            DRM_EXYNOS_IPP_FORMAT_DESTINATION);
+        if (!fmt) {
+                DRM_DEBUG_DRIVER("Task %pK: %s format not supported\n", task,
+                                 buf == src ? "src" : "dst");
+                return -EINVAL;
+        }
+
+        /* basic checks */
+        if (buf->buf.width == 0 || buf->buf.height == 0)
+                return -EINVAL;
+
+        buf->format = drm_format_info(buf->buf.fourcc);
+        for (i = 0; i < buf->format->num_planes; i++) {
+                unsigned int width = (i == 0) ? buf->buf.width :
+                             DIV_ROUND_UP(buf->buf.width, buf->format->hsub);
+
+                if (buf->buf.pitch[i] == 0)
+                        buf->buf.pitch[i] = width * buf->format->cpp[i];
+                if (buf->buf.pitch[i] < width * buf->format->cpp[i])
+                        return -EINVAL;
+                if (!buf->buf.gem_id[i])
+                        return -ENOENT;
+        }
+
+        /* pitch for additional planes must match */
+        if (buf->format->num_planes > 2 &&
+            buf->buf.pitch[1] != buf->buf.pitch[2])
+                return -EINVAL;
+
+        /* check driver limits */
+        ret = exynos_drm_ipp_check_size_limits(buf, fmt->limits,
+                                               fmt->num_limits,
+                                               rotate,
+                                               buf == dst ? swap : false);
+        if (ret)
+                return ret;
+        ret = exynos_drm_ipp_check_scale_limits(&src->rect, &dst->rect,
+                                                fmt->limits,
+                                                fmt->num_limits, swap);
+        return ret;
+}
+
 static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
 {
         struct exynos_drm_ipp *ipp = task->ipp;
-        const struct exynos_drm_ipp_formats *src_fmt, *dst_fmt;
         struct exynos_drm_ipp_buffer *src = &task->src, *dst = &task->dst;
         unsigned int rotation = task->transform.rotation;
         int ret = 0;
@@ -607,37 +639,11 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
                 return -EINVAL;
         }
 
-        src_fmt = __ipp_format_get(ipp, src->buf.fourcc, src->buf.modifier,
-                                   DRM_EXYNOS_IPP_FORMAT_SOURCE);
-        if (!src_fmt) {
-                DRM_DEBUG_DRIVER("Task %pK: src format not supported\n", task);
-                return -EINVAL;
-        }
-        ret = exynos_drm_ipp_check_size_limits(src, src_fmt->limits,
-                                               src_fmt->num_limits,
-                                               rotate, false);
-        if (ret)
-                return ret;
-        ret = exynos_drm_ipp_check_scale_limits(&src->rect, &dst->rect,
-                                                src_fmt->limits,
-                                                src_fmt->num_limits, swap);
+        ret = exynos_drm_ipp_check_format(task, src, src, dst, rotate, swap);
         if (ret)
                 return ret;
 
-        dst_fmt = __ipp_format_get(ipp, dst->buf.fourcc, dst->buf.modifier,
-                                   DRM_EXYNOS_IPP_FORMAT_DESTINATION);
-        if (!dst_fmt) {
-                DRM_DEBUG_DRIVER("Task %pK: dst format not supported\n", task);
-                return -EINVAL;
-        }
-        ret = exynos_drm_ipp_check_size_limits(dst, dst_fmt->limits,
-                                               dst_fmt->num_limits,
-                                               false, swap);
-        if (ret)
-                return ret;
-        ret = exynos_drm_ipp_check_scale_limits(&src->rect, &dst->rect,
-                                                dst_fmt->limits,
-                                                dst_fmt->num_limits, swap);
+        ret = exynos_drm_ipp_check_format(task, dst, src, dst, false, swap);
         if (ret)
                 return ret;
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index 38a2a7f1204b..7098c6d35266 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -132,7 +132,7 @@ static void exynos_drm_plane_reset(struct drm_plane *plane)
         if (plane->state) {
                 exynos_state = to_exynos_plane_state(plane->state);
                 if (exynos_state->base.fb)
-                        drm_framebuffer_unreference(exynos_state->base.fb);
+                        drm_framebuffer_put(exynos_state->base.fb);
                 kfree(exynos_state);
                 plane->state = NULL;
         }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
index 1a76dd3d52e1..a820a68429b9 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
@@ -168,9 +168,9 @@ static void rotator_dst_set_transf(struct rot_context *rot,
         val &= ~ROT_CONTROL_FLIP_MASK;
 
         if (rotation & DRM_MODE_REFLECT_X)
-                val |= ROT_CONTROL_FLIP_HORIZONTAL;
-        if (rotation & DRM_MODE_REFLECT_Y)
                 val |= ROT_CONTROL_FLIP_VERTICAL;
+        if (rotation & DRM_MODE_REFLECT_Y)
+                val |= ROT_CONTROL_FLIP_HORIZONTAL;
 
         val &= ~ROT_CONTROL_ROT_MASK;
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_scaler.c b/drivers/gpu/drm/exynos/exynos_drm_scaler.c
index 91d4382343d0..0ddb6eec7b11 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_scaler.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_scaler.c
@@ -30,6 +30,7 @@
 #define scaler_write(cfg, offset)       writel(cfg, scaler->regs + (offset))
 #define SCALER_MAX_CLK                  4
 #define SCALER_AUTOSUSPEND_DELAY        2000
+#define SCALER_RESET_WAIT_RETRIES       100
 
 struct scaler_data {
         const char      *clk_name[SCALER_MAX_CLK];
@@ -51,9 +52,9 @@ struct scaler_context {
 static u32 scaler_get_format(u32 drm_fmt)
 {
         switch (drm_fmt) {
-        case DRM_FORMAT_NV21:
-                return SCALER_YUV420_2P_UV;
         case DRM_FORMAT_NV12:
+                return SCALER_YUV420_2P_UV;
+        case DRM_FORMAT_NV21:
                 return SCALER_YUV420_2P_VU;
         case DRM_FORMAT_YUV420:
                 return SCALER_YUV420_3P;
@@ -63,15 +64,15 @@ static u32 scaler_get_format(u32 drm_fmt)
                 return SCALER_YUV422_1P_UYVY;
         case DRM_FORMAT_YVYU:
                 return SCALER_YUV422_1P_YVYU;
-        case DRM_FORMAT_NV61:
-                return SCALER_YUV422_2P_UV;
         case DRM_FORMAT_NV16:
+                return SCALER_YUV422_2P_UV;
+        case DRM_FORMAT_NV61:
                 return SCALER_YUV422_2P_VU;
         case DRM_FORMAT_YUV422:
                 return SCALER_YUV422_3P;
-        case DRM_FORMAT_NV42:
-                return SCALER_YUV444_2P_UV;
         case DRM_FORMAT_NV24:
+                return SCALER_YUV444_2P_UV;
+        case DRM_FORMAT_NV42:
                 return SCALER_YUV444_2P_VU;
         case DRM_FORMAT_YUV444:
                 return SCALER_YUV444_3P;
@@ -100,6 +101,23 @@ static u32 scaler_get_format(u32 drm_fmt)
         return 0;
 }
 
+static inline int scaler_reset(struct scaler_context *scaler)
+{
+        int retry = SCALER_RESET_WAIT_RETRIES;
+
+        scaler_write(SCALER_CFG_SOFT_RESET, SCALER_CFG);
+        do {
+                cpu_relax();
+        } while (retry > 1 &&
+                 scaler_read(SCALER_CFG) & SCALER_CFG_SOFT_RESET);
+        do {
+                cpu_relax();
+                scaler_write(1, SCALER_INT_EN);
+        } while (retry > 0 && scaler_read(SCALER_INT_EN) != 1);
+
+        return retry ? 0 : -EIO;
+}
+
 static inline void scaler_enable_int(struct scaler_context *scaler)
 {
         u32 val;
@@ -354,9 +372,13 @@ static int scaler_commit(struct exynos_drm_ipp *ipp,
         u32 dst_fmt = scaler_get_format(task->dst.buf.fourcc);
         struct drm_exynos_ipp_task_rect *dst_pos = &task->dst.rect;
 
-        scaler->task = task;
-
         pm_runtime_get_sync(scaler->dev);
+        if (scaler_reset(scaler)) {
+                pm_runtime_put(scaler->dev);
+                return -EIO;
+        }
+
+        scaler->task = task;
 
         scaler_set_src_fmt(scaler, src_fmt);
         scaler_set_src_base(scaler, &task->src);
@@ -394,7 +416,11 @@ static inline void scaler_disable_int(struct scaler_context *scaler)
 
 static inline u32 scaler_get_int_status(struct scaler_context *scaler)
 {
-        return scaler_read(SCALER_INT_STATUS);
+        u32 val = scaler_read(SCALER_INT_STATUS);
+
+        scaler_write(val, SCALER_INT_STATUS);
+
+        return val;
 }
 
 static inline int scaler_task_done(u32 val)
diff --git a/drivers/gpu/drm/exynos/regs-gsc.h b/drivers/gpu/drm/exynos/regs-gsc.h
index 4704a993cbb7..16b39734115c 100644
--- a/drivers/gpu/drm/exynos/regs-gsc.h
+++ b/drivers/gpu/drm/exynos/regs-gsc.h
@@ -138,6 +138,7 @@
 #define GSC_OUT_YUV420_3P               (3 << 4)
 #define GSC_OUT_YUV422_1P               (4 << 4)
 #define GSC_OUT_YUV422_2P               (5 << 4)
+#define GSC_OUT_YUV422_3P               (6 << 4)
 #define GSC_OUT_YUV444                  (7 << 4)
 #define GSC_OUT_TILE_TYPE_MASK          (1 << 2)
 #define GSC_OUT_TILE_C_16x8             (0 << 2)
diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
index 6d8180e8d1e2..4b072ade8c38 100644
--- a/drivers/gpu/drm/i915/gvt/display.c
+++ b/drivers/gpu/drm/i915/gvt/display.c
@@ -196,7 +196,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
                         ~(TRANS_DDI_BPC_MASK | TRANS_DDI_MODE_SELECT_MASK |
                         TRANS_DDI_PORT_MASK);
                 vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) |=
-                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST |
+                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DVI |
                         (PORT_B << TRANS_DDI_PORT_SHIFT) |
                         TRANS_DDI_FUNC_ENABLE);
                 if (IS_BROADWELL(dev_priv)) {
@@ -216,7 +216,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
                         ~(TRANS_DDI_BPC_MASK | TRANS_DDI_MODE_SELECT_MASK |
                         TRANS_DDI_PORT_MASK);
                 vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) |=
-                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST |
+                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DVI |
                         (PORT_C << TRANS_DDI_PORT_SHIFT) |
                         TRANS_DDI_FUNC_ENABLE);
                 if (IS_BROADWELL(dev_priv)) {
@@ -236,7 +236,7 @@ static void emulate_monitor_status_change(struct intel_vgpu *vgpu)
                         ~(TRANS_DDI_BPC_MASK | TRANS_DDI_MODE_SELECT_MASK |
                         TRANS_DDI_PORT_MASK);
                 vgpu_vreg_t(vgpu, TRANS_DDI_FUNC_CTL(TRANSCODER_A)) |=
-                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DP_SST |
+                        (TRANS_DDI_BPC_8 | TRANS_DDI_MODE_SELECT_DVI |
                         (PORT_D << TRANS_DDI_PORT_SHIFT) |
                         TRANS_DDI_FUNC_ENABLE);
                 if (IS_BROADWELL(dev_priv)) {
diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index 23296547da95..4efec8fa6c1d 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -1592,6 +1592,7 @@ static struct intel_vgpu_mm *intel_vgpu_create_ggtt_mm(struct intel_vgpu *vgpu)
                 vgpu_free_mm(mm);
                 return ERR_PTR(-ENOMEM);
         }
+        mm->ggtt_mm.last_partial_off = -1UL;
 
         return mm;
 }
@@ -1616,6 +1617,7 @@ void _intel_vgpu_mm_release(struct kref *mm_ref)
                 invalidate_ppgtt_mm(mm);
         } else {
                 vfree(mm->ggtt_mm.virtual_ggtt);
+                mm->ggtt_mm.last_partial_off = -1UL;
         }
 
         vgpu_free_mm(mm);
@@ -1868,6 +1870,62 @@ static int emulate_ggtt_mmio_write(struct intel_vgpu *vgpu, unsigned int off,
         memcpy((void *)&e.val64 + (off & (info->gtt_entry_size - 1)), p_data,
                         bytes);
 
+        /* If ggtt entry size is 8 bytes, and it's split into two 4 bytes
+         * write, we assume the two 4 bytes writes are consecutive.
+         * Otherwise, we abort and report error
+         */
+        if (bytes < info->gtt_entry_size) {
+                if (ggtt_mm->ggtt_mm.last_partial_off == -1UL) {
+                        /* the first partial part*/
+                        ggtt_mm->ggtt_mm.last_partial_off = off;
+                        ggtt_mm->ggtt_mm.last_partial_data = e.val64;
+                        return 0;
+                } else if ((g_gtt_index ==
+                                (ggtt_mm->ggtt_mm.last_partial_off >>
+                                info->gtt_entry_size_shift)) &&
+                        (off != ggtt_mm->ggtt_mm.last_partial_off)) {
+                        /* the second partial part */
+
+                        int last_off = ggtt_mm->ggtt_mm.last_partial_off &
+                                (info->gtt_entry_size - 1);
+
+                        memcpy((void *)&e.val64 + last_off,
+                                (void *)&ggtt_mm->ggtt_mm.last_partial_data +
+                                last_off, bytes);
+
+                        ggtt_mm->ggtt_mm.last_partial_off = -1UL;
+                } else {
+                        int last_offset;
+
+                        gvt_vgpu_err("failed to populate guest ggtt entry: abnormal ggtt entry write sequence, last_partial_off=%lx, offset=%x, bytes=%d, ggtt entry size=%d\n",
+                                        ggtt_mm->ggtt_mm.last_partial_off, off,
+                                        bytes, info->gtt_entry_size);
+
+                        /* set host ggtt entry to scratch page and clear
+                         * virtual ggtt entry as not present for last
+                         * partially write offset
+                         */
+                        last_offset = ggtt_mm->ggtt_mm.last_partial_off &
+                                        (~(info->gtt_entry_size - 1));
+
+                        ggtt_get_host_entry(ggtt_mm, &m, last_offset);
+                        ggtt_invalidate_pte(vgpu, &m);
+                        ops->set_pfn(&m, gvt->gtt.scratch_mfn);
+                        ops->clear_present(&m);
+                        ggtt_set_host_entry(ggtt_mm, &m, last_offset);
+                        ggtt_invalidate(gvt->dev_priv);
+
+                        ggtt_get_guest_entry(ggtt_mm, &e, last_offset);
+                        ops->clear_present(&e);
+                        ggtt_set_guest_entry(ggtt_mm, &e, last_offset);
+
+                        ggtt_mm->ggtt_mm.last_partial_off = off;
+                        ggtt_mm->ggtt_mm.last_partial_data = e.val64;
+
+                        return 0;
+                }
+        }
+
         if (ops->test_present(&e)) {
                 gfn = ops->get_pfn(&e);
                 m = e;
diff --git a/drivers/gpu/drm/i915/gvt/gtt.h b/drivers/gpu/drm/i915/gvt/gtt.h
index 3792f2b7f4ff..97e62647418a 100644
--- a/drivers/gpu/drm/i915/gvt/gtt.h
+++ b/drivers/gpu/drm/i915/gvt/gtt.h
@@ -150,6 +150,8 @@ struct intel_vgpu_mm {
                 } ppgtt_mm;
                 struct {
                         void *virtual_ggtt;
+                        unsigned long last_partial_off;
+                        u64 last_partial_data;
                 } ggtt_mm;
         };
 };
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 34c125e2d90c..52f3b91d14fd 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -340,14 +340,21 @@ struct drm_i915_file_private {
 
         unsigned int bsd_engine;
 
-/* Client can have a maximum of 3 contexts banned before
- * it is denied of creating new contexts. As one context
- * ban needs 4 consecutive hangs, and more if there is
- * progress in between, this is a last resort stop gap measure
- * to limit the badly behaving clients access to gpu.
+/*
+ * Every context ban increments per client ban score. Also
+ * hangs in short succession increments ban score. If ban threshold
+ * is reached, client is considered banned and submitting more work
+ * will fail. This is a stop gap measure to limit the badly behaving
+ * clients access to gpu. Note that unbannable contexts never increment
+ * the client ban score.
  */
-#define I915_MAX_CLIENT_CONTEXT_BANS 3
-        atomic_t context_bans;
+#define I915_CLIENT_SCORE_HANG_FAST     1
+#define   I915_CLIENT_FAST_HANG_JIFFIES (60 * HZ)
+#define I915_CLIENT_SCORE_CONTEXT_BAN   3
+#define I915_CLIENT_SCORE_BANNED        9
+        /** ban_score: Accumulated score of all ctx bans and fast hangs. */
+        atomic_t ban_score;
+        unsigned long hang_timestamp;
 };
 
 /* Interface history:
@@ -2238,9 +2245,6 @@ static inline struct scatterlist *____sg_next(struct scatterlist *sg)
  **/
 static inline struct scatterlist *__sg_next(struct scatterlist *sg)
 {
-#ifdef CONFIG_DEBUG_SG
-        BUG_ON(sg->sg_magic != SG_MAGIC);
-#endif
         return sg_is_last(sg) ? NULL : ____sg_next(sg);
 }
 
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 3704f4c0c2c9..17c5097721e8 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2002,7 +2002,6 @@ int i915_gem_fault(struct vm_fault *vmf)
         bool write = !!(vmf->flags & FAULT_FLAG_WRITE);
         struct i915_vma *vma;
         pgoff_t page_offset;
-        unsigned int flags;
         int ret;
 
         /* We don't use vmf->pgoff since that has the fake offset */
@@ -2038,27 +2037,34 @@ int i915_gem_fault(struct vm_fault *vmf)
                 goto err_unlock;
         }
 
-        /* If the object is smaller than a couple of partial vma, it is
-         * not worth only creating a single partial vma - we may as well
-         * clear enough space for the full object.
-         */
-        flags = PIN_MAPPABLE;
-        if (obj->base.size > 2 * MIN_CHUNK_PAGES << PAGE_SHIFT)
-                flags |= PIN_NONBLOCK | PIN_NONFAULT;
 
         /* Now pin it into the GTT as needed */
-        vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, flags);
+        vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0,
+                                       PIN_MAPPABLE |
+                                       PIN_NONBLOCK |
+                                       PIN_NONFAULT);
         if (IS_ERR(vma)) {
                 /* Use a partial view if it is bigger than available space */
                 struct i915_ggtt_view view =
                         compute_partial_view(obj, page_offset, MIN_CHUNK_PAGES);
+                unsigned int flags;
 
-                /* Userspace is now writing through an untracked VMA, abandon
+                flags = PIN_MAPPABLE;
+                if (view.type == I915_GGTT_VIEW_NORMAL)
+                        flags |= PIN_NONBLOCK; /* avoid warnings for pinned */
+
+                /*
+                 * Userspace is now writing through an untracked VMA, abandon
                  * all hope that the hardware is able to track future writes.
                  */
                 obj->frontbuffer_ggtt_origin = ORIGIN_CPU;
 
-                vma = i915_gem_object_ggtt_pin(obj, &view, 0, 0, PIN_MAPPABLE);
+                vma = i915_gem_object_ggtt_pin(obj, &view, 0, 0, flags);
+                if (IS_ERR(vma) && !view.type) {
+                        flags = PIN_MAPPABLE;
+                        view.type = I915_GGTT_VIEW_PARTIAL;
+                        vma = i915_gem_object_ggtt_pin(obj, &view, 0, 0, flags);
+                }
         }
         if (IS_ERR(vma)) {
                 ret = PTR_ERR(vma);
@@ -2933,32 +2939,54 @@ i915_gem_object_pwrite_gtt(struct drm_i915_gem_object *obj,
         return 0;
 }
 
+static void i915_gem_client_mark_guilty(struct drm_i915_file_private *file_priv,
+                                        const struct i915_gem_context *ctx)
+{
+        unsigned int score;
+        unsigned long prev_hang;
+
+        if (i915_gem_context_is_banned(ctx))
+                score = I915_CLIENT_SCORE_CONTEXT_BAN;
+        else
+                score = 0;
+
+        prev_hang = xchg(&file_priv->hang_timestamp, jiffies);
+        if (time_before(jiffies, prev_hang + I915_CLIENT_FAST_HANG_JIFFIES))
+                score += I915_CLIENT_SCORE_HANG_FAST;
+
+        if (score) {
+                atomic_add(score, &file_priv->ban_score);
+
+                DRM_DEBUG_DRIVER("client %s: gained %u ban score, now %u\n",
+                                 ctx->name, score,
+                                 atomic_read(&file_priv->ban_score));
+        }
+}
+
 static void i915_gem_context_mark_guilty(struct i915_gem_context *ctx)
 {
-        bool banned;
+        unsigned int score;
+        bool banned, bannable;
 
         atomic_inc(&ctx->guilty_count);
 
-        banned = false;
-        if (i915_gem_context_is_bannable(ctx)) {
-                unsigned int score;
+        bannable = i915_gem_context_is_bannable(ctx);
+        score = atomic_add_return(CONTEXT_SCORE_GUILTY, &ctx->ban_score);
+        banned = score >= CONTEXT_SCORE_BAN_THRESHOLD;
 
-                score = atomic_add_return(CONTEXT_SCORE_GUILTY,
-                                          &ctx->ban_score);
-                banned = score >= CONTEXT_SCORE_BAN_THRESHOLD;
+        DRM_DEBUG_DRIVER("context %s: guilty %d, score %u, ban %s\n",
+                         ctx->name, atomic_read(&ctx->guilty_count),
+                         score, yesno(banned && bannable));
 
-                DRM_DEBUG_DRIVER("context %s marked guilty (score %d) banned? %s\n",
-                                 ctx->name, score, yesno(banned));
-        }
-        if (!banned)
+        /* Cool contexts don't accumulate client ban score */
+        if (!bannable)
                 return;
 
-        i915_gem_context_set_banned(ctx);
-        if (!IS_ERR_OR_NULL(ctx->file_priv)) {
-                atomic_inc(&ctx->file_priv->context_bans);
-                DRM_DEBUG_DRIVER("client %s has had %d context banned\n",
-                                 ctx->name, atomic_read(&ctx->file_priv->context_bans));
-        }
+        if (banned)
+                i915_gem_context_set_banned(ctx);
+
+        if (!IS_ERR_OR_NULL(ctx->file_priv))
+                i915_gem_client_mark_guilty(ctx->file_priv, ctx);
 }
 
 static void i915_gem_context_mark_innocent(struct i915_gem_context *ctx)
@@ -5736,6 +5764,7 @@ int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file)
         INIT_LIST_HEAD(&file_priv->mm.request_list);
 
         file_priv->bsd_engine = -1;
+        file_priv->hang_timestamp = jiffies;
 
         ret = i915_gem_context_open(i915, file);
         if (ret)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 33f8a4b3c981..060335d3d9e0 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -652,7 +652,7 @@ int i915_gem_switch_to_kernel_context(struct drm_i915_private *dev_priv)
 
 static bool client_is_banned(struct drm_i915_file_private *file_priv)
 {
-        return atomic_read(&file_priv->context_bans) > I915_MAX_CLIENT_CONTEXT_BANS;
+        return atomic_read(&file_priv->ban_score) >= I915_CLIENT_SCORE_BANNED;
 }
 
 int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index f627a8c47c58..22df17c8ca9b 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -489,7 +489,9 @@ eb_validate_vma(struct i915_execbuffer *eb,
 }
 
 static int
-eb_add_vma(struct i915_execbuffer *eb, unsigned int i, struct i915_vma *vma)
+eb_add_vma(struct i915_execbuffer *eb,
+           unsigned int i, unsigned batch_idx,
+           struct i915_vma *vma)
 {
         struct drm_i915_gem_exec_object2 *entry = &eb->exec[i];
         int err;
@@ -522,6 +524,24 @@ eb_add_vma(struct i915_execbuffer *eb, unsigned int i, struct i915_vma *vma)
         eb->flags[i] = entry->flags;
         vma->exec_flags = &eb->flags[i];
 
+        /*
+         * SNA is doing fancy tricks with compressing batch buffers, which leads
+         * to negative relocation deltas. Usually that works out ok since the
+         * relocate address is still positive, except when the batch is placed
+         * very low in the GTT. Ensure this doesn't happen.
+         *
+         * Note that actual hangs have only been observed on gen7, but for
+         * paranoia do it everywhere.
+         */
+        if (i == batch_idx) {
+                if (!(eb->flags[i] & EXEC_OBJECT_PINNED))
+                        eb->flags[i] |= __EXEC_OBJECT_NEEDS_BIAS;
+                if (eb->reloc_cache.has_fence)
+                        eb->flags[i] |= EXEC_OBJECT_NEEDS_FENCE;
+
+                eb->batch = vma;
+        }
+
         err = 0;
         if (eb_pin_vma(eb, entry, vma)) {
                 if (entry->offset != vma->node.start) {
@@ -716,7 +736,7 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb)
 {
         struct radix_tree_root *handles_vma = &eb->ctx->handles_vma;
         struct drm_i915_gem_object *obj;
-        unsigned int i;
+        unsigned int i, batch;
         int err;
 
         if (unlikely(i915_gem_context_is_closed(eb->ctx)))
@@ -728,6 +748,8 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb)
         INIT_LIST_HEAD(&eb->relocs);
         INIT_LIST_HEAD(&eb->unbound);
 
+        batch = eb_batch_index(eb);
+
         for (i = 0; i < eb->buffer_count; i++) {
                 u32 handle = eb->exec[i].handle;
                 struct i915_lut_handle *lut;
@@ -770,33 +792,16 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb)
                 lut->handle = handle;
 
 add_vma:
-                err = eb_add_vma(eb, i, vma);
+                err = eb_add_vma(eb, i, batch, vma);
                 if (unlikely(err))
                         goto err_vma;
 
                 GEM_BUG_ON(vma != eb->vma[i]);
                 GEM_BUG_ON(vma->exec_flags != &eb->flags[i]);
+                GEM_BUG_ON(drm_mm_node_allocated(&vma->node) &&
+                           eb_vma_misplaced(&eb->exec[i], vma, eb->flags[i]));
         }
 
-        /* take note of the batch buffer before we might reorder the lists */
-        i = eb_batch_index(eb);
-        eb->batch = eb->vma[i];
-        GEM_BUG_ON(eb->batch->exec_flags != &eb->flags[i]);
-
-        /*
-         * SNA is doing fancy tricks with compressing batch buffers, which leads
-         * to negative relocation deltas. Usually that works out ok since the
-         * relocate address is still positive, except when the batch is placed
-         * very low in the GTT. Ensure this doesn't happen.
-         *
-         * Note that actual hangs have only been observed on gen7, but for
-         * paranoia do it everywhere.
-         */
-        if (!(eb->flags[i] & EXEC_OBJECT_PINNED))
-                eb->flags[i] |= __EXEC_OBJECT_NEEDS_BIAS;
-        if (eb->reloc_cache.has_fence)
-                eb->flags[i] |= EXEC_OBJECT_NEEDS_FENCE;
-
         eb->args->flags |= __EXEC_VALIDATED;
         return eb_reserve(eb);
 
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index f9bc3aaa90d0..4a02747ac658 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1893,9 +1893,17 @@ static void i9xx_pipestat_irq_ack(struct drm_i915_private *dev_priv,
 
                 /*
                  * Clear the PIPE*STAT regs before the IIR
+                 *
+                 * Toggle the enable bits to make sure we get an
+                 * edge in the ISR pipe event bit if we don't clear
+                 * all the enabled status bits. Otherwise the edge
+                 * triggered IIR on i965/g4x wouldn't notice that
+                 * an interrupt is still pending.
                  */
-                if (pipe_stats[pipe])
-                        I915_WRITE(reg, enable_mask | pipe_stats[pipe]);
+                if (pipe_stats[pipe]) {
+                        I915_WRITE(reg, pipe_stats[pipe]);
+                        I915_WRITE(reg, enable_mask);
+                }
         }
         spin_unlock(&dev_priv->irq_lock);
 }
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index f11bb213ec07..7720569f2024 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2425,12 +2425,17 @@ enum i915_power_well_id {
 #define _3D_CHICKEN     _MMIO(0x2084)
 #define  _3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB      (1 << 10)
 #define _3D_CHICKEN2    _MMIO(0x208c)
+
+#define FF_SLICE_CHICKEN        _MMIO(0x2088)
+#define  FF_SLICE_CHICKEN_CL_PROVOKING_VERTEX_FIX       (1 << 1)
+
 /* Disables pipelining of read flushes past the SF-WIZ interface.
  * Required on all Ironlake steppings according to the B-Spec, but the
  * particular danger of not doing so is not specified.
  */
 # define _3D_CHICKEN2_WM_READ_PIPELINED                 (1 << 14)
 #define _3D_CHICKEN3    _MMIO(0x2090)
+#define  _3D_CHICKEN_SF_PROVOKING_VERTEX_FIX            (1 << 12)
 #define  _3D_CHICKEN_SF_DISABLE_OBJEND_CULL             (1 << 10)
 #define  _3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE        (1 << 5)
 #define  _3D_CHICKEN3_SF_DISABLE_FASTCLIP_CULL          (1 << 5)
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 9324d476e0a7..0531c01c3604 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -109,7 +109,7 @@ vma_create(struct drm_i915_gem_object *obj,
                                                      obj->base.size >> PAGE_SHIFT));
                         vma->size = view->partial.size;
                         vma->size <<= PAGE_SHIFT;
-                        GEM_BUG_ON(vma->size >= obj->base.size);
+                        GEM_BUG_ON(vma->size > obj->base.size);
                 } else if (view->type == I915_GGTT_VIEW_ROTATED) {
                         vma->size = intel_rotation_info_size(&view->rotated);
                         vma->size <<= PAGE_SHIFT;
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index de0e22322c76..072b326d5ee0 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -304,6 +304,9 @@ intel_crt_mode_valid(struct drm_connector *connector,
         int max_dotclk = dev_priv->max_dotclk_freq;
         int max_clock;
 
+        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return MODE_NO_DBLESCAN;
+
         if (mode->clock < 25000)
                 return MODE_CLOCK_LOW;
 
@@ -337,6 +340,12 @@ static bool intel_crt_compute_config(struct intel_encoder *encoder,
                                      struct intel_crtc_state *pipe_config,
                                      struct drm_connector_state *conn_state)
 {
+        struct drm_display_mode *adjusted_mode =
+                &pipe_config->base.adjusted_mode;
+
+        if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return false;
+
         return true;
 }
 
@@ -344,6 +353,12 @@ static bool pch_crt_compute_config(struct intel_encoder *encoder,
                                    struct intel_crtc_state *pipe_config,
                                    struct drm_connector_state *conn_state)
 {
+        struct drm_display_mode *adjusted_mode =
+                &pipe_config->base.adjusted_mode;
+
+        if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return false;
+
         pipe_config->has_pch_encoder = true;
 
         return true;
@@ -354,6 +369,11 @@ static bool hsw_crt_compute_config(struct intel_encoder *encoder,
                                    struct drm_connector_state *conn_state)
 {
         struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+        struct drm_display_mode *adjusted_mode =
+                &pipe_config->base.adjusted_mode;
+
+        if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return false;
 
         pipe_config->has_pch_encoder = true;
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index dee3a8e659f1..2cc6faa1daa8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14469,12 +14469,22 @@ static enum drm_mode_status
 intel_mode_valid(struct drm_device *dev,
                  const struct drm_display_mode *mode)
 {
+        /*
+         * Can't reject DBLSCAN here because Xorg ddxen can add piles
+         * of DBLSCAN modes to the output's mode list when they detect
+         * the scaling mode property on the connector. And they don't
+         * ask the kernel to validate those modes in any way until
+         * modeset time at which point the client gets a protocol error.
+         * So in order to not upset those clients we silently ignore the
+         * DBLSCAN flag on such connectors. For other connectors we will
+         * reject modes with the DBLSCAN flag in encoder->compute_config().
+         * And we always reject DBLSCAN modes in connector->mode_valid()
+         * as we never want such modes on the connector's mode list.
+         */
+
         if (mode->vscan > 1)
                 return MODE_NO_VSCAN;
 
-        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return MODE_NO_DBLESCAN;
-
         if (mode->flags & DRM_MODE_FLAG_HSKEW)
                 return MODE_H_ILLEGAL;
 
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 8320f0e8e3be..16faea30114a 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -420,6 +420,9 @@ intel_dp_mode_valid(struct drm_connector *connector,
         int max_rate, mode_rate, max_lanes, max_link_clock;
         int max_dotclk;
 
+        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return MODE_NO_DBLESCAN;
+
         max_dotclk = intel_dp_downstream_max_dotclock(intel_dp);
 
         if (intel_dp_is_edp(intel_dp) && fixed_mode) {
@@ -1862,7 +1865,10 @@ intel_dp_compute_config(struct intel_encoder *encoder,
                                                 conn_state->scaling_mode);
         }
 
-        if ((IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) &&
+        if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return false;
+
+        if (HAS_GMCH_DISPLAY(dev_priv) &&
             adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE)
                 return false;
 
@@ -2784,16 +2790,6 @@ static void g4x_disable_dp(struct intel_encoder *encoder,
                            const struct drm_connector_state *old_conn_state)
 {
         intel_disable_dp(encoder, old_crtc_state, old_conn_state);
-
-        /* disable the port before the pipe on g4x */
-        intel_dp_link_down(encoder, old_crtc_state);
-}
-
-static void ilk_disable_dp(struct intel_encoder *encoder,
-                           const struct intel_crtc_state *old_crtc_state,
-                           const struct drm_connector_state *old_conn_state)
-{
-        intel_disable_dp(encoder, old_crtc_state, old_conn_state);
 }
 
 static void vlv_disable_dp(struct intel_encoder *encoder,
@@ -2807,13 +2803,19 @@ static void vlv_disable_dp(struct intel_encoder *encoder,
         intel_disable_dp(encoder, old_crtc_state, old_conn_state);
 }
 
-static void ilk_post_disable_dp(struct intel_encoder *encoder,
+static void g4x_post_disable_dp(struct intel_encoder *encoder,
                                 const struct intel_crtc_state *old_crtc_state,
                                 const struct drm_connector_state *old_conn_state)
 {
         struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
         enum port port = encoder->port;
 
+        /*
+         * Bspec does not list a specific disable sequence for g4x DP.
+         * Follow the ilk+ sequence (disable pipe before the port) for
+         * g4x DP as it does not suffer from underruns like the normal
+         * g4x modeset sequence (disable pipe after the port).
+         */
         intel_dp_link_down(encoder, old_crtc_state);
 
         /* Only ilk+ has port A */
@@ -6337,7 +6339,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
         drm_connector_init(dev, connector, &intel_dp_connector_funcs, type);
         drm_connector_helper_add(connector, &intel_dp_connector_helper_funcs);
 
-        if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
+        if (!HAS_GMCH_DISPLAY(dev_priv))
                 connector->interlace_allowed = true;
         connector->doublescan_allowed = 0;
 
@@ -6436,15 +6438,11 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
                 intel_encoder->enable = vlv_enable_dp;
                 intel_encoder->disable = vlv_disable_dp;
                 intel_encoder->post_disable = vlv_post_disable_dp;
-        } else if (INTEL_GEN(dev_priv) >= 5) {
-                intel_encoder->pre_enable = g4x_pre_enable_dp;
-                intel_encoder->enable = g4x_enable_dp;
-                intel_encoder->disable = ilk_disable_dp;
-                intel_encoder->post_disable = ilk_post_disable_dp;
         } else {
                 intel_encoder->pre_enable = g4x_pre_enable_dp;
                 intel_encoder->enable = g4x_enable_dp;
                 intel_encoder->disable = g4x_disable_dp;
+                intel_encoder->post_disable = g4x_post_disable_dp;
         }
 
         intel_dig_port->dp.output_reg = output_reg;
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 9e6956c08688..5890500a3a8b 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -48,6 +48,9 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
         bool reduce_m_n = drm_dp_has_quirk(&intel_dp->desc,
                                            DP_DPCD_QUIRK_LIMITED_M_N);
 
+        if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return false;
+
         pipe_config->has_pch_encoder = false;
         bpp = 24;
         if (intel_dp->compliance.test_data.bpc) {
@@ -366,6 +369,9 @@ intel_dp_mst_mode_valid(struct drm_connector *connector,
         if (!intel_dp)
                 return MODE_ERROR;
 
+        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return MODE_NO_DBLESCAN;
+
         max_link_clock = intel_dp_max_link_rate(intel_dp);
         max_lanes = intel_dp_max_lane_count(intel_dp);
 
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index cf39ca90d887..f349b3920199 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -326,6 +326,9 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
                                                 conn_state->scaling_mode);
         }
 
+        if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return false;
+
         /* DSI uses short packets for sync events, so clear mode flags for DSI */
         adjusted_mode->flags = 0;
 
@@ -1266,6 +1269,9 @@ intel_dsi_mode_valid(struct drm_connector *connector,
 
         DRM_DEBUG_KMS("\n");
 
+        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return MODE_NO_DBLESCAN;
+
         if (fixed_mode) {
                 if (mode->hdisplay > fixed_mode->hdisplay)
                         return MODE_PANEL;
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index a70d767313aa..61d908e0df0e 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -219,6 +219,9 @@ intel_dvo_mode_valid(struct drm_connector *connector,
         int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;
         int target_clock = mode->clock;
 
+        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return MODE_NO_DBLESCAN;
+
         /* XXX: Validate clock range */
 
         if (fixed_mode) {
@@ -254,6 +257,9 @@ static bool intel_dvo_compute_config(struct intel_encoder *encoder,
         if (fixed_mode)
                 intel_fixed_panel_mode(fixed_mode, adjusted_mode);
 
+        if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return false;
+
         return true;
 }
 
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index ee929f31f7db..d8cb53ef4351 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1557,6 +1557,9 @@ intel_hdmi_mode_valid(struct drm_connector *connector,
         bool force_dvi =
                 READ_ONCE(to_intel_digital_connector_state(connector->state)->force_audio) == HDMI_AUDIO_OFF_DVI;
 
+        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return MODE_NO_DBLESCAN;
+
         clock = mode->clock;
 
         if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING)
@@ -1677,6 +1680,9 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
         int desired_bpp;
         bool force_dvi = intel_conn_state->force_audio == HDMI_AUDIO_OFF_DVI;
 
+        if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return false;
+
         pipe_config->has_hdmi_sink = !force_dvi && intel_hdmi->has_hdmi_sink;
 
         if (pipe_config->has_hdmi_sink)
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 15434cad5430..7c4c8fb1dae4 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1545,11 +1545,21 @@ static u32 *gen9_init_indirectctx_bb(struct intel_engine_cs *engine, u32 *batch)
         /* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt,glk */
         batch = gen8_emit_flush_coherentl3_wa(engine, batch);
 
+        *batch++ = MI_LOAD_REGISTER_IMM(3);
+
         /* WaDisableGatherAtSetShaderCommonSlice:skl,bxt,kbl,glk */
-        *batch++ = MI_LOAD_REGISTER_IMM(1);
         *batch++ = i915_mmio_reg_offset(COMMON_SLICE_CHICKEN2);
         *batch++ = _MASKED_BIT_DISABLE(
                         GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE);
+
+        /* BSpec: 11391 */
+        *batch++ = i915_mmio_reg_offset(FF_SLICE_CHICKEN);
+        *batch++ = _MASKED_BIT_ENABLE(FF_SLICE_CHICKEN_CL_PROVOKING_VERTEX_FIX);
+
+        /* BSpec: 11299 */
+        *batch++ = i915_mmio_reg_offset(_3D_CHICKEN3);
+        *batch++ = _MASKED_BIT_ENABLE(_3D_CHICKEN_SF_PROVOKING_VERTEX_FIX);
+
         *batch++ = MI_NOOP;
 
         /* WaClearSlmSpaceAtContextSwitch:kbl */
@@ -2641,10 +2651,8 @@ static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
         context_size += LRC_HEADER_PAGES * PAGE_SIZE;
 
         ctx_obj = i915_gem_object_create(ctx->i915, context_size);
-        if (IS_ERR(ctx_obj)) {
-                ret = PTR_ERR(ctx_obj);
-                goto error_deref_obj;
-        }
+        if (IS_ERR(ctx_obj))
+                return PTR_ERR(ctx_obj);
 
         vma = i915_vma_instance(ctx_obj, &ctx->i915->ggtt.base, NULL);
         if (IS_ERR(vma)) {
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index d278f24ba6ae..48f618dc9abb 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -380,6 +380,8 @@ intel_lvds_mode_valid(struct drm_connector *connector,
         struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
         int max_pixclk = to_i915(connector->dev)->max_dotclk_freq;
 
+        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return MODE_NO_DBLESCAN;
         if (mode->hdisplay > fixed_mode->hdisplay)
                 return MODE_PANEL;
         if (mode->vdisplay > fixed_mode->vdisplay)
@@ -429,6 +431,9 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,
         intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
                                adjusted_mode);
 
+        if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return false;
+
         if (HAS_PCH_SPLIT(dev_priv)) {
                 pipe_config->has_pch_encoder = true;
 
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 25005023c243..26975df4e593 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1160,6 +1160,9 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
                                                            adjusted_mode);
         }
 
+        if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return false;
+
         /*
          * Make the CRTC code factor in the SDVO pixel multiplier.  The
          * SDVO device will factor out the multiplier during mode_set.
@@ -1621,6 +1624,9 @@ intel_sdvo_mode_valid(struct drm_connector *connector,
         struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
         int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;
 
+        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return MODE_NO_DBLESCAN;
+
         if (intel_sdvo->pixel_clock_min > mode->clock)
                 return MODE_CLOCK_LOW;
 
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 885fc3809f7f..b55b5c157e38 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -850,6 +850,9 @@ intel_tv_mode_valid(struct drm_connector *connector,
         const struct tv_mode *tv_mode = intel_tv_mode_find(connector->state);
         int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;
 
+        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return MODE_NO_DBLESCAN;
+
         if (mode->clock > max_dotclk)
                 return MODE_CLOCK_HIGH;
 
@@ -877,16 +880,21 @@ intel_tv_compute_config(struct intel_encoder *encoder,
                         struct drm_connector_state *conn_state)
 {
         const struct tv_mode *tv_mode = intel_tv_mode_find(conn_state);
+        struct drm_display_mode *adjusted_mode =
+                &pipe_config->base.adjusted_mode;
 
         if (!tv_mode)
                 return false;
 
-        pipe_config->base.adjusted_mode.crtc_clock = tv_mode->clock;
+        if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return false;
+
+        adjusted_mode->crtc_clock = tv_mode->clock;
         DRM_DEBUG_KMS("forcing bpc to 8 for TV\n");
         pipe_config->pipe_bpp = 8*3;
 
         /* TV has it's own notion of sync and other mode flags, so clear them. */
-        pipe_config->base.adjusted_mode.flags = 0;
+        adjusted_mode->flags = 0;
 
         /*
          * FIXME: We don't check whether the input mode is actually what we want
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 32b1a6cdecfc..d3443125e661 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -197,8 +197,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
         priv->io_base = regs;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hhi");
-        if (!res)
-                return -EINVAL;
+        if (!res) {
+                ret = -EINVAL;
+                goto free_drm;
+        }
         /* Simply ioremap since it may be a shared register zone */
         regs = devm_ioremap(dev, res->start, resource_size(res));
         if (!regs) {
@@ -215,8 +217,10 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
         }
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dmc");
-        if (!res)
-                return -EINVAL;
+        if (!res) {
+                ret = -EINVAL;
+                goto free_drm;
+        }
         /* Simply ioremap since it may be a shared register zone */
         regs = devm_ioremap(dev, res->start, resource_size(res));
         if (!regs) {
diff --git a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
index 291c08117ab6..397143b639c6 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
@@ -132,7 +132,7 @@ curs507a_new_(const struct nv50_wimm_func *func, struct nouveau_drm *drm,
 
         nvif_object_map(&wndw->wimm.base.user, NULL, 0);
         wndw->immd = func;
-        wndw->ctxdma.parent = &disp->core->chan.base.user;
+        wndw->ctxdma.parent = NULL;
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
index 224963b533a6..c5a9bc1af5af 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
@@ -444,14 +444,17 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state)
         if (ret)
                 return ret;
 
-        ctxdma = nv50_wndw_ctxdma_new(wndw, fb);
-        if (IS_ERR(ctxdma)) {
-                nouveau_bo_unpin(fb->nvbo);
-                return PTR_ERR(ctxdma);
+        if (wndw->ctxdma.parent) {
+                ctxdma = nv50_wndw_ctxdma_new(wndw, fb);
+                if (IS_ERR(ctxdma)) {
+                        nouveau_bo_unpin(fb->nvbo);
+                        return PTR_ERR(ctxdma);
+                }
+
+                asyw->image.handle[0] = ctxdma->object.handle;
         }
 
         asyw->state.fence = reservation_object_get_excl_rcu(fb->nvbo->bo.resv);
-        asyw->image.handle[0] = ctxdma->object.handle;
         asyw->image.offset[0] = fb->nvbo->bo.offset;
 
         if (wndw->func->prepare) {
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index b8cda9449241..768207fbbae3 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -623,7 +623,7 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane,
         struct qxl_cursor_cmd *cmd;
         struct qxl_cursor *cursor;
         struct drm_gem_object *obj;
-        struct qxl_bo *cursor_bo = NULL, *user_bo = NULL;
+        struct qxl_bo *cursor_bo = NULL, *user_bo = NULL, *old_cursor_bo = NULL;
         int ret;
         void *user_ptr;
         int size = 64*64*4;
@@ -677,7 +677,7 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane,
                                                            cursor_bo, 0);
                 cmd->type = QXL_CURSOR_SET;
 
-                qxl_bo_unref(&qcrtc->cursor_bo);
+                old_cursor_bo = qcrtc->cursor_bo;
                 qcrtc->cursor_bo = cursor_bo;
                 cursor_bo = NULL;
         } else {
@@ -697,6 +697,9 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane,
         qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
         qxl_release_fence_buffer_objects(release);
 
+        if (old_cursor_bo)
+                qxl_bo_unref(&old_cursor_bo);
+
         qxl_bo_unref(&cursor_bo);
 
         return;
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index 08747fc3ee71..8232b39e16ca 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -17,7 +17,6 @@
 #include <drm/drm_encoder.h>
 #include <drm/drm_modes.h>
 #include <drm/drm_of.h>
-#include <drm/drm_panel.h>
 
 #include <uapi/drm/drm_mode.h>
 
@@ -418,9 +417,6 @@ static void sun4i_tcon0_mode_set_lvds(struct sun4i_tcon *tcon,
 static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
                                      const struct drm_display_mode *mode)
 {
-        struct drm_panel *panel = tcon->panel;
-        struct drm_connector *connector = panel->connector;
-        struct drm_display_info display_info = connector->display_info;
         unsigned int bp, hsync, vsync;
         u8 clk_delay;
         u32 val = 0;
@@ -478,27 +474,6 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
         if (mode->flags & DRM_MODE_FLAG_PVSYNC)
                 val |= SUN4I_TCON0_IO_POL_VSYNC_POSITIVE;
 
-        /*
-         * On A20 and similar SoCs, the only way to achieve Positive Edge
-         * (Rising Edge), is setting dclk clock phase to 2/3(240°).
-         * By default TCON works in Negative Edge(Falling Edge),
-         * this is why phase is set to 0 in that case.
-         * Unfortunately there's no way to logically invert dclk through
-         * IO_POL register.
-         * The only acceptable way to work, triple checked with scope,
-         * is using clock phase set to 0° for Negative Edge and set to 240°
-         * for Positive Edge.
-         * On A33 and similar SoCs there would be a 90° phase option,
-         * but it divides also dclk by 2.
-         * Following code is a way to avoid quirks all around TCON
-         * and DOTCLOCK drivers.
-         */
-        if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE)
-                clk_set_phase(tcon->dclk, 240);
-
-        if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE)
-                clk_set_phase(tcon->dclk, 0);
-
         regmap_update_bits(tcon->regs, SUN4I_TCON0_IO_POL_REG,
                            SUN4I_TCON0_IO_POL_HSYNC_POSITIVE | SUN4I_TCON0_IO_POL_VSYNC_POSITIVE,
                            val);
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index 2ebdc6d5a76e..d5583190f3e4 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -137,7 +137,10 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
 
         if (cmd > (char *) urb->transfer_buffer) {
                 /* Send partial buffer remaining before exiting */
-                int len = cmd - (char *) urb->transfer_buffer;
+                int len;
+                if (cmd < (char *) urb->transfer_buffer + urb->transfer_buffer_length)
+                        *cmd++ = 0xAF;
+                len = cmd - (char *) urb->transfer_buffer;
                 ret = udl_submit_urb(dev, urb, len);
                 bytes_sent += len;
         } else
diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c
index 0c87b1ac6b68..b992644c17e6 100644
--- a/drivers/gpu/drm/udl/udl_transfer.c
+++ b/drivers/gpu/drm/udl/udl_transfer.c
@@ -153,11 +153,11 @@ static void udl_compress_hline16(
                 raw_pixels_count_byte = cmd++; /*  we'll know this later */
                 raw_pixel_start = pixel;
 
-                cmd_pixel_end = pixel + (min(MAX_CMD_PIXELS + 1,
-                        min((int)(pixel_end - pixel) / bpp,
-                            (int)(cmd_buffer_end - cmd) / 2))) * bpp;
+                cmd_pixel_end = pixel + min3(MAX_CMD_PIXELS + 1UL,
+                                        (unsigned long)(pixel_end - pixel) / bpp,
+                                        (unsigned long)(cmd_buffer_end - 1 - cmd) / 2) * bpp;
 
-                prefetch_range((void *) pixel, (cmd_pixel_end - pixel) * bpp);
+                prefetch_range((void *) pixel, cmd_pixel_end - pixel);
                 pixel_val16 = get_pixel_val16(pixel, bpp);
 
                 while (pixel < cmd_pixel_end) {
@@ -193,6 +193,9 @@ static void udl_compress_hline16(
                 if (pixel > raw_pixel_start) {
                         /* finalize last RAW span */
                         *raw_pixels_count_byte = ((pixel-raw_pixel_start) / bpp) & 0xFF;
+                } else {
+                        /* undo unused byte */
+                        cmd--;
                 }
 
                 *cmd_pixels_count_byte = ((pixel - cmd_pixel_start) / bpp) & 0xFF;
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index f858cc72011d..3942ee61bd1c 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1952,6 +1952,8 @@ static int hid_device_probe(struct device *dev)
         }
         hdev->io_started = false;
 
+        clear_bit(ffs(HID_STAT_REPROBED), &hdev->status);
+
         if (!hdev->driver) {
                 id = hid_match_device(hdev, hdrv);
                 if (id == NULL) {
@@ -2215,7 +2217,8 @@ static int __hid_bus_reprobe_drivers(struct device *dev, void *data)
         struct hid_device *hdev = to_hid_device(dev);
 
         if (hdev->driver == hdrv &&
-            !hdrv->match(hdev, hid_ignore_special_drivers))
+            !hdrv->match(hdev, hid_ignore_special_drivers) &&
+            !test_and_set_bit(ffs(HID_STAT_REPROBED), &hdev->status))
                 return device_reprobe(dev);
 
         return 0;
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 8469b6964ff6..b48100236df8 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -1154,6 +1154,8 @@ copy_rest:
                         goto out;
                 if (list->tail > list->head) {
                         len = list->tail - list->head;
+                        if (len > count)
+                                len = count;
 
                         if (copy_to_user(buffer + ret, &list->hid_debug_buf[list->head], len)) {
                                 ret = -EFAULT;
@@ -1163,6 +1165,8 @@ copy_rest:
                         list->head += len;
                 } else {
                         len = HID_DEBUG_BUFSIZE - list->head;
+                        if (len > count)
+                                len = count;
 
                         if (copy_to_user(buffer, &list->hid_debug_buf[list->head], len)) {
                                 ret = -EFAULT;
@@ -1170,7 +1174,9 @@ copy_rest:
                         }
                         list->head = 0;
                         ret += len;
-                        goto copy_rest;
+                        count -= len;
+                        if (count > 0)
+                                goto copy_rest;
                 }
 
         }
diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c
index 7b8e17b03cb8..6bf4da7ad63a 100644
--- a/drivers/hid/hid-google-hammer.c
+++ b/drivers/hid/hid-google-hammer.c
@@ -124,6 +124,8 @@ static const struct hid_device_id hammer_devices[] = {
                      USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_STAFF) },
         { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
                      USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_WAND) },
+        { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
+                     USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_WHISKERS) },
         { }
 };
 MODULE_DEVICE_TABLE(hid, hammer_devices);
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index a85634fe033f..c7981ddd8776 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -452,6 +452,7 @@
 #define USB_DEVICE_ID_GOOGLE_TOUCH_ROSE 0x5028
 #define USB_DEVICE_ID_GOOGLE_STAFF      0x502b
 #define USB_DEVICE_ID_GOOGLE_WAND       0x502d
+#define USB_DEVICE_ID_GOOGLE_WHISKERS   0x5030
 
 #define USB_VENDOR_ID_GOTOP             0x08f2
 #define USB_DEVICE_ID_SUPER_Q2          0x007f
diff --git a/drivers/hid/hid-steam.c b/drivers/hid/hid-steam.c
index cb86cc834201..0422ec2b13d2 100644
--- a/drivers/hid/hid-steam.c
+++ b/drivers/hid/hid-steam.c
@@ -573,7 +573,7 @@ static bool steam_is_valve_interface(struct hid_device *hdev)
 
 static int steam_client_ll_parse(struct hid_device *hdev)
 {
-        struct steam_device *steam = hid_get_drvdata(hdev);
+        struct steam_device *steam = hdev->driver_data;
 
         return hid_parse_report(hdev, steam->hdev->dev_rdesc,
                         steam->hdev->dev_rsize);
@@ -590,7 +590,7 @@ static void steam_client_ll_stop(struct hid_device *hdev)
 
 static int steam_client_ll_open(struct hid_device *hdev)
 {
-        struct steam_device *steam = hid_get_drvdata(hdev);
+        struct steam_device *steam = hdev->driver_data;
         int ret;
 
         ret = hid_hw_open(steam->hdev);
@@ -605,7 +605,7 @@ static int steam_client_ll_open(struct hid_device *hdev)
 
 static void steam_client_ll_close(struct hid_device *hdev)
 {
-        struct steam_device *steam = hid_get_drvdata(hdev);
+        struct steam_device *steam = hdev->driver_data;
 
         mutex_lock(&steam->mutex);
         steam->client_opened = false;
@@ -623,7 +623,7 @@ static int steam_client_ll_raw_request(struct hid_device *hdev,
                                 size_t count, unsigned char report_type,
                                 int reqtype)
 {
-        struct steam_device *steam = hid_get_drvdata(hdev);
+        struct steam_device *steam = hdev->driver_data;
 
         return hid_hw_raw_request(steam->hdev, reportnum, buf, count,
                         report_type, reqtype);
@@ -710,7 +710,7 @@ static int steam_probe(struct hid_device *hdev,
                 ret = PTR_ERR(steam->client_hdev);
                 goto client_hdev_fail;
         }
-        hid_set_drvdata(steam->client_hdev, steam);
+        steam->client_hdev->driver_data = steam;
 
         /*
          * With the real steam controller interface, do not connect hidraw.
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index c1652bb7bd15..eae0cb3ddec6 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -484,7 +484,7 @@ static void i2c_hid_get_input(struct i2c_hid *ihid)
                 return;
         }
 
-        if ((ret_size > size) || (ret_size <= 2)) {
+        if ((ret_size > size) || (ret_size < 2)) {
                 dev_err(&ihid->client->dev, "%s: incomplete report (%d/%d)\n",
                         __func__, size, ret_size);
                 return;
diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
index 582e449be9fe..a2c53ea3b5ed 100644
--- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
+++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
@@ -205,8 +205,7 @@ static void ish_remove(struct pci_dev *pdev)
         kfree(ishtp_dev);
 }
 
-#ifdef CONFIG_PM
-static struct device *ish_resume_device;
+static struct device __maybe_unused *ish_resume_device;
 
 /* 50ms to get resume response */
 #define WAIT_FOR_RESUME_ACK_MS          50
@@ -220,7 +219,7 @@ static struct device *ish_resume_device;
  * in that case a simple resume message is enough, others we need
  * a reset sequence.
  */
-static void ish_resume_handler(struct work_struct *work)
+static void __maybe_unused ish_resume_handler(struct work_struct *work)
 {
         struct pci_dev *pdev = to_pci_dev(ish_resume_device);
         struct ishtp_device *dev = pci_get_drvdata(pdev);
@@ -262,7 +261,7 @@ static void ish_resume_handler(struct work_struct *work)
  *
  * Return: 0 to the pm core
  */
-static int ish_suspend(struct device *device)
+static int __maybe_unused ish_suspend(struct device *device)
 {
         struct pci_dev *pdev = to_pci_dev(device);
         struct ishtp_device *dev = pci_get_drvdata(pdev);
@@ -288,7 +287,7 @@ static int ish_suspend(struct device *device)
         return 0;
 }
 
-static DECLARE_WORK(resume_work, ish_resume_handler);
+static __maybe_unused DECLARE_WORK(resume_work, ish_resume_handler);
 /**
  * ish_resume() - ISH resume callback
  * @device:     device pointer
@@ -297,7 +296,7 @@ static DECLARE_WORK(resume_work, ish_resume_handler);
  *
  * Return: 0 to the pm core
  */
-static int ish_resume(struct device *device)
+static int __maybe_unused ish_resume(struct device *device)
 {
         struct pci_dev *pdev = to_pci_dev(device);
         struct ishtp_device *dev = pci_get_drvdata(pdev);
@@ -311,21 +310,14 @@ static int ish_resume(struct device *device)
         return 0;
 }
 
-static const struct dev_pm_ops ish_pm_ops = {
-        .suspend = ish_suspend,
-        .resume = ish_resume,
-};
-#define ISHTP_ISH_PM_OPS        (&ish_pm_ops)
-#else
-#define ISHTP_ISH_PM_OPS        NULL
-#endif /* CONFIG_PM */
+static SIMPLE_DEV_PM_OPS(ish_pm_ops, ish_suspend, ish_resume);
 
 static struct pci_driver ish_driver = {
         .name = KBUILD_MODNAME,
         .id_table = ish_pci_tbl,
         .probe = ish_probe,
         .remove = ish_remove,
-        .driver.pm = ISHTP_ISH_PM_OPS,
+        .driver.pm = &ish_pm_ops,
 };
 
 module_pci_driver(ish_driver);
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index e3ce233f8bdc..23872d08308c 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -36,6 +36,7 @@
 #include <linux/hiddev.h>
 #include <linux/compat.h>
 #include <linux/vmalloc.h>
+#include <linux/nospec.h>
 #include "usbhid.h"
 
 #ifdef CONFIG_USB_DYNAMIC_MINORS
@@ -469,10 +470,14 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
 
                 if (uref->field_index >= report->maxfield)
                         goto inval;
+                uref->field_index = array_index_nospec(uref->field_index,
+                                                       report->maxfield);
 
                 field = report->field[uref->field_index];
                 if (uref->usage_index >= field->maxusage)
                         goto inval;
+                uref->usage_index = array_index_nospec(uref->usage_index,
+                                                       field->maxusage);
 
                 uref->usage_code = field->usage[uref->usage_index].hid;
 
@@ -499,6 +504,8 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
 
                         if (uref->field_index >= report->maxfield)
                                 goto inval;
+                        uref->field_index = array_index_nospec(uref->field_index,
+                                                               report->maxfield);
 
                         field = report->field[uref->field_index];
 
@@ -753,6 +760,8 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
                 if (finfo.field_index >= report->maxfield)
                         break;
+                finfo.field_index = array_index_nospec(finfo.field_index,
+                                                       report->maxfield);
 
                 field = report->field[finfo.field_index];
                 memset(&finfo, 0, sizeof(finfo));
@@ -797,6 +806,8 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
                 if (cinfo.index >= hid->maxcollection)
                         break;
+                cinfo.index = array_index_nospec(cinfo.index,
+                                                 hid->maxcollection);
 
                 cinfo.type = hid->collection[cinfo.index].type;
                 cinfo.usage = hid->collection[cinfo.index].usage;
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index c101369b51de..d6797535fff9 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -395,6 +395,14 @@ static void wacom_usage_mapping(struct hid_device *hdev,
                 }
         }
 
+        /* 2nd-generation Intuos Pro Large has incorrect Y maximum */
+        if (hdev->vendor == USB_VENDOR_ID_WACOM &&
+            hdev->product == 0x0358 &&
+            WACOM_PEN_FIELD(field) &&
+            wacom_equivalent_usage(usage->hid) == HID_GD_Y) {
+                field->logical_maximum = 43200;
+        }
+
         switch (usage->hid) {
         case HID_GD_X:
                 features->x_max = field->logical_maximum;
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 0bb44d0088ed..ad7afa74d365 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -3365,8 +3365,14 @@ void wacom_setup_device_quirks(struct wacom *wacom)
                         if (features->type >= INTUOSHT && features->type <= BAMBOO_PT)
                                 features->device_type |= WACOM_DEVICETYPE_PAD;
 
-                        features->x_max = 4096;
-                        features->y_max = 4096;
+                        if (features->type == INTUOSHT2) {
+                                features->x_max = features->x_max / 10;
+                                features->y_max = features->y_max / 10;
+                        }
+                        else {
+                                features->x_max = 4096;
+                                features->y_max = 4096;
+                        }
                 }
                 else if (features->pktlen == WACOM_PKGLEN_BBTOUCH) {
                         features->device_type |= WACOM_DEVICETYPE_PAD;
diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
index bf3bb7e1adab..9d3ef879dc51 100644
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -1074,6 +1074,13 @@ static struct dmi_system_id i8k_blacklist_fan_support_dmi_table[] __initdata = {
                         DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Vostro 3360"),
                 },
         },
+        {
+                .ident = "Dell XPS13 9333",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "XPS13 9333"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index 155d4d1d1585..f9d1349c3286 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -4175,7 +4175,7 @@ static int nct6775_probe(struct platform_device *pdev)
          * The temperature is already monitored if the respective bit in <mask>
          * is set.
          */
-        for (i = 0; i < 32; i++) {
+        for (i = 0; i < 31; i++) {
                 if (!(data->temp_mask & BIT(i + 1)))
                         continue;
                 if (!reg_temp_alternate[i])
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 4a34f311e1ff..6ec65adaba49 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -647,10 +647,10 @@ static int __i2c_bit_add_bus(struct i2c_adapter *adap,
         if (bit_adap->getscl == NULL)
                 adap->quirks = &i2c_bit_quirk_no_clk_stretch;
 
-        /* Bring bus to a known state. Looks like STOP if bus is not free yet */
-        setscl(bit_adap, 1);
-        udelay(bit_adap->udelay);
-        setsda(bit_adap, 1);
+        /*
+         * We tried forcing SCL/SDA to an initial state here. But that caused a
+         * regression, sadly. Check Bugzilla #200045 for details.
+         */
 
         ret = add_adapter(adap);
         if (ret < 0)
diff --git a/drivers/i2c/busses/i2c-cht-wc.c b/drivers/i2c/busses/i2c-cht-wc.c
index 44cffad43701..c4d176f5ed79 100644
--- a/drivers/i2c/busses/i2c-cht-wc.c
+++ b/drivers/i2c/busses/i2c-cht-wc.c
@@ -234,7 +234,8 @@ static const struct irq_chip cht_wc_i2c_irq_chip = {
         .name                   = "cht_wc_ext_chrg_irq_chip",
 };
 
-static const char * const bq24190_suppliers[] = { "fusb302-typec-source" };
+static const char * const bq24190_suppliers[] = {
+        "tcpm-source-psy-i2c-fusb302" };
 
 static const struct property_entry bq24190_props[] = {
         PROPERTY_ENTRY_STRING_ARRAY("supplied-from", bq24190_suppliers),
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 005e6e0330c2..66f85bbf3591 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -279,9 +279,9 @@ static int i2c_gpio_probe(struct platform_device *pdev)
          * required for an I2C bus.
          */
         if (pdata->scl_is_open_drain)
-                gflags = GPIOD_OUT_LOW;
+                gflags = GPIOD_OUT_HIGH;
         else
-                gflags = GPIOD_OUT_LOW_OPEN_DRAIN;
+                gflags = GPIOD_OUT_HIGH_OPEN_DRAIN;
         priv->scl = i2c_gpio_get_desc(dev, "scl", 1, gflags);
         if (IS_ERR(priv->scl))
                 return PTR_ERR(priv->scl);
diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index e866c481bfc3..fce52bdab2b7 100644
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -127,7 +127,7 @@ enum stu300_error {
 
 /*
  * The number of address send athemps tried before giving up.
- * If the first one failes it seems like 5 to 8 attempts are required.
+ * If the first one fails it seems like 5 to 8 attempts are required.
  */
 #define NUM_ADDR_RESEND_ATTEMPTS 12
 
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 5fccd1f1bca8..797def5319f1 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -545,6 +545,14 @@ static int tegra_i2c_disable_packet_mode(struct tegra_i2c_dev *i2c_dev)
 {
         u32 cnfg;
 
+        /*
+         * NACK interrupt is generated before the I2C controller generates
+         * the STOP condition on the bus. So wait for 2 clock periods
+         * before disabling the controller so that the STOP condition has
+         * been delivered properly.
+         */
+        udelay(DIV_ROUND_UP(2 * 1000000, i2c_dev->bus_clk_rate));
+
         cnfg = i2c_readl(i2c_dev, I2C_CNFG);
         if (cnfg & I2C_CNFG_PACKET_MODE_EN)
                 i2c_writel(i2c_dev, cnfg & ~I2C_CNFG_PACKET_MODE_EN, I2C_CNFG);
@@ -706,15 +714,6 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
         if (likely(i2c_dev->msg_err == I2C_ERR_NONE))
                 return 0;
 
-        /*
-         * NACK interrupt is generated before the I2C controller generates
-         * the STOP condition on the bus. So wait for 2 clock periods
-         * before resetting the controller so that the STOP condition has
-         * been delivered properly.
-         */
-        if (i2c_dev->msg_err == I2C_ERR_NO_ACK)
-                udelay(DIV_ROUND_UP(2 * 1000000, i2c_dev->bus_clk_rate));
-
         tegra_i2c_init(i2c_dev);
         if (i2c_dev->msg_err == I2C_ERR_NO_ACK) {
                 if (msg->flags & I2C_M_IGNORE_NAK)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 31d16ada6e7d..301285c54603 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -198,7 +198,16 @@ int i2c_generic_scl_recovery(struct i2c_adapter *adap)
 
                 val = !val;
                 bri->set_scl(adap, val);
-                ndelay(RECOVERY_NDELAY);
+
+                /*
+                 * If we can set SDA, we will always create STOP here to ensure
+                 * the additional pulses will do no harm. This is achieved by
+                 * letting SDA follow SCL half a cycle later.
+                 */
+                ndelay(RECOVERY_NDELAY / 2);
+                if (bri->set_sda)
+                        bri->set_sda(adap, val);
+                ndelay(RECOVERY_NDELAY / 2);
         }
 
         /* check if recovery actually succeeded */
diff --git a/drivers/i2c/i2c-core-smbus.c b/drivers/i2c/i2c-core-smbus.c
index f3f683041e7f..51970bae3c4a 100644
--- a/drivers/i2c/i2c-core-smbus.c
+++ b/drivers/i2c/i2c-core-smbus.c
@@ -465,15 +465,18 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter *adapter, u16 addr,
 
         status = i2c_transfer(adapter, msg, num);
         if (status < 0)
-                return status;
-        if (status != num)
-                return -EIO;
+                goto cleanup;
+        if (status != num) {
+                status = -EIO;
+                goto cleanup;
+        }
+        status = 0;
 
         /* Check PEC if last message is a read */
         if (i && (msg[num-1].flags & I2C_M_RD)) {
                 status = i2c_smbus_check_pec(partial_pec, &msg[num-1]);
                 if (status < 0)
-                        return status;
+                        goto cleanup;
         }
 
         if (read_write == I2C_SMBUS_READ)
@@ -499,12 +502,13 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter *adapter, u16 addr,
                         break;
                 }
 
+cleanup:
         if (msg[0].flags & I2C_M_DMA_SAFE)
                 kfree(msg[0].buf);
         if (msg[1].flags & I2C_M_DMA_SAFE)
                 kfree(msg[1].buf);
 
-        return 0;
+        return status;
 }
 
 /**
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index 7e3d82cff3d5..c149c9c360fc 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -1053,7 +1053,7 @@ static irqreturn_t mma8452_interrupt(int irq, void *p)
         if (src < 0)
                 return IRQ_NONE;
 
-        if (!(src & data->chip_info->enabled_events))
+        if (!(src & (data->chip_info->enabled_events | MMA8452_INT_DRDY)))
                 return IRQ_NONE;
 
         if (src & MMA8452_INT_DRDY) {
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index f9c0624505a2..42618fe4f83e 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -959,6 +959,8 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name,
         }
 
         irq_type = irqd_get_trigger_type(desc);
+        if (!irq_type)
+                irq_type = IRQF_TRIGGER_RISING;
         if (irq_type == IRQF_TRIGGER_RISING)
                 st->irq_mask = INV_MPU6050_ACTIVE_HIGH;
         else if (irq_type == IRQF_TRIGGER_FALLING)
diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c
index 34d42a2504c9..df5b2a0da96c 100644
--- a/drivers/iio/light/tsl2772.c
+++ b/drivers/iio/light/tsl2772.c
@@ -582,6 +582,8 @@ static int tsl2772_als_calibrate(struct iio_dev *indio_dev)
                         "%s: failed to get lux\n", __func__);
                 return lux_val;
         }
+        if (lux_val == 0)
+                return -ERANGE;
 
         ret = (chip->settings.als_cal_target * chip->settings.als_gain_trim) /
                         lux_val;
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 5ec3e41b65f2..fe87d27779d9 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -415,10 +415,9 @@ static int bmp280_read_humid(struct bmp280_data *data, int *val, int *val2)
         }
         comp_humidity = bmp280_compensate_humidity(data, adc_humidity);
 
-        *val = comp_humidity;
-        *val2 = 1024;
+        *val = comp_humidity * 1000 / 1024;
 
-        return IIO_VAL_FRACTIONAL;
+        return IIO_VAL_INT;
 }
 
 static int bmp280_read_raw(struct iio_dev *indio_dev,
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 3e90b6a1d9d2..cc06e8404e9b 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -3488,8 +3488,8 @@ int ib_uverbs_ex_create_flow(struct ib_uverbs_file *file,
         struct ib_flow_attr               *flow_attr;
         struct ib_qp                      *qp;
         struct ib_uflow_resources         *uflow_res;
+        struct ib_uverbs_flow_spec_hdr    *kern_spec;
         int err = 0;
-        void *kern_spec;
         void *ib_spec;
         int i;
 
@@ -3538,8 +3538,8 @@ int ib_uverbs_ex_create_flow(struct ib_uverbs_file *file,
                 if (!kern_flow_attr)
                         return -ENOMEM;
 
-                memcpy(kern_flow_attr, &cmd.flow_attr, sizeof(*kern_flow_attr));
-                err = ib_copy_from_udata(kern_flow_attr + 1, ucore,
+                *kern_flow_attr = cmd.flow_attr;
+                err = ib_copy_from_udata(&kern_flow_attr->flow_specs, ucore,
                                          cmd.flow_attr.size);
                 if (err)
                         goto err_free_attr;
@@ -3559,6 +3559,11 @@ int ib_uverbs_ex_create_flow(struct ib_uverbs_file *file,
                 goto err_uobj;
         }
 
+        if (qp->qp_type != IB_QPT_UD && qp->qp_type != IB_QPT_RAW_PACKET) {
+                err = -EINVAL;
+                goto err_put;
+        }
+
         flow_attr = kzalloc(struct_size(flow_attr, flows,
                                 cmd.flow_attr.num_of_specs), GFP_KERNEL);
         if (!flow_attr) {
@@ -3578,21 +3583,22 @@ int ib_uverbs_ex_create_flow(struct ib_uverbs_file *file,
         flow_attr->flags = kern_flow_attr->flags;
         flow_attr->size = sizeof(*flow_attr);
 
-        kern_spec = kern_flow_attr + 1;
+        kern_spec = kern_flow_attr->flow_specs;
         ib_spec = flow_attr + 1;
         for (i = 0; i < flow_attr->num_of_specs &&
-             cmd.flow_attr.size > offsetof(struct ib_uverbs_flow_spec, reserved) &&
-             cmd.flow_attr.size >=
-             ((struct ib_uverbs_flow_spec *)kern_spec)->size; i++) {
-                err = kern_spec_to_ib_spec(file->ucontext, kern_spec, ib_spec,
-                                           uflow_res);
+                        cmd.flow_attr.size >= sizeof(*kern_spec) &&
+                        cmd.flow_attr.size >= kern_spec->size;
+             i++) {
+                err = kern_spec_to_ib_spec(
+                                file->ucontext, (struct ib_uverbs_flow_spec *)kern_spec,
+                                ib_spec, uflow_res);
                 if (err)
                         goto err_free;
 
                 flow_attr->size +=
                         ((union ib_flow_spec *) ib_spec)->size;
-                cmd.flow_attr.size -= ((struct ib_uverbs_flow_spec *)kern_spec)->size;
-                kern_spec += ((struct ib_uverbs_flow_spec *) kern_spec)->size;
+                cmd.flow_attr.size -= kern_spec->size;
+                kern_spec = ((void *)kern_spec) + kern_spec->size;
                 ib_spec += ((union ib_flow_spec *) ib_spec)->size;
         }
         if (cmd.flow_attr.size || (i != flow_attr->num_of_specs)) {
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 3ae2339dd27a..2094d136513d 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -736,10 +736,6 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
         if (ret)
                 return ret;
 
-        if (!file->ucontext &&
-            (command != IB_USER_VERBS_CMD_GET_CONTEXT || extended))
-                return -EINVAL;
-
         if (extended) {
                 if (count < (sizeof(hdr) + sizeof(ex_hdr)))
                         return -EINVAL;
@@ -759,6 +755,16 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
                 goto out;
         }
 
+        /*
+         * Must be after the ib_dev check, as once the RCU clears ib_dev ==
+         * NULL means ucontext == NULL
+         */
+        if (!file->ucontext &&
+            (command != IB_USER_VERBS_CMD_GET_CONTEXT || extended)) {
+                ret = -EINVAL;
+                goto out;
+        }
+
         if (!verify_command_mask(ib_dev, command, extended)) {
                 ret = -EOPNOTSUPP;
                 goto out;
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 0b56828c1319..9d6beb948535 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -1562,11 +1562,12 @@ EXPORT_SYMBOL(ib_destroy_qp);
 
 /* Completion queues */
 
-struct ib_cq *ib_create_cq(struct ib_device *device,
-                           ib_comp_handler comp_handler,
-                           void (*event_handler)(struct ib_event *, void *),
-                           void *cq_context,
-                           const struct ib_cq_init_attr *cq_attr)
+struct ib_cq *__ib_create_cq(struct ib_device *device,
+                             ib_comp_handler comp_handler,
+                             void (*event_handler)(struct ib_event *, void *),
+                             void *cq_context,
+                             const struct ib_cq_init_attr *cq_attr,
+                             const char *caller)
 {
         struct ib_cq *cq;
 
@@ -1580,12 +1581,13 @@ struct ib_cq *ib_create_cq(struct ib_device *device,
                 cq->cq_context    = cq_context;
                 atomic_set(&cq->usecnt, 0);
                 cq->res.type = RDMA_RESTRACK_CQ;
+                cq->res.kern_name = caller;
                 rdma_restrack_add(&cq->res);
         }
 
         return cq;
 }
-EXPORT_SYMBOL(ib_create_cq);
+EXPORT_SYMBOL(__ib_create_cq);
 
 int rdma_set_cq_moderation(struct ib_cq *cq, u16 cq_count, u16 cq_period)
 {
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index 1445918e3239..7b76e6f81aeb 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -774,7 +774,7 @@ static int c4iw_set_page(struct ib_mr *ibmr, u64 addr)
 {
         struct c4iw_mr *mhp = to_c4iw_mr(ibmr);
 
-        if (unlikely(mhp->mpl_len == mhp->max_mpl_len))
+        if (unlikely(mhp->mpl_len == mhp->attr.pbl_size))
                 return -ENOMEM;
 
         mhp->mpl[mhp->mpl_len++] = addr;
diff --git a/drivers/infiniband/hw/hfi1/rc.c b/drivers/infiniband/hw/hfi1/rc.c
index 1a1a47ac53c6..f15c93102081 100644
--- a/drivers/infiniband/hw/hfi1/rc.c
+++ b/drivers/infiniband/hw/hfi1/rc.c
@@ -271,7 +271,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)
 
         lockdep_assert_held(&qp->s_lock);
         ps->s_txreq = get_txreq(ps->dev, qp);
-        if (IS_ERR(ps->s_txreq))
+        if (!ps->s_txreq)
                 goto bail_no_tx;
 
         if (priv->hdr_type == HFI1_PKT_TYPE_9B) {
diff --git a/drivers/infiniband/hw/hfi1/uc.c b/drivers/infiniband/hw/hfi1/uc.c
index b7b671017e59..e254dcec6f64 100644
--- a/drivers/infiniband/hw/hfi1/uc.c
+++ b/drivers/infiniband/hw/hfi1/uc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2015, 2016 Intel Corporation.
+ * Copyright(c) 2015 - 2018 Intel Corporation.
  *
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
@@ -72,7 +72,7 @@ int hfi1_make_uc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)
         int middle = 0;
 
         ps->s_txreq = get_txreq(ps->dev, qp);
-        if (IS_ERR(ps->s_txreq))
+        if (!ps->s_txreq)
                 goto bail_no_tx;
 
         if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_SEND_OK)) {
diff --git a/drivers/infiniband/hw/hfi1/ud.c b/drivers/infiniband/hw/hfi1/ud.c
index 1ab332f1866e..70d39fc450a1 100644
--- a/drivers/infiniband/hw/hfi1/ud.c
+++ b/drivers/infiniband/hw/hfi1/ud.c
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2015, 2016 Intel Corporation.
+ * Copyright(c) 2015 - 2018 Intel Corporation.
  *
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
@@ -503,7 +503,7 @@ int hfi1_make_ud_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)
         u32 lid;
 
         ps->s_txreq = get_txreq(ps->dev, qp);
-        if (IS_ERR(ps->s_txreq))
+        if (!ps->s_txreq)
                 goto bail_no_tx;
 
         if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_NEXT_SEND_OK)) {
diff --git a/drivers/infiniband/hw/hfi1/verbs_txreq.c b/drivers/infiniband/hw/hfi1/verbs_txreq.c
index 873e48ea923f..c4ab2d5b4502 100644
--- a/drivers/infiniband/hw/hfi1/verbs_txreq.c
+++ b/drivers/infiniband/hw/hfi1/verbs_txreq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2016 - 2017 Intel Corporation.
+ * Copyright(c) 2016 - 2018 Intel Corporation.
  *
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
@@ -94,7 +94,7 @@ struct verbs_txreq *__get_txreq(struct hfi1_ibdev *dev,
                                 struct rvt_qp *qp)
         __must_hold(&qp->s_lock)
 {
-        struct verbs_txreq *tx = ERR_PTR(-EBUSY);
+        struct verbs_txreq *tx = NULL;
 
         write_seqlock(&dev->txwait_lock);
         if (ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK) {
diff --git a/drivers/infiniband/hw/hfi1/verbs_txreq.h b/drivers/infiniband/hw/hfi1/verbs_txreq.h
index 729244c3086c..1c19bbc764b2 100644
--- a/drivers/infiniband/hw/hfi1/verbs_txreq.h
+++ b/drivers/infiniband/hw/hfi1/verbs_txreq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2016 Intel Corporation.
+ * Copyright(c) 2016 - 2018 Intel Corporation.
  *
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
@@ -83,7 +83,7 @@ static inline struct verbs_txreq *get_txreq(struct hfi1_ibdev *dev,
         if (unlikely(!tx)) {
                 /* call slow path to get the lock */
                 tx = __get_txreq(dev, qp);
-                if (IS_ERR(tx))
+                if (!tx)
                         return tx;
         }
         tx->qp = qp;
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index ed1f253faf97..c7c85c22e4e3 100644
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -486,8 +486,11 @@ int mlx4_ib_rereg_user_mr(struct ib_mr *mr, int flags,
         }
 
         if (flags & IB_MR_REREG_ACCESS) {
-                if (ib_access_writable(mr_access_flags) && !mmr->umem->writable)
-                        return -EPERM;
+                if (ib_access_writable(mr_access_flags) &&
+                    !mmr->umem->writable) {
+                        err = -EPERM;
+                        goto release_mpt_entry;
+                }
 
                 err = mlx4_mr_hw_change_access(dev->dev, *pmpt_entry,
                                                convert_access(mr_access_flags));
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index e52dd21519b4..b3ba9a222550 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -3199,8 +3199,8 @@ static int flow_counters_set_data(struct ib_counters *ibcounters,
         if (!mcounters->hw_cntrs_hndl) {
                 mcounters->hw_cntrs_hndl = mlx5_fc_create(
                         to_mdev(ibcounters->device)->mdev, false);
-                if (!mcounters->hw_cntrs_hndl) {
-                        ret = -ENOMEM;
+                if (IS_ERR(mcounters->hw_cntrs_hndl)) {
+                        ret = PTR_ERR(mcounters->hw_cntrs_hndl);
                         goto free;
                 }
                 hw_hndl = true;
@@ -3546,29 +3546,35 @@ static struct ib_flow *mlx5_ib_create_flow(struct ib_qp *qp,
                         return ERR_PTR(-ENOMEM);
 
                 err = ib_copy_from_udata(ucmd, udata, required_ucmd_sz);
-                if (err) {
-                        kfree(ucmd);
-                        return ERR_PTR(err);
-                }
+                if (err)
+                        goto free_ucmd;
         }
 
-        if (flow_attr->priority > MLX5_IB_FLOW_LAST_PRIO)
-                return ERR_PTR(-ENOMEM);
+        if (flow_attr->priority > MLX5_IB_FLOW_LAST_PRIO) {
+                err = -ENOMEM;
+                goto free_ucmd;
+        }
 
         if (domain != IB_FLOW_DOMAIN_USER ||
             flow_attr->port > dev->num_ports ||
             (flow_attr->flags & ~(IB_FLOW_ATTR_FLAGS_DONT_TRAP |
-                                  IB_FLOW_ATTR_FLAGS_EGRESS)))
-                return ERR_PTR(-EINVAL);
+                                  IB_FLOW_ATTR_FLAGS_EGRESS))) {
+                err = -EINVAL;
+                goto free_ucmd;
+        }
 
         if (is_egress &&
             (flow_attr->type == IB_FLOW_ATTR_ALL_DEFAULT ||
-             flow_attr->type == IB_FLOW_ATTR_MC_DEFAULT))
-                return ERR_PTR(-EINVAL);
+             flow_attr->type == IB_FLOW_ATTR_MC_DEFAULT)) {
+                err = -EINVAL;
+                goto free_ucmd;
+        }
 
         dst = kzalloc(sizeof(*dst), GFP_KERNEL);
-        if (!dst)
-                return ERR_PTR(-ENOMEM);
+        if (!dst) {
+                err = -ENOMEM;
+                goto free_ucmd;
+        }
 
         mutex_lock(&dev->flow_db->lock);
 
@@ -3637,8 +3643,8 @@ destroy_ft:
 unlock:
         mutex_unlock(&dev->flow_db->lock);
         kfree(dst);
+free_ucmd:
         kfree(ucmd);
-        kfree(handler);
         return ERR_PTR(err);
 }
 
@@ -6107,7 +6113,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
         dev->num_ports = max(MLX5_CAP_GEN(mdev, num_ports),
                              MLX5_CAP_GEN(mdev, num_vhca_ports));
 
-        if (MLX5_VPORT_MANAGER(mdev) &&
+        if (MLX5_ESWITCH_MANAGER(mdev) &&
             mlx5_ib_eswitch_mode(mdev->priv.eswitch) == SRIOV_OFFLOADS) {
                 dev->rep = mlx5_ib_vport_rep(mdev->priv.eswitch, 0);
 
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index 0af7b7905550..f5de5adc9b1a 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -266,18 +266,24 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd,
 
         desc_size = sizeof(struct mlx5_wqe_srq_next_seg) +
                     srq->msrq.max_gs * sizeof(struct mlx5_wqe_data_seg);
-        if (desc_size == 0 || srq->msrq.max_gs > desc_size)
-                return ERR_PTR(-EINVAL);
+        if (desc_size == 0 || srq->msrq.max_gs > desc_size) {
+                err = -EINVAL;
+                goto err_srq;
+        }
         desc_size = roundup_pow_of_two(desc_size);
         desc_size = max_t(size_t, 32, desc_size);
-        if (desc_size < sizeof(struct mlx5_wqe_srq_next_seg))
-                return ERR_PTR(-EINVAL);
+        if (desc_size < sizeof(struct mlx5_wqe_srq_next_seg)) {
+                err = -EINVAL;
+                goto err_srq;
+        }
         srq->msrq.max_avail_gather = (desc_size - sizeof(struct mlx5_wqe_srq_next_seg)) /
                 sizeof(struct mlx5_wqe_data_seg);
         srq->msrq.wqe_shift = ilog2(desc_size);
         buf_size = srq->msrq.max * desc_size;
-        if (buf_size < desc_size)
-                return ERR_PTR(-EINVAL);
+        if (buf_size < desc_size) {
+                err = -EINVAL;
+                goto err_srq;
+        }
         in.type = init_attr->srq_type;
 
         if (pd->uobject)
diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index f7ac8fc9b531..f07b8df96f43 100644
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -1957,6 +1957,9 @@ int qedr_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         }
 
         if (attr_mask & (IB_QP_AV | IB_QP_PATH_MTU)) {
+                if (rdma_protocol_iwarp(&dev->ibdev, 1))
+                        return -EINVAL;
+
                 if (attr_mask & IB_QP_PATH_MTU) {
                         if (attr->path_mtu < IB_MTU_256 ||
                             attr->path_mtu > IB_MTU_4096) {
diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c
index f30eeba3f772..8be27238a86e 100644
--- a/drivers/infiniband/sw/rxe/rxe_req.c
+++ b/drivers/infiniband/sw/rxe/rxe_req.c
@@ -645,6 +645,9 @@ next_wqe:
                 } else {
                         goto exit;
                 }
+                if ((wqe->wr.send_flags & IB_SEND_SIGNALED) ||
+                    qp->sq_sig_type == IB_SIGNAL_ALL_WR)
+                        rxe_run_task(&qp->comp.task, 1);
                 qp->req.wqe_index = next_index(qp->sq.queue,
                                                 qp->req.wqe_index);
                 goto next_wqe;
@@ -709,6 +712,7 @@ next_wqe:
 
         if (fill_packet(qp, wqe, &pkt, skb, payload)) {
                 pr_debug("qp#%d Error during fill packet\n", qp_num(qp));
+                kfree_skb(skb);
                 goto err;
         }
 
@@ -740,7 +744,6 @@ next_wqe:
         goto next_wqe;
 
 err:
-        kfree_skb(skb);
         wqe->status = IB_WC_LOC_PROT_ERR;
         wqe->state = wqe_state_error;
         __rxe_do_task(&qp->comp.task);
diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index cf30523c6ef6..6c7326c93721 100644
--- a/drivers/input/input-mt.c
+++ b/drivers/input/input-mt.c
@@ -131,8 +131,10 @@ EXPORT_SYMBOL(input_mt_destroy_slots);
  * inactive, or if the tool type is changed, a new tracking id is
  * assigned to the slot. The tool type is only reported if the
  * corresponding absbit field is set.
+ *
+ * Returns true if contact is active.
  */
-void input_mt_report_slot_state(struct input_dev *dev,
+bool input_mt_report_slot_state(struct input_dev *dev,
                                 unsigned int tool_type, bool active)
 {
         struct input_mt *mt = dev->mt;
@@ -140,22 +142,24 @@ void input_mt_report_slot_state(struct input_dev *dev,
         int id;
 
         if (!mt)
-                return;
+                return false;
 
         slot = &mt->slots[mt->slot];
         slot->frame = mt->frame;
 
         if (!active) {
                 input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1);
-                return;
+                return false;
         }
 
         id = input_mt_get_value(slot, ABS_MT_TRACKING_ID);
-        if (id < 0 || input_mt_get_value(slot, ABS_MT_TOOL_TYPE) != tool_type)
+        if (id < 0)
                 id = input_mt_new_trkid(mt);
 
         input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, id);
         input_event(dev, EV_ABS, ABS_MT_TOOL_TYPE, tool_type);
+
+        return true;
 }
 EXPORT_SYMBOL(input_mt_report_slot_state);
 
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 48e36acbeb49..cd620e009bad 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -125,7 +125,7 @@ static const struct xpad_device {
         u8 mapping;
         u8 xtype;
 } xpad_device[] = {
-        { 0x0079, 0x18d4, "GPD Win 2 Controller", 0, XTYPE_XBOX360 },
+        { 0x0079, 0x18d4, "GPD Win 2 X-Box Controller", 0, XTYPE_XBOX360 },
         { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX },
         { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX },
         { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
diff --git a/drivers/input/keyboard/goldfish_events.c b/drivers/input/keyboard/goldfish_events.c
index f6e643b589b6..e8dae6195b30 100644
--- a/drivers/input/keyboard/goldfish_events.c
+++ b/drivers/input/keyboard/goldfish_events.c
@@ -45,7 +45,7 @@ struct event_dev {
 static irqreturn_t events_interrupt(int irq, void *dev_id)
 {
         struct event_dev *edev = dev_id;
-        unsigned type, code, value;
+        unsigned int type, code, value;
 
         type = __raw_readl(edev->addr + REG_READ);
         code = __raw_readl(edev->addr + REG_READ);
@@ -57,7 +57,7 @@ static irqreturn_t events_interrupt(int irq, void *dev_id)
 }
 
 static void events_import_bits(struct event_dev *edev,
-                        unsigned long bits[], unsigned type, size_t count)
+                        unsigned long bits[], unsigned int type, size_t count)
 {
         void __iomem *addr = edev->addr;
         int i, j;
@@ -99,6 +99,7 @@ static void events_import_abs_params(struct event_dev *edev)
 
                 for (j = 0; j < ARRAY_SIZE(val); j++) {
                         int offset = (i * ARRAY_SIZE(val) + j) * sizeof(u32);
+
                         val[j] = __raw_readl(edev->addr + REG_DATA + offset);
                 }
 
@@ -112,7 +113,7 @@ static int events_probe(struct platform_device *pdev)
         struct input_dev *input_dev;
         struct event_dev *edev;
         struct resource *res;
-        unsigned keymapnamelen;
+        unsigned int keymapnamelen;
         void __iomem *addr;
         int irq;
         int i;
@@ -150,7 +151,7 @@ static int events_probe(struct platform_device *pdev)
         for (i = 0; i < keymapnamelen; i++)
                 edev->name[i] = __raw_readb(edev->addr + REG_DATA + i);
 
-        pr_debug("events_probe() keymap=%s\n", edev->name);
+        pr_debug("%s: keymap=%s\n", __func__, edev->name);
 
         input_dev->name = edev->name;
         input_dev->id.bustype = BUS_HOST;
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index c25606e00693..ca59a2be9bc5 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -841,4 +841,14 @@ config INPUT_RAVE_SP_PWRBUTTON
           To compile this driver as a module, choose M here: the
           module will be called rave-sp-pwrbutton.
 
+config INPUT_SC27XX_VIBRA
+        tristate "Spreadtrum sc27xx vibrator support"
+        depends on MFD_SC27XX_PMIC || COMPILE_TEST
+        select INPUT_FF_MEMLESS
+        help
+          This option enables support for Spreadtrum sc27xx vibrator driver.
+
+          To compile this driver as a module, choose M here. The module will
+          be called sc27xx_vibra.
+
 endif
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 72cde28649e2..9d0f9d1ff68f 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -66,6 +66,7 @@ obj-$(CONFIG_INPUT_RETU_PWRBUTTON)	+= retu-pwrbutton.o
 obj-$(CONFIG_INPUT_AXP20X_PEK)          += axp20x-pek.o
 obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o
 obj-$(CONFIG_INPUT_RK805_PWRKEY)        += rk805-pwrkey.o
+obj-$(CONFIG_INPUT_SC27XX_VIBRA)        += sc27xx-vibra.o
 obj-$(CONFIG_INPUT_SGI_BTNS)            += sgi_btns.o
 obj-$(CONFIG_INPUT_SIRFSOC_ONKEY)       += sirfsoc-onkey.o
 obj-$(CONFIG_INPUT_SOC_BUTTON_ARRAY)    += soc_button_array.o
diff --git a/drivers/input/misc/sc27xx-vibra.c b/drivers/input/misc/sc27xx-vibra.c
new file mode 100644
index 000000000000..295251abbdac
--- /dev/null
+++ b/drivers/input/misc/sc27xx-vibra.c
@@ -0,0 +1,154 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2018 Spreadtrum Communications Inc.
+ */
+
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/input.h>
+#include <linux/workqueue.h>
+
+#define CUR_DRV_CAL_SEL         GENMASK(13, 12)
+#define SLP_LDOVIBR_PD_EN       BIT(9)
+#define LDO_VIBR_PD             BIT(8)
+
+struct vibra_info {
+        struct input_dev        *input_dev;
+        struct work_struct      play_work;
+        struct regmap           *regmap;
+        u32                     base;
+        u32                     strength;
+        bool                    enabled;
+};
+
+static void sc27xx_vibra_set(struct vibra_info *info, bool on)
+{
+        if (on) {
+                regmap_update_bits(info->regmap, info->base, LDO_VIBR_PD, 0);
+                regmap_update_bits(info->regmap, info->base,
+                                   SLP_LDOVIBR_PD_EN, 0);
+                info->enabled = true;
+        } else {
+                regmap_update_bits(info->regmap, info->base, LDO_VIBR_PD,
+                                   LDO_VIBR_PD);
+                regmap_update_bits(info->regmap, info->base,
+                                   SLP_LDOVIBR_PD_EN, SLP_LDOVIBR_PD_EN);
+                info->enabled = false;
+        }
+}
+
+static int sc27xx_vibra_hw_init(struct vibra_info *info)
+{
+        return regmap_update_bits(info->regmap, info->base, CUR_DRV_CAL_SEL, 0);
+}
+
+static void sc27xx_vibra_play_work(struct work_struct *work)
+{
+        struct vibra_info *info = container_of(work, struct vibra_info,
+                                               play_work);
+
+        if (info->strength && !info->enabled)
+                sc27xx_vibra_set(info, true);
+        else if (info->strength == 0 && info->enabled)
+                sc27xx_vibra_set(info, false);
+}
+
+static int sc27xx_vibra_play(struct input_dev *input, void *data,
+                             struct ff_effect *effect)
+{
+        struct vibra_info *info = input_get_drvdata(input);
+
+        info->strength = effect->u.rumble.weak_magnitude;
+        schedule_work(&info->play_work);
+
+        return 0;
+}
+
+static void sc27xx_vibra_close(struct input_dev *input)
+{
+        struct vibra_info *info = input_get_drvdata(input);
+
+        cancel_work_sync(&info->play_work);
+        if (info->enabled)
+                sc27xx_vibra_set(info, false);
+}
+
+static int sc27xx_vibra_probe(struct platform_device *pdev)
+{
+        struct vibra_info *info;
+        int error;
+
+        info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        info->regmap = dev_get_regmap(pdev->dev.parent, NULL);
+        if (!info->regmap) {
+                dev_err(&pdev->dev, "failed to get vibrator regmap.\n");
+                return -ENODEV;
+        }
+
+        error = device_property_read_u32(&pdev->dev, "reg", &info->base);
+        if (error) {
+                dev_err(&pdev->dev, "failed to get vibrator base address.\n");
+                return error;
+        }
+
+        info->input_dev = devm_input_allocate_device(&pdev->dev);
+        if (!info->input_dev) {
+                dev_err(&pdev->dev, "failed to allocate input device.\n");
+                return -ENOMEM;
+        }
+
+        info->input_dev->name = "sc27xx:vibrator";
+        info->input_dev->id.version = 0;
+        info->input_dev->close = sc27xx_vibra_close;
+
+        input_set_drvdata(info->input_dev, info);
+        input_set_capability(info->input_dev, EV_FF, FF_RUMBLE);
+        INIT_WORK(&info->play_work, sc27xx_vibra_play_work);
+        info->enabled = false;
+
+        error = sc27xx_vibra_hw_init(info);
+        if (error) {
+                dev_err(&pdev->dev, "failed to initialize the vibrator.\n");
+                return error;
+        }
+
+        error = input_ff_create_memless(info->input_dev, NULL,
+                                        sc27xx_vibra_play);
+        if (error) {
+                dev_err(&pdev->dev, "failed to register vibrator to FF.\n");
+                return error;
+        }
+
+        error = input_register_device(info->input_dev);
+        if (error) {
+                dev_err(&pdev->dev, "failed to register input device.\n");
+                return error;
+        }
+
+        return 0;
+}
+
+static const struct of_device_id sc27xx_vibra_of_match[] = {
+        { .compatible = "sprd,sc2731-vibrator", },
+        {}
+};
+MODULE_DEVICE_TABLE(of, sc27xx_vibra_of_match);
+
+static struct platform_driver sc27xx_vibra_driver = {
+        .driver = {
+                .name = "sc27xx-vibrator",
+                .of_match_table = sc27xx_vibra_of_match,
+        },
+        .probe = sc27xx_vibra_probe,
+};
+
+module_platform_driver(sc27xx_vibra_driver);
+
+MODULE_DESCRIPTION("Spreadtrum SC27xx Vibrator Driver");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Xiaotong Lu <xiaotong.lu@spreadtrum.com>");
diff --git a/drivers/input/mouse/elan_i2c.h b/drivers/input/mouse/elan_i2c.h
index 599544c1a91c..243e0fa6e3e3 100644
--- a/drivers/input/mouse/elan_i2c.h
+++ b/drivers/input/mouse/elan_i2c.h
@@ -27,6 +27,8 @@
 #define ETP_DISABLE_POWER       0x0001
 #define ETP_PRESSURE_OFFSET     25
 
+#define ETP_CALIBRATE_MAX_LEN   3
+
 /* IAP Firmware handling */
 #define ETP_PRODUCT_ID_FORMAT_STRING    "%d.0"
 #define ETP_FW_NAME             "elan_i2c_" ETP_PRODUCT_ID_FORMAT_STRING ".bin"
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 8ff75114e762..1f9cd7d8b7ad 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -613,7 +613,7 @@ static ssize_t calibrate_store(struct device *dev,
         int tries = 20;
         int retval;
         int error;
-        u8 val[3];
+        u8 val[ETP_CALIBRATE_MAX_LEN];
 
         retval = mutex_lock_interruptible(&data->sysfs_mutex);
         if (retval)
@@ -1345,6 +1345,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
         { "ELAN060C", 0 },
         { "ELAN0611", 0 },
         { "ELAN0612", 0 },
+        { "ELAN0618", 0 },
         { "ELAN1000", 0 },
         { }
 };
diff --git a/drivers/input/mouse/elan_i2c_smbus.c b/drivers/input/mouse/elan_i2c_smbus.c
index cfcb32559925..c060d270bc4d 100644
--- a/drivers/input/mouse/elan_i2c_smbus.c
+++ b/drivers/input/mouse/elan_i2c_smbus.c
@@ -56,7 +56,7 @@
 static int elan_smbus_initialize(struct i2c_client *client)
 {
         u8 check[ETP_SMBUS_HELLOPACKET_LEN] = { 0x55, 0x55, 0x55, 0x55, 0x55 };
-        u8 values[ETP_SMBUS_HELLOPACKET_LEN] = { 0, 0, 0, 0, 0 };
+        u8 values[I2C_SMBUS_BLOCK_MAX] = {0};
         int len, error;
 
         /* Get hello packet */
@@ -117,12 +117,16 @@ static int elan_smbus_calibrate(struct i2c_client *client)
 static int elan_smbus_calibrate_result(struct i2c_client *client, u8 *val)
 {
         int error;
+        u8 buf[I2C_SMBUS_BLOCK_MAX] = {0};
+
+        BUILD_BUG_ON(ETP_CALIBRATE_MAX_LEN > sizeof(buf));
 
         error = i2c_smbus_read_block_data(client,
-                                          ETP_SMBUS_CALIBRATE_QUERY, val);
+                                          ETP_SMBUS_CALIBRATE_QUERY, buf);
         if (error < 0)
                 return error;
 
+        memcpy(val, buf, ETP_CALIBRATE_MAX_LEN);
         return 0;
 }
 
@@ -472,6 +476,8 @@ static int elan_smbus_get_report(struct i2c_client *client, u8 *report)
 {
         int len;
 
+        BUILD_BUG_ON(I2C_SMBUS_BLOCK_MAX > ETP_SMBUS_REPORT_LEN);
+
         len = i2c_smbus_read_block_data(client,
                                         ETP_SMBUS_PACKET_QUERY,
                                         &report[ETP_SMBUS_REPORT_OFFSET]);
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index fb4d902c4403..dd85b16dc6f8 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -799,7 +799,7 @@ static int elantech_packet_check_v4(struct psmouse *psmouse)
         else if (ic_version == 7 && etd->info.samples[1] == 0x2A)
                 sanity_check = ((packet[3] & 0x1c) == 0x10);
         else
-                sanity_check = ((packet[0] & 0x0c) == 0x04 &&
+                sanity_check = ((packet[0] & 0x08) == 0x00 &&
                                 (packet[3] & 0x1c) == 0x10);
 
         if (!sanity_check)
@@ -1175,6 +1175,12 @@ static const struct dmi_system_id elantech_dmi_has_middle_button[] = {
         { }
 };
 
+static const char * const middle_button_pnp_ids[] = {
+        "LEN2131", /* ThinkPad P52 w/ NFC */
+        "LEN2132", /* ThinkPad P52 */
+        NULL
+};
+
 /*
  * Set the appropriate event bits for the input subsystem
  */
@@ -1194,7 +1200,8 @@ static int elantech_set_input_params(struct psmouse *psmouse)
         __clear_bit(EV_REL, dev->evbit);
 
         __set_bit(BTN_LEFT, dev->keybit);
-        if (dmi_check_system(elantech_dmi_has_middle_button))
+        if (dmi_check_system(elantech_dmi_has_middle_button) ||
+                        psmouse_matches_pnp_id(psmouse, middle_button_pnp_ids))
                 __set_bit(BTN_MIDDLE, dev->keybit);
         __set_bit(BTN_RIGHT, dev->keybit);
 
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 5ff5b1952be0..d3ff1fc09af7 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -192,8 +192,8 @@ psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse)
                         else
                                 input_report_rel(dev, REL_WHEEL, -wheel);
 
-                        input_report_key(dev, BTN_SIDE,  BIT(4));
-                        input_report_key(dev, BTN_EXTRA, BIT(5));
+                        input_report_key(dev, BTN_SIDE,  packet[3] & BIT(4));
+                        input_report_key(dev, BTN_EXTRA, packet[3] & BIT(5));
                         break;
                 }
                 break;
@@ -203,13 +203,13 @@ psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse)
                 input_report_rel(dev, REL_WHEEL, -(s8) packet[3]);
 
                 /* Extra buttons on Genius NewNet 3D */
-                input_report_key(dev, BTN_SIDE,  BIT(6));
-                input_report_key(dev, BTN_EXTRA, BIT(7));
+                input_report_key(dev, BTN_SIDE,  packet[0] & BIT(6));
+                input_report_key(dev, BTN_EXTRA, packet[0] & BIT(7));
                 break;
 
         case PSMOUSE_THINKPS:
                 /* Extra button on ThinkingMouse */
-                input_report_key(dev, BTN_EXTRA, BIT(3));
+                input_report_key(dev, BTN_EXTRA, packet[0] & BIT(3));
 
                 /*
                  * Without this bit of weirdness moving up gives wildly
@@ -223,7 +223,7 @@ psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse)
                  * Cortron PS2 Trackball reports SIDE button in the
                  * 4th bit of the first byte.
                  */
-                input_report_key(dev, BTN_SIDE, BIT(3));
+                input_report_key(dev, BTN_SIDE, packet[0] & BIT(3));
                 packet[0] |= BIT(3);
                 break;
 
diff --git a/drivers/input/rmi4/Kconfig b/drivers/input/rmi4/Kconfig
index 7172b88cd064..fad2eae4a118 100644
--- a/drivers/input/rmi4/Kconfig
+++ b/drivers/input/rmi4/Kconfig
@@ -3,6 +3,7 @@
 #
 config RMI4_CORE
         tristate "Synaptics RMI4 bus support"
+        select IRQ_DOMAIN
         help
           Say Y here if you want to support the Synaptics RMI4 bus.  This is
           required for all RMI4 device support.
diff --git a/drivers/input/rmi4/rmi_2d_sensor.c b/drivers/input/rmi4/rmi_2d_sensor.c
index 8bb866c7b985..8eeffa066022 100644
--- a/drivers/input/rmi4/rmi_2d_sensor.c
+++ b/drivers/input/rmi4/rmi_2d_sensor.c
@@ -32,15 +32,15 @@ void rmi_2d_sensor_abs_process(struct rmi_2d_sensor *sensor,
         if (obj->type == RMI_2D_OBJECT_NONE)
                 return;
 
-        if (axis_align->swap_axes)
-                swap(obj->x, obj->y);
-
         if (axis_align->flip_x)
                 obj->x = sensor->max_x - obj->x;
 
         if (axis_align->flip_y)
                 obj->y = sensor->max_y - obj->y;
 
+        if (axis_align->swap_axes)
+                swap(obj->x, obj->y);
+
         /*
          * Here checking if X offset or y offset are specified is
          * redundant. We just add the offsets or clip the values.
@@ -120,15 +120,15 @@ void rmi_2d_sensor_rel_report(struct rmi_2d_sensor *sensor, int x, int y)
         x = min(RMI_2D_REL_POS_MAX, max(RMI_2D_REL_POS_MIN, (int)x));
         y = min(RMI_2D_REL_POS_MAX, max(RMI_2D_REL_POS_MIN, (int)y));
 
-        if (axis_align->swap_axes)
-                swap(x, y);
-
         if (axis_align->flip_x)
                 x = min(RMI_2D_REL_POS_MAX, -x);
 
         if (axis_align->flip_y)
                 y = min(RMI_2D_REL_POS_MAX, -y);
 
+        if (axis_align->swap_axes)
+                swap(x, y);
+
         if (x || y) {
                 input_report_rel(sensor->input, REL_X, x);
                 input_report_rel(sensor->input, REL_Y, y);
@@ -141,17 +141,10 @@ static void rmi_2d_sensor_set_input_params(struct rmi_2d_sensor *sensor)
         struct input_dev *input = sensor->input;
         int res_x;
         int res_y;
+        int max_x, max_y;
         int input_flags = 0;
 
         if (sensor->report_abs) {
-                if (sensor->axis_align.swap_axes) {
-                        swap(sensor->max_x, sensor->max_y);
-                        swap(sensor->axis_align.clip_x_low,
-                             sensor->axis_align.clip_y_low);
-                        swap(sensor->axis_align.clip_x_high,
-                             sensor->axis_align.clip_y_high);
-                }
-
                 sensor->min_x = sensor->axis_align.clip_x_low;
                 if (sensor->axis_align.clip_x_high)
                         sensor->max_x = min(sensor->max_x,
@@ -163,14 +156,19 @@ static void rmi_2d_sensor_set_input_params(struct rmi_2d_sensor *sensor)
                                 sensor->axis_align.clip_y_high);
 
                 set_bit(EV_ABS, input->evbit);
-                input_set_abs_params(input, ABS_MT_POSITION_X, 0, sensor->max_x,
-                                        0, 0);
-                input_set_abs_params(input, ABS_MT_POSITION_Y, 0, sensor->max_y,
-                                        0, 0);
+
+                max_x = sensor->max_x;
+                max_y = sensor->max_y;
+                if (sensor->axis_align.swap_axes)
+                        swap(max_x, max_y);
+                input_set_abs_params(input, ABS_MT_POSITION_X, 0, max_x, 0, 0);
+                input_set_abs_params(input, ABS_MT_POSITION_Y, 0, max_y, 0, 0);
 
                 if (sensor->x_mm && sensor->y_mm) {
                         res_x = (sensor->max_x - sensor->min_x) / sensor->x_mm;
                         res_y = (sensor->max_y - sensor->min_y) / sensor->y_mm;
+                        if (sensor->axis_align.swap_axes)
+                                swap(res_x, res_y);
 
                         input_abs_set_res(input, ABS_X, res_x);
                         input_abs_set_res(input, ABS_Y, res_y);
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
index c5fa53adba8d..bd0d5ff01b08 100644
--- a/drivers/input/rmi4/rmi_bus.c
+++ b/drivers/input/rmi4/rmi_bus.c
@@ -9,6 +9,8 @@
 
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/irq.h>
+#include <linux/irqdomain.h>
 #include <linux/list.h>
 #include <linux/pm.h>
 #include <linux/rmi.h>
@@ -167,6 +169,39 @@ static inline void rmi_function_of_probe(struct rmi_function *fn)
 {}
 #endif
 
+static struct irq_chip rmi_irq_chip = {
+        .name = "rmi4",
+};
+
+static int rmi_create_function_irq(struct rmi_function *fn,
+                                   struct rmi_function_handler *handler)
+{
+        struct rmi_driver_data *drvdata = dev_get_drvdata(&fn->rmi_dev->dev);
+        int i, error;
+
+        for (i = 0; i < fn->num_of_irqs; i++) {
+                set_bit(fn->irq_pos + i, fn->irq_mask);
+
+                fn->irq[i] = irq_create_mapping(drvdata->irqdomain,
+                                                fn->irq_pos + i);
+
+                irq_set_chip_data(fn->irq[i], fn);
+                irq_set_chip_and_handler(fn->irq[i], &rmi_irq_chip,
+                                         handle_simple_irq);
+                irq_set_nested_thread(fn->irq[i], 1);
+
+                error = devm_request_threaded_irq(&fn->dev, fn->irq[i], NULL,
+                                        handler->attention, IRQF_ONESHOT,
+                                        dev_name(&fn->dev), fn);
+                if (error) {
+                        dev_err(&fn->dev, "Error %d registering IRQ\n", error);
+                        return error;
+                }
+        }
+
+        return 0;
+}
+
 static int rmi_function_probe(struct device *dev)
 {
         struct rmi_function *fn = to_rmi_function(dev);
@@ -178,7 +213,14 @@ static int rmi_function_probe(struct device *dev)
 
         if (handler->probe) {
                 error = handler->probe(fn);
-                return error;
+                if (error)
+                        return error;
+        }
+
+        if (fn->num_of_irqs && handler->attention) {
+                error = rmi_create_function_irq(fn, handler);
+                if (error)
+                        return error;
         }
 
         return 0;
@@ -230,12 +272,18 @@ err_put_device:
 
 void rmi_unregister_function(struct rmi_function *fn)
 {
+        int i;
+
         rmi_dbg(RMI_DEBUG_CORE, &fn->dev, "Unregistering F%02X.\n",
                         fn->fd.function_number);
 
         device_del(&fn->dev);
         of_node_put(fn->dev.of_node);
         put_device(&fn->dev);
+
+        for (i = 0; i < fn->num_of_irqs; i++)
+                irq_dispose_mapping(fn->irq[i]);
+
 }
 
 /**
diff --git a/drivers/input/rmi4/rmi_bus.h b/drivers/input/rmi4/rmi_bus.h
index b7625a9ac66a..96383eab41ba 100644
--- a/drivers/input/rmi4/rmi_bus.h
+++ b/drivers/input/rmi4/rmi_bus.h
@@ -14,6 +14,12 @@
 
 struct rmi_device;
 
+/*
+ * The interrupt source count in the function descriptor can represent up to
+ * 6 interrupt sources in the normal manner.
+ */
+#define RMI_FN_MAX_IRQS 6
+
 /**
  * struct rmi_function - represents the implementation of an RMI4
  * function for a particular device (basically, a driver for that RMI4 function)
@@ -26,6 +32,7 @@ struct rmi_device;
  * @irq_pos: The position in the irq bitfield this function holds
  * @irq_mask: For convenience, can be used to mask IRQ bits off during ATTN
  * interrupt handling.
+ * @irqs: assigned virq numbers (up to num_of_irqs)
  *
  * @node: entry in device's list of functions
  */
@@ -36,6 +43,7 @@ struct rmi_function {
         struct list_head node;
 
         unsigned int num_of_irqs;
+        int irq[RMI_FN_MAX_IRQS];
         unsigned int irq_pos;
         unsigned long irq_mask[];
 };
@@ -76,7 +84,7 @@ struct rmi_function_handler {
         void (*remove)(struct rmi_function *fn);
         int (*config)(struct rmi_function *fn);
         int (*reset)(struct rmi_function *fn);
-        int (*attention)(struct rmi_function *fn, unsigned long *irq_bits);
+        irqreturn_t (*attention)(int irq, void *ctx);
         int (*suspend)(struct rmi_function *fn);
         int (*resume)(struct rmi_function *fn);
 };
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index 7d29053dfb0f..fc3ab93b7aea 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -21,6 +21,7 @@
 #include <linux/pm.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/irqdomain.h>
 #include <uapi/linux/input.h>
 #include <linux/rmi.h>
 #include "rmi_bus.h"
@@ -127,28 +128,11 @@ static int rmi_driver_process_config_requests(struct rmi_device *rmi_dev)
         return 0;
 }
 
-static void process_one_interrupt(struct rmi_driver_data *data,
-                                  struct rmi_function *fn)
-{
-        struct rmi_function_handler *fh;
-
-        if (!fn || !fn->dev.driver)
-                return;
-
-        fh = to_rmi_function_handler(fn->dev.driver);
-        if (fh->attention) {
-                bitmap_and(data->fn_irq_bits, data->irq_status, fn->irq_mask,
-                                data->irq_count);
-                if (!bitmap_empty(data->fn_irq_bits, data->irq_count))
-                        fh->attention(fn, data->fn_irq_bits);
-        }
-}
-
 static int rmi_process_interrupt_requests(struct rmi_device *rmi_dev)
 {
         struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev);
         struct device *dev = &rmi_dev->dev;
-        struct rmi_function *entry;
+        int i;
         int error;
 
         if (!data)
@@ -173,16 +157,8 @@ static int rmi_process_interrupt_requests(struct rmi_device *rmi_dev)
          */
         mutex_unlock(&data->irq_mutex);
 
-        /*
-         * It would be nice to be able to use irq_chip to handle these
-         * nested IRQs.  Unfortunately, most of the current customers for
-         * this driver are using older kernels (3.0.x) that don't support
-         * the features required for that.  Once they've shifted to more
-         * recent kernels (say, 3.3 and higher), this should be switched to
-         * use irq_chip.
-         */
-        list_for_each_entry(entry, &data->function_list, node)
-                process_one_interrupt(data, entry);
+        for_each_set_bit(i, data->irq_status, data->irq_count)
+                handle_nested_irq(irq_find_mapping(data->irqdomain, i));
 
         if (data->input)
                 input_sync(data->input);
@@ -1001,9 +977,13 @@ EXPORT_SYMBOL_GPL(rmi_driver_resume);
 static int rmi_driver_remove(struct device *dev)
 {
         struct rmi_device *rmi_dev = to_rmi_device(dev);
+        struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev);
 
         rmi_disable_irq(rmi_dev, false);
 
+        irq_domain_remove(data->irqdomain);
+        data->irqdomain = NULL;
+
         rmi_f34_remove_sysfs(rmi_dev);
         rmi_free_function_list(rmi_dev);
 
@@ -1035,7 +1015,8 @@ int rmi_probe_interrupts(struct rmi_driver_data *data)
 {
         struct rmi_device *rmi_dev = data->rmi_dev;
         struct device *dev = &rmi_dev->dev;
-        int irq_count;
+        struct fwnode_handle *fwnode = rmi_dev->xport->dev->fwnode;
+        int irq_count = 0;
         size_t size;
         int retval;
 
@@ -1046,7 +1027,6 @@ int rmi_probe_interrupts(struct rmi_driver_data *data)
          * being accessed.
          */
         rmi_dbg(RMI_DEBUG_CORE, dev, "%s: Counting IRQs.\n", __func__);
-        irq_count = 0;
         data->bootloader_mode = false;
 
         retval = rmi_scan_pdt(rmi_dev, &irq_count, rmi_count_irqs);
@@ -1058,6 +1038,15 @@ int rmi_probe_interrupts(struct rmi_driver_data *data)
         if (data->bootloader_mode)
                 dev_warn(dev, "Device in bootloader mode.\n");
 
+        /* Allocate and register a linear revmap irq_domain */
+        data->irqdomain = irq_domain_create_linear(fwnode, irq_count,
+                                                   &irq_domain_simple_ops,
+                                                   data);
+        if (!data->irqdomain) {
+                dev_err(&rmi_dev->dev, "Failed to create IRQ domain\n");
+                return -ENOMEM;
+        }
+
         data->irq_count = irq_count;
         data->num_of_irq_regs = (data->irq_count + 7) / 8;
 
@@ -1080,10 +1069,9 @@ int rmi_init_functions(struct rmi_driver_data *data)
 {
         struct rmi_device *rmi_dev = data->rmi_dev;
         struct device *dev = &rmi_dev->dev;
-        int irq_count;
+        int irq_count = 0;
         int retval;
 
-        irq_count = 0;
         rmi_dbg(RMI_DEBUG_CORE, dev, "%s: Creating functions.\n", __func__);
         retval = rmi_scan_pdt(rmi_dev, &irq_count, rmi_create_function);
         if (retval < 0) {
diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c
index 8a07ae147df6..4edaa14fe878 100644
--- a/drivers/input/rmi4/rmi_f01.c
+++ b/drivers/input/rmi4/rmi_f01.c
@@ -681,9 +681,9 @@ static int rmi_f01_resume(struct rmi_function *fn)
         return 0;
 }
 
-static int rmi_f01_attention(struct rmi_function *fn,
-                             unsigned long *irq_bits)
+static irqreturn_t rmi_f01_attention(int irq, void *ctx)
 {
+        struct rmi_function *fn = ctx;
         struct rmi_device *rmi_dev = fn->rmi_dev;
         int error;
         u8 device_status;
@@ -692,7 +692,7 @@ static int rmi_f01_attention(struct rmi_function *fn,
         if (error) {
                 dev_err(&fn->dev,
                         "Failed to read device status: %d.\n", error);
-                return error;
+                return IRQ_RETVAL(error);
         }
 
         if (RMI_F01_STATUS_BOOTLOADER(device_status))
@@ -704,11 +704,11 @@ static int rmi_f01_attention(struct rmi_function *fn,
                 error = rmi_dev->driver->reset_handler(rmi_dev);
                 if (error) {
                         dev_err(&fn->dev, "Device reset failed: %d\n", error);
-                        return error;
+                        return IRQ_RETVAL(error);
                 }
         }
 
-        return 0;
+        return IRQ_HANDLED;
 }
 
 struct rmi_function_handler rmi_f01_handler = {
diff --git a/drivers/input/rmi4/rmi_f03.c b/drivers/input/rmi4/rmi_f03.c
index 88822196d6b7..aaa1edc95522 100644
--- a/drivers/input/rmi4/rmi_f03.c
+++ b/drivers/input/rmi4/rmi_f03.c
@@ -244,8 +244,9 @@ static int rmi_f03_config(struct rmi_function *fn)
         return 0;
 }
 
-static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits)
+static irqreturn_t rmi_f03_attention(int irq, void *ctx)
 {
+        struct rmi_function *fn = ctx;
         struct rmi_device *rmi_dev = fn->rmi_dev;
         struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);
         struct f03_data *f03 = dev_get_drvdata(&fn->dev);
@@ -262,7 +263,7 @@ static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits)
                 /* First grab the data passed by the transport device */
                 if (drvdata->attn_data.size < ob_len) {
                         dev_warn(&fn->dev, "F03 interrupted, but data is missing!\n");
-                        return 0;
+                        return IRQ_HANDLED;
                 }
 
                 memcpy(obs, drvdata->attn_data.data, ob_len);
@@ -277,7 +278,7 @@ static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits)
                                 "%s: Failed to read F03 output buffers: %d\n",
                                 __func__, error);
                         serio_interrupt(f03->serio, 0, SERIO_TIMEOUT);
-                        return error;
+                        return IRQ_RETVAL(error);
                 }
         }
 
@@ -303,7 +304,7 @@ static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits)
                 serio_interrupt(f03->serio, ob_data, serio_flags);
         }
 
-        return 0;
+        return IRQ_HANDLED;
 }
 
 static void rmi_f03_remove(struct rmi_function *fn)
diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c
index 12a233251793..df64d6aed4f7 100644
--- a/drivers/input/rmi4/rmi_f11.c
+++ b/drivers/input/rmi4/rmi_f11.c
@@ -570,9 +570,7 @@ static inline u8 rmi_f11_parse_finger_state(const u8 *f_state, u8 n_finger)
 }
 
 static void rmi_f11_finger_handler(struct f11_data *f11,
-                                   struct rmi_2d_sensor *sensor,
-                                   unsigned long *irq_bits, int num_irq_regs,
-                                   int size)
+                                   struct rmi_2d_sensor *sensor, int size)
 {
         const u8 *f_state = f11->data.f_state;
         u8 finger_state;
@@ -581,12 +579,7 @@ static void rmi_f11_finger_handler(struct f11_data *f11,
         int rel_fingers;
         int abs_size = sensor->nbr_fingers * RMI_F11_ABS_BYTES;
 
-        int abs_bits = bitmap_and(f11->result_bits, irq_bits, f11->abs_mask,
-                                  num_irq_regs * 8);
-        int rel_bits = bitmap_and(f11->result_bits, irq_bits, f11->rel_mask,
-                                  num_irq_regs * 8);
-
-        if (abs_bits) {
+        if (sensor->report_abs) {
                 if (abs_size > size)
                         abs_fingers = size / RMI_F11_ABS_BYTES;
                 else
@@ -604,19 +597,7 @@ static void rmi_f11_finger_handler(struct f11_data *f11,
                         rmi_f11_abs_pos_process(f11, sensor, &sensor->objs[i],
                                                         finger_state, i);
                 }
-        }
 
-        if (rel_bits) {
-                if ((abs_size + sensor->nbr_fingers * RMI_F11_REL_BYTES) > size)
-                        rel_fingers = (size - abs_size) / RMI_F11_REL_BYTES;
-                else
-                        rel_fingers = sensor->nbr_fingers;
-
-                for (i = 0; i < rel_fingers; i++)
-                        rmi_f11_rel_pos_report(f11, i);
-        }
-
-        if (abs_bits) {
                 /*
                  * the absolute part is made in 2 parts to allow the kernel
                  * tracking to take place.
@@ -638,7 +619,16 @@ static void rmi_f11_finger_handler(struct f11_data *f11,
                 }
 
                 input_mt_sync_frame(sensor->input);
+        } else if (sensor->report_rel) {
+                if ((abs_size + sensor->nbr_fingers * RMI_F11_REL_BYTES) > size)
+                        rel_fingers = (size - abs_size) / RMI_F11_REL_BYTES;
+                else
+                        rel_fingers = sensor->nbr_fingers;
+
+                for (i = 0; i < rel_fingers; i++)
+                        rmi_f11_rel_pos_report(f11, i);
         }
+
 }
 
 static int f11_2d_construct_data(struct f11_data *f11)
@@ -1276,8 +1266,9 @@ static int rmi_f11_config(struct rmi_function *fn)
         return 0;
 }
 
-static int rmi_f11_attention(struct rmi_function *fn, unsigned long *irq_bits)
+static irqreturn_t rmi_f11_attention(int irq, void *ctx)
 {
+        struct rmi_function *fn = ctx;
         struct rmi_device *rmi_dev = fn->rmi_dev;
         struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);
         struct f11_data *f11 = dev_get_drvdata(&fn->dev);
@@ -1303,13 +1294,12 @@ static int rmi_f11_attention(struct rmi_function *fn, unsigned long *irq_bits)
                                 data_base_addr, f11->sensor.data_pkt,
                                 f11->sensor.pkt_size);
                 if (error < 0)
-                        return error;
+                        return IRQ_RETVAL(error);
         }
 
-        rmi_f11_finger_handler(f11, &f11->sensor, irq_bits,
-                                drvdata->num_of_irq_regs, valid_bytes);
+        rmi_f11_finger_handler(f11, &f11->sensor, valid_bytes);
 
-        return 0;
+        return IRQ_HANDLED;
 }
 
 static int rmi_f11_resume(struct rmi_function *fn)
diff --git a/drivers/input/rmi4/rmi_f12.c b/drivers/input/rmi4/rmi_f12.c
index a3d1aa88f2a9..5c7f48915779 100644
--- a/drivers/input/rmi4/rmi_f12.c
+++ b/drivers/input/rmi4/rmi_f12.c
@@ -197,10 +197,10 @@ static void rmi_f12_process_objects(struct f12_data *f12, u8 *data1, int size)
                 rmi_2d_sensor_abs_report(sensor, &sensor->objs[i], i);
 }
 
-static int rmi_f12_attention(struct rmi_function *fn,
-                             unsigned long *irq_nr_regs)
+static irqreturn_t rmi_f12_attention(int irq, void *ctx)
 {
         int retval;
+        struct rmi_function *fn = ctx;
         struct rmi_device *rmi_dev = fn->rmi_dev;
         struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);
         struct f12_data *f12 = dev_get_drvdata(&fn->dev);
@@ -222,7 +222,7 @@ static int rmi_f12_attention(struct rmi_function *fn,
                 if (retval < 0) {
                         dev_err(&fn->dev, "Failed to read object data. Code: %d.\n",
                                 retval);
-                        return retval;
+                        return IRQ_RETVAL(retval);
                 }
         }
 
@@ -232,7 +232,7 @@ static int rmi_f12_attention(struct rmi_function *fn,
 
         input_mt_sync_frame(sensor->input);
 
-        return 0;
+        return IRQ_HANDLED;
 }
 
 static int rmi_f12_write_control_regs(struct rmi_function *fn)
diff --git a/drivers/input/rmi4/rmi_f30.c b/drivers/input/rmi4/rmi_f30.c
index 82e0f0d43d55..5e3ed5ac0c3e 100644
--- a/drivers/input/rmi4/rmi_f30.c
+++ b/drivers/input/rmi4/rmi_f30.c
@@ -122,8 +122,9 @@ static void rmi_f30_report_button(struct rmi_function *fn,
         }
 }
 
-static int rmi_f30_attention(struct rmi_function *fn, unsigned long *irq_bits)
+static irqreturn_t rmi_f30_attention(int irq, void *ctx)
 {
+        struct rmi_function *fn = ctx;
         struct f30_data *f30 = dev_get_drvdata(&fn->dev);
         struct rmi_driver_data *drvdata = dev_get_drvdata(&fn->rmi_dev->dev);
         int error;
@@ -134,7 +135,7 @@ static int rmi_f30_attention(struct rmi_function *fn, unsigned long *irq_bits)
                 if (drvdata->attn_data.size < f30->register_count) {
                         dev_warn(&fn->dev,
                                  "F30 interrupted, but data is missing\n");
-                        return 0;
+                        return IRQ_HANDLED;
                 }
                 memcpy(f30->data_regs, drvdata->attn_data.data,
                         f30->register_count);
@@ -147,7 +148,7 @@ static int rmi_f30_attention(struct rmi_function *fn, unsigned long *irq_bits)
                         dev_err(&fn->dev,
                                 "%s: Failed to read F30 data registers: %d\n",
                                 __func__, error);
-                        return error;
+                        return IRQ_RETVAL(error);
                 }
         }
 
@@ -159,7 +160,7 @@ static int rmi_f30_attention(struct rmi_function *fn, unsigned long *irq_bits)
                         rmi_f03_commit_buttons(f30->f03);
         }
 
-        return 0;
+        return IRQ_HANDLED;
 }
 
 static int rmi_f30_config(struct rmi_function *fn)
diff --git a/drivers/input/rmi4/rmi_f34.c b/drivers/input/rmi4/rmi_f34.c
index f1f5ac539d5d..87a7d4ba382d 100644
--- a/drivers/input/rmi4/rmi_f34.c
+++ b/drivers/input/rmi4/rmi_f34.c
@@ -100,8 +100,9 @@ static int rmi_f34_command(struct f34_data *f34, u8 command,
         return 0;
 }
 
-static int rmi_f34_attention(struct rmi_function *fn, unsigned long *irq_bits)
+static irqreturn_t rmi_f34_attention(int irq, void *ctx)
 {
+        struct rmi_function *fn = ctx;
         struct f34_data *f34 = dev_get_drvdata(&fn->dev);
         int ret;
         u8 status;
@@ -126,7 +127,7 @@ static int rmi_f34_attention(struct rmi_function *fn, unsigned long *irq_bits)
                         complete(&f34->v7.cmd_done);
         }
 
-        return 0;
+        return IRQ_HANDLED;
 }
 
 static int rmi_f34_write_blocks(struct f34_data *f34, const void *data,
diff --git a/drivers/input/rmi4/rmi_f54.c b/drivers/input/rmi4/rmi_f54.c
index e8a59d164019..a6f515bcab22 100644
--- a/drivers/input/rmi4/rmi_f54.c
+++ b/drivers/input/rmi4/rmi_f54.c
@@ -610,11 +610,6 @@ error:
         mutex_unlock(&f54->data_mutex);
 }
 
-static int rmi_f54_attention(struct rmi_function *fn, unsigned long *irqbits)
-{
-        return 0;
-}
-
 static int rmi_f54_config(struct rmi_function *fn)
 {
         struct rmi_driver *drv = fn->rmi_dev->driver;
@@ -756,6 +751,5 @@ struct rmi_function_handler rmi_f54_handler = {
         .func = 0x54,
         .probe = rmi_f54_probe,
         .config = rmi_f54_config,
-        .attention = rmi_f54_attention,
         .remove = rmi_f54_remove,
 };
diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c
index ff7043f74a3d..d196ac3d8b8c 100644
--- a/drivers/input/touchscreen/silead.c
+++ b/drivers/input/touchscreen/silead.c
@@ -603,6 +603,7 @@ static const struct acpi_device_id silead_ts_acpi_match[] = {
         { "GSL3692", 0 },
         { "MSSL1680", 0 },
         { "MSSL0001", 0 },
+        { "MSSL0002", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(acpi, silead_ts_acpi_match);
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index e055d228bfb9..689ffe538370 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -142,7 +142,6 @@ config DMAR_TABLE
 config INTEL_IOMMU
         bool "Support for Intel IOMMU using DMA Remapping Devices"
         depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC)
-        select DMA_DIRECT_OPS
         select IOMMU_API
         select IOMMU_IOVA
         select NEED_DMA_MAP_STATE
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 14e4b3722428..b344a883f116 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -31,7 +31,6 @@
 #include <linux/pci.h>
 #include <linux/dmar.h>
 #include <linux/dma-mapping.h>
-#include <linux/dma-direct.h>
 #include <linux/mempool.h>
 #include <linux/memory.h>
 #include <linux/cpu.h>
@@ -3713,30 +3712,61 @@ static void *intel_alloc_coherent(struct device *dev, size_t size,
                                   dma_addr_t *dma_handle, gfp_t flags,
                                   unsigned long attrs)
 {
-        void *vaddr;
+        struct page *page = NULL;
+        int order;
 
-        vaddr = dma_direct_alloc(dev, size, dma_handle, flags, attrs);
-        if (iommu_no_mapping(dev) || !vaddr)
-                return vaddr;
+        size = PAGE_ALIGN(size);
+        order = get_order(size);
 
-        *dma_handle = __intel_map_single(dev, virt_to_phys(vaddr),
-                        PAGE_ALIGN(size), DMA_BIDIRECTIONAL,
-                        dev->coherent_dma_mask);
-        if (!*dma_handle)
-                goto out_free_pages;
-        return vaddr;
+        if (!iommu_no_mapping(dev))
+                flags &= ~(GFP_DMA | GFP_DMA32);
+        else if (dev->coherent_dma_mask < dma_get_required_mask(dev)) {
+                if (dev->coherent_dma_mask < DMA_BIT_MASK(32))
+                        flags |= GFP_DMA;
+                else
+                        flags |= GFP_DMA32;
+        }
+
+        if (gfpflags_allow_blocking(flags)) {
+                unsigned int count = size >> PAGE_SHIFT;
+
+                page = dma_alloc_from_contiguous(dev, count, order, flags);
+                if (page && iommu_no_mapping(dev) &&
+                    page_to_phys(page) + size > dev->coherent_dma_mask) {
+                        dma_release_from_contiguous(dev, page, count);
+                        page = NULL;
+                }
+        }
+
+        if (!page)
+                page = alloc_pages(flags, order);
+        if (!page)
+                return NULL;
+        memset(page_address(page), 0, size);
+
+        *dma_handle = __intel_map_single(dev, page_to_phys(page), size,
+                                         DMA_BIDIRECTIONAL,
+                                         dev->coherent_dma_mask);
+        if (*dma_handle)
+                return page_address(page);
+        if (!dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT))
+                __free_pages(page, order);
 
-out_free_pages:
-        dma_direct_free(dev, size, vaddr, *dma_handle, attrs);
         return NULL;
 }
 
 static void intel_free_coherent(struct device *dev, size_t size, void *vaddr,
                                 dma_addr_t dma_handle, unsigned long attrs)
 {
-        if (!iommu_no_mapping(dev))
-                intel_unmap(dev, dma_handle, PAGE_ALIGN(size));
-        dma_direct_free(dev, size, vaddr, dma_handle, attrs);
+        int order;
+        struct page *page = virt_to_page(vaddr);
+
+        size = PAGE_ALIGN(size);
+        order = get_order(size);
+
+        intel_unmap(dev, dma_handle, size);
+        if (!dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT))
+                __free_pages(page, order);
 }
 
 static void intel_unmap_sg(struct device *dev, struct scatterlist *sglist,
diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
index 0f52d44b3f69..f5fe0100f9ff 100644
--- a/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@ -199,7 +199,7 @@ static int gicv2m_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
 
 fail:
         irq_domain_free_irqs_parent(domain, virq, nr_irqs);
-        gicv2m_unalloc_msi(v2m, hwirq, get_count_order(nr_irqs));
+        gicv2m_unalloc_msi(v2m, hwirq, nr_irqs);
         return err;
 }
 
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 5377d7e2afba..d7842d312d3e 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -182,6 +182,22 @@ static struct its_collection *dev_event_to_col(struct its_device *its_dev,
         return its->collections + its_dev->event_map.col_map[event];
 }
 
+static struct its_collection *valid_col(struct its_collection *col)
+{
+        if (WARN_ON_ONCE(col->target_address & GENMASK_ULL(0, 15)))
+                return NULL;
+
+        return col;
+}
+
+static struct its_vpe *valid_vpe(struct its_node *its, struct its_vpe *vpe)
+{
+        if (valid_col(its->collections + vpe->col_idx))
+                return vpe;
+
+        return NULL;
+}
+
 /*
  * ITS command descriptors - parameters to be encoded in a command
  * block.
@@ -439,7 +455,7 @@ static struct its_collection *its_build_mapti_cmd(struct its_node *its,
 
         its_fixup_cmd(cmd);
 
-        return col;
+        return valid_col(col);
 }
 
 static struct its_collection *its_build_movi_cmd(struct its_node *its,
@@ -458,7 +474,7 @@ static struct its_collection *its_build_movi_cmd(struct its_node *its,
 
         its_fixup_cmd(cmd);
 
-        return col;
+        return valid_col(col);
 }
 
 static struct its_collection *its_build_discard_cmd(struct its_node *its,
@@ -476,7 +492,7 @@ static struct its_collection *its_build_discard_cmd(struct its_node *its,
 
         its_fixup_cmd(cmd);
 
-        return col;
+        return valid_col(col);
 }
 
 static struct its_collection *its_build_inv_cmd(struct its_node *its,
@@ -494,7 +510,7 @@ static struct its_collection *its_build_inv_cmd(struct its_node *its,
 
         its_fixup_cmd(cmd);
 
-        return col;
+        return valid_col(col);
 }
 
 static struct its_collection *its_build_int_cmd(struct its_node *its,
@@ -512,7 +528,7 @@ static struct its_collection *its_build_int_cmd(struct its_node *its,
 
         its_fixup_cmd(cmd);
 
-        return col;
+        return valid_col(col);
 }
 
 static struct its_collection *its_build_clear_cmd(struct its_node *its,
@@ -530,7 +546,7 @@ static struct its_collection *its_build_clear_cmd(struct its_node *its,
 
         its_fixup_cmd(cmd);
 
-        return col;
+        return valid_col(col);
 }
 
 static struct its_collection *its_build_invall_cmd(struct its_node *its,
@@ -554,7 +570,7 @@ static struct its_vpe *its_build_vinvall_cmd(struct its_node *its,
 
         its_fixup_cmd(cmd);
 
-        return desc->its_vinvall_cmd.vpe;
+        return valid_vpe(its, desc->its_vinvall_cmd.vpe);
 }
 
 static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
@@ -576,7 +592,7 @@ static struct its_vpe *its_build_vmapp_cmd(struct its_node *its,
 
         its_fixup_cmd(cmd);
 
-        return desc->its_vmapp_cmd.vpe;
+        return valid_vpe(its, desc->its_vmapp_cmd.vpe);
 }
 
 static struct its_vpe *its_build_vmapti_cmd(struct its_node *its,
@@ -599,7 +615,7 @@ static struct its_vpe *its_build_vmapti_cmd(struct its_node *its,
 
         its_fixup_cmd(cmd);
 
-        return desc->its_vmapti_cmd.vpe;
+        return valid_vpe(its, desc->its_vmapti_cmd.vpe);
 }
 
 static struct its_vpe *its_build_vmovi_cmd(struct its_node *its,
@@ -622,7 +638,7 @@ static struct its_vpe *its_build_vmovi_cmd(struct its_node *its,
 
         its_fixup_cmd(cmd);
 
-        return desc->its_vmovi_cmd.vpe;
+        return valid_vpe(its, desc->its_vmovi_cmd.vpe);
 }
 
 static struct its_vpe *its_build_vmovp_cmd(struct its_node *its,
@@ -640,7 +656,7 @@ static struct its_vpe *its_build_vmovp_cmd(struct its_node *its,
 
         its_fixup_cmd(cmd);
 
-        return desc->its_vmovp_cmd.vpe;
+        return valid_vpe(its, desc->its_vmovp_cmd.vpe);
 }
 
 static u64 its_cmd_ptr_to_offset(struct its_node *its,
@@ -1824,11 +1840,16 @@ static int its_alloc_tables(struct its_node *its)
 
 static int its_alloc_collections(struct its_node *its)
 {
+        int i;
+
         its->collections = kcalloc(nr_cpu_ids, sizeof(*its->collections),
                                    GFP_KERNEL);
         if (!its->collections)
                 return -ENOMEM;
 
+        for (i = 0; i < nr_cpu_ids; i++)
+                its->collections[i].target_address = ~0ULL;
+
         return 0;
 }
 
@@ -2310,7 +2331,14 @@ static int its_irq_domain_activate(struct irq_domain *domain,
                 cpu_mask = cpumask_of_node(its_dev->its->numa_node);
 
         /* Bind the LPI to the first possible CPU */
-        cpu = cpumask_first(cpu_mask);
+        cpu = cpumask_first_and(cpu_mask, cpu_online_mask);
+        if (cpu >= nr_cpu_ids) {
+                if (its_dev->its->flags & ITS_FLAGS_WORKAROUND_CAVIUM_23144)
+                        return -EINVAL;
+
+                cpu = cpumask_first(cpu_online_mask);
+        }
+
         its_dev->event_map.col_map[event] = cpu;
         irq_data_update_effective_affinity(d, cpumask_of(cpu));
 
@@ -3399,6 +3427,16 @@ static int redist_disable_lpis(void)
         u64 timeout = USEC_PER_SEC;
         u64 val;
 
+        /*
+         * If coming via a CPU hotplug event, we don't need to disable
+         * LPIs before trying to re-enable them. They are already
+         * configured and all is well in the world. Detect this case
+         * by checking the allocation of the pending table for the
+         * current CPU.
+         */
+        if (gic_data_rdist()->pend_page)
+                return 0;
+
         if (!gic_rdists_supports_plpis()) {
                 pr_info("CPU%d: LPIs not supported\n", smp_processor_id());
                 return -ENXIO;
diff --git a/drivers/irqchip/irq-ls-scfg-msi.c b/drivers/irqchip/irq-ls-scfg-msi.c
index 1ec3bfe56693..c671b3212010 100644
--- a/drivers/irqchip/irq-ls-scfg-msi.c
+++ b/drivers/irqchip/irq-ls-scfg-msi.c
@@ -93,8 +93,12 @@ static void ls_scfg_msi_compose_msg(struct irq_data *data, struct msi_msg *msg)
         msg->address_lo = lower_32_bits(msi_data->msiir_addr);
         msg->data = data->hwirq;
 
-        if (msi_affinity_flag)
-                msg->data |= cpumask_first(data->common->affinity);
+        if (msi_affinity_flag) {
+                const struct cpumask *mask;
+
+                mask = irq_data_get_effective_affinity_mask(data);
+                msg->data |= cpumask_first(mask);
+        }
 
         iommu_dma_map_msi_msg(data->irq, msg);
 }
@@ -121,7 +125,7 @@ static int ls_scfg_msi_set_affinity(struct irq_data *irq_data,
                 return -EINVAL;
         }
 
-        cpumask_copy(irq_data->common->affinity, mask);
+        irq_data_update_effective_affinity(irq_data, cpumask_of(cpu));
 
         return IRQ_SET_MASK_OK;
 }
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 98f90aadd141..18c0a1281914 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -588,7 +588,7 @@ static const struct proto_ops data_sock_ops = {
         .getname        = data_sock_getname,
         .sendmsg        = mISDN_sock_sendmsg,
         .recvmsg        = mISDN_sock_recvmsg,
-        .poll_mask      = datagram_poll_mask,
+        .poll           = datagram_poll,
         .listen         = sock_no_listen,
         .shutdown       = sock_no_shutdown,
         .setsockopt     = data_sock_setsockopt,
diff --git a/drivers/lightnvm/Kconfig b/drivers/lightnvm/Kconfig
index 10c08982185a..9c03f35d9df1 100644
--- a/drivers/lightnvm/Kconfig
+++ b/drivers/lightnvm/Kconfig
@@ -4,7 +4,7 @@
 
 menuconfig NVM
         bool "Open-Channel SSD target support"
-        depends on BLOCK && HAS_DMA && PCI
+        depends on BLOCK && PCI
         select BLK_DEV_NVME
         help
           Say Y here to get to enable Open-channel SSDs.
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index ab13fcec3fca..75df4c9d8b54 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -588,7 +588,7 @@ static const char *raid10_md_layout_to_format(int layout)
 }
 
 /* Return md raid10 algorithm for @name */
-static const int raid10_name_to_format(const char *name)
+static int raid10_name_to_format(const char *name)
 {
         if (!strcasecmp(name, "near"))
                 return ALGORITHM_RAID10_NEAR;
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 938766794c2e..3d0e2c198f06 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -885,9 +885,7 @@ EXPORT_SYMBOL_GPL(dm_table_set_type);
 static int device_supports_dax(struct dm_target *ti, struct dm_dev *dev,
                                sector_t start, sector_t len, void *data)
 {
-        struct request_queue *q = bdev_get_queue(dev->bdev);
-
-        return q && blk_queue_dax(q);
+        return bdev_dax_supported(dev->bdev, PAGE_SIZE);
 }
 
 static bool dm_table_supports_dax(struct dm_table *t)
@@ -1907,6 +1905,9 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
 
         if (dm_table_supports_dax(t))
                 blk_queue_flag_set(QUEUE_FLAG_DAX, q);
+        else
+                blk_queue_flag_clear(QUEUE_FLAG_DAX, q);
+
         if (dm_table_supports_dax_write_cache(t))
                 dax_write_cache(t->md->dax_dev, true);
 
diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
index 36ef284ad086..72142021b5c9 100644
--- a/drivers/md/dm-thin-metadata.c
+++ b/drivers/md/dm-thin-metadata.c
@@ -776,7 +776,6 @@ static int __write_changed_details(struct dm_pool_metadata *pmd)
 static int __commit_transaction(struct dm_pool_metadata *pmd)
 {
         int r;
-        size_t metadata_len, data_len;
         struct thin_disk_superblock *disk_super;
         struct dm_block *sblock;
 
@@ -797,14 +796,6 @@ static int __commit_transaction(struct dm_pool_metadata *pmd)
         if (r < 0)
                 return r;
 
-        r = dm_sm_root_size(pmd->metadata_sm, &metadata_len);
-        if (r < 0)
-                return r;
-
-        r = dm_sm_root_size(pmd->data_sm, &data_len);
-        if (r < 0)
-                return r;
-
         r = save_sm_roots(pmd);
         if (r < 0)
                 return r;
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index 7945238df1c0..b900723bbd0f 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -1386,6 +1386,8 @@ static void schedule_external_copy(struct thin_c *tc, dm_block_t virt_block,
 
 static void set_pool_mode(struct pool *pool, enum pool_mode new_mode);
 
+static void requeue_bios(struct pool *pool);
+
 static void check_for_space(struct pool *pool)
 {
         int r;
@@ -1398,8 +1400,10 @@ static void check_for_space(struct pool *pool)
         if (r)
                 return;
 
-        if (nr_free)
+        if (nr_free) {
                 set_pool_mode(pool, PM_WRITE);
+                requeue_bios(pool);
+        }
 }
 
 /*
@@ -1476,7 +1480,10 @@ static int alloc_data_block(struct thin_c *tc, dm_block_t *result)
 
         r = dm_pool_alloc_data_block(pool->pmd, result);
         if (r) {
-                metadata_operation_failed(pool, "dm_pool_alloc_data_block", r);
+                if (r == -ENOSPC)
+                        set_pool_mode(pool, PM_OUT_OF_DATA_SPACE);
+                else
+                        metadata_operation_failed(pool, "dm_pool_alloc_data_block", r);
                 return r;
         }
 
diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
index 5961c7794ef3..07ea6a48aac6 100644
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -259,7 +259,7 @@ static int persistent_memory_claim(struct dm_writecache *wc)
         if (da != p) {
                 long i;
                 wc->memory_map = NULL;
-                pages = kvmalloc(p * sizeof(struct page *), GFP_KERNEL);
+                pages = kvmalloc_array(p, sizeof(struct page *), GFP_KERNEL);
                 if (!pages) {
                         r = -ENOMEM;
                         goto err2;
@@ -859,7 +859,7 @@ static int writecache_alloc_entries(struct dm_writecache *wc)
 
         if (wc->entries)
                 return 0;
-        wc->entries = vmalloc(sizeof(struct wc_entry) * wc->n_blocks);
+        wc->entries = vmalloc(array_size(sizeof(struct wc_entry), wc->n_blocks));
         if (!wc->entries)
                 return -ENOMEM;
         for (b = 0; b < wc->n_blocks; b++) {
@@ -1481,9 +1481,9 @@ static void __writecache_writeback_pmem(struct dm_writecache *wc, struct writeba
                 wb->bio.bi_iter.bi_sector = read_original_sector(wc, e);
                 wb->page_offset = PAGE_SIZE;
                 if (max_pages <= WB_LIST_INLINE ||
-                    unlikely(!(wb->wc_list = kmalloc(max_pages * sizeof(struct wc_entry *),
-                                                     GFP_NOIO | __GFP_NORETRY |
-                                                     __GFP_NOMEMALLOC | __GFP_NOWARN)))) {
+                    unlikely(!(wb->wc_list = kmalloc_array(max_pages, sizeof(struct wc_entry *),
+                                                           GFP_NOIO | __GFP_NORETRY |
+                                                           __GFP_NOMEMALLOC | __GFP_NOWARN)))) {
                         wb->wc_list = wb->wc_list_inline;
                         max_pages = WB_LIST_INLINE;
                 }
diff --git a/drivers/md/dm-zoned-target.c b/drivers/md/dm-zoned-target.c
index 3c0e45f4dcf5..a44183ff4be0 100644
--- a/drivers/md/dm-zoned-target.c
+++ b/drivers/md/dm-zoned-target.c
@@ -787,7 +787,7 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         /* Chunk BIO work */
         mutex_init(&dmz->chunk_lock);
-        INIT_RADIX_TREE(&dmz->chunk_rxtree, GFP_KERNEL);
+        INIT_RADIX_TREE(&dmz->chunk_rxtree, GFP_NOIO);
         dmz->chunk_wq = alloc_workqueue("dmz_cwq_%s", WQ_MEM_RECLAIM | WQ_UNBOUND,
                                         0, dev->name);
         if (!dmz->chunk_wq) {
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index e65429a29c06..b0dd7027848b 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1056,8 +1056,7 @@ static long dm_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
         if (len < 1)
                 goto out;
         nr_pages = min(len, nr_pages);
-        if (ti->type->direct_access)
-                ret = ti->type->direct_access(ti, pgoff, nr_pages, kaddr, pfn);
+        ret = ti->type->direct_access(ti, pgoff, nr_pages, kaddr, pfn);
 
  out:
         dm_put_live_table(md, srcu_idx);
@@ -1606,10 +1605,9 @@ static blk_qc_t __split_and_process_bio(struct mapped_device *md,
                                  * the usage of io->orig_bio in dm_remap_zone_report()
                                  * won't be affected by this reassignment.
                                  */
-                                struct bio *b = bio_clone_bioset(bio, GFP_NOIO,
-                                                                 &md->queue->bio_split);
+                                struct bio *b = bio_split(bio, bio_sectors(bio) - ci.sector_count,
+                                                          GFP_NOIO, &md->queue->bio_split);
                                 ci.io->orig_bio = b;
-                                bio_advance(bio, (bio_sectors(bio) - ci.sector_count) << 9);
                                 bio_chain(b, bio);
                                 ret = generic_make_request(bio);
                                 break;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 29b0cd9ec951..994aed2f9dff 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5547,7 +5547,8 @@ int md_run(struct mddev *mddev)
                 else
                         pr_warn("md: personality for level %s is not loaded!\n",
                                 mddev->clevel);
-                return -EINVAL;
+                err = -EINVAL;
+                goto abort;
         }
         spin_unlock(&pers_lock);
         if (mddev->level != pers->level) {
@@ -5560,7 +5561,8 @@ int md_run(struct mddev *mddev)
             pers->start_reshape == NULL) {
                 /* This personality cannot handle reshaping... */
                 module_put(pers->owner);
-                return -EINVAL;
+                err = -EINVAL;
+                goto abort;
         }
 
         if (pers->sync_request) {
@@ -5629,7 +5631,7 @@ int md_run(struct mddev *mddev)
                 mddev->private = NULL;
                 module_put(pers->owner);
                 bitmap_destroy(mddev);
-                return err;
+                goto abort;
         }
         if (mddev->queue) {
                 bool nonrot = true;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 478cf446827f..35bd3a62451b 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3893,6 +3893,13 @@ static int raid10_run(struct mddev *mddev)
                             disk->rdev->saved_raid_disk < 0)
                                 conf->fullsync = 1;
                 }
+
+                if (disk->replacement &&
+                    !test_bit(In_sync, &disk->replacement->flags) &&
+                    disk->replacement->saved_raid_disk < 0) {
+                        conf->fullsync = 1;
+                }
+
                 disk->recovery_disabled = mddev->recovery_disabled - 1;
         }
 
diff --git a/drivers/media/rc/bpf-lirc.c b/drivers/media/rc/bpf-lirc.c
index 40826bba06b6..fcfab6635f9c 100644
--- a/drivers/media/rc/bpf-lirc.c
+++ b/drivers/media/rc/bpf-lirc.c
@@ -207,29 +207,19 @@ void lirc_bpf_free(struct rc_dev *rcdev)
         bpf_prog_array_free(rcdev->raw->progs);
 }
 
-int lirc_prog_attach(const union bpf_attr *attr)
+int lirc_prog_attach(const union bpf_attr *attr, struct bpf_prog *prog)
 {
-        struct bpf_prog *prog;
         struct rc_dev *rcdev;
         int ret;
 
         if (attr->attach_flags)
                 return -EINVAL;
 
-        prog = bpf_prog_get_type(attr->attach_bpf_fd,
-                                 BPF_PROG_TYPE_LIRC_MODE2);
-        if (IS_ERR(prog))
-                return PTR_ERR(prog);
-
         rcdev = rc_dev_get_from_fd(attr->target_fd);
-        if (IS_ERR(rcdev)) {
-                bpf_prog_put(prog);
+        if (IS_ERR(rcdev))
                 return PTR_ERR(rcdev);
-        }
 
         ret = lirc_bpf_attach(rcdev, prog);
-        if (ret)
-                bpf_prog_put(prog);
 
         put_device(&rcdev->dev);
 
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index e05c3245930a..fa840666bdd1 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -507,35 +507,14 @@ static int remote_settings_file_close(struct inode *inode, struct file *file)
 static ssize_t remote_settings_file_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
         void __iomem *address = (void __iomem *)file->private_data;
-        unsigned char *page;
-        int retval;
         int len = 0;
         unsigned int value;
-
-        if (*offset < 0)
-                return -EINVAL;
-        if (count == 0 || count > 1024)
-                return 0;
-        if (*offset != 0)
-                return 0;
-
-        page = (unsigned char *)__get_free_page(GFP_KERNEL);
-        if (!page)
-                return -ENOMEM;
+        char lbuf[20];
 
         value = readl(address);
-        len = sprintf(page, "%d\n", value);
-
-        if (copy_to_user(buf, page, len)) {
-                retval = -EFAULT;
-                goto exit;
-        }
-        *offset += len;
-        retval = len;
+        len = snprintf(lbuf, sizeof(lbuf), "%d\n", value);
 
-exit:
-        free_page((unsigned long)page);
-        return retval;
+        return simple_read_from_buffer(buf, count, offset, lbuf, len);
 }
 
 static ssize_t remote_settings_file_write(struct file *file, const char __user *ubuff, size_t count, loff_t *offset)
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index b0b8f18a85e3..6649f0d56d2f 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -310,8 +310,11 @@ int mei_irq_read_handler(struct mei_device *dev,
         if (&cl->link == &dev->file_list) {
                 /* A message for not connected fixed address clients
                  * should be silently discarded
+                 * On power down client may be force cleaned,
+                 * silently discard such messages
                  */
-                if (hdr_is_fixed(mei_hdr)) {
+                if (hdr_is_fixed(mei_hdr) ||
+                    dev->dev_state == MEI_DEV_POWER_DOWN) {
                         mei_irq_discard_msg(dev, mei_hdr);
                         ret = 0;
                         goto reset_slots;
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index efd733472a35..56c6f79a5c5a 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -467,7 +467,7 @@ static int vmballoon_send_batched_lock(struct vmballoon *b,
                 unsigned int num_pages, bool is_2m_pages, unsigned int *target)
 {
         unsigned long status;
-        unsigned long pfn = page_to_pfn(b->page);
+        unsigned long pfn = PHYS_PFN(virt_to_phys(b->batch_page));
 
         STATS_INC(b->stats.lock[is_2m_pages]);
 
@@ -515,7 +515,7 @@ static bool vmballoon_send_batched_unlock(struct vmballoon *b,
                 unsigned int num_pages, bool is_2m_pages, unsigned int *target)
 {
         unsigned long status;
-        unsigned long pfn = page_to_pfn(b->page);
+        unsigned long pfn = PHYS_PFN(virt_to_phys(b->batch_page));
 
         STATS_INC(b->stats.unlock[is_2m_pages]);
 
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
index ef05e0039378..2a833686784b 100644
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -27,8 +27,8 @@ struct mmc_gpio {
         bool override_cd_active_level;
         irqreturn_t (*cd_gpio_isr)(int irq, void *dev_id);
         char *ro_label;
-        char cd_label[0];
         u32 cd_debounce_delay_ms;
+        char cd_label[];
 };
 
 static irqreturn_t mmc_gpio_cd_irqt(int irq, void *dev_id)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 623f4d27fa01..80dc2fd6576c 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1065,8 +1065,8 @@ static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data)
          * It's used when HS400 mode is enabled.
          */
         if (data->flags & MMC_DATA_WRITE &&
-                !(host->timing != MMC_TIMING_MMC_HS400))
-                return;
+                host->timing != MMC_TIMING_MMC_HS400)
+                goto disable;
 
         if (data->flags & MMC_DATA_WRITE)
                 enable = SDMMC_CARD_WR_THR_EN;
@@ -1074,7 +1074,8 @@ static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data)
                 enable = SDMMC_CARD_RD_THR_EN;
 
         if (host->timing != MMC_TIMING_MMC_HS200 &&
-            host->timing != MMC_TIMING_UHS_SDR104)
+            host->timing != MMC_TIMING_UHS_SDR104 &&
+            host->timing != MMC_TIMING_MMC_HS400)
                 goto disable;
 
         blksz_depth = blksz / (1 << host->data_shift);
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index f7f9773d161f..d032bd63444d 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -139,8 +139,7 @@ renesas_sdhi_internal_dmac_abort_dma(struct tmio_mmc_host *host) {
         renesas_sdhi_internal_dmac_dm_write(host, DM_CM_RST,
                                             RST_RESERVED_BITS | val);
 
-        if (host->data && host->data->flags & MMC_DATA_READ)
-                clear_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags);
+        clear_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags);
 
         renesas_sdhi_internal_dmac_enable_dma(host, true);
 }
@@ -164,17 +163,14 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host,
                 goto force_pio;
 
         /* This DMAC cannot handle if buffer is not 8-bytes alignment */
-        if (!IS_ALIGNED(sg_dma_address(sg), 8)) {
-                dma_unmap_sg(&host->pdev->dev, sg, host->sg_len,
-                             mmc_get_dma_dir(data));
-                goto force_pio;
-        }
+        if (!IS_ALIGNED(sg_dma_address(sg), 8))
+                goto force_pio_with_unmap;
 
         if (data->flags & MMC_DATA_READ) {
                 dtran_mode |= DTRAN_MODE_CH_NUM_CH1;
                 if (test_bit(SDHI_INTERNAL_DMAC_ONE_RX_ONLY, &global_flags) &&
                     test_and_set_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags))
-                        goto force_pio;
+                        goto force_pio_with_unmap;
         } else {
                 dtran_mode |= DTRAN_MODE_CH_NUM_CH0;
         }
@@ -189,6 +185,9 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host,
 
         return;
 
+force_pio_with_unmap:
+        dma_unmap_sg(&host->pdev->dev, sg, host->sg_len, mmc_get_dma_dir(data));
+
 force_pio:
         host->force_pio = true;
         renesas_sdhi_internal_dmac_enable_dma(host, false);
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index d6aef70d34fa..4eb3d29ecde1 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -312,6 +312,15 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
 
                         if (imx_data->socdata->flags & ESDHC_FLAG_HS400)
                                 val |= SDHCI_SUPPORT_HS400;
+
+                        /*
+                         * Do not advertise faster UHS modes if there are no
+                         * pinctrl states for 100MHz/200MHz.
+                         */
+                        if (IS_ERR_OR_NULL(imx_data->pins_100mhz) ||
+                            IS_ERR_OR_NULL(imx_data->pins_200mhz))
+                                val &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_DDR50
+                                         | SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_HS400);
                 }
         }
 
@@ -1158,18 +1167,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
                                                 ESDHC_PINCTRL_STATE_100MHZ);
                 imx_data->pins_200mhz = pinctrl_lookup_state(imx_data->pinctrl,
                                                 ESDHC_PINCTRL_STATE_200MHZ);
-                if (IS_ERR(imx_data->pins_100mhz) ||
-                                IS_ERR(imx_data->pins_200mhz)) {
-                        dev_warn(mmc_dev(host->mmc),
-                                "could not get ultra high speed state, work on normal mode\n");
-                        /*
-                         * fall back to not supporting uhs by specifying no
-                         * 1.8v quirk
-                         */
-                        host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
-                }
-        } else {
-                host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
         }
 
         /* call to generic mmc_of_parse to support additional capabilities */
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index e7472590f2ed..8e7f3e35ee3d 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -1446,6 +1446,7 @@ static int sunxi_mmc_runtime_resume(struct device *dev)
         sunxi_mmc_init_host(host);
         sunxi_mmc_set_bus_width(host, mmc->ios.bus_width);
         sunxi_mmc_set_clk(host, &mmc->ios);
+        enable_irq(host->irq);
 
         return 0;
 }
@@ -1455,6 +1456,12 @@ static int sunxi_mmc_runtime_suspend(struct device *dev)
         struct mmc_host *mmc = dev_get_drvdata(dev);
         struct sunxi_mmc_host *host = mmc_priv(mmc);
 
+        /*
+         * When clocks are off, it's possible receiving
+         * fake interrupts, which will stall the system.
+         * Disabling the irq  will prevent this.
+         */
+        disable_irq(host->irq);
         sunxi_mmc_reset_host(host);
         sunxi_mmc_disable(host);
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index a0c655628d6d..1b64ac8c5bc8 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -2526,7 +2526,7 @@ static int cfi_atmel_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 
 struct ppb_lock {
         struct flchip *chip;
-        loff_t offset;
+        unsigned long adr;
         int locked;
 };
 
@@ -2544,8 +2544,9 @@ static int __maybe_unused do_ppb_xxlock(struct map_info *map,
         unsigned long timeo;
         int ret;
 
+        adr += chip->start;
         mutex_lock(&chip->mutex);
-        ret = get_chip(map, chip, adr + chip->start, FL_LOCKING);
+        ret = get_chip(map, chip, adr, FL_LOCKING);
         if (ret) {
                 mutex_unlock(&chip->mutex);
                 return ret;
@@ -2563,8 +2564,8 @@ static int __maybe_unused do_ppb_xxlock(struct map_info *map,
 
         if (thunk == DO_XXLOCK_ONEBLOCK_LOCK) {
                 chip->state = FL_LOCKING;
-                map_write(map, CMD(0xA0), chip->start + adr);
-                map_write(map, CMD(0x00), chip->start + adr);
+                map_write(map, CMD(0xA0), adr);
+                map_write(map, CMD(0x00), adr);
         } else if (thunk == DO_XXLOCK_ONEBLOCK_UNLOCK) {
                 /*
                  * Unlocking of one specific sector is not supported, so we
@@ -2602,7 +2603,7 @@ static int __maybe_unused do_ppb_xxlock(struct map_info *map,
         map_write(map, CMD(0x00), chip->start);
 
         chip->state = FL_READY;
-        put_chip(map, chip, adr + chip->start);
+        put_chip(map, chip, adr);
         mutex_unlock(&chip->mutex);
 
         return ret;
@@ -2659,9 +2660,9 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs,
                  * sectors shall be unlocked, so lets keep their locking
                  * status at "unlocked" (locked=0) for the final re-locking.
                  */
-                if ((adr < ofs) || (adr >= (ofs + len))) {
+                if ((offset < ofs) || (offset >= (ofs + len))) {
                         sect[sectors].chip = &cfi->chips[chipnum];
-                        sect[sectors].offset = offset;
+                        sect[sectors].adr = adr;
                         sect[sectors].locked = do_ppb_xxlock(
                                 map, &cfi->chips[chipnum], adr, 0,
                                 DO_XXLOCK_ONEBLOCK_GETLOCK);
@@ -2675,6 +2676,8 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs,
                         i++;
 
                 if (adr >> cfi->chipshift) {
+                        if (offset >= (ofs + len))
+                                break;
                         adr = 0;
                         chipnum++;
 
@@ -2705,7 +2708,7 @@ static int __maybe_unused cfi_ppb_unlock(struct mtd_info *mtd, loff_t ofs,
          */
         for (i = 0; i < sectors; i++) {
                 if (sect[i].locked)
-                        do_ppb_xxlock(map, sect[i].chip, sect[i].offset, 0,
+                        do_ppb_xxlock(map, sect[i].chip, sect[i].adr, 0,
                                       DO_XXLOCK_ONEBLOCK_LOCK);
         }
 
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 3a6f450d1093..53febe8a68c3 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -733,8 +733,8 @@ static struct flash_info dataflash_data[] = {
         { "AT45DB642x",  0x1f2800, 8192, 1056, 11, SUP_POW2PS},
         { "at45db642d",  0x1f2800, 8192, 1024, 10, SUP_POW2PS | IS_POW2PS},
 
-        { "AT45DB641E",  0x1f28000100, 32768, 264, 9, SUP_EXTID | SUP_POW2PS},
-        { "at45db641e",  0x1f28000100, 32768, 256, 8, SUP_EXTID | SUP_POW2PS | IS_POW2PS},
+        { "AT45DB641E",  0x1f28000100ULL, 32768, 264, 9, SUP_EXTID | SUP_POW2PS},
+        { "at45db641e",  0x1f28000100ULL, 32768, 256, 8, SUP_EXTID | SUP_POW2PS | IS_POW2PS},
 };
 
 static struct flash_info *jedec_lookup(struct spi_device *spi,
diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c
index cfd33e6ca77f..5869e90cc14b 100644
--- a/drivers/mtd/nand/raw/denali_dt.c
+++ b/drivers/mtd/nand/raw/denali_dt.c
@@ -123,7 +123,11 @@ static int denali_dt_probe(struct platform_device *pdev)
         if (ret)
                 return ret;
 
-        denali->clk_x_rate = clk_get_rate(dt->clk);
+        /*
+         * Hardcode the clock rate for the backward compatibility.
+         * This works for both SOCFPGA and UniPhier.
+         */
+        denali->clk_x_rate = 200000000;
 
         ret = denali_init(denali);
         if (ret)
diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 45786e707b7b..26cef218bb43 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -48,7 +48,7 @@
 #define NFC_V1_V2_CONFIG                (host->regs + 0x0a)
 #define NFC_V1_V2_ECC_STATUS_RESULT     (host->regs + 0x0c)
 #define NFC_V1_V2_RSLTMAIN_AREA         (host->regs + 0x0e)
-#define NFC_V1_V2_RSLTSPARE_AREA        (host->regs + 0x10)
+#define NFC_V21_RSLTSPARE_AREA          (host->regs + 0x10)
 #define NFC_V1_V2_WRPROT                (host->regs + 0x12)
 #define NFC_V1_UNLOCKSTART_BLKADDR      (host->regs + 0x14)
 #define NFC_V1_UNLOCKEND_BLKADDR        (host->regs + 0x16)
@@ -1274,6 +1274,9 @@ static void preset_v2(struct mtd_info *mtd)
         writew(config1, NFC_V1_V2_CONFIG1);
         /* preset operation */
 
+        /* spare area size in 16-bit half-words */
+        writew(mtd->oobsize / 2, NFC_V21_RSLTSPARE_AREA);
+
         /* Unlock the internal RAM Buffer */
         writew(0x2, NFC_V1_V2_CONFIG);
 
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 10c4f9919850..b01d15ec4c56 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -440,7 +440,7 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs)
 
         for (; page < page_end; page++) {
                 res = chip->ecc.read_oob(mtd, chip, page);
-                if (res)
+                if (res < 0)
                         return res;
 
                 bad = chip->oob_poi[chip->badblockpos];
diff --git a/drivers/mtd/nand/raw/nand_macronix.c b/drivers/mtd/nand/raw/nand_macronix.c
index 7ed1f87e742a..49c546c97c6f 100644
--- a/drivers/mtd/nand/raw/nand_macronix.c
+++ b/drivers/mtd/nand/raw/nand_macronix.c
@@ -17,23 +17,47 @@
 
 #include <linux/mtd/rawnand.h>
 
+/*
+ * Macronix AC series does not support using SET/GET_FEATURES to change
+ * the timings unlike what is declared in the parameter page. Unflag
+ * this feature to avoid unnecessary downturns.
+ */
+static void macronix_nand_fix_broken_get_timings(struct nand_chip *chip)
+{
+        unsigned int i;
+        static const char * const broken_get_timings[] = {
+                "MX30LF1G18AC",
+                "MX30LF1G28AC",
+                "MX30LF2G18AC",
+                "MX30LF2G28AC",
+                "MX30LF4G18AC",
+                "MX30LF4G28AC",
+                "MX60LF8G18AC",
+        };
+
+        if (!chip->parameters.supports_set_get_features)
+                return;
+
+        for (i = 0; i < ARRAY_SIZE(broken_get_timings); i++) {
+                if (!strcmp(broken_get_timings[i], chip->parameters.model))
+                        break;
+        }
+
+        if (i == ARRAY_SIZE(broken_get_timings))
+                return;
+
+        bitmap_clear(chip->parameters.get_feature_list,
+                     ONFI_FEATURE_ADDR_TIMING_MODE, 1);
+        bitmap_clear(chip->parameters.set_feature_list,
+                     ONFI_FEATURE_ADDR_TIMING_MODE, 1);
+}
+
 static int macronix_nand_init(struct nand_chip *chip)
 {
         if (nand_is_slc(chip))
                 chip->bbt_options |= NAND_BBT_SCAN2NDPAGE;
 
-        /*
-         * MX30LF2G18AC chip does not support using SET/GET_FEATURES to change
-         * the timings unlike what is declared in the parameter page. Unflag
-         * this feature to avoid unnecessary downturns.
-         */
-        if (chip->parameters.supports_set_get_features &&
-            !strcmp("MX30LF2G18AC", chip->parameters.model)) {
-                bitmap_clear(chip->parameters.get_feature_list,
-                             ONFI_FEATURE_ADDR_TIMING_MODE, 1);
-                bitmap_clear(chip->parameters.set_feature_list,
-                             ONFI_FEATURE_ADDR_TIMING_MODE, 1);
-        }
+        macronix_nand_fix_broken_get_timings(chip);
 
         return 0;
 }
diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c
index 0af45b134c0c..5ec4c90a637d 100644
--- a/drivers/mtd/nand/raw/nand_micron.c
+++ b/drivers/mtd/nand/raw/nand_micron.c
@@ -66,7 +66,9 @@ static int micron_nand_onfi_init(struct nand_chip *chip)
 
         if (p->supports_set_get_features) {
                 set_bit(ONFI_FEATURE_ADDR_READ_RETRY, p->set_feature_list);
+                set_bit(ONFI_FEATURE_ON_DIE_ECC, p->set_feature_list);
                 set_bit(ONFI_FEATURE_ADDR_READ_RETRY, p->get_feature_list);
+                set_bit(ONFI_FEATURE_ON_DIE_ECC, p->get_feature_list);
         }
 
         return 0;
diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
index c3f7aaa5d18f..d7e10b36a0b9 100644
--- a/drivers/mtd/spi-nor/cadence-quadspi.c
+++ b/drivers/mtd/spi-nor/cadence-quadspi.c
@@ -926,10 +926,12 @@ static ssize_t cqspi_write(struct spi_nor *nor, loff_t to,
         if (ret)
                 return ret;
 
-        if (f_pdata->use_direct_mode)
+        if (f_pdata->use_direct_mode) {
                 memcpy_toio(cqspi->ahb_base + to, buf, len);
-        else
+                ret = cqspi_wait_idle(cqspi);
+        } else {
                 ret = cqspi_indirect_write_execute(nor, to, buf, len);
+        }
         if (ret)
                 return ret;
 
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index d5c15e8bb3de..f273af136fc7 100644
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -173,7 +173,7 @@ config SUNLANCE
 
 config AMD_XGBE
         tristate "AMD 10GbE Ethernet driver"
-        depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM && HAS_DMA
+        depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM
         depends on X86 || ARM64 || COMPILE_TEST
         select BITREVERSE
         select CRC32
diff --git a/drivers/net/ethernet/apm/xgene-v2/Kconfig b/drivers/net/ethernet/apm/xgene-v2/Kconfig
index 1205861b6318..eedd3f3dd22e 100644
--- a/drivers/net/ethernet/apm/xgene-v2/Kconfig
+++ b/drivers/net/ethernet/apm/xgene-v2/Kconfig
@@ -1,6 +1,5 @@
 config NET_XGENE_V2
         tristate "APM X-Gene SoC Ethernet-v2 Driver"
-        depends on HAS_DMA
         depends on ARCH_XGENE || COMPILE_TEST
         help
           This is the Ethernet driver for the on-chip ethernet interface
diff --git a/drivers/net/ethernet/apm/xgene/Kconfig b/drivers/net/ethernet/apm/xgene/Kconfig
index afccb033177b..e4e33c900b57 100644
--- a/drivers/net/ethernet/apm/xgene/Kconfig
+++ b/drivers/net/ethernet/apm/xgene/Kconfig
@@ -1,6 +1,5 @@
 config NET_XGENE
         tristate "APM X-Gene SoC Ethernet Driver"
-        depends on HAS_DMA
         depends on ARCH_XGENE || COMPILE_TEST
         select PHYLIB
         select MDIO_XGENE
diff --git a/drivers/net/ethernet/arc/Kconfig b/drivers/net/ethernet/arc/Kconfig
index e743ddf46343..5d0ab8e74b68 100644
--- a/drivers/net/ethernet/arc/Kconfig
+++ b/drivers/net/ethernet/arc/Kconfig
@@ -24,7 +24,8 @@ config ARC_EMAC_CORE
 config ARC_EMAC
         tristate "ARC EMAC support"
         select ARC_EMAC_CORE
-        depends on OF_IRQ && OF_NET && HAS_DMA && (ARC || COMPILE_TEST)
+        depends on OF_IRQ && OF_NET
+        depends on ARC || COMPILE_TEST
         ---help---
           On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x
           non-standard on-chip ethernet device ARC EMAC 10/100 is used.
@@ -33,7 +34,8 @@ config ARC_EMAC
 config EMAC_ROCKCHIP
         tristate "Rockchip EMAC support"
         select ARC_EMAC_CORE
-        depends on OF_IRQ && OF_NET && REGULATOR && HAS_DMA && (ARCH_ROCKCHIP || COMPILE_TEST)
+        depends on OF_IRQ && OF_NET && REGULATOR
+        depends on ARCH_ROCKCHIP || COMPILE_TEST
         ---help---
           Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers.
           This selects Rockchip SoC glue layer support for the
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 567ee54504bc..5e5022fa1d04 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1897,13 +1897,19 @@ static int alx_resume(struct device *dev)
         struct pci_dev *pdev = to_pci_dev(dev);
         struct alx_priv *alx = pci_get_drvdata(pdev);
         struct alx_hw *hw = &alx->hw;
+        int err;
 
         alx_reset_phy(hw);
 
         if (!netif_running(alx->dev))
                 return 0;
         netif_device_attach(alx->dev);
-        return __alx_open(alx, true);
+
+        rtnl_lock();
+        err = __alx_open(alx, true);
+        rtnl_unlock();
+
+        return err;
 }
 
 static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index af75156919ed..4c3bfde6e8de 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -157,7 +157,6 @@ config BGMAC
 config BGMAC_BCMA
         tristate "Broadcom iProc GBit BCMA support"
         depends on BCMA && BCMA_HOST_SOC
-        depends on HAS_DMA
         depends on BCM47XX || ARCH_BCM_5301X || COMPILE_TEST
         select BGMAC
         select PHYLIB
@@ -170,7 +169,6 @@ config BGMAC_BCMA
 
 config BGMAC_PLATFORM
         tristate "Broadcom iProc GBit platform support"
-        depends on HAS_DMA
         depends on ARCH_BCM_IPROC || COMPILE_TEST
         depends on OF
         select BGMAC
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index d847e1b9c37b..be1506169076 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1533,6 +1533,7 @@ struct bnx2x {
         struct link_vars        link_vars;
         u32                     link_cnt;
         struct bnx2x_link_report_data last_reported_link;
+        bool                    force_link_down;
 
         struct mdio_if_info     mdio;
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 8cd73ff5debc..af7b5a4d8ba0 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -1261,6 +1261,11 @@ void __bnx2x_link_report(struct bnx2x *bp)
 {
         struct bnx2x_link_report_data cur_data;
 
+        if (bp->force_link_down) {
+                bp->link_vars.link_up = 0;
+                return;
+        }
+
         /* reread mf_cfg */
         if (IS_PF(bp) && !CHIP_IS_E1(bp))
                 bnx2x_read_mf_cfg(bp);
@@ -2817,6 +2822,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 bp->pending_max = 0;
         }
 
+        bp->force_link_down = false;
         if (bp->port.pmf) {
                 rc = bnx2x_initial_phy_init(bp, load_mode);
                 if (rc)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 5b1ed240bf18..57348f2b49a3 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -10279,6 +10279,12 @@ static void bnx2x_sp_rtnl_task(struct work_struct *work)
                 bp->sp_rtnl_state = 0;
                 smp_mb();
 
+                /* Immediately indicate link as down */
+                bp->link_vars.link_up = 0;
+                bp->force_link_down = true;
+                netif_carrier_off(bp->dev);
+                BNX2X_ERR("Indicating link is down due to Tx-timeout\n");
+
                 bnx2x_nic_unload(bp, UNLOAD_NORMAL, true);
                 /* When ret value shows failure of allocation failure,
                  * the nic is rebooted again. If open still fails, a error
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index 30273a7717e2..4fd829b5e65d 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -660,7 +660,7 @@ static int cnic_init_id_tbl(struct cnic_id_tbl *id_tbl, u32 size, u32 start_id,
         id_tbl->max = size;
         id_tbl->next = next;
         spin_lock_init(&id_tbl->lock);
-        id_tbl->table = kcalloc(DIV_ROUND_UP(size, 32), 4, GFP_KERNEL);
+        id_tbl->table = kcalloc(BITS_TO_LONGS(size), sizeof(long), GFP_KERNEL);
         if (!id_tbl->table)
                 return -ENOMEM;
 
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 3e93df5d4e3b..96cc03a6d942 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3726,6 +3726,8 @@ static int at91ether_init(struct platform_device *pdev)
         int err;
         u32 reg;
 
+        bp->queues[0].bp = bp;
+
         dev->netdev_ops = &at91ether_netdev_ops;
         dev->ethtool_ops = &macb_ethtool_ops;
 
diff --git a/drivers/net/ethernet/cadence/macb_ptp.c b/drivers/net/ethernet/cadence/macb_ptp.c
index 2220c771092b..678835136bf8 100644
--- a/drivers/net/ethernet/cadence/macb_ptp.c
+++ b/drivers/net/ethernet/cadence/macb_ptp.c
@@ -170,10 +170,7 @@ static int gem_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
 
         if (delta > TSU_NSEC_MAX_VAL) {
                 gem_tsu_get_time(&bp->ptp_clock_info, &now);
-                if (sign)
-                        now = timespec64_sub(now, then);
-                else
-                        now = timespec64_add(now, then);
+                now = timespec64_add(now, then);
 
                 gem_tsu_set_time(&bp->ptp_clock_info,
                                  (const struct timespec64 *)&now);
diff --git a/drivers/net/ethernet/calxeda/Kconfig b/drivers/net/ethernet/calxeda/Kconfig
index 07d2201530d2..9fdd496b90ff 100644
--- a/drivers/net/ethernet/calxeda/Kconfig
+++ b/drivers/net/ethernet/calxeda/Kconfig
@@ -1,6 +1,6 @@
 config NET_CALXEDA_XGMAC
         tristate "Calxeda 1G/10G XGMAC Ethernet driver"
-        depends on HAS_IOMEM && HAS_DMA
+        depends on HAS_IOMEM
         depends on ARCH_HIGHBANK || COMPILE_TEST
         select CRC32
         help
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index dd04a2f89ce6..bc03c175a3cd 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -263,7 +263,7 @@ static void dcb_tx_queue_prio_enable(struct net_device *dev, int enable)
                                 "Can't %s DCB Priority on port %d, TX Queue %d: err=%d\n",
                                 enable ? "set" : "unset", pi->port_id, i, -err);
                 else
-                        txq->dcb_prio = value;
+                        txq->dcb_prio = enable ? value : 0;
         }
 }
 
diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.c b/drivers/net/ethernet/cisco/enic/enic_clsf.c
index 973c1fb70d09..99038dfc7fbe 100644
--- a/drivers/net/ethernet/cisco/enic/enic_clsf.c
+++ b/drivers/net/ethernet/cisco/enic/enic_clsf.c
@@ -79,7 +79,6 @@ void enic_rfs_flw_tbl_init(struct enic *enic)
         enic->rfs_h.max = enic->config.num_arfs;
         enic->rfs_h.free = enic->rfs_h.max;
         enic->rfs_h.toclean = 0;
-        enic_rfs_timer_start(enic);
 }
 
 void enic_rfs_flw_tbl_free(struct enic *enic)
@@ -88,7 +87,6 @@ void enic_rfs_flw_tbl_free(struct enic *enic)
 
         enic_rfs_timer_stop(enic);
         spin_lock_bh(&enic->rfs_h.lock);
-        enic->rfs_h.free = 0;
         for (i = 0; i < (1 << ENIC_RFS_FLW_BITSHIFT); i++) {
                 struct hlist_head *hhead;
                 struct hlist_node *tmp;
@@ -99,6 +97,7 @@ void enic_rfs_flw_tbl_free(struct enic *enic)
                         enic_delfltr(enic, n->fltr_id);
                         hlist_del(&n->node);
                         kfree(n);
+                        enic->rfs_h.free++;
                 }
         }
         spin_unlock_bh(&enic->rfs_h.lock);
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 30d2eaa18c04..90c645b8538e 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -1920,7 +1920,7 @@ static int enic_open(struct net_device *netdev)
 {
         struct enic *enic = netdev_priv(netdev);
         unsigned int i;
-        int err;
+        int err, ret;
 
         err = enic_request_intr(enic);
         if (err) {
@@ -1971,16 +1971,15 @@ static int enic_open(struct net_device *netdev)
                 vnic_intr_unmask(&enic->intr[i]);
 
         enic_notify_timer_start(enic);
-        enic_rfs_flw_tbl_init(enic);
+        enic_rfs_timer_start(enic);
 
         return 0;
 
 err_out_free_rq:
         for (i = 0; i < enic->rq_count; i++) {
-                err = vnic_rq_disable(&enic->rq[i]);
-                if (err)
-                        return err;
-                vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);
+                ret = vnic_rq_disable(&enic->rq[i]);
+                if (!ret)
+                        vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);
         }
         enic_dev_notify_unset(enic);
 err_out_free_intr:
@@ -2904,6 +2903,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         timer_setup(&enic->notify_timer, enic_notify_timer, 0);
 
+        enic_rfs_flw_tbl_init(enic);
         enic_set_rx_coal_setting(enic);
         INIT_WORK(&enic->reset, enic_reset);
         INIT_WORK(&enic->tx_hang_reset, enic_tx_hang_reset);
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 78db8e62a83f..ed6c76d20b45 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1735,8 +1735,8 @@ static void ftgmac100_ncsi_handler(struct ncsi_dev *nd)
         if (unlikely(nd->state != ncsi_dev_state_functional))
                 return;
 
-        netdev_info(nd->dev, "NCSI interface %s\n",
-                    nd->link_up ? "up" : "down");
+        netdev_dbg(nd->dev, "NCSI interface %s\n",
+                   nd->link_up ? "up" : "down");
 }
 
 static void ftgmac100_setup_clk(struct ftgmac100 *priv)
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 5f4e1ffa7b95..ab02057ac730 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -125,6 +125,9 @@ MODULE_PARM_DESC(tx_timeout, "The Tx timeout in ms");
 /* Default alignment for start of data in an Rx FD */
 #define DPAA_FD_DATA_ALIGNMENT  16
 
+/* The DPAA requires 256 bytes reserved and mapped for the SGT */
+#define DPAA_SGT_SIZE 256
+
 /* Values for the L3R field of the FM Parse Results
  */
 /* L3 Type field: First IP Present IPv4 */
@@ -1617,8 +1620,8 @@ static struct sk_buff *dpaa_cleanup_tx_fd(const struct dpaa_priv *priv,
 
         if (unlikely(qm_fd_get_format(fd) == qm_fd_sg)) {
                 nr_frags = skb_shinfo(skb)->nr_frags;
-                dma_unmap_single(dev, addr, qm_fd_get_offset(fd) +
-                                 sizeof(struct qm_sg_entry) * (1 + nr_frags),
+                dma_unmap_single(dev, addr,
+                                 qm_fd_get_offset(fd) + DPAA_SGT_SIZE,
                                  dma_dir);
 
                 /* The sgt buffer has been allocated with netdev_alloc_frag(),
@@ -1903,8 +1906,7 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,
         void *sgt_buf;
 
         /* get a page frag to store the SGTable */
-        sz = SKB_DATA_ALIGN(priv->tx_headroom +
-                sizeof(struct qm_sg_entry) * (1 + nr_frags));
+        sz = SKB_DATA_ALIGN(priv->tx_headroom + DPAA_SGT_SIZE);
         sgt_buf = netdev_alloc_frag(sz);
         if (unlikely(!sgt_buf)) {
                 netdev_err(net_dev, "netdev_alloc_frag() failed for size %d\n",
@@ -1972,9 +1974,8 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,
         skbh = (struct sk_buff **)buffer_start;
         *skbh = skb;
 
-        addr = dma_map_single(dev, buffer_start, priv->tx_headroom +
-                              sizeof(struct qm_sg_entry) * (1 + nr_frags),
-                              dma_dir);
+        addr = dma_map_single(dev, buffer_start,
+                              priv->tx_headroom + DPAA_SGT_SIZE, dma_dir);
         if (unlikely(dma_mapping_error(dev, addr))) {
                 dev_err(dev, "DMA mapping failed");
                 err = -EINVAL;
diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c
index ce6e24c74978..ecbf6187e13a 100644
--- a/drivers/net/ethernet/freescale/fman/fman_port.c
+++ b/drivers/net/ethernet/freescale/fman/fman_port.c
@@ -324,6 +324,10 @@ struct fman_port_qmi_regs {
 #define HWP_HXS_PHE_REPORT 0x00000800
 #define HWP_HXS_PCAC_PSTAT 0x00000100
 #define HWP_HXS_PCAC_PSTOP 0x00000001
+#define HWP_HXS_TCP_OFFSET 0xA
+#define HWP_HXS_UDP_OFFSET 0xB
+#define HWP_HXS_SH_PAD_REM 0x80000000
+
 struct fman_port_hwp_regs {
         struct {
                 u32 ssa; /* Soft Sequence Attachment */
@@ -728,6 +732,10 @@ static void init_hwp(struct fman_port *port)
                 iowrite32be(0xffffffff, &regs->pmda[i].lcv);
         }
 
+        /* Short packet padding removal from checksum calculation */
+        iowrite32be(HWP_HXS_SH_PAD_REM, &regs->pmda[HWP_HXS_TCP_OFFSET].ssa);
+        iowrite32be(HWP_HXS_SH_PAD_REM, &regs->pmda[HWP_HXS_UDP_OFFSET].ssa);
+
         start_port_hwp(port);
 }
 
diff --git a/drivers/net/ethernet/hisilicon/Kconfig b/drivers/net/ethernet/hisilicon/Kconfig
index 8bcf470ff5f3..fb1a7251f45d 100644
--- a/drivers/net/ethernet/hisilicon/Kconfig
+++ b/drivers/net/ethernet/hisilicon/Kconfig
@@ -5,7 +5,7 @@
 config NET_VENDOR_HISILICON
         bool "Hisilicon devices"
         default y
-        depends on (OF || ACPI) && HAS_DMA
+        depends on OF || ACPI
         depends on ARM || ARM64 || COMPILE_TEST
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y.
diff --git a/drivers/net/ethernet/huawei/hinic/hinic_rx.c b/drivers/net/ethernet/huawei/hinic/hinic_rx.c
index e2e5cdc7119c..4c0f7eda1166 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_rx.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_rx.c
@@ -439,6 +439,7 @@ static void rx_free_irq(struct hinic_rxq *rxq)
 {
         struct hinic_rq *rq = rxq->rq;
 
+        irq_set_affinity_hint(rq->irq, NULL);
         free_irq(rq->irq, rxq);
         rx_del_napi(rxq);
 }
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 8ffb7454e67c..b151ae316546 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2103,9 +2103,8 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring *rx_ring,
         unsigned int truesize = i40e_rx_pg_size(rx_ring) / 2;
 #else
         unsigned int truesize = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) +
-                                SKB_DATA_ALIGN(I40E_SKB_PAD +
-                                               (xdp->data_end -
-                                                xdp->data_hard_start));
+                                SKB_DATA_ALIGN(xdp->data_end -
+                                               xdp->data_hard_start);
 #endif
         struct sk_buff *skb;
 
@@ -2124,7 +2123,7 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring *rx_ring,
                 return NULL;
 
         /* update pointers within the skb to store the data */
-        skb_reserve(skb, I40E_SKB_PAD + (xdp->data - xdp->data_hard_start));
+        skb_reserve(skb, xdp->data - xdp->data_hard_start);
         __skb_put(skb, xdp->data_end - xdp->data);
         if (metasize)
                 skb_metadata_set(skb, metasize);
@@ -2200,9 +2199,10 @@ static bool i40e_is_non_eop(struct i40e_ring *rx_ring,
         return true;
 }
 
-#define I40E_XDP_PASS 0
-#define I40E_XDP_CONSUMED 1
-#define I40E_XDP_TX 2
+#define I40E_XDP_PASS           0
+#define I40E_XDP_CONSUMED       BIT(0)
+#define I40E_XDP_TX             BIT(1)
+#define I40E_XDP_REDIR          BIT(2)
 
 static int i40e_xmit_xdp_ring(struct xdp_frame *xdpf,
                               struct i40e_ring *xdp_ring);
@@ -2249,7 +2249,7 @@ static struct sk_buff *i40e_run_xdp(struct i40e_ring *rx_ring,
                 break;
         case XDP_REDIRECT:
                 err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
-                result = !err ? I40E_XDP_TX : I40E_XDP_CONSUMED;
+                result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;
                 break;
         default:
                 bpf_warn_invalid_xdp_action(act);
@@ -2312,7 +2312,8 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
         unsigned int total_rx_bytes = 0, total_rx_packets = 0;
         struct sk_buff *skb = rx_ring->skb;
         u16 cleaned_count = I40E_DESC_UNUSED(rx_ring);
-        bool failure = false, xdp_xmit = false;
+        unsigned int xdp_xmit = 0;
+        bool failure = false;
         struct xdp_buff xdp;
 
         xdp.rxq = &rx_ring->xdp_rxq;
@@ -2373,8 +2374,10 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
                 }
 
                 if (IS_ERR(skb)) {
-                        if (PTR_ERR(skb) == -I40E_XDP_TX) {
-                                xdp_xmit = true;
+                        unsigned int xdp_res = -PTR_ERR(skb);
+
+                        if (xdp_res & (I40E_XDP_TX | I40E_XDP_REDIR)) {
+                                xdp_xmit |= xdp_res;
                                 i40e_rx_buffer_flip(rx_ring, rx_buffer, size);
                         } else {
                                 rx_buffer->pagecnt_bias++;
@@ -2428,12 +2431,14 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
                 total_rx_packets++;
         }
 
-        if (xdp_xmit) {
+        if (xdp_xmit & I40E_XDP_REDIR)
+                xdp_do_flush_map();
+
+        if (xdp_xmit & I40E_XDP_TX) {
                 struct i40e_ring *xdp_ring =
                         rx_ring->vsi->xdp_rings[rx_ring->queue_index];
 
                 i40e_xdp_ring_update_tail(xdp_ring);
-                xdp_do_flush_map();
         }
 
         rx_ring->skb = skb;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 3e87dbbc9024..62e57b05a0ae 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -2186,9 +2186,10 @@ static struct sk_buff *ixgbe_build_skb(struct ixgbe_ring *rx_ring,
         return skb;
 }
 
-#define IXGBE_XDP_PASS 0
-#define IXGBE_XDP_CONSUMED 1
-#define IXGBE_XDP_TX 2
+#define IXGBE_XDP_PASS          0
+#define IXGBE_XDP_CONSUMED      BIT(0)
+#define IXGBE_XDP_TX            BIT(1)
+#define IXGBE_XDP_REDIR         BIT(2)
 
 static int ixgbe_xmit_xdp_ring(struct ixgbe_adapter *adapter,
                                struct xdp_frame *xdpf);
@@ -2225,7 +2226,7 @@ static struct sk_buff *ixgbe_run_xdp(struct ixgbe_adapter *adapter,
         case XDP_REDIRECT:
                 err = xdp_do_redirect(adapter->netdev, xdp, xdp_prog);
                 if (!err)
-                        result = IXGBE_XDP_TX;
+                        result = IXGBE_XDP_REDIR;
                 else
                         result = IXGBE_XDP_CONSUMED;
                 break;
@@ -2285,7 +2286,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
         unsigned int mss = 0;
 #endif /* IXGBE_FCOE */
         u16 cleaned_count = ixgbe_desc_unused(rx_ring);
-        bool xdp_xmit = false;
+        unsigned int xdp_xmit = 0;
         struct xdp_buff xdp;
 
         xdp.rxq = &rx_ring->xdp_rxq;
@@ -2328,8 +2329,10 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
                 }
 
                 if (IS_ERR(skb)) {
-                        if (PTR_ERR(skb) == -IXGBE_XDP_TX) {
-                                xdp_xmit = true;
+                        unsigned int xdp_res = -PTR_ERR(skb);
+
+                        if (xdp_res & (IXGBE_XDP_TX | IXGBE_XDP_REDIR)) {
+                                xdp_xmit |= xdp_res;
                                 ixgbe_rx_buffer_flip(rx_ring, rx_buffer, size);
                         } else {
                                 rx_buffer->pagecnt_bias++;
@@ -2401,7 +2404,10 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
                 total_rx_packets++;
         }
 
-        if (xdp_xmit) {
+        if (xdp_xmit & IXGBE_XDP_REDIR)
+                xdp_do_flush_map();
+
+        if (xdp_xmit & IXGBE_XDP_TX) {
                 struct ixgbe_ring *ring = adapter->xdp_ring[smp_processor_id()];
 
                 /* Force memory writes to complete before letting h/w
@@ -2409,8 +2415,6 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
                  */
                 wmb();
                 writel(ring->next_to_use, ring->tail);
-
-                xdp_do_flush_map();
         }
 
         u64_stats_update_begin(&rx_ring->syncp);
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig
index cc2f7701e71e..f33fd22b351c 100644
--- a/drivers/net/ethernet/marvell/Kconfig
+++ b/drivers/net/ethernet/marvell/Kconfig
@@ -18,8 +18,8 @@ if NET_VENDOR_MARVELL
 
 config MV643XX_ETH
         tristate "Marvell Discovery (643XX) and Orion ethernet support"
-        depends on (MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST) && INET
-        depends on HAS_DMA
+        depends on MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST
+        depends on INET
         select PHYLIB
         select MVMDIO
         ---help---
@@ -58,7 +58,6 @@ config MVNETA_BM_ENABLE
 config MVNETA
         tristate "Marvell Armada 370/38x/XP/37xx network interface support"
         depends on ARCH_MVEBU || COMPILE_TEST
-        depends on HAS_DMA
         select MVMDIO
         select PHYLINK
         ---help---
@@ -84,7 +83,6 @@ config MVNETA_BM
 config MVPP2
         tristate "Marvell Armada 375/7K/8K network interface support"
         depends on ARCH_MVEBU || COMPILE_TEST
-        depends on HAS_DMA
         select MVMDIO
         select PHYLINK
         ---help---
@@ -93,7 +91,7 @@ config MVPP2
 
 config PXA168_ETH
         tristate "Marvell pxa168 ethernet support"
-        depends on HAS_IOMEM && HAS_DMA
+        depends on HAS_IOMEM
         depends on CPU_PXA168 || ARCH_BERLIN || COMPILE_TEST
         select PHYLIB
         ---help---
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 17a904cc6a5e..0ad2f3f7da85 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -1932,7 +1932,7 @@ static int mvneta_rx_swbm(struct mvneta_port *pp, int rx_todo,
                 rx_bytes = rx_desc->data_size - (ETH_FCS_LEN + MVNETA_MH_SIZE);
                 index = rx_desc - rxq->descs;
                 data = rxq->buf_virt_addr[index];
-                phys_addr = rx_desc->buf_phys_addr;
+                phys_addr = rx_desc->buf_phys_addr - pp->rx_offset_correction;
 
                 if (!mvneta_rxq_desc_is_first_last(rx_status) ||
                     (rx_status & MVNETA_RXD_ERR_SUMMARY)) {
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 487388aed98f..384c1fa49081 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -807,6 +807,7 @@ static void cmd_work_handler(struct work_struct *work)
         unsigned long flags;
         bool poll_cmd = ent->polling;
         int alloc_ret;
+        int cmd_mode;
 
         sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;
         down(sem);
@@ -853,6 +854,7 @@ static void cmd_work_handler(struct work_struct *work)
         set_signature(ent, !cmd->checksum_disabled);
         dump_command(dev, ent, 1);
         ent->ts1 = ktime_get_ns();
+        cmd_mode = cmd->mode;
 
         if (ent->callback)
                 schedule_delayed_work(&ent->cb_timeout_work, cb_timeout);
@@ -877,7 +879,7 @@ static void cmd_work_handler(struct work_struct *work)
         iowrite32be(1 << ent->idx, &dev->iseg->cmd_dbell);
         mmiowb();
         /* if not in polling don't use ent after this point */
-        if (cmd->mode == CMD_MODE_POLLING || poll_cmd) {
+        if (cmd_mode == CMD_MODE_POLLING || poll_cmd) {
                 poll_timeout(ent);
                 /* make sure we read the descriptor after ownership is SW */
                 rmb();
@@ -1276,7 +1278,7 @@ static ssize_t outlen_write(struct file *filp, const char __user *buf,
 {
         struct mlx5_core_dev *dev = filp->private_data;
         struct mlx5_cmd_debug *dbg = &dev->cmd.dbg;
-        char outlen_str[8];
+        char outlen_str[8] = {0};
         int outlen;
         void *ptr;
         int err;
@@ -1291,8 +1293,6 @@ static ssize_t outlen_write(struct file *filp, const char __user *buf,
         if (copy_from_user(outlen_str, buf, count))
                 return -EFAULT;
 
-        outlen_str[7] = 0;
-
         err = sscanf(outlen_str, "%d", &outlen);
         if (err < 0)
                 return err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 56c1b6f5593e..dae4156a710d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2846,7 +2846,7 @@ void mlx5e_activate_priv_channels(struct mlx5e_priv *priv)
         mlx5e_activate_channels(&priv->channels);
         netif_tx_start_all_queues(priv->netdev);
 
-        if (MLX5_VPORT_MANAGER(priv->mdev))
+        if (MLX5_ESWITCH_MANAGER(priv->mdev))
                 mlx5e_add_sqs_fwd_rules(priv);
 
         mlx5e_wait_channels_min_rx_wqes(&priv->channels);
@@ -2857,7 +2857,7 @@ void mlx5e_deactivate_priv_channels(struct mlx5e_priv *priv)
 {
         mlx5e_redirect_rqts_to_drop(priv);
 
-        if (MLX5_VPORT_MANAGER(priv->mdev))
+        if (MLX5_ESWITCH_MANAGER(priv->mdev))
                 mlx5e_remove_sqs_fwd_rules(priv);
 
         /* FIXME: This is a W/A only for tx timeout watch dog false alarm when
@@ -4597,7 +4597,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev)
         mlx5e_set_netdev_dev_addr(netdev);
 
 #if IS_ENABLED(CONFIG_MLX5_ESWITCH)
-        if (MLX5_VPORT_MANAGER(mdev))
+        if (MLX5_ESWITCH_MANAGER(mdev))
                 netdev->switchdev_ops = &mlx5e_switchdev_ops;
 #endif
 
@@ -4753,7 +4753,7 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv)
 
         mlx5e_enable_async_events(priv);
 
-        if (MLX5_VPORT_MANAGER(priv->mdev))
+        if (MLX5_ESWITCH_MANAGER(priv->mdev))
                 mlx5e_register_vport_reps(priv);
 
         if (netdev->reg_state != NETREG_REGISTERED)
@@ -4788,7 +4788,7 @@ static void mlx5e_nic_disable(struct mlx5e_priv *priv)
 
         queue_work(priv->wq, &priv->set_rx_mode_work);
 
-        if (MLX5_VPORT_MANAGER(priv->mdev))
+        if (MLX5_ESWITCH_MANAGER(priv->mdev))
                 mlx5e_unregister_vport_reps(priv);
 
         mlx5e_disable_async_events(priv);
@@ -4972,7 +4972,7 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev)
                 return NULL;
 
 #ifdef CONFIG_MLX5_ESWITCH
-        if (MLX5_VPORT_MANAGER(mdev)) {
+        if (MLX5_ESWITCH_MANAGER(mdev)) {
                 rpriv = mlx5e_alloc_nic_rep_priv(mdev);
                 if (!rpriv) {
                         mlx5_core_warn(mdev, "Failed to alloc NIC rep priv data\n");
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 57987f6546e8..2b8040a3cdbd 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -823,7 +823,7 @@ bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv)
         struct mlx5e_rep_priv *rpriv = priv->ppriv;
         struct mlx5_eswitch_rep *rep;
 
-        if (!MLX5_CAP_GEN(priv->mdev, vport_group_manager))
+        if (!MLX5_ESWITCH_MANAGER(priv->mdev))
                 return false;
 
         rep = rpriv->rep;
@@ -837,8 +837,12 @@ bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv)
 static bool mlx5e_is_vf_vport_rep(struct mlx5e_priv *priv)
 {
         struct mlx5e_rep_priv *rpriv = priv->ppriv;
-        struct mlx5_eswitch_rep *rep = rpriv->rep;
+        struct mlx5_eswitch_rep *rep;
 
+        if (!MLX5_ESWITCH_MANAGER(priv->mdev))
+                return false;
+
+        rep = rpriv->rep;
         if (rep && rep->vport != FDB_UPLINK_VPORT)
                 return true;
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index f63dfbcd29fe..b79d74860a30 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1594,17 +1594,15 @@ static void esw_disable_vport(struct mlx5_eswitch *esw, int vport_num)
 }
 
 /* Public E-Switch API */
-#define ESW_ALLOWED(esw) ((esw) && MLX5_VPORT_MANAGER((esw)->dev))
+#define ESW_ALLOWED(esw) ((esw) && MLX5_ESWITCH_MANAGER((esw)->dev))
+
 
 int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs, int mode)
 {
         int err;
         int i, enabled_events;
 
-        if (!ESW_ALLOWED(esw))
-                return 0;
-
-        if (!MLX5_CAP_GEN(esw->dev, eswitch_flow_table) ||
+        if (!ESW_ALLOWED(esw) ||
             !MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, ft_support)) {
                 esw_warn(esw->dev, "E-Switch FDB is not supported, aborting ...\n");
                 return -EOPNOTSUPP;
@@ -1806,7 +1804,7 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,
         u64 node_guid;
         int err = 0;
 
-        if (!ESW_ALLOWED(esw))
+        if (!MLX5_CAP_GEN(esw->dev, vport_group_manager))
                 return -EPERM;
         if (!LEGAL_VPORT(esw, vport) || is_multicast_ether_addr(mac))
                 return -EINVAL;
@@ -1883,7 +1881,7 @@ int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw,
 {
         struct mlx5_vport *evport;
 
-        if (!ESW_ALLOWED(esw))
+        if (!MLX5_CAP_GEN(esw->dev, vport_group_manager))
                 return -EPERM;
         if (!LEGAL_VPORT(esw, vport))
                 return -EINVAL;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index cecd201f0b73..91f1209886ff 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -1079,8 +1079,8 @@ static int mlx5_devlink_eswitch_check(struct devlink *devlink)
         if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)
                 return -EOPNOTSUPP;
 
-        if (!MLX5_CAP_GEN(dev, vport_group_manager))
-                return -EOPNOTSUPP;
+        if(!MLX5_ESWITCH_MANAGER(dev))
+                return -EPERM;
 
         if (dev->priv.eswitch->mode == SRIOV_NONE)
                 return -EOPNOTSUPP;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 49a75d31185e..f1a86cea86a0 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -32,6 +32,7 @@
 
 #include <linux/mutex.h>
 #include <linux/mlx5/driver.h>
+#include <linux/mlx5/eswitch.h>
 
 #include "mlx5_core.h"
 #include "fs_core.h"
@@ -2652,7 +2653,7 @@ int mlx5_init_fs(struct mlx5_core_dev *dev)
                         goto err;
         }
 
-        if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {
+        if (MLX5_ESWITCH_MANAGER(dev)) {
                 if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, ft_support)) {
                         err = init_fdb_root_ns(steering);
                         if (err)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw.c b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
index afd9f4fa22f4..41ad24f0de2c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
@@ -32,6 +32,7 @@
 
 #include <linux/mlx5/driver.h>
 #include <linux/mlx5/cmd.h>
+#include <linux/mlx5/eswitch.h>
 #include <linux/module.h>
 #include "mlx5_core.h"
 #include "../../mlxfw/mlxfw.h"
@@ -159,13 +160,13 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev)
         }
 
         if (MLX5_CAP_GEN(dev, vport_group_manager) &&
-            MLX5_CAP_GEN(dev, eswitch_flow_table)) {
+            MLX5_ESWITCH_MANAGER(dev)) {
                 err = mlx5_core_get_caps(dev, MLX5_CAP_ESWITCH_FLOW_TABLE);
                 if (err)
                         return err;
         }
 
-        if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {
+        if (MLX5_ESWITCH_MANAGER(dev)) {
                 err = mlx5_core_get_caps(dev, MLX5_CAP_ESWITCH);
                 if (err)
                         return err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
index 7cb67122e8b5..98359559c77e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c
@@ -33,6 +33,7 @@
 #include <linux/etherdevice.h>
 #include <linux/mlx5/driver.h>
 #include <linux/mlx5/mlx5_ifc.h>
+#include <linux/mlx5/eswitch.h>
 #include "mlx5_core.h"
 #include "lib/mpfs.h"
 
@@ -98,7 +99,7 @@ int mlx5_mpfs_init(struct mlx5_core_dev *dev)
         int l2table_size = 1 << MLX5_CAP_GEN(dev, log_max_l2_table);
         struct mlx5_mpfs *mpfs;
 
-        if (!MLX5_VPORT_MANAGER(dev))
+        if (!MLX5_ESWITCH_MANAGER(dev))
                 return 0;
 
         mpfs = kzalloc(sizeof(*mpfs), GFP_KERNEL);
@@ -122,7 +123,7 @@ void mlx5_mpfs_cleanup(struct mlx5_core_dev *dev)
 {
         struct mlx5_mpfs *mpfs = dev->priv.mpfs;
 
-        if (!MLX5_VPORT_MANAGER(dev))
+        if (!MLX5_ESWITCH_MANAGER(dev))
                 return;
 
         WARN_ON(!hlist_empty(mpfs->hash));
@@ -137,7 +138,7 @@ int mlx5_mpfs_add_mac(struct mlx5_core_dev *dev, u8 *mac)
         u32 index;
         int err;
 
-        if (!MLX5_VPORT_MANAGER(dev))
+        if (!MLX5_ESWITCH_MANAGER(dev))
                 return 0;
 
         mutex_lock(&mpfs->lock);
@@ -179,7 +180,7 @@ int mlx5_mpfs_del_mac(struct mlx5_core_dev *dev, u8 *mac)
         int err = 0;
         u32 index;
 
-        if (!MLX5_VPORT_MANAGER(dev))
+        if (!MLX5_ESWITCH_MANAGER(dev))
                 return 0;
 
         mutex_lock(&mpfs->lock);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/ethernet/mellanox/mlx5/core/port.c
index fa9d0760dd36..31a9cbd85689 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c
@@ -701,7 +701,7 @@ EXPORT_SYMBOL_GPL(mlx5_query_port_prio_tc);
 static int mlx5_set_port_qetcr_reg(struct mlx5_core_dev *mdev, u32 *in,
                                    int inlen)
 {
-        u32 out[MLX5_ST_SZ_DW(qtct_reg)];
+        u32 out[MLX5_ST_SZ_DW(qetc_reg)];
 
         if (!MLX5_CAP_GEN(mdev, ets))
                 return -EOPNOTSUPP;
@@ -713,7 +713,7 @@ static int mlx5_set_port_qetcr_reg(struct mlx5_core_dev *mdev, u32 *in,
 static int mlx5_query_port_qetcr_reg(struct mlx5_core_dev *mdev, u32 *out,
                                      int outlen)
 {
-        u32 in[MLX5_ST_SZ_DW(qtct_reg)];
+        u32 in[MLX5_ST_SZ_DW(qetc_reg)];
 
         if (!MLX5_CAP_GEN(mdev, ets))
                 return -EOPNOTSUPP;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sriov.c b/drivers/net/ethernet/mellanox/mlx5/core/sriov.c
index 2a8b529ce6dd..a0674962f02c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/sriov.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/sriov.c
@@ -88,6 +88,9 @@ static int mlx5_device_enable_sriov(struct mlx5_core_dev *dev, int num_vfs)
                 return -EBUSY;
         }
 
+        if (!MLX5_ESWITCH_MANAGER(dev))
+                goto enable_vfs_hca;
+
         err = mlx5_eswitch_enable_sriov(dev->priv.eswitch, num_vfs, SRIOV_LEGACY);
         if (err) {
                 mlx5_core_warn(dev,
@@ -95,6 +98,7 @@ static int mlx5_device_enable_sriov(struct mlx5_core_dev *dev, int num_vfs)
                 return err;
         }
 
+enable_vfs_hca:
         for (vf = 0; vf < num_vfs; vf++) {
                 err = mlx5_core_enable_hca(dev, vf + 1);
                 if (err) {
@@ -140,7 +144,8 @@ static void mlx5_device_disable_sriov(struct mlx5_core_dev *dev)
         }
 
 out:
-        mlx5_eswitch_disable_sriov(dev->priv.eswitch);
+        if (MLX5_ESWITCH_MANAGER(dev))
+                mlx5_eswitch_disable_sriov(dev->priv.eswitch);
 
         if (mlx5_wait_for_vf_pages(dev))
                 mlx5_core_warn(dev, "timeout reclaiming VFs pages\n");
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
index 719cecb182c6..7eecd5b07bb1 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
@@ -549,8 +549,6 @@ int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,
                 return -EINVAL;
         if (!MLX5_CAP_GEN(mdev, vport_group_manager))
                 return -EACCES;
-        if (!MLX5_CAP_ESW(mdev, nic_vport_node_guid_modify))
-                return -EOPNOTSUPP;
 
         in = kvzalloc(inlen, GFP_KERNEL);
         if (!in)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/Kconfig b/drivers/net/ethernet/mellanox/mlxsw/Kconfig
index f4d9c9975ac3..82827a8d3d67 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlxsw/Kconfig
@@ -30,7 +30,7 @@ config MLXSW_CORE_THERMAL
 
 config MLXSW_PCI
         tristate "PCI bus implementation for Mellanox Technologies Switch ASICs"
-        depends on PCI && HAS_DMA && HAS_IOMEM && MLXSW_CORE
+        depends on PCI && HAS_IOMEM && MLXSW_CORE
         default m
         ---help---
           This is PCI bus implementation for Mellanox Technologies Switch ASICs.
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index fb2c8f8071e6..776a8a9be8e3 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -344,10 +344,9 @@ static int ocelot_port_stop(struct net_device *dev)
 static int ocelot_gen_ifh(u32 *ifh, struct frame_info *info)
 {
         ifh[0] = IFH_INJ_BYPASS;
-        ifh[1] = (0xff00 & info->port) >> 8;
+        ifh[1] = (0xf00 & info->port) >> 8;
         ifh[2] = (0xff & info->port) << 24;
-        ifh[3] = IFH_INJ_POP_CNT_DISABLE | (info->cpuq << 20) |
-                 (info->tag_type << 16) | info->vid;
+        ifh[3] = (info->tag_type << 16) | info->vid;
 
         return 0;
 }
@@ -370,11 +369,13 @@ static int ocelot_port_xmit(struct sk_buff *skb, struct net_device *dev)
                          QS_INJ_CTRL_SOF, QS_INJ_CTRL, grp);
 
         info.port = BIT(port->chip_port);
-        info.cpuq = 0xff;
+        info.tag_type = IFH_TAG_TYPE_C;
+        info.vid = skb_vlan_tag_get(skb);
         ocelot_gen_ifh(ifh, &info);
 
         for (i = 0; i < IFH_LEN; i++)
-                ocelot_write_rix(ocelot, ifh[i], QS_INJ_WR, grp);
+                ocelot_write_rix(ocelot, (__force u32)cpu_to_be32(ifh[i]),
+                                 QS_INJ_WR, grp);
 
         count = (skb->len + 3) / 4;
         last = skb->len % 4;
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c
index fcdfb8e7fdea..40216d56dddc 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/main.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c
@@ -81,10 +81,10 @@ nfp_bpf_xdp_offload(struct nfp_app *app, struct nfp_net *nn,
 
         ret = nfp_net_bpf_offload(nn, prog, running, extack);
         /* Stop offload if replace not possible */
-        if (ret && prog)
-                nfp_bpf_xdp_offload(app, nn, NULL, extack);
+        if (ret)
+                return ret;
 
-        nn->dp.bpf_offload_xdp = prog && !ret;
+        nn->dp.bpf_offload_xdp = !!prog;
         return ret;
 }
 
@@ -202,6 +202,9 @@ static int nfp_bpf_setup_tc_block(struct net_device *netdev,
         if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
                 return -EOPNOTSUPP;
 
+        if (tcf_block_shared(f->block))
+                return -EOPNOTSUPP;
+
         switch (f->command) {
         case TC_BLOCK_BIND:
                 return tcf_block_cb_register(f->block,
diff --git a/drivers/net/ethernet/netronome/nfp/flower/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c
index 91935405f586..84f7a5dbea9d 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/match.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/match.c
@@ -123,6 +123,20 @@ nfp_flower_compile_mac(struct nfp_flower_mac_mpls *frame,
                          NFP_FLOWER_MASK_MPLS_Q;
 
                 frame->mpls_lse = cpu_to_be32(t_mpls);
+        } else if (dissector_uses_key(flow->dissector,
+                                      FLOW_DISSECTOR_KEY_BASIC)) {
+                /* Check for mpls ether type and set NFP_FLOWER_MASK_MPLS_Q
+                 * bit, which indicates an mpls ether type but without any
+                 * mpls fields.
+                 */
+                struct flow_dissector_key_basic *key_basic;
+
+                key_basic = skb_flow_dissector_target(flow->dissector,
+                                                      FLOW_DISSECTOR_KEY_BASIC,
+                                                      flow->key);
+                if (key_basic->n_proto == cpu_to_be16(ETH_P_MPLS_UC) ||
+                    key_basic->n_proto == cpu_to_be16(ETH_P_MPLS_MC))
+                        frame->mpls_lse = cpu_to_be32(NFP_FLOWER_MASK_MPLS_Q);
         }
 }
 
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index c42e64f32333..525057bee0ed 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -264,6 +264,14 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,
                 case cpu_to_be16(ETH_P_ARP):
                         return -EOPNOTSUPP;
 
+                case cpu_to_be16(ETH_P_MPLS_UC):
+                case cpu_to_be16(ETH_P_MPLS_MC):
+                        if (!(key_layer & NFP_FLOWER_LAYER_MAC)) {
+                                key_layer |= NFP_FLOWER_LAYER_MAC;
+                                key_size += sizeof(struct nfp_flower_mac_mpls);
+                        }
+                        break;
+
                 /* Will be included in layer 2. */
                 case cpu_to_be16(ETH_P_8021Q):
                         break;
@@ -623,6 +631,9 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev,
         if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
                 return -EOPNOTSUPP;
 
+        if (tcf_block_shared(f->block))
+                return -EOPNOTSUPP;
+
         switch (f->command) {
         case TC_BLOCK_BIND:
                 return tcf_block_cb_register(f->block,
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c
index 46b76d5a726c..152283d7e59c 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c
@@ -240,7 +240,6 @@ static int nfp_pcie_sriov_read_nfd_limit(struct nfp_pf *pf)
                 return pci_sriov_set_totalvfs(pf->pdev, pf->limit_vfs);
 
         pf->limit_vfs = ~0;
-        pci_sriov_set_totalvfs(pf->pdev, 0); /* 0 is unset */
         /* Allow any setting for backwards compatibility if symbol not found */
         if (err == -ENOENT)
                 return 0;
@@ -668,7 +667,7 @@ static int nfp_pci_probe(struct pci_dev *pdev,
 
         err = nfp_net_pci_probe(pf);
         if (err)
-                goto err_sriov_unlimit;
+                goto err_fw_unload;
 
         err = nfp_hwmon_register(pf);
         if (err) {
@@ -680,8 +679,6 @@ static int nfp_pci_probe(struct pci_dev *pdev,
 
 err_net_remove:
         nfp_net_pci_remove(pf);
-err_sriov_unlimit:
-        pci_sriov_set_totalvfs(pf->pdev, 0);
 err_fw_unload:
         kfree(pf->rtbl);
         nfp_mip_close(pf->mip);
@@ -715,7 +712,6 @@ static void nfp_pci_remove(struct pci_dev *pdev)
         nfp_hwmon_unregister(pf);
 
         nfp_pcie_sriov_disable(pdev);
-        pci_sriov_set_totalvfs(pf->pdev, 0);
 
         nfp_net_pci_remove(pf);
 
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c
index cd34097b79f1..37a6d7822a38 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c
@@ -232,7 +232,7 @@ struct nfp_nffw_info *nfp_nffw_info_open(struct nfp_cpp *cpp)
         err = nfp_cpp_read(cpp, nfp_resource_cpp_id(state->res),
                            nfp_resource_address(state->res),
                            fwinf, sizeof(*fwinf));
-        if (err < sizeof(*fwinf))
+        if (err < (int)sizeof(*fwinf))
                 goto err_release;
 
         if (!nffw_res_flg_init_get(fwinf))
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
index 8f31406ec894..e0680ce91328 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
@@ -255,9 +255,8 @@ qed_dcbx_get_app_protocol_type(struct qed_hwfn *p_hwfn,
                 *type = DCBX_PROTOCOL_ROCE_V2;
         } else {
                 *type = DCBX_MAX_PROTOCOL_TYPE;
-                DP_ERR(p_hwfn,
-                       "No action required, App TLV id = 0x%x app_prio_bitmap = 0x%x\n",
-                       id, app_prio_bitmap);
+                DP_ERR(p_hwfn, "No action required, App TLV entry = 0x%x\n",
+                       app_prio_bitmap);
                 return false;
         }
 
@@ -710,9 +709,9 @@ qed_dcbx_get_local_lldp_params(struct qed_hwfn *p_hwfn,
         p_local = &p_hwfn->p_dcbx_info->lldp_local[LLDP_NEAREST_BRIDGE];
 
         memcpy(params->lldp_local.local_chassis_id, p_local->local_chassis_id,
-               ARRAY_SIZE(p_local->local_chassis_id));
+               sizeof(p_local->local_chassis_id));
         memcpy(params->lldp_local.local_port_id, p_local->local_port_id,
-               ARRAY_SIZE(p_local->local_port_id));
+               sizeof(p_local->local_port_id));
 }
 
 static void
@@ -724,9 +723,9 @@ qed_dcbx_get_remote_lldp_params(struct qed_hwfn *p_hwfn,
         p_remote = &p_hwfn->p_dcbx_info->lldp_remote[LLDP_NEAREST_BRIDGE];
 
         memcpy(params->lldp_remote.peer_chassis_id, p_remote->peer_chassis_id,
-               ARRAY_SIZE(p_remote->peer_chassis_id));
+               sizeof(p_remote->peer_chassis_id));
         memcpy(params->lldp_remote.peer_port_id, p_remote->peer_port_id,
-               ARRAY_SIZE(p_remote->peer_port_id));
+               sizeof(p_remote->peer_port_id));
 }
 
 static int
@@ -1479,8 +1478,8 @@ static u8 qed_dcbnl_getcap(struct qed_dev *cdev, int capid, u8 *cap)
                 *cap = 0x80;
                 break;
         case DCB_CAP_ATTR_DCBX:
-                *cap = (DCB_CAP_DCBX_LLD_MANAGED | DCB_CAP_DCBX_VER_CEE |
-                        DCB_CAP_DCBX_VER_IEEE | DCB_CAP_DCBX_STATIC);
+                *cap = (DCB_CAP_DCBX_VER_CEE | DCB_CAP_DCBX_VER_IEEE |
+                        DCB_CAP_DCBX_STATIC);
                 break;
         default:
                 *cap = false;
@@ -1548,8 +1547,6 @@ static u8 qed_dcbnl_getdcbx(struct qed_dev *cdev)
         if (!dcbx_info)
                 return 0;
 
-        if (dcbx_info->operational.enabled)
-                mode |= DCB_CAP_DCBX_LLD_MANAGED;
         if (dcbx_info->operational.ieee)
                 mode |= DCB_CAP_DCBX_VER_IEEE;
         if (dcbx_info->operational.cee)
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index 329781cda77f..e5249b4741d0 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -1804,7 +1804,7 @@ int qed_hw_init(struct qed_dev *cdev, struct qed_hw_init_params *p_params)
                         DP_INFO(p_hwfn, "Failed to update driver state\n");
 
                 rc = qed_mcp_ov_update_eswitch(p_hwfn, p_hwfn->p_main_ptt,
-                                               QED_OV_ESWITCH_VEB);
+                                               QED_OV_ESWITCH_NONE);
                 if (rc)
                         DP_INFO(p_hwfn, "Failed to update eswitch mode\n");
         }
diff --git a/drivers/net/ethernet/qlogic/qed/qed_ll2.c b/drivers/net/ethernet/qlogic/qed/qed_ll2.c
index c97ebd681c47..012973d75ad0 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_ll2.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.c
@@ -201,8 +201,9 @@ void qed_ll2b_complete_rx_packet(void *cxt, struct qed_ll2_comp_rx_data *data)
 
         skb = build_skb(buffer->data, 0);
         if (!skb) {
-                rc = -ENOMEM;
-                goto out_post;
+                DP_INFO(cdev, "Failed to build SKB\n");
+                kfree(buffer->data);
+                goto out_post1;
         }
 
         data->u.placement_offset += NET_SKB_PAD;
@@ -224,8 +225,14 @@ void qed_ll2b_complete_rx_packet(void *cxt, struct qed_ll2_comp_rx_data *data)
                 cdev->ll2->cbs->rx_cb(cdev->ll2->cb_cookie, skb,
                                       data->opaque_data_0,
                                       data->opaque_data_1);
+        } else {
+                DP_VERBOSE(p_hwfn, (NETIF_MSG_RX_STATUS | NETIF_MSG_PKTDATA |
+                                    QED_MSG_LL2 | QED_MSG_STORAGE),
+                           "Dropping the packet\n");
+                kfree(buffer->data);
         }
 
+out_post1:
         /* Update Buffer information and update FW producer */
         buffer->data = new_data;
         buffer->phys_addr = new_phys_addr;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index b04d57ca5176..0cbc74d6ca8b 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -567,8 +567,16 @@ static irqreturn_t qed_single_int(int irq, void *dev_instance)
                 /* Fastpath interrupts */
                 for (j = 0; j < 64; j++) {
                         if ((0x2ULL << j) & status) {
-                                hwfn->simd_proto_handler[j].func(
-                                        hwfn->simd_proto_handler[j].token);
+                                struct qed_simd_fp_handler *p_handler =
+                                        &hwfn->simd_proto_handler[j];
+
+                                if (p_handler->func)
+                                        p_handler->func(p_handler->token);
+                                else
+                                        DP_NOTICE(hwfn,
+                                                  "Not calling fastpath handler as it is NULL [handler #%d, status 0x%llx]\n",
+                                                  j, status);
+
                                 status &= ~(0x2ULL << j);
                                 rc = IRQ_HANDLED;
                         }
@@ -781,6 +789,14 @@ static int qed_slowpath_setup_int(struct qed_dev *cdev,
         /* We want a minimum of one slowpath and one fastpath vector per hwfn */
         cdev->int_params.in.min_msix_cnt = cdev->num_hwfns * 2;
 
+        if (is_kdump_kernel()) {
+                DP_INFO(cdev,
+                        "Kdump kernel: Limit the max number of requested MSI-X vectors to %hd\n",
+                        cdev->int_params.in.min_msix_cnt);
+                cdev->int_params.in.num_vectors =
+                        cdev->int_params.in.min_msix_cnt;
+        }
+
         rc = qed_set_int_mode(cdev, false);
         if (rc)  {
                 DP_ERR(cdev, "qed_slowpath_setup_int ERR\n");
diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.c b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
index f01bf52bc381..fd59cf45f4be 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_sriov.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
@@ -4513,6 +4513,8 @@ static void qed_sriov_enable_qid_config(struct qed_hwfn *hwfn,
 static int qed_sriov_enable(struct qed_dev *cdev, int num)
 {
         struct qed_iov_vf_init_params params;
+        struct qed_hwfn *hwfn;
+        struct qed_ptt *ptt;
         int i, j, rc;
 
         if (num >= RESC_NUM(&cdev->hwfns[0], QED_VPORT)) {
@@ -4525,8 +4527,8 @@ static int qed_sriov_enable(struct qed_dev *cdev, int num)
 
         /* Initialize HW for VF access */
         for_each_hwfn(cdev, j) {
-                struct qed_hwfn *hwfn = &cdev->hwfns[j];
-                struct qed_ptt *ptt = qed_ptt_acquire(hwfn);
+                hwfn = &cdev->hwfns[j];
+                ptt = qed_ptt_acquire(hwfn);
 
                 /* Make sure not to use more than 16 queues per VF */
                 params.num_queues = min_t(int,
@@ -4562,6 +4564,19 @@ static int qed_sriov_enable(struct qed_dev *cdev, int num)
                 goto err;
         }
 
+        hwfn = QED_LEADING_HWFN(cdev);
+        ptt = qed_ptt_acquire(hwfn);
+        if (!ptt) {
+                DP_ERR(hwfn, "Failed to acquire ptt\n");
+                rc = -EBUSY;
+                goto err;
+        }
+
+        rc = qed_mcp_ov_update_eswitch(hwfn, ptt, QED_OV_ESWITCH_VEB);
+        if (rc)
+                DP_INFO(cdev, "Failed to update eswitch mode\n");
+        qed_ptt_release(hwfn, ptt);
+
         return num;
 
 err:
diff --git a/drivers/net/ethernet/qlogic/qede/qede_ptp.c b/drivers/net/ethernet/qlogic/qede/qede_ptp.c
index 02adb513f475..013ff567283c 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_ptp.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_ptp.c
@@ -337,8 +337,14 @@ int qede_ptp_get_ts_info(struct qede_dev *edev, struct ethtool_ts_info *info)
 {
         struct qede_ptp *ptp = edev->ptp;
 
-        if (!ptp)
-                return -EIO;
+        if (!ptp) {
+                info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
+                                        SOF_TIMESTAMPING_RX_SOFTWARE |
+                                        SOF_TIMESTAMPING_SOFTWARE;
+                info->phc_index = -1;
+
+                return 0;
+        }
 
         info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
                                 SOF_TIMESTAMPING_RX_SOFTWARE |
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 75dfac0248f4..f4cae2be0fda 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7148,7 +7148,7 @@ static void rtl8169_netpoll(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
 
-        rtl8169_interrupt(pci_irq_vector(tp->pci_dev, 0), dev);
+        rtl8169_interrupt(pci_irq_vector(tp->pci_dev, 0), tp);
 }
 #endif
 
diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig
index 27be51f0a421..f3f7477043ce 100644
--- a/drivers/net/ethernet/renesas/Kconfig
+++ b/drivers/net/ethernet/renesas/Kconfig
@@ -17,7 +17,6 @@ if NET_VENDOR_RENESAS
 
 config SH_ETH
         tristate "Renesas SuperH Ethernet support"
-        depends on HAS_DMA
         depends on ARCH_RENESAS || SUPERH || COMPILE_TEST
         select CRC32
         select MII
@@ -31,7 +30,6 @@ config SH_ETH
 
 config RAVB
         tristate "Renesas Ethernet AVB support"
-        depends on HAS_DMA
         depends on ARCH_RENESAS || COMPILE_TEST
         select CRC32
         select MII
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index ad4a354ce570..570ec72266f3 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -3180,6 +3180,7 @@ bool efx_rps_check_rule(struct efx_arfs_rule *rule, unsigned int filter_idx,
         return true;
 }
 
+static
 struct hlist_head *efx_rps_hash_bucket(struct efx_nic *efx,
                                        const struct efx_filter_spec *spec)
 {
diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index 8edf20967c82..e045a5d6b938 100644
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c
@@ -2794,6 +2794,7 @@ int efx_farch_filter_table_probe(struct efx_nic *efx)
         if (!state)
                 return -ENOMEM;
         efx->filter_state = state;
+        init_rwsem(&state->lock);
 
         table = &state->table[EFX_FARCH_FILTER_TABLE_RX_IP];
         table->id = EFX_FARCH_FILTER_TABLE_RX_IP;
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index cb5b0f58c395..edf20361ea5f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -111,7 +111,7 @@ config DWMAC_ROCKCHIP
 config DWMAC_SOCFPGA
         tristate "SOCFPGA dwmac support"
         default ARCH_SOCFPGA
-        depends on OF && (ARCH_SOCFPGA || COMPILE_TEST)
+        depends on OF && (ARCH_SOCFPGA || ARCH_STRATIX10 || COMPILE_TEST)
         select MFD_SYSCON
         help
           Support for ethernet controller on Altera SOCFPGA
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index 6e359572b9f0..5b3b06a0a3bf 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -55,6 +55,7 @@ struct socfpga_dwmac {
         struct  device *dev;
         struct regmap *sys_mgr_base_addr;
         struct reset_control *stmmac_rst;
+        struct reset_control *stmmac_ocp_rst;
         void __iomem *splitter_base;
         bool f2h_ptp_ref_clk;
         struct tse_pcs pcs;
@@ -262,8 +263,8 @@ static int socfpga_dwmac_set_phy_mode(struct socfpga_dwmac *dwmac)
                 val = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII;
 
         /* Assert reset to the enet controller before changing the phy mode */
-        if (dwmac->stmmac_rst)
-                reset_control_assert(dwmac->stmmac_rst);
+        reset_control_assert(dwmac->stmmac_ocp_rst);
+        reset_control_assert(dwmac->stmmac_rst);
 
         regmap_read(sys_mgr_base_addr, reg_offset, &ctrl);
         ctrl &= ~(SYSMGR_EMACGRP_CTRL_PHYSEL_MASK << reg_shift);
@@ -288,8 +289,8 @@ static int socfpga_dwmac_set_phy_mode(struct socfpga_dwmac *dwmac)
         /* Deassert reset for the phy configuration to be sampled by
          * the enet controller, and operation to start in requested mode
          */
-        if (dwmac->stmmac_rst)
-                reset_control_deassert(dwmac->stmmac_rst);
+        reset_control_deassert(dwmac->stmmac_ocp_rst);
+        reset_control_deassert(dwmac->stmmac_rst);
         if (phymode == PHY_INTERFACE_MODE_SGMII) {
                 if (tse_pcs_init(dwmac->pcs.tse_pcs_base, &dwmac->pcs) != 0) {
                         dev_err(dwmac->dev, "Unable to initialize TSE PCS");
@@ -324,6 +325,15 @@ static int socfpga_dwmac_probe(struct platform_device *pdev)
                 goto err_remove_config_dt;
         }
 
+        dwmac->stmmac_ocp_rst = devm_reset_control_get_optional(dev, "stmmaceth-ocp");
+        if (IS_ERR(dwmac->stmmac_ocp_rst)) {
+                ret = PTR_ERR(dwmac->stmmac_ocp_rst);
+                dev_err(dev, "error getting reset control of ocp %d\n", ret);
+                goto err_remove_config_dt;
+        }
+
+        reset_control_deassert(dwmac->stmmac_ocp_rst);
+
         ret = socfpga_dwmac_parse_data(dwmac, dev);
         if (ret) {
                 dev_err(dev, "Unable to parse OF data\n");
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
index d37f17ca62fe..65bc3556bd8f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
@@ -407,6 +407,16 @@ static void dwmac4_enable_tso(void __iomem *ioaddr, bool en, u32 chan)
         }
 }
 
+static void dwmac4_set_bfsize(void __iomem *ioaddr, int bfsize, u32 chan)
+{
+        u32 value = readl(ioaddr + DMA_CHAN_RX_CONTROL(chan));
+
+        value &= ~DMA_RBSZ_MASK;
+        value |= (bfsize << DMA_RBSZ_SHIFT) & DMA_RBSZ_MASK;
+
+        writel(value, ioaddr + DMA_CHAN_RX_CONTROL(chan));
+}
+
 const struct stmmac_dma_ops dwmac4_dma_ops = {
         .reset = dwmac4_dma_reset,
         .init = dwmac4_dma_init,
@@ -431,6 +441,7 @@ const struct stmmac_dma_ops dwmac4_dma_ops = {
         .set_rx_tail_ptr = dwmac4_set_rx_tail_ptr,
         .set_tx_tail_ptr = dwmac4_set_tx_tail_ptr,
         .enable_tso = dwmac4_enable_tso,
+        .set_bfsize = dwmac4_set_bfsize,
 };
 
 const struct stmmac_dma_ops dwmac410_dma_ops = {
@@ -457,4 +468,5 @@ const struct stmmac_dma_ops dwmac410_dma_ops = {
         .set_rx_tail_ptr = dwmac4_set_rx_tail_ptr,
         .set_tx_tail_ptr = dwmac4_set_tx_tail_ptr,
         .enable_tso = dwmac4_enable_tso,
+        .set_bfsize = dwmac4_set_bfsize,
 };
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h
index c63c1fe3f26b..22a4a6dbb1a4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h
@@ -120,6 +120,8 @@
 
 /* DMA Rx Channel X Control register defines */
 #define DMA_CONTROL_SR                  BIT(0)
+#define DMA_RBSZ_MASK                   GENMASK(14, 1)
+#define DMA_RBSZ_SHIFT                  1
 
 /* Interrupt status per channel */
 #define DMA_CHAN_STATUS_REB             GENMASK(21, 19)
diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index e44e7b26ce82..fe8b536b13f8 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -183,6 +183,7 @@ struct stmmac_dma_ops {
         void (*set_rx_tail_ptr)(void __iomem *ioaddr, u32 tail_ptr, u32 chan);
         void (*set_tx_tail_ptr)(void __iomem *ioaddr, u32 tail_ptr, u32 chan);
         void (*enable_tso)(void __iomem *ioaddr, bool en, u32 chan);
+        void (*set_bfsize)(void __iomem *ioaddr, int bfsize, u32 chan);
 };
 
 #define stmmac_reset(__priv, __args...) \
@@ -235,6 +236,8 @@ struct stmmac_dma_ops {
         stmmac_do_void_callback(__priv, dma, set_tx_tail_ptr, __args)
 #define stmmac_enable_tso(__priv, __args...) \
         stmmac_do_void_callback(__priv, dma, enable_tso, __args)
+#define stmmac_set_dma_bfsize(__priv, __args...) \
+        stmmac_do_void_callback(__priv, dma, set_bfsize, __args)
 
 struct mac_device_info;
 struct net_device;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index e79b0d7b388a..60f59abab009 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -928,6 +928,7 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv)
 static int stmmac_init_phy(struct net_device *dev)
 {
         struct stmmac_priv *priv = netdev_priv(dev);
+        u32 tx_cnt = priv->plat->tx_queues_to_use;
         struct phy_device *phydev;
         char phy_id_fmt[MII_BUS_ID_SIZE + 3];
         char bus_id[MII_BUS_ID_SIZE];
@@ -969,6 +970,15 @@ static int stmmac_init_phy(struct net_device *dev)
                                          SUPPORTED_1000baseT_Full);
 
         /*
+         * Half-duplex mode not supported with multiqueue
+         * half-duplex can only works with single queue
+         */
+        if (tx_cnt > 1)
+                phydev->supported &= ~(SUPPORTED_1000baseT_Half |
+                                       SUPPORTED_100baseT_Half |
+                                       SUPPORTED_10baseT_Half);
+
+        /*
          * Broken HW is sometimes missing the pull-up resistor on the
          * MDIO line, which results in reads to non-existent devices returning
          * 0 rather than 0xffff. Catch this here and treat 0 as a non-existent
@@ -1794,6 +1804,8 @@ static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
 
                 stmmac_dma_rx_mode(priv, priv->ioaddr, rxmode, chan,
                                 rxfifosz, qmode);
+                stmmac_set_dma_bfsize(priv, priv->ioaddr, priv->dma_buf_sz,
+                                chan);
         }
 
         for (chan = 0; chan < tx_channels_count; chan++) {
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 7a16d40a72d1..b9221fc1674d 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -60,8 +60,7 @@
 #include <linux/sungem_phy.h>
 #include "sungem.h"
 
-/* Stripping FCS is causing problems, disabled for now */
-#undef STRIP_FCS
+#define STRIP_FCS
 
 #define DEFAULT_MSG     (NETIF_MSG_DRV          | \
                          NETIF_MSG_PROBE        | \
@@ -435,7 +434,7 @@ static int gem_rxmac_reset(struct gem *gp)
         writel(desc_dma & 0xffffffff, gp->regs + RXDMA_DBLOW);
         writel(RX_RING_SIZE - 4, gp->regs + RXDMA_KICK);
         val = (RXDMA_CFG_BASE | (RX_OFFSET << 10) |
-               ((14 / 2) << 13) | RXDMA_CFG_FTHRESH_128);
+               (ETH_HLEN << 13) | RXDMA_CFG_FTHRESH_128);
         writel(val, gp->regs + RXDMA_CFG);
         if (readl(gp->regs + GREG_BIFCFG) & GREG_BIFCFG_M66EN)
                 writel(((5 & RXDMA_BLANK_IPKTS) |
@@ -760,7 +759,6 @@ static int gem_rx(struct gem *gp, int work_to_do)
         struct net_device *dev = gp->dev;
         int entry, drops, work_done = 0;
         u32 done;
-        __sum16 csum;
 
         if (netif_msg_rx_status(gp))
                 printk(KERN_DEBUG "%s: rx interrupt, done: %d, rx_new: %d\n",
@@ -855,9 +853,13 @@ static int gem_rx(struct gem *gp, int work_to_do)
                         skb = copy_skb;
                 }
 
-                csum = (__force __sum16)htons((status & RXDCTRL_TCPCSUM) ^ 0xffff);
-                skb->csum = csum_unfold(csum);
-                skb->ip_summed = CHECKSUM_COMPLETE;
+                if (likely(dev->features & NETIF_F_RXCSUM)) {
+                        __sum16 csum;
+
+                        csum = (__force __sum16)htons((status & RXDCTRL_TCPCSUM) ^ 0xffff);
+                        skb->csum = csum_unfold(csum);
+                        skb->ip_summed = CHECKSUM_COMPLETE;
+                }
                 skb->protocol = eth_type_trans(skb, gp->dev);
 
                 napi_gro_receive(&gp->napi, skb);
@@ -1761,7 +1763,7 @@ static void gem_init_dma(struct gem *gp)
         writel(0, gp->regs + TXDMA_KICK);
 
         val = (RXDMA_CFG_BASE | (RX_OFFSET << 10) |
-               ((14 / 2) << 13) | RXDMA_CFG_FTHRESH_128);
+               (ETH_HLEN << 13) | RXDMA_CFG_FTHRESH_128);
         writel(val, gp->regs + RXDMA_CFG);
 
         writel(desc_dma >> 32, gp->regs + RXDMA_DBHI);
@@ -2985,8 +2987,8 @@ static int gem_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         pci_set_drvdata(pdev, dev);
 
         /* We can do scatter/gather and HW checksum */
-        dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM;
-        dev->features |= dev->hw_features | NETIF_F_RXCSUM;
+        dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
+        dev->features = dev->hw_features;
         if (pci_using_dac)
                 dev->features |= NETIF_F_HIGHDMA;
 
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index cdbddf16dd29..4f1267477aa4 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -205,7 +205,7 @@ static void cpdma_desc_pool_destroy(struct cpdma_ctlr *ctlr)
  * devices (e.g. cpsw switches) use plain old memory.  Descriptor pools
  * abstract out these details
  */
-int cpdma_desc_pool_create(struct cpdma_ctlr *ctlr)
+static int cpdma_desc_pool_create(struct cpdma_ctlr *ctlr)
 {
         struct cpdma_params *cpdma_params = &ctlr->params;
         struct cpdma_desc_pool *pool;
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 06d7c9e4dcda..f270beebb428 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1385,6 +1385,15 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd)
                 return -EOPNOTSUPP;
 }
 
+static int match_first_device(struct device *dev, void *data)
+{
+        if (dev->parent && dev->parent->of_node)
+                return of_device_is_compatible(dev->parent->of_node,
+                                               "ti,davinci_mdio");
+
+        return !strncmp(dev_name(dev), "davinci_mdio", 12);
+}
+
 /**
  * emac_dev_open - EMAC device open
  * @ndev: The DaVinci EMAC network adapter
@@ -1484,8 +1493,14 @@ static int emac_dev_open(struct net_device *ndev)
 
         /* use the first phy on the bus if pdata did not give us a phy id */
         if (!phydev && !priv->phy_id) {
-                phy = bus_find_device_by_name(&mdio_bus_type, NULL,
-                                              "davinci_mdio");
+                /* NOTE: we can't use bus_find_device_by_name() here because
+                 * the device name is not guaranteed to be 'davinci_mdio'. On
+                 * some systems it can be 'davinci_mdio.0' so we need to use
+                 * strncmp() against the first part of the string to correctly
+                 * match it.
+                 */
+                phy = bus_find_device(&mdio_bus_type, NULL, NULL,
+                                      match_first_device);
                 if (phy) {
                         priv->phy_id = dev_name(phy);
                         if (!priv->phy_id || !*priv->phy_id)
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 750eaa53bf0c..ada33c2d9ac2 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -476,7 +476,7 @@ static struct sk_buff **geneve_gro_receive(struct sock *sk,
 out_unlock:
         rcu_read_unlock();
 out:
-        NAPI_GRO_CB(skb)->flush |= flush;
+        skb_gro_flush_final(skb, pp, flush);
 
         return pp;
 }
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index f347fd9c5b28..777fa59f5e0c 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -89,10 +89,6 @@
 static const char banner[] __initconst = KERN_INFO \
         "AX.25: bpqether driver version 004\n";
 
-static char bcast_addr[6]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-
-static char bpq_eth_addr[6];
-
 static int bpq_rcv(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *);
 static int bpq_device_event(struct notifier_block *, unsigned long, void *);
 
@@ -501,8 +497,8 @@ static int bpq_new_device(struct net_device *edev)
         bpq->ethdev = edev;
         bpq->axdev = ndev;
 
-        memcpy(bpq->dest_addr, bcast_addr, sizeof(bpq_eth_addr));
-        memcpy(bpq->acpt_addr, bcast_addr, sizeof(bpq_eth_addr));
+        eth_broadcast_addr(bpq->dest_addr);
+        eth_broadcast_addr(bpq->acpt_addr);
 
         err = register_netdevice(ndev);
         if (err)
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 1a924b867b07..4b6e308199d2 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -210,7 +210,7 @@ int netvsc_recv_callback(struct net_device *net,
 void netvsc_channel_cb(void *context);
 int netvsc_poll(struct napi_struct *napi, int budget);
 
-void rndis_set_subchannel(struct work_struct *w);
+int rndis_set_subchannel(struct net_device *ndev, struct netvsc_device *nvdev);
 int rndis_filter_open(struct netvsc_device *nvdev);
 int rndis_filter_close(struct netvsc_device *nvdev);
 struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 5d5bd513847f..8e9d0ee1572b 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -65,6 +65,41 @@ void netvsc_switch_datapath(struct net_device *ndev, bool vf)
                                VM_PKT_DATA_INBAND, 0);
 }
 
+/* Worker to setup sub channels on initial setup
+ * Initial hotplug event occurs in softirq context
+ * and can't wait for channels.
+ */
+static void netvsc_subchan_work(struct work_struct *w)
+{
+        struct netvsc_device *nvdev =
+                container_of(w, struct netvsc_device, subchan_work);
+        struct rndis_device *rdev;
+        int i, ret;
+
+        /* Avoid deadlock with device removal already under RTNL */
+        if (!rtnl_trylock()) {
+                schedule_work(w);
+                return;
+        }
+
+        rdev = nvdev->extension;
+        if (rdev) {
+                ret = rndis_set_subchannel(rdev->ndev, nvdev);
+                if (ret == 0) {
+                        netif_device_attach(rdev->ndev);
+                } else {
+                        /* fallback to only primary channel */
+                        for (i = 1; i < nvdev->num_chn; i++)
+                                netif_napi_del(&nvdev->chan_table[i].napi);
+
+                        nvdev->max_chn = 1;
+                        nvdev->num_chn = 1;
+                }
+        }
+
+        rtnl_unlock();
+}
+
 static struct netvsc_device *alloc_net_device(void)
 {
         struct netvsc_device *net_device;
@@ -81,7 +116,7 @@ static struct netvsc_device *alloc_net_device(void)
 
         init_completion(&net_device->channel_init_wait);
         init_waitqueue_head(&net_device->subchan_open);
-        INIT_WORK(&net_device->subchan_work, rndis_set_subchannel);
+        INIT_WORK(&net_device->subchan_work, netvsc_subchan_work);
 
         return net_device;
 }
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index fe2256bf1d13..dd1d6e115145 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -905,8 +905,20 @@ static int netvsc_attach(struct net_device *ndev,
         if (IS_ERR(nvdev))
                 return PTR_ERR(nvdev);
 
-        /* Note: enable and attach happen when sub-channels setup */
+        if (nvdev->num_chn > 1) {
+                ret = rndis_set_subchannel(ndev, nvdev);
+
+                /* if unavailable, just proceed with one queue */
+                if (ret) {
+                        nvdev->max_chn = 1;
+                        nvdev->num_chn = 1;
+                }
+        }
+
+        /* In any case device is now ready */
+        netif_device_attach(ndev);
 
+        /* Note: enable and attach happen when sub-channels setup */
         netif_carrier_off(ndev);
 
         if (netif_running(ndev)) {
@@ -2089,6 +2101,9 @@ static int netvsc_probe(struct hv_device *dev,
 
         memcpy(net->dev_addr, device_info.mac_adr, ETH_ALEN);
 
+        if (nvdev->num_chn > 1)
+                schedule_work(&nvdev->subchan_work);
+
         /* hw_features computed in rndis_netdev_set_hwcaps() */
         net->features = net->hw_features |
                 NETIF_F_HIGHDMA | NETIF_F_SG |
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 5428bb261102..9b4e3c3787e5 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -1062,29 +1062,15 @@ static void netvsc_sc_open(struct vmbus_channel *new_sc)
  * This breaks overlap of processing the host message for the
  * new primary channel with the initialization of sub-channels.
  */
-void rndis_set_subchannel(struct work_struct *w)
+int rndis_set_subchannel(struct net_device *ndev, struct netvsc_device *nvdev)
 {
-        struct netvsc_device *nvdev
-                = container_of(w, struct netvsc_device, subchan_work);
         struct nvsp_message *init_packet = &nvdev->channel_init_pkt;
-        struct net_device_context *ndev_ctx;
-        struct rndis_device *rdev;
-        struct net_device *ndev;
-        struct hv_device *hv_dev;
+        struct net_device_context *ndev_ctx = netdev_priv(ndev);
+        struct hv_device *hv_dev = ndev_ctx->device_ctx;
+        struct rndis_device *rdev = nvdev->extension;
         int i, ret;
 
-        if (!rtnl_trylock()) {
-                schedule_work(w);
-                return;
-        }
-
-        rdev = nvdev->extension;
-        if (!rdev)
-                goto unlock;    /* device was removed */
-
-        ndev = rdev->ndev;
-        ndev_ctx = netdev_priv(ndev);
-        hv_dev = ndev_ctx->device_ctx;
+        ASSERT_RTNL();
 
         memset(init_packet, 0, sizeof(struct nvsp_message));
         init_packet->hdr.msg_type = NVSP_MSG5_TYPE_SUBCHANNEL;
@@ -1100,13 +1086,13 @@ void rndis_set_subchannel(struct work_struct *w)
                                VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
         if (ret) {
                 netdev_err(ndev, "sub channel allocate send failed: %d\n", ret);
-                goto failed;
+                return ret;
         }
 
         wait_for_completion(&nvdev->channel_init_wait);
         if (init_packet->msg.v5_msg.subchn_comp.status != NVSP_STAT_SUCCESS) {
                 netdev_err(ndev, "sub channel request failed\n");
-                goto failed;
+                return -EIO;
         }
 
         nvdev->num_chn = 1 +
@@ -1125,21 +1111,7 @@ void rndis_set_subchannel(struct work_struct *w)
         for (i = 0; i < VRSS_SEND_TAB_SIZE; i++)
                 ndev_ctx->tx_table[i] = i % nvdev->num_chn;
 
-        netif_device_attach(ndev);
-        rtnl_unlock();
-        return;
-
-failed:
-        /* fallback to only primary channel */
-        for (i = 1; i < nvdev->num_chn; i++)
-                netif_napi_del(&nvdev->chan_table[i].napi);
-
-        nvdev->max_chn = 1;
-        nvdev->num_chn = 1;
-
-        netif_device_attach(ndev);
-unlock:
-        rtnl_unlock();
+        return 0;
 }
 
 static int rndis_netdev_set_hwcaps(struct rndis_device *rndis_device,
@@ -1360,21 +1332,12 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
                 netif_napi_add(net, &net_device->chan_table[i].napi,
                                netvsc_poll, NAPI_POLL_WEIGHT);
 
-        if (net_device->num_chn > 1)
-                schedule_work(&net_device->subchan_work);
+        return net_device;
 
 out:
-        /* if unavailable, just proceed with one queue */
-        if (ret) {
-                net_device->max_chn = 1;
-                net_device->num_chn = 1;
-        }
-
-        /* No sub channels, device is ready */
-        if (net_device->num_chn == 1)
-                netif_device_attach(net);
-
-        return net_device;
+        /* setting up multiple channels failed */
+        net_device->max_chn = 1;
+        net_device->num_chn = 1;
 
 err_dev_remv:
         rndis_filter_device_remove(dev, net_device);
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 4377c26f714d..4a949569ec4c 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -75,10 +75,23 @@ static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval)
 {
         struct ipvl_dev *ipvlan;
         struct net_device *mdev = port->dev;
-        int err = 0;
+        unsigned int flags;
+        int err;
 
         ASSERT_RTNL();
         if (port->mode != nval) {
+                list_for_each_entry(ipvlan, &port->ipvlans, pnode) {
+                        flags = ipvlan->dev->flags;
+                        if (nval == IPVLAN_MODE_L3 || nval == IPVLAN_MODE_L3S) {
+                                err = dev_change_flags(ipvlan->dev,
+                                                       flags | IFF_NOARP);
+                        } else {
+                                err = dev_change_flags(ipvlan->dev,
+                                                       flags & ~IFF_NOARP);
+                        }
+                        if (unlikely(err))
+                                goto fail;
+                }
                 if (nval == IPVLAN_MODE_L3S) {
                         /* New mode is L3S */
                         err = ipvlan_register_nf_hook(read_pnet(&port->pnet));
@@ -86,21 +99,28 @@ static int ipvlan_set_port_mode(struct ipvl_port *port, u16 nval)
                                 mdev->l3mdev_ops = &ipvl_l3mdev_ops;
                                 mdev->priv_flags |= IFF_L3MDEV_MASTER;
                         } else
-                                return err;
+                                goto fail;
                 } else if (port->mode == IPVLAN_MODE_L3S) {
                         /* Old mode was L3S */
                         mdev->priv_flags &= ~IFF_L3MDEV_MASTER;
                         ipvlan_unregister_nf_hook(read_pnet(&port->pnet));
                         mdev->l3mdev_ops = NULL;
                 }
-                list_for_each_entry(ipvlan, &port->ipvlans, pnode) {
-                        if (nval == IPVLAN_MODE_L3 || nval == IPVLAN_MODE_L3S)
-                                ipvlan->dev->flags |= IFF_NOARP;
-                        else
-                                ipvlan->dev->flags &= ~IFF_NOARP;
-                }
                 port->mode = nval;
         }
+        return 0;
+
+fail:
+        /* Undo the flags changes that have been done so far. */
+        list_for_each_entry_continue_reverse(ipvlan, &port->ipvlans, pnode) {
+                flags = ipvlan->dev->flags;
+                if (port->mode == IPVLAN_MODE_L3 ||
+                    port->mode == IPVLAN_MODE_L3S)
+                        dev_change_flags(ipvlan->dev, flags | IFF_NOARP);
+                else
+                        dev_change_flags(ipvlan->dev, flags & ~IFF_NOARP);
+        }
+
         return err;
 }
 
@@ -594,7 +614,8 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev,
         ipvlan->phy_dev = phy_dev;
         ipvlan->dev = dev;
         ipvlan->sfeatures = IPVLAN_FEATURES;
-        ipvlan_adjust_mtu(ipvlan, phy_dev);
+        if (!tb[IFLA_MTU])
+                ipvlan_adjust_mtu(ipvlan, phy_dev);
         INIT_LIST_HEAD(&ipvlan->addrs);
         spin_lock_init(&ipvlan->addrs_lock);
 
@@ -693,6 +714,7 @@ void ipvlan_link_setup(struct net_device *dev)
 {
         ether_setup(dev);
 
+        dev->max_mtu = ETH_MAX_MTU;
         dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);
         dev->priv_flags |= IFF_UNICAST_FLT | IFF_NO_QUEUE;
         dev->netdev_ops = &ipvlan_netdev_ops;
diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
index 83f7420ddea5..4f390fa557e4 100644
--- a/drivers/net/net_failover.c
+++ b/drivers/net/net_failover.c
@@ -527,7 +527,7 @@ static int net_failover_slave_register(struct net_device *slave_dev,
 
         netif_addr_lock_bh(failover_dev);
         dev_uc_sync_multiple(slave_dev, failover_dev);
-        dev_uc_sync_multiple(slave_dev, failover_dev);
+        dev_mc_sync_multiple(slave_dev, failover_dev);
         netif_addr_unlock_bh(failover_dev);
 
         err = vlan_vids_add_by_dev(slave_dev, failover_dev);
diff --git a/drivers/net/phy/dp83tc811.c b/drivers/net/phy/dp83tc811.c
index 081d99aa3985..49ac678eb2dc 100644
--- a/drivers/net/phy/dp83tc811.c
+++ b/drivers/net/phy/dp83tc811.c
@@ -222,7 +222,7 @@ static int dp83811_config_intr(struct phy_device *phydev)
                 if (err < 0)
                         return err;
 
-                err = phy_write(phydev, MII_DP83811_INT_STAT1, 0);
+                err = phy_write(phydev, MII_DP83811_INT_STAT2, 0);
         }
 
         return err;
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index de51e8f70f44..ce61231e96ea 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -1107,7 +1107,7 @@ static const struct proto_ops pppoe_ops = {
         .socketpair     = sock_no_socketpair,
         .accept         = sock_no_accept,
         .getname        = pppoe_getname,
-        .poll_mask      = datagram_poll_mask,
+        .poll           = datagram_poll,
         .listen         = sock_no_listen,
         .shutdown       = sock_no_shutdown,
         .setsockopt     = sock_no_setsockopt,
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index b0e8b9613054..1eaec648bd1f 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -967,8 +967,7 @@ void cdc_ncm_unbind(struct usbnet *dev, struct usb_interface *intf)
 
         atomic_set(&ctx->stop, 1);
 
-        if (hrtimer_active(&ctx->tx_timer))
-                hrtimer_cancel(&ctx->tx_timer);
+        hrtimer_cancel(&ctx->tx_timer);
 
         tasklet_kill(&ctx->bh);
 
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 8dff87ec6d99..2e4130746c40 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -64,6 +64,7 @@
 #define DEFAULT_RX_CSUM_ENABLE          (true)
 #define DEFAULT_TSO_CSUM_ENABLE         (true)
 #define DEFAULT_VLAN_FILTER_ENABLE      (true)
+#define DEFAULT_VLAN_RX_OFFLOAD         (true)
 #define TX_OVERHEAD                     (8)
 #define RXW_PADDING                     2
 
@@ -2298,7 +2299,7 @@ static int lan78xx_change_mtu(struct net_device *netdev, int new_mtu)
         if ((ll_mtu % dev->maxpacket) == 0)
                 return -EDOM;
 
-        ret = lan78xx_set_rx_max_frame_length(dev, new_mtu + ETH_HLEN);
+        ret = lan78xx_set_rx_max_frame_length(dev, new_mtu + VLAN_ETH_HLEN);
 
         netdev->mtu = new_mtu;
 
@@ -2364,6 +2365,11 @@ static int lan78xx_set_features(struct net_device *netdev,
         }
 
         if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                pdata->rfe_ctl |= RFE_CTL_VLAN_STRIP_;
+        else
+                pdata->rfe_ctl &= ~RFE_CTL_VLAN_STRIP_;
+
+        if (features & NETIF_F_HW_VLAN_CTAG_FILTER)
                 pdata->rfe_ctl |= RFE_CTL_VLAN_FILTER_;
         else
                 pdata->rfe_ctl &= ~RFE_CTL_VLAN_FILTER_;
@@ -2587,7 +2593,8 @@ static int lan78xx_reset(struct lan78xx_net *dev)
         buf |= FCT_TX_CTL_EN_;
         ret = lan78xx_write_reg(dev, FCT_TX_CTL, buf);
 
-        ret = lan78xx_set_rx_max_frame_length(dev, dev->net->mtu + ETH_HLEN);
+        ret = lan78xx_set_rx_max_frame_length(dev,
+                                              dev->net->mtu + VLAN_ETH_HLEN);
 
         ret = lan78xx_read_reg(dev, MAC_RX, &buf);
         buf |= MAC_RX_RXEN_;
@@ -2975,6 +2982,12 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)
         if (DEFAULT_TSO_CSUM_ENABLE)
                 dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG;
 
+        if (DEFAULT_VLAN_RX_OFFLOAD)
+                dev->net->features |= NETIF_F_HW_VLAN_CTAG_RX;
+
+        if (DEFAULT_VLAN_FILTER_ENABLE)
+                dev->net->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
+
         dev->net->hw_features = dev->net->features;
 
         ret = lan78xx_setup_irq_domain(dev);
@@ -3039,8 +3052,13 @@ static void lan78xx_rx_csum_offload(struct lan78xx_net *dev,
                                     struct sk_buff *skb,
                                     u32 rx_cmd_a, u32 rx_cmd_b)
 {
+        /* HW Checksum offload appears to be flawed if used when not stripping
+         * VLAN headers. Drop back to S/W checksums under these conditions.
+         */
         if (!(dev->net->features & NETIF_F_RXCSUM) ||
-            unlikely(rx_cmd_a & RX_CMD_A_ICSM_)) {
+            unlikely(rx_cmd_a & RX_CMD_A_ICSM_) ||
+            ((rx_cmd_a & RX_CMD_A_FVTG_) &&
+             !(dev->net->features & NETIF_F_HW_VLAN_CTAG_RX))) {
                 skb->ip_summed = CHECKSUM_NONE;
         } else {
                 skb->csum = ntohs((u16)(rx_cmd_b >> RX_CMD_B_CSUM_SHIFT_));
@@ -3048,6 +3066,16 @@ static void lan78xx_rx_csum_offload(struct lan78xx_net *dev,
         }
 }
 
+static void lan78xx_rx_vlan_offload(struct lan78xx_net *dev,
+                                    struct sk_buff *skb,
+                                    u32 rx_cmd_a, u32 rx_cmd_b)
+{
+        if ((dev->net->features & NETIF_F_HW_VLAN_CTAG_RX) &&
+            (rx_cmd_a & RX_CMD_A_FVTG_))
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+                                       (rx_cmd_b & 0xffff));
+}
+
 static void lan78xx_skb_return(struct lan78xx_net *dev, struct sk_buff *skb)
 {
         int             status;
@@ -3112,6 +3140,8 @@ static int lan78xx_rx(struct lan78xx_net *dev, struct sk_buff *skb)
                         if (skb->len == size) {
                                 lan78xx_rx_csum_offload(dev, skb,
                                                         rx_cmd_a, rx_cmd_b);
+                                lan78xx_rx_vlan_offload(dev, skb,
+                                                        rx_cmd_a, rx_cmd_b);
 
                                 skb_trim(skb, skb->len - 4); /* remove fcs */
                                 skb->truesize = size + sizeof(struct sk_buff);
@@ -3130,6 +3160,7 @@ static int lan78xx_rx(struct lan78xx_net *dev, struct sk_buff *skb)
                         skb_set_tail_pointer(skb2, size);
 
                         lan78xx_rx_csum_offload(dev, skb2, rx_cmd_a, rx_cmd_b);
+                        lan78xx_rx_vlan_offload(dev, skb2, rx_cmd_a, rx_cmd_b);
 
                         skb_trim(skb2, skb2->len - 4); /* remove fcs */
                         skb2->truesize = size + sizeof(struct sk_buff);
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 8e8b51f171f4..8fac8e132c5b 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1246,6 +1246,7 @@ static const struct usb_device_id products[] = {
         {QMI_FIXED_INTF(0x413c, 0x81b3, 8)},    /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */
         {QMI_FIXED_INTF(0x413c, 0x81b6, 8)},    /* Dell Wireless 5811e */
         {QMI_FIXED_INTF(0x413c, 0x81b6, 10)},   /* Dell Wireless 5811e */
+        {QMI_FIXED_INTF(0x413c, 0x81d7, 1)},    /* Dell Wireless 5821e */
         {QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)},    /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */
         {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)},    /* HP lt4120 Snapdragon X5 LTE */
         {QMI_FIXED_INTF(0x22de, 0x9061, 3)},    /* WeTelecom WPD-600N */
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 86f7196f9d91..2a58607a6aea 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3962,7 +3962,8 @@ static int rtl8152_close(struct net_device *netdev)
 #ifdef CONFIG_PM_SLEEP
         unregister_pm_notifier(&tp->pm_notifier);
 #endif
-        napi_disable(&tp->napi);
+        if (!test_bit(RTL8152_UNPLUG, &tp->flags))
+                napi_disable(&tp->napi);
         clear_bit(WORK_ENABLE, &tp->flags);
         usb_kill_urb(tp->intr_urb);
         cancel_delayed_work_sync(&tp->schedule);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index b6c9a2af3732..53085c63277b 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -53,6 +53,10 @@ module_param(napi_tx, bool, 0644);
 /* Amount of XDP headroom to prepend to packets for use by xdp_adjust_head */
 #define VIRTIO_XDP_HEADROOM 256
 
+/* Separating two types of XDP xmit */
+#define VIRTIO_XDP_TX           BIT(0)
+#define VIRTIO_XDP_REDIR        BIT(1)
+
 /* RX packet size EWMA. The average packet size is used to determine the packet
  * buffer size when refilling RX rings. As the entire RX ring may be refilled
  * at once, the weight is chosen so that the EWMA will be insensitive to short-
@@ -582,7 +586,7 @@ static struct sk_buff *receive_small(struct net_device *dev,
                                      struct receive_queue *rq,
                                      void *buf, void *ctx,
                                      unsigned int len,
-                                     bool *xdp_xmit)
+                                     unsigned int *xdp_xmit)
 {
         struct sk_buff *skb;
         struct bpf_prog *xdp_prog;
@@ -654,14 +658,14 @@ static struct sk_buff *receive_small(struct net_device *dev,
                                 trace_xdp_exception(vi->dev, xdp_prog, act);
                                 goto err_xdp;
                         }
-                        *xdp_xmit = true;
+                        *xdp_xmit |= VIRTIO_XDP_TX;
                         rcu_read_unlock();
                         goto xdp_xmit;
                 case XDP_REDIRECT:
                         err = xdp_do_redirect(dev, &xdp, xdp_prog);
                         if (err)
                                 goto err_xdp;
-                        *xdp_xmit = true;
+                        *xdp_xmit |= VIRTIO_XDP_REDIR;
                         rcu_read_unlock();
                         goto xdp_xmit;
                 default:
@@ -723,7 +727,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                                          void *buf,
                                          void *ctx,
                                          unsigned int len,
-                                         bool *xdp_xmit)
+                                         unsigned int *xdp_xmit)
 {
         struct virtio_net_hdr_mrg_rxbuf *hdr = buf;
         u16 num_buf = virtio16_to_cpu(vi->vdev, hdr->num_buffers);
@@ -818,7 +822,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                                         put_page(xdp_page);
                                 goto err_xdp;
                         }
-                        *xdp_xmit = true;
+                        *xdp_xmit |= VIRTIO_XDP_TX;
                         if (unlikely(xdp_page != page))
                                 put_page(page);
                         rcu_read_unlock();
@@ -830,7 +834,7 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
                                         put_page(xdp_page);
                                 goto err_xdp;
                         }
-                        *xdp_xmit = true;
+                        *xdp_xmit |= VIRTIO_XDP_REDIR;
                         if (unlikely(xdp_page != page))
                                 put_page(page);
                         rcu_read_unlock();
@@ -939,7 +943,8 @@ xdp_xmit:
 }
 
 static int receive_buf(struct virtnet_info *vi, struct receive_queue *rq,
-                       void *buf, unsigned int len, void **ctx, bool *xdp_xmit)
+                       void *buf, unsigned int len, void **ctx,
+                       unsigned int *xdp_xmit)
 {
         struct net_device *dev = vi->dev;
         struct sk_buff *skb;
@@ -1232,7 +1237,8 @@ static void refill_work(struct work_struct *work)
         }
 }
 
-static int virtnet_receive(struct receive_queue *rq, int budget, bool *xdp_xmit)
+static int virtnet_receive(struct receive_queue *rq, int budget,
+                           unsigned int *xdp_xmit)
 {
         struct virtnet_info *vi = rq->vq->vdev->priv;
         unsigned int len, received = 0, bytes = 0;
@@ -1321,7 +1327,7 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
         struct virtnet_info *vi = rq->vq->vdev->priv;
         struct send_queue *sq;
         unsigned int received, qp;
-        bool xdp_xmit = false;
+        unsigned int xdp_xmit = 0;
 
         virtnet_poll_cleantx(rq);
 
@@ -1331,12 +1337,14 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
         if (received < budget)
                 virtqueue_napi_complete(napi, rq->vq, received);
 
-        if (xdp_xmit) {
+        if (xdp_xmit & VIRTIO_XDP_REDIR)
+                xdp_do_flush_map();
+
+        if (xdp_xmit & VIRTIO_XDP_TX) {
                 qp = vi->curr_queue_pairs - vi->xdp_queue_pairs +
                      smp_processor_id();
                 sq = &vi->sq[qp];
                 virtqueue_kick(sq->vq);
-                xdp_do_flush_map();
         }
 
         return received;
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index aee0e60471f1..f6bb1d54d4bd 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -623,9 +623,7 @@ static struct sk_buff **vxlan_gro_receive(struct sock *sk,
         flush = 0;
 
 out:
-        skb_gro_remcsum_cleanup(skb, &grc);
-        skb->remcsum_offload = 0;
-        NAPI_GRO_CB(skb)->flush |= flush;
+        skb_gro_flush_final_remcsum(skb, pp, flush, &grc);
 
         return pp;
 }
diff --git a/drivers/net/wireless/broadcom/brcm80211/Kconfig b/drivers/net/wireless/broadcom/brcm80211/Kconfig
index 9d99eb42d917..6acba67bca07 100644
--- a/drivers/net/wireless/broadcom/brcm80211/Kconfig
+++ b/drivers/net/wireless/broadcom/brcm80211/Kconfig
@@ -60,7 +60,6 @@ config BRCMFMAC_PCIE
         bool "PCIE bus interface support for FullMAC driver"
         depends on BRCMFMAC
         depends on PCI
-        depends on HAS_DMA
         select BRCMFMAC_PROTO_MSGBUF
         select FW_LOADER
         ---help---
diff --git a/drivers/net/wireless/quantenna/qtnfmac/Kconfig b/drivers/net/wireless/quantenna/qtnfmac/Kconfig
index 025fa6018550..8d1492a90bd1 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/Kconfig
+++ b/drivers/net/wireless/quantenna/qtnfmac/Kconfig
@@ -7,7 +7,7 @@ config QTNFMAC
 config QTNFMAC_PEARL_PCIE
         tristate "Quantenna QSR10g PCIe support"
         default n
-        depends on HAS_DMA && PCI && CFG80211
+        depends on PCI && CFG80211
         select QTNFMAC
         select FW_LOADER
         select CRC32
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 922ce0abf5cf..a57daecf1d57 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1810,7 +1810,7 @@ static int talk_to_netback(struct xenbus_device *dev,
         err = xen_net_read_mac(dev, info->netdev->dev_addr);
         if (err) {
                 xenbus_dev_fatal(dev, err, "parsing %s/mac", dev->nodename);
-                goto out;
+                goto out_unlocked;
         }
 
         rtnl_lock();
@@ -1925,6 +1925,7 @@ abort_transaction_no_dev_fatal:
         xennet_destroy_queues(info);
  out:
         rtnl_unlock();
+out_unlocked:
         device_unregister(&dev->dev);
         return err;
 }
@@ -1950,10 +1951,6 @@ static int xennet_connect(struct net_device *dev)
         /* talk_to_netback() sets the correct number of queues */
         num_queues = dev->real_num_tx_queues;
 
-        rtnl_lock();
-        netdev_update_features(dev);
-        rtnl_unlock();
-
         if (dev->reg_state == NETREG_UNINITIALIZED) {
                 err = register_netdev(dev);
                 if (err) {
@@ -1963,6 +1960,10 @@ static int xennet_connect(struct net_device *dev)
                 }
         }
 
+        rtnl_lock();
+        netdev_update_features(dev);
+        rtnl_unlock();
+
         /*
          * All public and private state should now be sane.  Get
          * ready to start sending and receiving packets and give the driver
diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c
index d5553c47014f..5d823e965883 100644
--- a/drivers/nfc/pn533/usb.c
+++ b/drivers/nfc/pn533/usb.c
@@ -74,7 +74,7 @@ static void pn533_recv_response(struct urb *urb)
         struct sk_buff *skb = NULL;
 
         if (!urb->status) {
-                skb = alloc_skb(urb->actual_length, GFP_KERNEL);
+                skb = alloc_skb(urb->actual_length, GFP_ATOMIC);
                 if (!skb) {
                         nfc_err(&phy->udev->dev, "failed to alloc memory\n");
                 } else {
@@ -186,7 +186,7 @@ static int pn533_usb_send_frame(struct pn533 *dev,
 
         if (dev->protocol_type == PN533_PROTO_REQ_RESP) {
                 /* request for response for sent packet directly */
-                rc = pn533_submit_urb_for_response(phy, GFP_ATOMIC);
+                rc = pn533_submit_urb_for_response(phy, GFP_KERNEL);
                 if (rc)
                         goto error;
         } else if (dev->protocol_type == PN533_PROTO_REQ_ACK_RESP) {
diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c
index 2e96b34bc936..fb667bf469c7 100644
--- a/drivers/nvdimm/claim.c
+++ b/drivers/nvdimm/claim.c
@@ -278,6 +278,7 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns,
                         return -EIO;
                 if (memcpy_mcsafe(buf, nsio->addr + offset, size) != 0)
                         return -EIO;
+                return 0;
         }
 
         if (unlikely(is_bad_pmem(&nsio->bb, sector, sz_align))) {
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 68940356cad3..8b1fd7f1a224 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -414,7 +414,8 @@ static int pmem_attach_disk(struct device *dev,
         blk_queue_logical_block_size(q, pmem_sector_size(ndns));
         blk_queue_max_hw_sectors(q, UINT_MAX);
         blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
-        blk_queue_flag_set(QUEUE_FLAG_DAX, q);
+        if (pmem->pfn_flags & PFN_MAP)
+                blk_queue_flag_set(QUEUE_FLAG_DAX, q);
         q->queuedata = pmem;
 
         disk = alloc_disk_node(0, nid);
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 21710a7460c8..46df030b2c3f 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1808,6 +1808,7 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl,
                 u32 max_segments =
                         (ctrl->max_hw_sectors / (ctrl->page_size >> 9)) + 1;
 
+                max_segments = min_not_zero(max_segments, ctrl->max_segments);
                 blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors);
                 blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX));
         }
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index b528a2f5826c..41d45a1b5c62 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -2790,6 +2790,9 @@ nvme_fc_delete_association(struct nvme_fc_ctrl *ctrl)
         /* re-enable the admin_q so anything new can fast fail */
         blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
 
+        /* resume the io queues so that things will fast fail */
+        nvme_start_queues(&ctrl->ctrl);
+
         nvme_fc_ctlr_inactive_on_rport(ctrl);
 }
 
@@ -2804,9 +2807,6 @@ nvme_fc_delete_ctrl(struct nvme_ctrl *nctrl)
          * waiting for io to terminate
          */
         nvme_fc_delete_association(ctrl);
-
-        /* resume the io queues so that things will fast fail */
-        nvme_start_queues(nctrl);
 }
 
 static void
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 231807cbc849..0c4a33df3b2f 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -170,6 +170,7 @@ struct nvme_ctrl {
         u64 cap;
         u32 page_size;
         u32 max_hw_sectors;
+        u32 max_segments;
         u16 oncs;
         u16 oacs;
         u16 nssa;
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index fc33804662e7..ba943f211687 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -38,6 +38,13 @@
 
 #define SGES_PER_PAGE   (PAGE_SIZE / sizeof(struct nvme_sgl_desc))
 
+/*
+ * These can be higher, but we need to ensure that any command doesn't
+ * require an sg allocation that needs more than a page of data.
+ */
+#define NVME_MAX_KB_SZ  4096
+#define NVME_MAX_SEGS   127
+
 static int use_threaded_interrupts;
 module_param(use_threaded_interrupts, int, 0);
 
@@ -100,6 +107,8 @@ struct nvme_dev {
         struct nvme_ctrl ctrl;
         struct completion ioq_wait;
 
+        mempool_t *iod_mempool;
+
         /* shadow doorbell buffer support: */
         u32 *dbbuf_dbs;
         dma_addr_t dbbuf_dbs_dma_addr;
@@ -477,10 +486,7 @@ static blk_status_t nvme_init_iod(struct request *rq, struct nvme_dev *dev)
         iod->use_sgl = nvme_pci_use_sgls(dev, rq);
 
         if (nseg > NVME_INT_PAGES || size > NVME_INT_BYTES(dev)) {
-                size_t alloc_size = nvme_pci_iod_alloc_size(dev, size, nseg,
-                                iod->use_sgl);
-
-                iod->sg = kmalloc(alloc_size, GFP_ATOMIC);
+                iod->sg = mempool_alloc(dev->iod_mempool, GFP_ATOMIC);
                 if (!iod->sg)
                         return BLK_STS_RESOURCE;
         } else {
@@ -526,7 +532,7 @@ static void nvme_free_iod(struct nvme_dev *dev, struct request *req)
         }
 
         if (iod->sg != iod->inline_sg)
-                kfree(iod->sg);
+                mempool_free(iod->sg, dev->iod_mempool);
 }
 
 #ifdef CONFIG_BLK_DEV_INTEGRITY
@@ -2280,6 +2286,7 @@ static void nvme_pci_free_ctrl(struct nvme_ctrl *ctrl)
                 blk_put_queue(dev->ctrl.admin_q);
         kfree(dev->queues);
         free_opal_dev(dev->ctrl.opal_dev);
+        mempool_destroy(dev->iod_mempool);
         kfree(dev);
 }
 
@@ -2289,6 +2296,7 @@ static void nvme_remove_dead_ctrl(struct nvme_dev *dev, int status)
 
         nvme_get_ctrl(&dev->ctrl);
         nvme_dev_disable(dev, false);
+        nvme_kill_queues(&dev->ctrl);
         if (!queue_work(nvme_wq, &dev->remove_work))
                 nvme_put_ctrl(&dev->ctrl);
 }
@@ -2333,6 +2341,13 @@ static void nvme_reset_work(struct work_struct *work)
         if (result)
                 goto out;
 
+        /*
+         * Limit the max command size to prevent iod->sg allocations going
+         * over a single page.
+         */
+        dev->ctrl.max_hw_sectors = NVME_MAX_KB_SZ << 1;
+        dev->ctrl.max_segments = NVME_MAX_SEGS;
+
         result = nvme_init_identify(&dev->ctrl);
         if (result)
                 goto out;
@@ -2405,7 +2420,6 @@ static void nvme_remove_dead_ctrl_work(struct work_struct *work)
         struct nvme_dev *dev = container_of(work, struct nvme_dev, remove_work);
         struct pci_dev *pdev = to_pci_dev(dev->dev);
 
-        nvme_kill_queues(&dev->ctrl);
         if (pci_get_drvdata(pdev))
                 device_release_driver(&pdev->dev);
         nvme_put_ctrl(&dev->ctrl);
@@ -2509,6 +2523,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         int node, result = -ENOMEM;
         struct nvme_dev *dev;
         unsigned long quirks = id->driver_data;
+        size_t alloc_size;
 
         node = dev_to_node(&pdev->dev);
         if (node == NUMA_NO_NODE)
@@ -2546,6 +2561,23 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         if (result)
                 goto release_pools;
 
+        /*
+         * Double check that our mempool alloc size will cover the biggest
+         * command we support.
+         */
+        alloc_size = nvme_pci_iod_alloc_size(dev, NVME_MAX_KB_SZ,
+                                                NVME_MAX_SEGS, true);
+        WARN_ON_ONCE(alloc_size > PAGE_SIZE);
+
+        dev->iod_mempool = mempool_create_node(1, mempool_kmalloc,
+                                                mempool_kfree,
+                                                (void *) alloc_size,
+                                                GFP_KERNEL, node);
+        if (!dev->iod_mempool) {
+                result = -ENOMEM;
+                goto release_pools;
+        }
+
         dev_info(dev->ctrl.device, "pci function %s\n", dev_name(&pdev->dev));
 
         nvme_get_ctrl(&dev->ctrl);
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index c9424da0d23e..518c5b09038c 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -560,12 +560,6 @@ static void nvme_rdma_free_queue(struct nvme_rdma_queue *queue)
         if (!test_and_clear_bit(NVME_RDMA_Q_ALLOCATED, &queue->flags))
                 return;
 
-        if (nvme_rdma_queue_idx(queue) == 0) {
-                nvme_rdma_free_qe(queue->device->dev,
-                        &queue->ctrl->async_event_sqe,
-                        sizeof(struct nvme_command), DMA_TO_DEVICE);
-        }
-
         nvme_rdma_destroy_queue_ib(queue);
         rdma_destroy_id(queue->cm_id);
 }
@@ -698,7 +692,7 @@ static struct blk_mq_tag_set *nvme_rdma_alloc_tagset(struct nvme_ctrl *nctrl,
                 set = &ctrl->tag_set;
                 memset(set, 0, sizeof(*set));
                 set->ops = &nvme_rdma_mq_ops;
-                set->queue_depth = nctrl->opts->queue_size;
+                set->queue_depth = nctrl->sqsize + 1;
                 set->reserved_tags = 1; /* fabric connect */
                 set->numa_node = NUMA_NO_NODE;
                 set->flags = BLK_MQ_F_SHOULD_MERGE;
@@ -734,11 +728,15 @@ out:
 static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl,
                 bool remove)
 {
-        nvme_rdma_stop_queue(&ctrl->queues[0]);
         if (remove) {
                 blk_cleanup_queue(ctrl->ctrl.admin_q);
                 nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset);
         }
+        if (ctrl->async_event_sqe.data) {
+                nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
+                                sizeof(struct nvme_command), DMA_TO_DEVICE);
+                ctrl->async_event_sqe.data = NULL;
+        }
         nvme_rdma_free_queue(&ctrl->queues[0]);
 }
 
@@ -755,11 +753,16 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
 
         ctrl->max_fr_pages = nvme_rdma_get_max_fr_pages(ctrl->device->dev);
 
+        error = nvme_rdma_alloc_qe(ctrl->device->dev, &ctrl->async_event_sqe,
+                        sizeof(struct nvme_command), DMA_TO_DEVICE);
+        if (error)
+                goto out_free_queue;
+
         if (new) {
                 ctrl->ctrl.admin_tagset = nvme_rdma_alloc_tagset(&ctrl->ctrl, true);
                 if (IS_ERR(ctrl->ctrl.admin_tagset)) {
                         error = PTR_ERR(ctrl->ctrl.admin_tagset);
-                        goto out_free_queue;
+                        goto out_free_async_qe;
                 }
 
                 ctrl->ctrl.admin_q = blk_mq_init_queue(&ctrl->admin_tag_set);
@@ -795,12 +798,6 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
         if (error)
                 goto out_stop_queue;
 
-        error = nvme_rdma_alloc_qe(ctrl->queues[0].device->dev,
-                        &ctrl->async_event_sqe, sizeof(struct nvme_command),
-                        DMA_TO_DEVICE);
-        if (error)
-                goto out_stop_queue;
-
         return 0;
 
 out_stop_queue:
@@ -811,6 +808,9 @@ out_cleanup_queue:
 out_free_tagset:
         if (new)
                 nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset);
+out_free_async_qe:
+        nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
+                sizeof(struct nvme_command), DMA_TO_DEVICE);
 out_free_queue:
         nvme_rdma_free_queue(&ctrl->queues[0]);
         return error;
@@ -819,7 +819,6 @@ out_free_queue:
 static void nvme_rdma_destroy_io_queues(struct nvme_rdma_ctrl *ctrl,
                 bool remove)
 {
-        nvme_rdma_stop_io_queues(ctrl);
         if (remove) {
                 blk_cleanup_queue(ctrl->ctrl.connect_q);
                 nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.tagset);
@@ -888,9 +887,9 @@ static void nvme_rdma_free_ctrl(struct nvme_ctrl *nctrl)
         list_del(&ctrl->list);
         mutex_unlock(&nvme_rdma_ctrl_mutex);
 
-        kfree(ctrl->queues);
         nvmf_free_options(nctrl->opts);
 free_ctrl:
+        kfree(ctrl->queues);
         kfree(ctrl);
 }
 
@@ -949,6 +948,7 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work)
         return;
 
 destroy_admin:
+        nvme_rdma_stop_queue(&ctrl->queues[0]);
         nvme_rdma_destroy_admin_queue(ctrl, false);
 requeue:
         dev_info(ctrl->ctrl.device, "Failed reconnect attempt %d\n",
@@ -965,12 +965,14 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work)
 
         if (ctrl->ctrl.queue_count > 1) {
                 nvme_stop_queues(&ctrl->ctrl);
+                nvme_rdma_stop_io_queues(ctrl);
                 blk_mq_tagset_busy_iter(&ctrl->tag_set,
                                         nvme_cancel_request, &ctrl->ctrl);
                 nvme_rdma_destroy_io_queues(ctrl, false);
         }
 
         blk_mq_quiesce_queue(ctrl->ctrl.admin_q);
+        nvme_rdma_stop_queue(&ctrl->queues[0]);
         blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,
                                 nvme_cancel_request, &ctrl->ctrl);
         nvme_rdma_destroy_admin_queue(ctrl, false);
@@ -1736,6 +1738,7 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown)
 {
         if (ctrl->ctrl.queue_count > 1) {
                 nvme_stop_queues(&ctrl->ctrl);
+                nvme_rdma_stop_io_queues(ctrl);
                 blk_mq_tagset_busy_iter(&ctrl->tag_set,
                                         nvme_cancel_request, &ctrl->ctrl);
                 nvme_rdma_destroy_io_queues(ctrl, shutdown);
@@ -1747,6 +1750,7 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown)
                 nvme_disable_ctrl(&ctrl->ctrl, ctrl->ctrl.cap);
 
         blk_mq_quiesce_queue(ctrl->ctrl.admin_q);
+        nvme_rdma_stop_queue(&ctrl->queues[0]);
         blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,
                                 nvme_cancel_request, &ctrl->ctrl);
         blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
@@ -1932,11 +1936,6 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev,
                 goto out_free_ctrl;
         }
 
-        ret = nvme_init_ctrl(&ctrl->ctrl, dev, &nvme_rdma_ctrl_ops,
-                                0 /* no quirks, we're perfect! */);
-        if (ret)
-                goto out_free_ctrl;
-
         INIT_DELAYED_WORK(&ctrl->reconnect_work,
                         nvme_rdma_reconnect_ctrl_work);
         INIT_WORK(&ctrl->err_work, nvme_rdma_error_recovery_work);
@@ -1950,14 +1949,19 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev,
         ctrl->queues = kcalloc(ctrl->ctrl.queue_count, sizeof(*ctrl->queues),
                                 GFP_KERNEL);
         if (!ctrl->queues)
-                goto out_uninit_ctrl;
+                goto out_free_ctrl;
+
+        ret = nvme_init_ctrl(&ctrl->ctrl, dev, &nvme_rdma_ctrl_ops,
+                                0 /* no quirks, we're perfect! */);
+        if (ret)
+                goto out_kfree_queues;
 
         changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING);
         WARN_ON_ONCE(!changed);
 
         ret = nvme_rdma_configure_admin_queue(ctrl, true);
         if (ret)
-                goto out_kfree_queues;
+                goto out_uninit_ctrl;
 
         /* sanity check icdoff */
         if (ctrl->ctrl.icdoff) {
@@ -1974,20 +1978,19 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev,
                 goto out_remove_admin_queue;
         }
 
-        if (opts->queue_size > ctrl->ctrl.maxcmd) {
-                /* warn if maxcmd is lower than queue_size */
-                dev_warn(ctrl->ctrl.device,
-                        "queue_size %zu > ctrl maxcmd %u, clamping down\n",
-                        opts->queue_size, ctrl->ctrl.maxcmd);
-                opts->queue_size = ctrl->ctrl.maxcmd;
-        }
-
+        /* only warn if argument is too large here, will clamp later */
         if (opts->queue_size > ctrl->ctrl.sqsize + 1) {
-                /* warn if sqsize is lower than queue_size */
                 dev_warn(ctrl->ctrl.device,
                         "queue_size %zu > ctrl sqsize %u, clamping down\n",
                         opts->queue_size, ctrl->ctrl.sqsize + 1);
-                opts->queue_size = ctrl->ctrl.sqsize + 1;
+        }
+
+        /* warn if maxcmd is lower than sqsize+1 */
+        if (ctrl->ctrl.sqsize + 1 > ctrl->ctrl.maxcmd) {
+                dev_warn(ctrl->ctrl.device,
+                        "sqsize %u > ctrl maxcmd %u, clamping down\n",
+                        ctrl->ctrl.sqsize + 1, ctrl->ctrl.maxcmd);
+                ctrl->ctrl.sqsize = ctrl->ctrl.maxcmd - 1;
         }
 
         if (opts->nr_io_queues) {
@@ -2013,15 +2016,16 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev,
         return &ctrl->ctrl;
 
 out_remove_admin_queue:
+        nvme_rdma_stop_queue(&ctrl->queues[0]);
         nvme_rdma_destroy_admin_queue(ctrl, true);
-out_kfree_queues:
-        kfree(ctrl->queues);
 out_uninit_ctrl:
         nvme_uninit_ctrl(&ctrl->ctrl);
         nvme_put_ctrl(&ctrl->ctrl);
         if (ret > 0)
                 ret = -EIO;
         return ERR_PTR(ret);
+out_kfree_queues:
+        kfree(ctrl->queues);
 out_free_ctrl:
         kfree(ctrl);
         return ERR_PTR(ret);
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index a03da764ecae..74d4b785d2da 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -686,6 +686,14 @@ static void nvmet_start_ctrl(struct nvmet_ctrl *ctrl)
         }
 
         ctrl->csts = NVME_CSTS_RDY;
+
+        /*
+         * Controllers that are not yet enabled should not really enforce the
+         * keep alive timeout, but we still want to track a timeout and cleanup
+         * in case a host died before it enabled the controller.  Hence, simply
+         * reset the keep alive timer when the controller is enabled.
+         */
+        mod_delayed_work(system_wq, &ctrl->ka_work, ctrl->kato * HZ);
 }
 
 static void nvmet_clear_ctrl(struct nvmet_ctrl *ctrl)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index b5b0cdc21d01..514d1dfc5630 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -936,6 +936,10 @@ struct nvmem_cell *nvmem_cell_get(struct device *dev, const char *cell_id)
                         return cell;
         }
 
+        /* NULL cell_id only allowed for device tree; invalid otherwise */
+        if (!cell_id)
+                return ERR_PTR(-EINVAL);
+
         return nvmem_cell_get_from_list(cell_id);
 }
 EXPORT_SYMBOL_GPL(nvmem_cell_get);
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index ab2f3fead6b1..31ff03dbeb83 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -598,7 +598,7 @@ static int _generic_set_opp_regulator(const struct opp_table *opp_table,
         }
 
         /* Scaling up? Scale voltage before frequency */
-        if (freq > old_freq) {
+        if (freq >= old_freq) {
                 ret = _set_opp_voltage(dev, reg, new_supply);
                 if (ret)
                         goto restore_voltage;
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 535201984b8b..1b2cfe51e8d7 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -28,10 +28,10 @@ obj-$(CONFIG_PCI_PF_STUB)	+= pci-pf-stub.o
 obj-$(CONFIG_PCI_ECAM)          += ecam.o
 obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
 
-obj-y                           += controller/
-obj-y                           += switch/
-
 # Endpoint library must be initialized before its users
 obj-$(CONFIG_PCI_ENDPOINT)      += endpoint/
 
+obj-y                           += controller/
+obj-y                           += switch/
+
 ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index 18fa09b3ac8f..cc9fa02d32a0 100644
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -96,7 +96,6 @@ config PCI_HOST_GENERIC
         depends on OF
         select PCI_HOST_COMMON
         select IRQ_DOMAIN
-        select PCI_DOMAINS
         help
           Say Y here if you want to support a simple generic PCI host
           controller, such as the one emulated by kvmtool.
@@ -138,7 +137,6 @@ config PCI_VERSATILE
 
 config PCIE_IPROC
         tristate
-        select PCI_DOMAINS
         help
           This enables the iProc PCIe core controller support for Broadcom's
           iProc family of SoCs. An appropriate bus interface driver needs
@@ -176,7 +174,6 @@ config PCIE_IPROC_MSI
 config PCIE_ALTERA
         bool "Altera PCIe controller"
         depends on ARM || NIOS2 || COMPILE_TEST
-        select PCI_DOMAINS
         help
           Say Y here if you want to enable PCIe controller support on Altera
           FPGA.
diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
index 16f52c626b4b..91b0194240a5 100644
--- a/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@ -58,7 +58,6 @@ config PCIE_DW_PLAT_HOST
         depends on PCI && PCI_MSI_IRQ_DOMAIN
         select PCIE_DW_HOST
         select PCIE_DW_PLAT
-        default y
         help
           Enables support for the PCIe controller in the Designware IP to
           work in host mode. There are two instances of PCIe controller in
diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c
index a1ebe9ed441f..20bb2564a6b3 100644
--- a/drivers/pci/controller/pci-ftpci100.c
+++ b/drivers/pci/controller/pci-ftpci100.c
@@ -355,11 +355,13 @@ static int faraday_pci_setup_cascaded_irq(struct faraday_pci *p)
         irq = of_irq_get(intc, 0);
         if (irq <= 0) {
                 dev_err(p->dev, "failed to get parent IRQ\n");
+                of_node_put(intc);
                 return irq ?: -EINVAL;
         }
 
         p->irqdomain = irq_domain_add_linear(intc, PCI_NUM_INTX,
                                              &faraday_pci_irqdomain_ops, p);
+        of_node_put(intc);
         if (!p->irqdomain) {
                 dev_err(p->dev, "failed to create Gemini PCI IRQ domain\n");
                 return -EINVAL;
diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
index 874d75c9ee4a..c8febb009454 100644
--- a/drivers/pci/controller/pcie-rcar.c
+++ b/drivers/pci/controller/pcie-rcar.c
@@ -680,7 +680,11 @@ static int rcar_pcie_phy_init_gen3(struct rcar_pcie *pcie)
         if (err)
                 return err;
 
-        return phy_power_on(pcie->phy);
+        err = phy_power_on(pcie->phy);
+        if (err)
+                phy_exit(pcie->phy);
+
+        return err;
 }
 
 static int rcar_msi_alloc(struct rcar_msi *chip)
@@ -1165,7 +1169,7 @@ static int rcar_pcie_probe(struct platform_device *pdev)
         if (rcar_pcie_hw_init(pcie)) {
                 dev_info(dev, "PCIe link down\n");
                 err = -ENODEV;
-                goto err_clk_disable;
+                goto err_phy_shutdown;
         }
 
         data = rcar_pci_read_reg(pcie, MACSR);
@@ -1177,7 +1181,7 @@ static int rcar_pcie_probe(struct platform_device *pdev)
                         dev_err(dev,
                                 "failed to enable MSI support: %d\n",
                                 err);
-                        goto err_clk_disable;
+                        goto err_phy_shutdown;
                 }
         }
 
@@ -1191,6 +1195,12 @@ err_msi_teardown:
         if (IS_ENABLED(CONFIG_PCI_MSI))
                 rcar_pcie_teardown_msi(pcie);
 
+err_phy_shutdown:
+        if (pcie->phy) {
+                phy_power_off(pcie->phy);
+                phy_exit(pcie->phy);
+        }
+
 err_clk_disable:
         clk_disable_unprepare(pcie->bus_clk);
 
diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c
index 6a4bbb5b3de0..fb32840ce8e6 100644
--- a/drivers/pci/controller/pcie-xilinx-nwl.c
+++ b/drivers/pci/controller/pcie-xilinx-nwl.c
@@ -559,7 +559,7 @@ static int nwl_pcie_init_irq_domain(struct nwl_pcie *pcie)
                                                         PCI_NUM_INTX,
                                                         &legacy_domain_ops,
                                                         pcie);
-
+        of_node_put(legacy_intc_node);
         if (!pcie->legacy_irq_domain) {
                 dev_err(dev, "failed to create IRQ domain\n");
                 return -ENOMEM;
diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c
index b110a3a814e3..7b1389d8e2a5 100644
--- a/drivers/pci/controller/pcie-xilinx.c
+++ b/drivers/pci/controller/pcie-xilinx.c
@@ -509,6 +509,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
         port->leg_domain = irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX,
                                                  &intx_domain_ops,
                                                  port);
+        of_node_put(pcie_intc_node);
         if (!port->leg_domain) {
                 dev_err(dev, "Failed to get a INTx IRQ domain\n");
                 return -ENODEV;
diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c
index 523a8cab3bfb..bf53fad636a5 100644
--- a/drivers/pci/endpoint/pci-epf-core.c
+++ b/drivers/pci/endpoint/pci-epf-core.c
@@ -145,10 +145,10 @@ EXPORT_SYMBOL_GPL(pci_epf_alloc_space);
  */
 void pci_epf_unregister_driver(struct pci_epf_driver *driver)
 {
-        struct config_group *group;
+        struct config_group *group, *tmp;
 
         mutex_lock(&pci_epf_mutex);
-        list_for_each_entry(group, &driver->epf_group, group_entry)
+        list_for_each_entry_safe(group, tmp, &driver->epf_group, group_entry)
                 pci_ep_cfs_remove_epf_group(group);
         list_del(&driver->epf_group);
         mutex_unlock(&pci_epf_mutex);
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index 3979f89b250a..5bd6c1573295 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -7,7 +7,6 @@
  * All rights reserved.
  *
  * Send feedback to <kristen.c.accardi@intel.com>
- *
  */
 
 #include <linux/module.h>
@@ -87,8 +86,17 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev)
                 return 0;
 
         /* If _OSC exists, we should not evaluate OSHP */
+
+        /*
+         * If there's no ACPI host bridge (i.e., ACPI support is compiled
+         * into the kernel but the hardware platform doesn't support ACPI),
+         * there's nothing to do here.
+         */
         host = pci_find_host_bridge(pdev->bus);
         root = acpi_pci_find_root(ACPI_HANDLE(&host->dev));
+        if (!root)
+                return 0;
+
         if (root->osc_support_set)
                 goto no_control;
 
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index d0d73dbbd5ca..0f04ae648cf1 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -575,6 +575,22 @@ void pci_iov_release(struct pci_dev *dev)
 }
 
 /**
+ * pci_iov_remove - clean up SR-IOV state after PF driver is detached
+ * @dev: the PCI device
+ */
+void pci_iov_remove(struct pci_dev *dev)
+{
+        struct pci_sriov *iov = dev->sriov;
+
+        if (!dev->is_physfn)
+                return;
+
+        iov->driver_max_VFs = iov->total_VFs;
+        if (iov->num_VFs)
+                pci_warn(dev, "driver left SR-IOV enabled after remove\n");
+}
+
+/**
  * pci_iov_update_resource - update a VF BAR
  * @dev: the PCI device
  * @resno: the resource number
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 65113b6eed14..89ee6a2b6eb8 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -629,6 +629,18 @@ static bool acpi_pci_need_resume(struct pci_dev *dev)
 {
         struct acpi_device *adev = ACPI_COMPANION(&dev->dev);
 
+        /*
+         * In some cases (eg. Samsung 305V4A) leaving a bridge in suspend over
+         * system-wide suspend/resume confuses the platform firmware, so avoid
+         * doing that, unless the bridge has a driver that should take care of
+         * the PM handling.  According to Section 16.1.6 of ACPI 6.2, endpoint
+         * devices are expected to be in D3 before invoking the S3 entry path
+         * from the firmware, so they should not be affected by this issue.
+         */
+        if (pci_is_bridge(dev) && !dev->driver &&
+            acpi_target_system_state() != ACPI_STATE_S0)
+                return true;
+
         if (!adev || !acpi_device_power_manageable(adev))
                 return false;
 
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index c125d53033c6..6792292b5fc7 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -445,6 +445,7 @@ static int pci_device_remove(struct device *dev)
                 }
                 pcibios_free_irq(pci_dev);
                 pci_dev->driver = NULL;
+                pci_iov_remove(pci_dev);
         }
 
         /* Undo the runtime PM settings in local_pci_probe() */
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index c358e7a07f3f..882f1f9596df 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -311,6 +311,7 @@ static inline void pci_restore_ats_state(struct pci_dev *dev)
 #ifdef CONFIG_PCI_IOV
 int pci_iov_init(struct pci_dev *dev);
 void pci_iov_release(struct pci_dev *dev);
+void pci_iov_remove(struct pci_dev *dev);
 void pci_iov_update_resource(struct pci_dev *dev, int resno);
 resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno);
 void pci_restore_iov_state(struct pci_dev *dev);
@@ -325,6 +326,9 @@ static inline void pci_iov_release(struct pci_dev *dev)
 
 {
 }
+static inline void pci_iov_remove(struct pci_dev *dev)
+{
+}
 static inline void pci_restore_iov_state(struct pci_dev *dev)
 {
 }
diff --git a/drivers/perf/xgene_pmu.c b/drivers/perf/xgene_pmu.c
index 6bdb1dad805f..0e31f1392a53 100644
--- a/drivers/perf/xgene_pmu.c
+++ b/drivers/perf/xgene_pmu.c
@@ -1463,7 +1463,7 @@ static char *xgene_pmu_dev_name(struct device *dev, u32 type, int id)
         case PMU_TYPE_IOB:
                 return devm_kasprintf(dev, GFP_KERNEL, "iob%d", id);
         case PMU_TYPE_IOB_SLOW:
-                return devm_kasprintf(dev, GFP_KERNEL, "iob-slow%d", id);
+                return devm_kasprintf(dev, GFP_KERNEL, "iob_slow%d", id);
         case PMU_TYPE_MCB:
                 return devm_kasprintf(dev, GFP_KERNEL, "mcb%d", id);
         case PMU_TYPE_MC:
diff --git a/drivers/pinctrl/actions/pinctrl-owl.c b/drivers/pinctrl/actions/pinctrl-owl.c
index 76243caa08c6..b5c880b50bb3 100644
--- a/drivers/pinctrl/actions/pinctrl-owl.c
+++ b/drivers/pinctrl/actions/pinctrl-owl.c
@@ -333,7 +333,7 @@ static int owl_pin_config_set(struct pinctrl_dev *pctrldev,
         unsigned long flags;
         unsigned int param;
         u32 reg, bit, width, arg;
-        int ret, i;
+        int ret = 0, i;
 
         info = &pctrl->soc->padinfo[pin];
 
diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c
index b601039d6c69..c4aa411f5935 100644
--- a/drivers/pinctrl/devicetree.c
+++ b/drivers/pinctrl/devicetree.c
@@ -101,10 +101,11 @@ struct pinctrl_dev *of_pinctrl_get(struct device_node *np)
 }
 
 static int dt_to_map_one_config(struct pinctrl *p,
-                                struct pinctrl_dev *pctldev,
+                                struct pinctrl_dev *hog_pctldev,
                                 const char *statename,
                                 struct device_node *np_config)
 {
+        struct pinctrl_dev *pctldev = NULL;
         struct device_node *np_pctldev;
         const struct pinctrl_ops *ops;
         int ret;
@@ -123,8 +124,10 @@ static int dt_to_map_one_config(struct pinctrl *p,
                         return -EPROBE_DEFER;
                 }
                 /* If we're creating a hog we can use the passed pctldev */
-                if (pctldev && (np_pctldev == p->dev->of_node))
+                if (hog_pctldev && (np_pctldev == p->dev->of_node)) {
+                        pctldev = hog_pctldev;
                         break;
+                }
                 pctldev = get_pinctrl_dev_from_of_node(np_pctldev);
                 if (pctldev)
                         break;
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7622.c b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
index ad6da1184c9f..e3f1ab2290fc 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
@@ -1459,6 +1459,9 @@ static int mtk_gpio_to_irq(struct gpio_chip *chip, unsigned int offset)
         struct mtk_pinctrl *hw = gpiochip_get_data(chip);
         unsigned long eint_n;
 
+        if (!hw->eint)
+                return -ENOTSUPP;
+
         eint_n = offset;
 
         return mtk_eint_find_irq(hw->eint, eint_n);
@@ -1471,7 +1474,8 @@ static int mtk_gpio_set_config(struct gpio_chip *chip, unsigned int offset,
         unsigned long eint_n;
         u32 debounce;
 
-        if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
+        if (!hw->eint ||
+            pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
                 return -ENOTSUPP;
 
         debounce = pinconf_to_config_argument(config);
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index b3799695d8db..16ff56f93501 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -1000,11 +1000,6 @@ static int mtk_eint_init(struct mtk_pinctrl *pctl, struct platform_device *pdev)
                 return -ENOMEM;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(&pdev->dev, "Unable to get eint resource\n");
-                return -ENODEV;
-        }
-
         pctl->eint->base = devm_ioremap_resource(&pdev->dev, res);
         if (IS_ERR(pctl->eint->base))
                 return PTR_ERR(pctl->eint->base);
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index b3153c095199..e5647dac0818 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1590,8 +1590,11 @@ static int pcs_save_context(struct pcs_device *pcs)
 
         mux_bytes = pcs->width / BITS_PER_BYTE;
 
-        if (!pcs->saved_vals)
+        if (!pcs->saved_vals) {
                 pcs->saved_vals = devm_kzalloc(pcs->dev, pcs->size, GFP_ATOMIC);
+                if (!pcs->saved_vals)
+                        return -ENOMEM;
+        }
 
         switch (pcs->width) {
         case 64:
@@ -1651,8 +1654,13 @@ static int pinctrl_single_suspend(struct platform_device *pdev,
         if (!pcs)
                 return -EINVAL;
 
-        if (pcs->flags & PCS_CONTEXT_LOSS_OFF)
-                pcs_save_context(pcs);
+        if (pcs->flags & PCS_CONTEXT_LOSS_OFF) {
+                int ret;
+
+                ret = pcs_save_context(pcs);
+                if (ret < 0)
+                        return ret;
+        }
 
         return pinctrl_force_sleep(pcs->pctl);
 }
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index 767c485af59b..547dbdac9d54 100644
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -221,7 +221,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
                 }
                 pct = &sysoff->ts[0];
                 for (i = 0; i < sysoff->n_samples; i++) {
-                        getnstimeofday64(&ts);
+                        ktime_get_real_ts64(&ts);
                         pct->sec = ts.tv_sec;
                         pct->nsec = ts.tv_nsec;
                         pct++;
@@ -230,7 +230,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
                         pct->nsec = ts.tv_nsec;
                         pct++;
                 }
-                getnstimeofday64(&ts);
+                ktime_get_real_ts64(&ts);
                 pct->sec = ts.tv_sec;
                 pct->nsec = ts.tv_nsec;
                 if (copy_to_user((void __user *)arg, sysoff, sizeof(*sysoff)))
diff --git a/drivers/ptp/ptp_qoriq.c b/drivers/ptp/ptp_qoriq.c
index 1468a1642b49..e8652c148c52 100644
--- a/drivers/ptp/ptp_qoriq.c
+++ b/drivers/ptp/ptp_qoriq.c
@@ -374,7 +374,7 @@ static int qoriq_ptp_probe(struct platform_device *dev)
                 pr_err("ioremap ptp registers failed\n");
                 goto no_ioremap;
         }
-        getnstimeofday64(&now);
+        ktime_get_real_ts64(&now);
         ptp_qoriq_settime(&qoriq_ptp->caps, &now);
 
         tmr_ctrl =
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 73cce3ecb97f..a9f60d0ee02e 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -41,6 +41,15 @@
 
 #define DASD_DIAG_MOD           "dasd_diag_mod"
 
+static unsigned int queue_depth = 32;
+static unsigned int nr_hw_queues = 4;
+
+module_param(queue_depth, uint, 0444);
+MODULE_PARM_DESC(queue_depth, "Default queue depth for new DASD devices");
+
+module_param(nr_hw_queues, uint, 0444);
+MODULE_PARM_DESC(nr_hw_queues, "Default number of hardware queues for new DASD devices");
+
 /*
  * SECTION: exported variables of dasd.c
  */
@@ -1222,80 +1231,37 @@ static void dasd_hosts_init(struct dentry *base_dentry,
                 device->hosts_dentry = pde;
 }
 
-/*
- * Allocate memory for a channel program with 'cplength' channel
- * command words and 'datasize' additional space. There are two
- * variantes: 1) dasd_kmalloc_request uses kmalloc to get the needed
- * memory and 2) dasd_smalloc_request uses the static ccw memory
- * that gets allocated for each device.
- */
-struct dasd_ccw_req *dasd_kmalloc_request(int magic, int cplength,
-                                          int datasize,
-                                          struct dasd_device *device)
-{
-        struct dasd_ccw_req *cqr;
-
-        /* Sanity checks */
-        BUG_ON(datasize > PAGE_SIZE ||
-             (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
-
-        cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);
-        if (cqr == NULL)
-                return ERR_PTR(-ENOMEM);
-        cqr->cpaddr = NULL;
-        if (cplength > 0) {
-                cqr->cpaddr = kcalloc(cplength, sizeof(struct ccw1),
-                                      GFP_ATOMIC | GFP_DMA);
-                if (cqr->cpaddr == NULL) {
-                        kfree(cqr);
-                        return ERR_PTR(-ENOMEM);
-                }
-        }
-        cqr->data = NULL;
-        if (datasize > 0) {
-                cqr->data = kzalloc(datasize, GFP_ATOMIC | GFP_DMA);
-                if (cqr->data == NULL) {
-                        kfree(cqr->cpaddr);
-                        kfree(cqr);
-                        return ERR_PTR(-ENOMEM);
-                }
-        }
-        cqr->magic =  magic;
-        set_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
-        dasd_get_device(device);
-        return cqr;
-}
-EXPORT_SYMBOL(dasd_kmalloc_request);
-
-struct dasd_ccw_req *dasd_smalloc_request(int magic, int cplength,
-                                          int datasize,
-                                          struct dasd_device *device)
+struct dasd_ccw_req *dasd_smalloc_request(int magic, int cplength, int datasize,
+                                          struct dasd_device *device,
+                                          struct dasd_ccw_req *cqr)
 {
         unsigned long flags;
-        struct dasd_ccw_req *cqr;
-        char *data;
-        int size;
+        char *data, *chunk;
+        int size = 0;
 
-        size = (sizeof(struct dasd_ccw_req) + 7L) & -8L;
         if (cplength > 0)
                 size += cplength * sizeof(struct ccw1);
         if (datasize > 0)
                 size += datasize;
+        if (!cqr)
+                size += (sizeof(*cqr) + 7L) & -8L;
+
         spin_lock_irqsave(&device->mem_lock, flags);
-        cqr = (struct dasd_ccw_req *)
-                dasd_alloc_chunk(&device->ccw_chunks, size);
+        data = chunk = dasd_alloc_chunk(&device->ccw_chunks, size);
         spin_unlock_irqrestore(&device->mem_lock, flags);
-        if (cqr == NULL)
+        if (!chunk)
                 return ERR_PTR(-ENOMEM);
-        memset(cqr, 0, sizeof(struct dasd_ccw_req));
-        data = (char *) cqr + ((sizeof(struct dasd_ccw_req) + 7L) & -8L);
-        cqr->cpaddr = NULL;
+        if (!cqr) {
+                cqr = (void *) data;
+                data += (sizeof(*cqr) + 7L) & -8L;
+        }
+        memset(cqr, 0, sizeof(*cqr));
+        cqr->mem_chunk = chunk;
         if (cplength > 0) {
-                cqr->cpaddr = (struct ccw1 *) data;
-                data += cplength*sizeof(struct ccw1);
-                memset(cqr->cpaddr, 0, cplength*sizeof(struct ccw1));
+                cqr->cpaddr = data;
+                data += cplength * sizeof(struct ccw1);
+                memset(cqr->cpaddr, 0, cplength * sizeof(struct ccw1));
         }
-        cqr->data = NULL;
         if (datasize > 0) {
                 cqr->data = data;
                 memset(cqr->data, 0, datasize);
@@ -1307,33 +1273,12 @@ struct dasd_ccw_req *dasd_smalloc_request(int magic, int cplength,
 }
 EXPORT_SYMBOL(dasd_smalloc_request);
 
-/*
- * Free memory of a channel program. This function needs to free all the
- * idal lists that might have been created by dasd_set_cda and the
- * struct dasd_ccw_req itself.
- */
-void dasd_kfree_request(struct dasd_ccw_req *cqr, struct dasd_device *device)
-{
-        struct ccw1 *ccw;
-
-        /* Clear any idals used for the request. */
-        ccw = cqr->cpaddr;
-        do {
-                clear_normalized_cda(ccw);
-        } while (ccw++->flags & (CCW_FLAG_CC | CCW_FLAG_DC));
-        kfree(cqr->cpaddr);
-        kfree(cqr->data);
-        kfree(cqr);
-        dasd_put_device(device);
-}
-EXPORT_SYMBOL(dasd_kfree_request);
-
 void dasd_sfree_request(struct dasd_ccw_req *cqr, struct dasd_device *device)
 {
         unsigned long flags;
 
         spin_lock_irqsave(&device->mem_lock, flags);
-        dasd_free_chunk(&device->ccw_chunks, cqr);
+        dasd_free_chunk(&device->ccw_chunks, cqr->mem_chunk);
         spin_unlock_irqrestore(&device->mem_lock, flags);
         dasd_put_device(device);
 }
@@ -1885,6 +1830,33 @@ static void __dasd_device_process_ccw_queue(struct dasd_device *device,
         }
 }
 
+static void __dasd_process_cqr(struct dasd_device *device,
+                               struct dasd_ccw_req *cqr)
+{
+        char errorstring[ERRORLENGTH];
+
+        switch (cqr->status) {
+        case DASD_CQR_SUCCESS:
+                cqr->status = DASD_CQR_DONE;
+                break;
+        case DASD_CQR_ERROR:
+                cqr->status = DASD_CQR_NEED_ERP;
+                break;
+        case DASD_CQR_CLEARED:
+                cqr->status = DASD_CQR_TERMINATED;
+                break;
+        default:
+                /* internal error 12 - wrong cqr status*/
+                snprintf(errorstring, ERRORLENGTH, "12 %p %x02", cqr, cqr->status);
+                dev_err(&device->cdev->dev,
+                        "An error occurred in the DASD device driver, "
+                        "reason=%s\n", errorstring);
+                BUG();
+        }
+        if (cqr->callback)
+                cqr->callback(cqr, cqr->callback_data);
+}
+
 /*
  * the cqrs from the final queue are returned to the upper layer
  * by setting a dasd_block state and calling the callback function
@@ -1895,40 +1867,18 @@ static void __dasd_device_process_final_queue(struct dasd_device *device,
         struct list_head *l, *n;
         struct dasd_ccw_req *cqr;
         struct dasd_block *block;
-        void (*callback)(struct dasd_ccw_req *, void *data);
-        void *callback_data;
-        char errorstring[ERRORLENGTH];
 
         list_for_each_safe(l, n, final_queue) {
                 cqr = list_entry(l, struct dasd_ccw_req, devlist);
                 list_del_init(&cqr->devlist);
                 block = cqr->block;
-                callback = cqr->callback;
-                callback_data = cqr->callback_data;
-                if (block)
+                if (!block) {
+                        __dasd_process_cqr(device, cqr);
+                } else {
                         spin_lock_bh(&block->queue_lock);
-                switch (cqr->status) {
-                case DASD_CQR_SUCCESS:
-                        cqr->status = DASD_CQR_DONE;
-                        break;
-                case DASD_CQR_ERROR:
-                        cqr->status = DASD_CQR_NEED_ERP;
-                        break;
-                case DASD_CQR_CLEARED:
-                        cqr->status = DASD_CQR_TERMINATED;
-                        break;
-                default:
-                        /* internal error 12 - wrong cqr status*/
-                        snprintf(errorstring, ERRORLENGTH, "12 %p %x02", cqr, cqr->status);
-                        dev_err(&device->cdev->dev,
-                                "An error occurred in the DASD device driver, "
-                                "reason=%s\n", errorstring);
-                        BUG();
-                }
-                if (cqr->callback != NULL)
-                        (callback)(cqr, callback_data);
-                if (block)
+                        __dasd_process_cqr(device, cqr);
                         spin_unlock_bh(&block->queue_lock);
+                }
         }
 }
 
@@ -3041,7 +2991,6 @@ static blk_status_t do_dasd_request(struct blk_mq_hw_ctx *hctx,
         cqr->callback_data = req;
         cqr->status = DASD_CQR_FILLED;
         cqr->dq = dq;
-        *((struct dasd_ccw_req **) blk_mq_rq_to_pdu(req)) = cqr;
 
         blk_mq_start_request(req);
         spin_lock(&block->queue_lock);
@@ -3072,7 +3021,7 @@ enum blk_eh_timer_return dasd_times_out(struct request *req, bool reserved)
         unsigned long flags;
         int rc = 0;
 
-        cqr = *((struct dasd_ccw_req **) blk_mq_rq_to_pdu(req));
+        cqr = blk_mq_rq_to_pdu(req);
         if (!cqr)
                 return BLK_EH_DONE;
 
@@ -3174,9 +3123,9 @@ static int dasd_alloc_queue(struct dasd_block *block)
         int rc;
 
         block->tag_set.ops = &dasd_mq_ops;
-        block->tag_set.cmd_size = sizeof(struct dasd_ccw_req *);
-        block->tag_set.nr_hw_queues = DASD_NR_HW_QUEUES;
-        block->tag_set.queue_depth = DASD_MAX_LCU_DEV * DASD_REQ_PER_DEV;
+        block->tag_set.cmd_size = sizeof(struct dasd_ccw_req);
+        block->tag_set.nr_hw_queues = nr_hw_queues;
+        block->tag_set.queue_depth = queue_depth;
         block->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
 
         rc = blk_mq_alloc_tag_set(&block->tag_set);
@@ -4038,7 +3987,8 @@ static struct dasd_ccw_req *dasd_generic_build_rdc(struct dasd_device *device,
         struct ccw1 *ccw;
         unsigned long *idaw;
 
-        cqr = dasd_smalloc_request(magic, 1 /* RDC */, rdc_buffer_size, device);
+        cqr = dasd_smalloc_request(magic, 1 /* RDC */, rdc_buffer_size, device,
+                                   NULL);
 
         if (IS_ERR(cqr)) {
                 /* internal error 13 - Allocating the RDC request failed*/
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index 5e963fe0e38d..e36a114354fc 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -407,9 +407,9 @@ static int read_unit_address_configuration(struct dasd_device *device,
         int rc;
         unsigned long flags;
 
-        cqr = dasd_kmalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ + 1 /* RSSD */,
+        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ + 1 /* RSSD */,
                                    (sizeof(struct dasd_psf_prssd_data)),
-                                   device);
+                                   device, NULL);
         if (IS_ERR(cqr))
                 return PTR_ERR(cqr);
         cqr->startdev = device;
@@ -457,7 +457,7 @@ static int read_unit_address_configuration(struct dasd_device *device,
                 lcu->flags |= NEED_UAC_UPDATE;
                 spin_unlock_irqrestore(&lcu->lock, flags);
         }
-        dasd_kfree_request(cqr, cqr->memdev);
+        dasd_sfree_request(cqr, cqr->memdev);
         return rc;
 }
 
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 131f1989f6f3..e1fe02477ea8 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -536,7 +536,8 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,
         /* Build the request */
         datasize = sizeof(struct dasd_diag_req) +
                 count*sizeof(struct dasd_diag_bio);
-        cqr = dasd_smalloc_request(DASD_DIAG_MAGIC, 0, datasize, memdev);
+        cqr = dasd_smalloc_request(DASD_DIAG_MAGIC, 0, datasize, memdev,
+                                   blk_mq_rq_to_pdu(req));
         if (IS_ERR(cqr))
                 return cqr;
 
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index be208e7adcb4..bbf95b78ef5d 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -886,7 +886,7 @@ static int dasd_eckd_read_conf_lpm(struct dasd_device *device,
         }
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* RCD */,
                                    0, /* use rcd_buf as data ara */
-                                   device);
+                                   device, NULL);
         if (IS_ERR(cqr)) {
                 DBF_DEV_EVENT(DBF_WARNING, device, "%s",
                               "Could not allocate RCD request");
@@ -1442,7 +1442,7 @@ static int dasd_eckd_read_features(struct dasd_device *device)
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ + 1 /* RSSD */,
                                    (sizeof(struct dasd_psf_prssd_data) +
                                     sizeof(struct dasd_rssd_features)),
-                                   device);
+                                   device, NULL);
         if (IS_ERR(cqr)) {
                 DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s", "Could not "
                                 "allocate initialization request");
@@ -1504,7 +1504,7 @@ static struct dasd_ccw_req *dasd_eckd_build_psf_ssc(struct dasd_device *device,
 
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ ,
                                   sizeof(struct dasd_psf_ssc_data),
-                                  device);
+                                   device, NULL);
 
         if (IS_ERR(cqr)) {
                 DBF_DEV_EVENT(DBF_WARNING, device, "%s",
@@ -1815,7 +1815,8 @@ dasd_eckd_analysis_ccw(struct dasd_device *device)
 
         cplength = 8;
         datasize = sizeof(struct DE_eckd_data) + 2*sizeof(struct LO_eckd_data);
-        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize, device);
+        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize, device,
+                                   NULL);
         if (IS_ERR(cqr))
                 return cqr;
         ccw = cqr->cpaddr;
@@ -2092,7 +2093,8 @@ dasd_eckd_build_check_tcw(struct dasd_device *base, struct format_data_t *fdata,
          */
         itcw_size = itcw_calc_size(0, count, 0);
 
-        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 0, itcw_size, startdev);
+        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 0, itcw_size, startdev,
+                                   NULL);
         if (IS_ERR(cqr))
                 return cqr;
 
@@ -2186,7 +2188,7 @@ dasd_eckd_build_check(struct dasd_device *base, struct format_data_t *fdata,
         cplength += count;
 
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize,
-                                  startdev);
+                                   startdev, NULL);
         if (IS_ERR(cqr))
                 return cqr;
 
@@ -2332,7 +2334,7 @@ dasd_eckd_build_format(struct dasd_device *base,
         }
         /* Allocate the format ccw request. */
         fcp = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength,
-                                   datasize, startdev);
+                                   datasize, startdev, NULL);
         if (IS_ERR(fcp))
                 return fcp;
 
@@ -3103,7 +3105,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single(
         }
         /* Allocate the ccw request. */
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize,
-                                   startdev);
+                                   startdev, blk_mq_rq_to_pdu(req));
         if (IS_ERR(cqr))
                 return cqr;
         ccw = cqr->cpaddr;
@@ -3262,7 +3264,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track(
 
         /* Allocate the ccw request. */
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength, datasize,
-                                   startdev);
+                                   startdev, blk_mq_rq_to_pdu(req));
         if (IS_ERR(cqr))
                 return cqr;
         ccw = cqr->cpaddr;
@@ -3595,7 +3597,8 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
 
         /* Allocate the ccw request. */
         itcw_size = itcw_calc_size(0, ctidaw, 0);
-        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 0, itcw_size, startdev);
+        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 0, itcw_size, startdev,
+                                   blk_mq_rq_to_pdu(req));
         if (IS_ERR(cqr))
                 return cqr;
 
@@ -3862,7 +3865,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev,
 
         /* Allocate the ccw request. */
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, cplength,
-                                   datasize, startdev);
+                                   datasize, startdev, blk_mq_rq_to_pdu(req));
         if (IS_ERR(cqr))
                 return cqr;
 
@@ -4102,7 +4105,7 @@ dasd_eckd_release(struct dasd_device *device)
                 return -EACCES;
 
         useglobal = 0;
-        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);
+        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device, NULL);
         if (IS_ERR(cqr)) {
                 mutex_lock(&dasd_reserve_mutex);
                 useglobal = 1;
@@ -4157,7 +4160,7 @@ dasd_eckd_reserve(struct dasd_device *device)
                 return -EACCES;
 
         useglobal = 0;
-        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);
+        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device, NULL);
         if (IS_ERR(cqr)) {
                 mutex_lock(&dasd_reserve_mutex);
                 useglobal = 1;
@@ -4211,7 +4214,7 @@ dasd_eckd_steal_lock(struct dasd_device *device)
                 return -EACCES;
 
         useglobal = 0;
-        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device);
+        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1, 32, device, NULL);
         if (IS_ERR(cqr)) {
                 mutex_lock(&dasd_reserve_mutex);
                 useglobal = 1;
@@ -4271,7 +4274,8 @@ static int dasd_eckd_snid(struct dasd_device *device,
 
         useglobal = 0;
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1,
-                                   sizeof(struct dasd_snid_data), device);
+                                   sizeof(struct dasd_snid_data), device,
+                                   NULL);
         if (IS_ERR(cqr)) {
                 mutex_lock(&dasd_reserve_mutex);
                 useglobal = 1;
@@ -4331,7 +4335,7 @@ dasd_eckd_performance(struct dasd_device *device, void __user *argp)
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */  + 1 /* RSSD */,
                                    (sizeof(struct dasd_psf_prssd_data) +
                                     sizeof(struct dasd_rssd_perf_stats_t)),
-                                   device);
+                                   device, NULL);
         if (IS_ERR(cqr)) {
                 DBF_DEV_EVENT(DBF_WARNING, device, "%s",
                             "Could not allocate initialization request");
@@ -4477,7 +4481,7 @@ static int dasd_symm_io(struct dasd_device *device, void __user *argp)
         psf1 = psf_data[1];
 
         /* setup CCWs for PSF + RSSD */
-        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 2 , 0, device);
+        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 2, 0, device, NULL);
         if (IS_ERR(cqr)) {
                 DBF_DEV_EVENT(DBF_WARNING, device, "%s",
                         "Could not allocate initialization request");
@@ -5037,7 +5041,7 @@ static int dasd_eckd_read_message_buffer(struct dasd_device *device,
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ + 1 /* RSSD */,
                                    (sizeof(struct dasd_psf_prssd_data) +
                                     sizeof(struct dasd_rssd_messages)),
-                                   device);
+                                   device, NULL);
         if (IS_ERR(cqr)) {
                 DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
                                 "Could not allocate read message buffer request");
@@ -5126,7 +5130,7 @@ static int dasd_eckd_query_host_access(struct dasd_device *device,
 
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ + 1 /* RSSD */,
                                    sizeof(struct dasd_psf_prssd_data) + 1,
-                                   device);
+                                   device, NULL);
         if (IS_ERR(cqr)) {
                 DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
                                 "Could not allocate read message buffer request");
@@ -5284,8 +5288,8 @@ dasd_eckd_psf_cuir_response(struct dasd_device *device, int response,
         int rc;
 
         cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ ,
-                                  sizeof(struct dasd_psf_cuir_response),
-                                  device);
+                                   sizeof(struct dasd_psf_cuir_response),
+                                   device, NULL);
 
         if (IS_ERR(cqr)) {
                 DBF_DEV_EVENT(DBF_WARNING, device, "%s",
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 0af8c5295b65..6ef8714dc693 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -447,7 +447,7 @@ static void dasd_eer_snss_cb(struct dasd_ccw_req *cqr, void *data)
                  * is a new ccw in device->eer_cqr. Free the "old"
                  * snss request now.
                  */
-                dasd_kfree_request(cqr, device);
+                dasd_sfree_request(cqr, device);
 }
 
 /*
@@ -472,8 +472,8 @@ int dasd_eer_enable(struct dasd_device *device)
         if (rc)
                 goto out;
 
-        cqr = dasd_kmalloc_request(DASD_ECKD_MAGIC, 1 /* SNSS */,
-                                   SNSS_DATA_SIZE, device);
+        cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* SNSS */,
+                                   SNSS_DATA_SIZE, device, NULL);
         if (IS_ERR(cqr)) {
                 rc = -ENOMEM;
                 cqr = NULL;
@@ -505,7 +505,7 @@ out:
         spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
 
         if (cqr)
-                dasd_kfree_request(cqr, device);
+                dasd_sfree_request(cqr, device);
 
         return rc;
 }
@@ -528,7 +528,7 @@ void dasd_eer_disable(struct dasd_device *device)
         in_use = test_and_clear_bit(DASD_FLAG_EER_IN_USE, &device->flags);
         spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
         if (cqr && !in_use)
-                dasd_kfree_request(cqr, device);
+                dasd_sfree_request(cqr, device);
 }
 
 /*
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index a6b132f7e869..56007a3e7f11 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -356,7 +356,8 @@ static struct dasd_ccw_req *dasd_fba_build_cp_discard(
         datasize = sizeof(struct DE_fba_data) +
                 nr_ccws * (sizeof(struct LO_fba_data) + sizeof(struct ccw1));
 
-        cqr = dasd_smalloc_request(DASD_FBA_MAGIC, cplength, datasize, memdev);
+        cqr = dasd_smalloc_request(DASD_FBA_MAGIC, cplength, datasize, memdev,
+                                   blk_mq_rq_to_pdu(req));
         if (IS_ERR(cqr))
                 return cqr;
 
@@ -490,7 +491,8 @@ static struct dasd_ccw_req *dasd_fba_build_cp_regular(
                 datasize += (count - 1)*sizeof(struct LO_fba_data);
         }
         /* Allocate the ccw request. */
-        cqr = dasd_smalloc_request(DASD_FBA_MAGIC, cplength, datasize, memdev);
+        cqr = dasd_smalloc_request(DASD_FBA_MAGIC, cplength, datasize, memdev,
+                                   blk_mq_rq_to_pdu(req));
         if (IS_ERR(cqr))
                 return cqr;
         ccw = cqr->cpaddr;
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 96709b1a7bf8..de6b96036aa4 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -158,40 +158,33 @@ do { \
 
 struct dasd_ccw_req {
         unsigned int magic;             /* Eye catcher */
+        int intrc;                      /* internal error, e.g. from start_IO */
         struct list_head devlist;       /* for dasd_device request queue */
         struct list_head blocklist;     /* for dasd_block request queue */
-
-        /* Where to execute what... */
         struct dasd_block *block;       /* the originating block device */
         struct dasd_device *memdev;     /* the device used to allocate this */
         struct dasd_device *startdev;   /* device the request is started on */
         struct dasd_device *basedev;    /* base device if no block->base */
         void *cpaddr;                   /* address of ccw or tcw */
+        short retries;                  /* A retry counter */
         unsigned char cpmode;           /* 0 = cmd mode, 1 = itcw */
         char status;                    /* status of this request */
-        short retries;                  /* A retry counter */
+        char lpm;                       /* logical path mask */
         unsigned long flags;            /* flags of this request */
         struct dasd_queue *dq;
-
-        /* ... and how */
         unsigned long starttime;        /* jiffies time of request start */
         unsigned long expires;          /* expiration period in jiffies */
-        char lpm;                       /* logical path mask */
         void *data;                     /* pointer to data area */
-
-        /* these are important for recovering erroneous requests          */
-        int intrc;                      /* internal error, e.g. from start_IO */
         struct irb irb;                 /* device status in case of an error */
         struct dasd_ccw_req *refers;    /* ERP-chain queueing. */
         void *function;                 /* originating ERP action */
+        void *mem_chunk;
 
-        /* these are for statistics only */
         unsigned long buildclk;         /* TOD-clock of request generation */
         unsigned long startclk;         /* TOD-clock of request start */
         unsigned long stopclk;          /* TOD-clock of request interrupt */
         unsigned long endclk;           /* TOD-clock of request termination */
 
-        /* Callback that is called after reaching final status. */
         void (*callback)(struct dasd_ccw_req *, void *data);
         void *callback_data;
 };
@@ -235,14 +228,6 @@ struct dasd_ccw_req {
 #define DASD_CQR_SUPPRESS_IL    6       /* Suppress 'Incorrect Length' error */
 #define DASD_CQR_SUPPRESS_CR    7       /* Suppress 'Command Reject' error */
 
-/*
- * There is no reliable way to determine the number of available CPUs on
- * LPAR but there is no big performance difference between 1 and the
- * maximum CPU number.
- * 64 is a good trade off performance wise.
- */
-#define DASD_NR_HW_QUEUES 64
-#define DASD_MAX_LCU_DEV 256
 #define DASD_REQ_PER_DEV 4
 
 /* Signature for error recovery functions. */
@@ -714,19 +699,10 @@ extern const struct block_device_operations dasd_device_operations;
 extern struct kmem_cache *dasd_page_cache;
 
 struct dasd_ccw_req *
-dasd_kmalloc_request(int , int, int, struct dasd_device *);
-struct dasd_ccw_req *
-dasd_smalloc_request(int , int, int, struct dasd_device *);
-void dasd_kfree_request(struct dasd_ccw_req *, struct dasd_device *);
+dasd_smalloc_request(int, int, int, struct dasd_device *, struct dasd_ccw_req *);
 void dasd_sfree_request(struct dasd_ccw_req *, struct dasd_device *);
 void dasd_wakeup_cb(struct dasd_ccw_req *, void *);
 
-static inline int
-dasd_kmalloc_set_cda(struct ccw1 *ccw, void *cda, struct dasd_device *device)
-{
-        return set_normalized_cda(ccw, cda);
-}
-
 struct dasd_device *dasd_alloc_device(void);
 void dasd_free_device(struct dasd_device *);
 
diff --git a/drivers/s390/cio/Makefile b/drivers/s390/cio/Makefile
index a070ef0efe65..f230516abb96 100644
--- a/drivers/s390/cio/Makefile
+++ b/drivers/s390/cio/Makefile
@@ -5,6 +5,7 @@
 
 # The following is required for define_trace.h to find ./trace.h
 CFLAGS_trace.o := -I$(src)
+CFLAGS_vfio_ccw_fsm.o := -I$(src)
 
 obj-y += airq.o blacklist.o chsc.o cio.o css.o chp.o idset.o isc.o \
         fcx.o itcw.o crw.o ccwreq.o trace.o ioasm.o
diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c
index dce92b2a895d..dbe7c7ac9ac8 100644
--- a/drivers/s390/cio/vfio_ccw_cp.c
+++ b/drivers/s390/cio/vfio_ccw_cp.c
@@ -23,9 +23,13 @@
 #define CCWCHAIN_LEN_MAX        256
 
 struct pfn_array {
+        /* Starting guest physical I/O address. */
         unsigned long           pa_iova;
+        /* Array that stores PFNs of the pages need to pin. */
         unsigned long           *pa_iova_pfn;
+        /* Array that receives PFNs of the pages pinned. */
         unsigned long           *pa_pfn;
+        /* Number of pages pinned from @pa_iova. */
         int                     pa_nr;
 };
 
@@ -46,70 +50,33 @@ struct ccwchain {
 };
 
 /*
- * pfn_array_pin() - pin user pages in memory
+ * pfn_array_alloc_pin() - alloc memory for PFNs, then pin user pages in memory
  * @pa: pfn_array on which to perform the operation
  * @mdev: the mediated device to perform pin/unpin operations
+ * @iova: target guest physical address
+ * @len: number of bytes that should be pinned from @iova
  *
- * Attempt to pin user pages in memory.
+ * Attempt to allocate memory for PFNs, and pin user pages in memory.
  *
  * Usage of pfn_array:
- * @pa->pa_iova     starting guest physical I/O address. Assigned by caller.
- * @pa->pa_iova_pfn array that stores PFNs of the pages need to pin. Allocated
- *                  by caller.
- * @pa->pa_pfn      array that receives PFNs of the pages pinned. Allocated by
- *                  caller.
- * @pa->pa_nr       number of pages from @pa->pa_iova to pin. Assigned by
- *                  caller.
- *                  number of pages pinned. Assigned by callee.
+ * We expect (pa_nr == 0) and (pa_iova_pfn == NULL), any field in
+ * this structure will be filled in by this function.
  *
  * Returns:
  *   Number of pages pinned on success.
- *   If @pa->pa_nr is 0 or negative, returns 0.
+ *   If @pa->pa_nr is not 0, or @pa->pa_iova_pfn is not NULL initially,
+ *   returns -EINVAL.
  *   If no pages were pinned, returns -errno.
  */
-static int pfn_array_pin(struct pfn_array *pa, struct device *mdev)
-{
-        int i, ret;
-
-        if (pa->pa_nr <= 0) {
-                pa->pa_nr = 0;
-                return 0;
-        }
-
-        pa->pa_iova_pfn[0] = pa->pa_iova >> PAGE_SHIFT;
-        for (i = 1; i < pa->pa_nr; i++)
-                pa->pa_iova_pfn[i] = pa->pa_iova_pfn[i - 1] + 1;
-
-        ret = vfio_pin_pages(mdev, pa->pa_iova_pfn, pa->pa_nr,
-                             IOMMU_READ | IOMMU_WRITE, pa->pa_pfn);
-
-        if (ret > 0 && ret != pa->pa_nr) {
-                vfio_unpin_pages(mdev, pa->pa_iova_pfn, ret);
-                pa->pa_nr = 0;
-                return 0;
-        }
-
-        return ret;
-}
-
-/* Unpin the pages before releasing the memory. */
-static void pfn_array_unpin_free(struct pfn_array *pa, struct device *mdev)
-{
-        vfio_unpin_pages(mdev, pa->pa_iova_pfn, pa->pa_nr);
-        pa->pa_nr = 0;
-        kfree(pa->pa_iova_pfn);
-}
-
-/* Alloc memory for PFNs, then pin pages with them. */
 static int pfn_array_alloc_pin(struct pfn_array *pa, struct device *mdev,
                                u64 iova, unsigned int len)
 {
-        int ret = 0;
+        int i, ret = 0;
 
         if (!len)
                 return 0;
 
-        if (pa->pa_nr)
+        if (pa->pa_nr || pa->pa_iova_pfn)
                 return -EINVAL;
 
         pa->pa_iova = iova;
@@ -126,18 +93,39 @@ static int pfn_array_alloc_pin(struct pfn_array *pa, struct device *mdev,
                 return -ENOMEM;
         pa->pa_pfn = pa->pa_iova_pfn + pa->pa_nr;
 
-        ret = pfn_array_pin(pa, mdev);
+        pa->pa_iova_pfn[0] = pa->pa_iova >> PAGE_SHIFT;
+        for (i = 1; i < pa->pa_nr; i++)
+                pa->pa_iova_pfn[i] = pa->pa_iova_pfn[i - 1] + 1;
 
-        if (ret > 0)
-                return ret;
-        else if (!ret)
+        ret = vfio_pin_pages(mdev, pa->pa_iova_pfn, pa->pa_nr,
+                             IOMMU_READ | IOMMU_WRITE, pa->pa_pfn);
+
+        if (ret < 0) {
+                goto err_out;
+        } else if (ret > 0 && ret != pa->pa_nr) {
+                vfio_unpin_pages(mdev, pa->pa_iova_pfn, ret);
                 ret = -EINVAL;
+                goto err_out;
+        }
 
+        return ret;
+
+err_out:
+        pa->pa_nr = 0;
         kfree(pa->pa_iova_pfn);
+        pa->pa_iova_pfn = NULL;
 
         return ret;
 }
 
+/* Unpin the pages before releasing the memory. */
+static void pfn_array_unpin_free(struct pfn_array *pa, struct device *mdev)
+{
+        vfio_unpin_pages(mdev, pa->pa_iova_pfn, pa->pa_nr);
+        pa->pa_nr = 0;
+        kfree(pa->pa_iova_pfn);
+}
+
 static int pfn_array_table_init(struct pfn_array_table *pat, int nr)
 {
         pat->pat_pa = kcalloc(nr, sizeof(*pat->pat_pa), GFP_KERNEL);
@@ -365,6 +353,9 @@ static void cp_unpin_free(struct channel_program *cp)
  * This is the chain length not considering any TICs.
  * You need to do a new round for each TIC target.
  *
+ * The program is also validated for absence of not yet supported
+ * indirect data addressing scenarios.
+ *
  * Returns: the length of the ccw chain or -errno.
  */
 static int ccwchain_calc_length(u64 iova, struct channel_program *cp)
@@ -391,6 +382,14 @@ static int ccwchain_calc_length(u64 iova, struct channel_program *cp)
         do {
                 cnt++;
 
+                /*
+                 * As we don't want to fail direct addressing even if the
+                 * orb specified one of the unsupported formats, we defer
+                 * checking for IDAWs in unsupported formats to here.
+                 */
+                if ((!cp->orb.cmd.c64 || cp->orb.cmd.i2k) && ccw_is_idal(ccw))
+                        return -EOPNOTSUPP;
+
                 if ((!ccw_is_chain(ccw)) && (!ccw_is_tic(ccw)))
                         break;
 
@@ -503,7 +502,7 @@ static int ccwchain_fetch_direct(struct ccwchain *chain,
         struct ccw1 *ccw;
         struct pfn_array_table *pat;
         unsigned long *idaws;
-        int idaw_nr;
+        int ret;
 
         ccw = chain->ch_ccw + idx;
 
@@ -523,18 +522,19 @@ static int ccwchain_fetch_direct(struct ccwchain *chain,
          * needed when translating a direct ccw to a idal ccw.
          */
         pat = chain->ch_pat + idx;
-        if (pfn_array_table_init(pat, 1))
-                return -ENOMEM;
-        idaw_nr = pfn_array_alloc_pin(pat->pat_pa, cp->mdev,
-                                      ccw->cda, ccw->count);
-        if (idaw_nr < 0)
-                return idaw_nr;
+        ret = pfn_array_table_init(pat, 1);
+        if (ret)
+                goto out_init;
+
+        ret = pfn_array_alloc_pin(pat->pat_pa, cp->mdev, ccw->cda, ccw->count);
+        if (ret < 0)
+                goto out_init;
 
         /* Translate this direct ccw to a idal ccw. */
-        idaws = kcalloc(idaw_nr, sizeof(*idaws), GFP_DMA | GFP_KERNEL);
+        idaws = kcalloc(ret, sizeof(*idaws), GFP_DMA | GFP_KERNEL);
         if (!idaws) {
-                pfn_array_table_unpin_free(pat, cp->mdev);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out_unpin;
         }
         ccw->cda = (__u32) virt_to_phys(idaws);
         ccw->flags |= CCW_FLAG_IDA;
@@ -542,6 +542,12 @@ static int ccwchain_fetch_direct(struct ccwchain *chain,
         pfn_array_table_idal_create_words(pat, idaws);
 
         return 0;
+
+out_unpin:
+        pfn_array_table_unpin_free(pat, cp->mdev);
+out_init:
+        ccw->cda = 0;
+        return ret;
 }
 
 static int ccwchain_fetch_idal(struct ccwchain *chain,
@@ -571,7 +577,7 @@ static int ccwchain_fetch_idal(struct ccwchain *chain,
         pat = chain->ch_pat + idx;
         ret = pfn_array_table_init(pat, idaw_nr);
         if (ret)
-                return ret;
+                goto out_init;
 
         /* Translate idal ccw to use new allocated idaws. */
         idaws = kzalloc(idaw_len, GFP_DMA | GFP_KERNEL);
@@ -603,6 +609,8 @@ out_free_idaws:
         kfree(idaws);
 out_unpin:
         pfn_array_table_unpin_free(pat, cp->mdev);
+out_init:
+        ccw->cda = 0;
         return ret;
 }
 
@@ -656,10 +664,8 @@ int cp_init(struct channel_program *cp, struct device *mdev, union orb *orb)
         /*
          * XXX:
          * Only support prefetch enable mode now.
-         * Only support 64bit addressing idal.
-         * Only support 4k IDAW.
          */
-        if (!orb->cmd.pfch || !orb->cmd.c64 || orb->cmd.i2k)
+        if (!orb->cmd.pfch)
                 return -EOPNOTSUPP;
 
         INIT_LIST_HEAD(&cp->ccwchain_list);
@@ -688,6 +694,10 @@ int cp_init(struct channel_program *cp, struct device *mdev, union orb *orb)
         ret = ccwchain_loop_tic(chain, cp);
         if (ret)
                 cp_unpin_free(cp);
+        /* It is safe to force: if not set but idals used
+         * ccwchain_calc_length returns an error.
+         */
+        cp->orb.cmd.c64 = 1;
 
         return ret;
 }
diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c
index ea6a2d0b2894..770fa9cfc310 100644
--- a/drivers/s390/cio/vfio_ccw_drv.c
+++ b/drivers/s390/cio/vfio_ccw_drv.c
@@ -177,6 +177,7 @@ static int vfio_ccw_sch_event(struct subchannel *sch, int process)
 {
         struct vfio_ccw_private *private = dev_get_drvdata(&sch->dev);
         unsigned long flags;
+        int rc = -EAGAIN;
 
         spin_lock_irqsave(sch->lock, flags);
         if (!device_is_registered(&sch->dev))
@@ -187,6 +188,7 @@ static int vfio_ccw_sch_event(struct subchannel *sch, int process)
 
         if (cio_update_schib(sch)) {
                 vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_NOT_OPER);
+                rc = 0;
                 goto out_unlock;
         }
 
@@ -195,11 +197,12 @@ static int vfio_ccw_sch_event(struct subchannel *sch, int process)
                 private->state = private->mdev ? VFIO_CCW_STATE_IDLE :
                                  VFIO_CCW_STATE_STANDBY;
         }
+        rc = 0;
 
 out_unlock:
         spin_unlock_irqrestore(sch->lock, flags);
 
-        return 0;
+        return rc;
 }
 
 static struct css_device_id vfio_ccw_sch_ids[] = {
diff --git a/drivers/s390/cio/vfio_ccw_fsm.c b/drivers/s390/cio/vfio_ccw_fsm.c
index 3c800642134e..797a82731159 100644
--- a/drivers/s390/cio/vfio_ccw_fsm.c
+++ b/drivers/s390/cio/vfio_ccw_fsm.c
@@ -13,6 +13,9 @@
 #include "ioasm.h"
 #include "vfio_ccw_private.h"
 
+#define CREATE_TRACE_POINTS
+#include "vfio_ccw_trace.h"
+
 static int fsm_io_helper(struct vfio_ccw_private *private)
 {
         struct subchannel *sch;
@@ -110,6 +113,10 @@ static void fsm_disabled_irq(struct vfio_ccw_private *private,
          */
         cio_disable_subchannel(sch);
 }
+inline struct subchannel_id get_schid(struct vfio_ccw_private *p)
+{
+        return p->sch->schid;
+}
 
 /*
  * Deal with the ccw command request from the userspace.
@@ -121,6 +128,7 @@ static void fsm_io_request(struct vfio_ccw_private *private,
         union scsw *scsw = &private->scsw;
         struct ccw_io_region *io_region = &private->io_region;
         struct mdev_device *mdev = private->mdev;
+        char *errstr = "request";
 
         private->state = VFIO_CCW_STATE_BOXED;
 
@@ -132,15 +140,19 @@ static void fsm_io_request(struct vfio_ccw_private *private,
                 /* Don't try to build a cp if transport mode is specified. */
                 if (orb->tm.b) {
                         io_region->ret_code = -EOPNOTSUPP;
+                        errstr = "transport mode";
                         goto err_out;
                 }
                 io_region->ret_code = cp_init(&private->cp, mdev_dev(mdev),
                                               orb);
-                if (io_region->ret_code)
+                if (io_region->ret_code) {
+                        errstr = "cp init";
                         goto err_out;
+                }
 
                 io_region->ret_code = cp_prefetch(&private->cp);
                 if (io_region->ret_code) {
+                        errstr = "cp prefetch";
                         cp_free(&private->cp);
                         goto err_out;
                 }
@@ -148,6 +160,7 @@ static void fsm_io_request(struct vfio_ccw_private *private,
                 /* Start channel program and wait for I/O interrupt. */
                 io_region->ret_code = fsm_io_helper(private);
                 if (io_region->ret_code) {
+                        errstr = "cp fsm_io_helper";
                         cp_free(&private->cp);
                         goto err_out;
                 }
@@ -164,6 +177,8 @@ static void fsm_io_request(struct vfio_ccw_private *private,
 
 err_out:
         private->state = VFIO_CCW_STATE_IDLE;
+        trace_vfio_ccw_io_fctl(scsw->cmd.fctl, get_schid(private),
+                               io_region->ret_code, errstr);
 }
 
 /*
diff --git a/drivers/s390/cio/vfio_ccw_trace.h b/drivers/s390/cio/vfio_ccw_trace.h
new file mode 100644
index 000000000000..b1da53ddec1f
--- /dev/null
+++ b/drivers/s390/cio/vfio_ccw_trace.h
@@ -0,0 +1,54 @@
+/* SPDX-License-Identifier: GPL-2.0
+ * Tracepoints for vfio_ccw driver
+ *
+ * Copyright IBM Corp. 2018
+ *
+ * Author(s): Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
+ *            Halil Pasic <pasic@linux.vnet.ibm.com>
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM vfio_ccw
+
+#if !defined(_VFIO_CCW_TRACE_) || defined(TRACE_HEADER_MULTI_READ)
+#define _VFIO_CCW_TRACE_
+
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(vfio_ccw_io_fctl,
+        TP_PROTO(int fctl, struct subchannel_id schid, int errno, char *errstr),
+        TP_ARGS(fctl, schid, errno, errstr),
+
+        TP_STRUCT__entry(
+                __field(int, fctl)
+                __field_struct(struct subchannel_id, schid)
+                __field(int, errno)
+                __field(char*, errstr)
+        ),
+
+        TP_fast_assign(
+                __entry->fctl = fctl;
+                __entry->schid = schid;
+                __entry->errno = errno;
+                __entry->errstr = errstr;
+        ),
+
+        TP_printk("schid=%x.%x.%04x fctl=%x errno=%d info=%s",
+                  __entry->schid.cssid,
+                  __entry->schid.ssid,
+                  __entry->schid.sch_no,
+                  __entry->fctl,
+                  __entry->errno,
+                  __entry->errstr)
+);
+
+#endif /* _VFIO_CCW_TRACE_ */
+
+/* This part must be outside protection */
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE vfio_ccw_trace
+
+#include <trace/define_trace.h>
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 2a5fec55bf60..a246a618f9a4 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -829,6 +829,17 @@ struct qeth_trap_id {
 /*some helper functions*/
 #define QETH_CARD_IFNAME(card) (((card)->dev)? (card)->dev->name : "")
 
+static inline void qeth_scrub_qdio_buffer(struct qdio_buffer *buf,
+                                          unsigned int elements)
+{
+        unsigned int i;
+
+        for (i = 0; i < elements; i++)
+                memset(&buf->element[i], 0, sizeof(struct qdio_buffer_element));
+        buf->element[14].sflags = 0;
+        buf->element[15].sflags = 0;
+}
+
 /**
  * qeth_get_elements_for_range() -      find number of SBALEs to cover range.
  * @start:                              Start of the address range.
@@ -1029,7 +1040,7 @@ struct qeth_cmd_buffer *qeth_get_setassparms_cmd(struct qeth_card *,
                                                  __u16, __u16,
                                                  enum qeth_prot_versions);
 int qeth_set_features(struct net_device *, netdev_features_t);
-void qeth_recover_features(struct net_device *dev);
+void qeth_enable_hw_features(struct net_device *dev);
 netdev_features_t qeth_fix_features(struct net_device *, netdev_features_t);
 netdev_features_t qeth_features_check(struct sk_buff *skb,
                                       struct net_device *dev,
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 8e1474f1ffac..d01ac29fd986 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -73,9 +73,6 @@ static void qeth_notify_skbs(struct qeth_qdio_out_q *queue,
                 struct qeth_qdio_out_buffer *buf,
                 enum iucv_tx_notify notification);
 static void qeth_release_skbs(struct qeth_qdio_out_buffer *buf);
-static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue,
-                struct qeth_qdio_out_buffer *buf,
-                enum qeth_qdio_buffer_states newbufstate);
 static int qeth_init_qdio_out_buf(struct qeth_qdio_out_q *, int);
 
 struct workqueue_struct *qeth_wq;
@@ -489,6 +486,7 @@ static void qeth_qdio_handle_aob(struct qeth_card *card,
         struct qaob *aob;
         struct qeth_qdio_out_buffer *buffer;
         enum iucv_tx_notify notification;
+        unsigned int i;
 
         aob = (struct qaob *) phys_to_virt(phys_aob_addr);
         QETH_CARD_TEXT(card, 5, "haob");
@@ -513,10 +511,18 @@ static void qeth_qdio_handle_aob(struct qeth_card *card,
         qeth_notify_skbs(buffer->q, buffer, notification);
 
         buffer->aob = NULL;
-        qeth_clear_output_buffer(buffer->q, buffer,
-                                 QETH_QDIO_BUF_HANDLED_DELAYED);
+        /* Free dangling allocations. The attached skbs are handled by
+         * qeth_cleanup_handled_pending().
+         */
+        for (i = 0;
+             i < aob->sb_count && i < QETH_MAX_BUFFER_ELEMENTS(card);
+             i++) {
+                if (aob->sba[i] && buffer->is_header[i])
+                        kmem_cache_free(qeth_core_header_cache,
+                                        (void *) aob->sba[i]);
+        }
+        atomic_set(&buffer->state, QETH_QDIO_BUF_HANDLED_DELAYED);
 
-        /* from here on: do not touch buffer anymore */
         qdio_release_aob(aob);
 }
 
@@ -3759,6 +3765,10 @@ static void qeth_qdio_output_handler(struct ccw_device *ccwdev,
                         QETH_CARD_TEXT(queue->card, 5, "aob");
                         QETH_CARD_TEXT_(queue->card, 5, "%lx",
                                         virt_to_phys(buffer->aob));
+
+                        /* prepare the queue slot for re-use: */
+                        qeth_scrub_qdio_buffer(buffer->buffer,
+                                               QETH_MAX_BUFFER_ELEMENTS(card));
                         if (qeth_init_qdio_out_buf(queue, bidx)) {
                                 QETH_CARD_TEXT(card, 2, "outofbuf");
                                 qeth_schedule_recovery(card);
@@ -4834,7 +4844,7 @@ int qeth_vm_request_mac(struct qeth_card *card)
                 goto out;
         }
 
-        ccw_device_get_id(CARD_RDEV(card), &id);
+        ccw_device_get_id(CARD_DDEV(card), &id);
         request->resp_buf_len = sizeof(*response);
         request->resp_version = DIAG26C_VERSION2;
         request->op_code = DIAG26C_GET_MAC;
@@ -6459,28 +6469,27 @@ static int qeth_set_ipa_rx_csum(struct qeth_card *card, bool on)
 #define QETH_HW_FEATURES (NETIF_F_RXCSUM | NETIF_F_IP_CSUM | NETIF_F_TSO | \
                           NETIF_F_IPV6_CSUM)
 /**
- * qeth_recover_features() - Restore device features after recovery
- * @dev:        the recovering net_device
- *
- * Caller must hold rtnl lock.
+ * qeth_enable_hw_features() - (Re-)Enable HW functions for device features
+ * @dev:        a net_device
  */
-void qeth_recover_features(struct net_device *dev)
+void qeth_enable_hw_features(struct net_device *dev)
 {
-        netdev_features_t features = dev->features;
         struct qeth_card *card = dev->ml_priv;
+        netdev_features_t features;
 
+        rtnl_lock();
+        features = dev->features;
         /* force-off any feature that needs an IPA sequence.
          * netdev_update_features() will restart them.
          */
         dev->features &= ~QETH_HW_FEATURES;
         netdev_update_features(dev);
-
-        if (features == dev->features)
-                return;
-        dev_warn(&card->gdev->dev,
-                 "Device recovery failed to restore all offload features\n");
+        if (features != dev->features)
+                dev_warn(&card->gdev->dev,
+                         "Device recovery failed to restore all offload features\n");
+        rtnl_unlock();
 }
-EXPORT_SYMBOL_GPL(qeth_recover_features);
+EXPORT_SYMBOL_GPL(qeth_enable_hw_features);
 
 int qeth_set_features(struct net_device *dev, netdev_features_t features)
 {
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index a7cb37da6a21..2487f0aeb165 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -140,7 +140,7 @@ static int qeth_l2_send_setmac(struct qeth_card *card, __u8 *mac)
 
 static int qeth_l2_write_mac(struct qeth_card *card, u8 *mac)
 {
-        enum qeth_ipa_cmds cmd = is_multicast_ether_addr_64bits(mac) ?
+        enum qeth_ipa_cmds cmd = is_multicast_ether_addr(mac) ?
                                         IPA_CMD_SETGMAC : IPA_CMD_SETVMAC;
         int rc;
 
@@ -157,7 +157,7 @@ static int qeth_l2_write_mac(struct qeth_card *card, u8 *mac)
 
 static int qeth_l2_remove_mac(struct qeth_card *card, u8 *mac)
 {
-        enum qeth_ipa_cmds cmd = is_multicast_ether_addr_64bits(mac) ?
+        enum qeth_ipa_cmds cmd = is_multicast_ether_addr(mac) ?
                                         IPA_CMD_DELGMAC : IPA_CMD_DELVMAC;
         int rc;
 
@@ -501,27 +501,34 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p)
                 return -ERESTARTSYS;
         }
 
+        /* avoid racing against concurrent state change: */
+        if (!mutex_trylock(&card->conf_mutex))
+                return -EAGAIN;
+
         if (!qeth_card_hw_is_reachable(card)) {
                 ether_addr_copy(dev->dev_addr, addr->sa_data);
-                return 0;
+                goto out_unlock;
         }
 
         /* don't register the same address twice */
         if (ether_addr_equal_64bits(dev->dev_addr, addr->sa_data) &&
             (card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED))
-                return 0;
+                goto out_unlock;
 
         /* add the new address, switch over, drop the old */
         rc = qeth_l2_send_setmac(card, addr->sa_data);
         if (rc)
-                return rc;
+                goto out_unlock;
         ether_addr_copy(old_addr, dev->dev_addr);
         ether_addr_copy(dev->dev_addr, addr->sa_data);
 
         if (card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED)
                 qeth_l2_remove_mac(card, old_addr);
         card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;
-        return 0;
+
+out_unlock:
+        mutex_unlock(&card->conf_mutex);
+        return rc;
 }
 
 static void qeth_promisc_to_bridge(struct qeth_card *card)
@@ -1112,6 +1119,8 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                 netif_carrier_off(card->dev);
 
         qeth_set_allowed_threads(card, 0xffffffff, 0);
+
+        qeth_enable_hw_features(card->dev);
         if (recover_flag == CARD_STATE_RECOVER) {
                 if (recovery_mode &&
                     card->info.type != QETH_CARD_TYPE_OSN) {
@@ -1123,9 +1132,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                 }
                 /* this also sets saved unicast addresses */
                 qeth_l2_set_rx_mode(card->dev);
-                rtnl_lock();
-                qeth_recover_features(card->dev);
-                rtnl_unlock();
         }
         /* let user_space know that device is online */
         kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE);
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index e7fa479adf47..5905dc63e256 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2662,6 +2662,8 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                 netif_carrier_on(card->dev);
         else
                 netif_carrier_off(card->dev);
+
+        qeth_enable_hw_features(card->dev);
         if (recover_flag == CARD_STATE_RECOVER) {
                 rtnl_lock();
                 if (recovery_mode)
@@ -2669,7 +2671,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
                 else
                         dev_open(card->dev);
                 qeth_l3_set_rx_mode(card->dev);
-                qeth_recover_features(card->dev);
                 rtnl_unlock();
         }
         qeth_trace_features(card);
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index a9831bd37a73..a57f3a7d4748 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1974,7 +1974,6 @@ static void aac_set_safw_attr_all_targets(struct aac_dev *dev)
         u32 lun_count, nexus;
         u32 i, bus, target;
         u8 expose_flag, attribs;
-        u8 devtype;
 
         lun_count = aac_get_safw_phys_lun_count(dev);
 
@@ -1992,23 +1991,23 @@ static void aac_set_safw_attr_all_targets(struct aac_dev *dev)
                         continue;
 
                 if (expose_flag != 0) {
-                        devtype = AAC_DEVTYPE_RAID_MEMBER;
-                        goto update_devtype;
+                        dev->hba_map[bus][target].devtype =
+                                AAC_DEVTYPE_RAID_MEMBER;
+                        continue;
                 }
 
                 if (nexus != 0 && (attribs & 8)) {
-                        devtype = AAC_DEVTYPE_NATIVE_RAW;
+                        dev->hba_map[bus][target].devtype =
+                                AAC_DEVTYPE_NATIVE_RAW;
                         dev->hba_map[bus][target].rmw_nexus =
                                         nexus;
                 } else
-                        devtype = AAC_DEVTYPE_ARC_RAW;
+                        dev->hba_map[bus][target].devtype =
+                                AAC_DEVTYPE_ARC_RAW;
 
                 dev->hba_map[bus][target].scan_counter = dev->scan_counter;
 
                 aac_set_safw_target_qd(dev, bus, target);
-
-update_devtype:
-                dev->hba_map[bus][target].devtype = devtype;
         }
 }
 
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 0a9b8b387bd2..02d65dce74e5 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -760,7 +760,6 @@ static void ipr_mask_and_clear_interrupts(struct ipr_ioa_cfg *ioa_cfg,
                 ioa_cfg->hrrq[i].allow_interrupts = 0;
                 spin_unlock(&ioa_cfg->hrrq[i]._lock);
         }
-        wmb();
 
         /* Set interrupt mask to stop all new interrupts */
         if (ioa_cfg->sis64)
@@ -8403,7 +8402,6 @@ static int ipr_reset_enable_ioa(struct ipr_cmnd *ipr_cmd)
                 ioa_cfg->hrrq[i].allow_interrupts = 1;
                 spin_unlock(&ioa_cfg->hrrq[i]._lock);
         }
-        wmb();
         if (ioa_cfg->sis64) {
                 /* Set the adapter to the correct endian mode. */
                 writel(IPR_ENDIAN_SWAP_KEY, ioa_cfg->regs.endian_swap_reg);
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 0fea2e2326be..1027b0cb7fa3 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1224,7 +1224,6 @@ static void qla24xx_chk_fcp_state(struct fc_port *sess)
 void qlt_schedule_sess_for_deletion(struct fc_port *sess)
 {
         struct qla_tgt *tgt = sess->tgt;
-        struct qla_hw_data *ha = sess->vha->hw;
         unsigned long flags;
 
         if (sess->disc_state == DSC_DELETE_PEND)
@@ -1241,16 +1240,16 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)
                         return;
         }
 
-        spin_lock_irqsave(&ha->tgt.sess_lock, flags);
         if (sess->deleted == QLA_SESS_DELETED)
                 sess->logout_on_delete = 0;
 
+        spin_lock_irqsave(&sess->vha->work_lock, flags);
         if (sess->deleted == QLA_SESS_DELETION_IN_PROGRESS) {
-                spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
+                spin_unlock_irqrestore(&sess->vha->work_lock, flags);
                 return;
         }
         sess->deleted = QLA_SESS_DELETION_IN_PROGRESS;
-        spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
+        spin_unlock_irqrestore(&sess->vha->work_lock, flags);
 
         sess->disc_state = DSC_DELETE_PEND;
 
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 24d7496cd9e2..364e71861bfd 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5507,9 +5507,9 @@ static void __exit scsi_debug_exit(void)
         int k = sdebug_add_host;
 
         stop_all_queued();
-        free_all_queued();
         for (; k; k--)
                 sdebug_remove_adapter();
+        free_all_queued();
         driver_unregister(&sdebug_driverfs_driver);
         bus_unregister(&pseudo_lld_bus);
         root_device_unregister(pseudo_primary);
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 1da3d71e9f61..13948102ca29 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3592,7 +3592,7 @@ fc_bsg_job_timeout(struct request *req)
 
         /* the blk_end_sync_io() doesn't check the error */
         if (inflight)
-                blk_mq_complete_request(req);
+                __blk_complete_request(req);
         return BLK_EH_DONE;
 }
 
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 53ae52dbff84..cd2fdac000c9 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -51,6 +51,7 @@ static int sg_version_num = 30536;	/* 2 digits for each component */
 #include <linux/atomic.h>
 #include <linux/ratelimit.h>
 #include <linux/uio.h>
+#include <linux/cred.h> /* for sg_check_file_access() */
 
 #include "scsi.h"
 #include <scsi/scsi_dbg.h>
@@ -209,6 +210,33 @@ static void sg_device_destroy(struct kref *kref);
         sdev_prefix_printk(prefix, (sdp)->device,               \
                            (sdp)->disk->disk_name, fmt, ##a)
 
+/*
+ * The SCSI interfaces that use read() and write() as an asynchronous variant of
+ * ioctl(..., SG_IO, ...) are fundamentally unsafe, since there are lots of ways
+ * to trigger read() and write() calls from various contexts with elevated
+ * privileges. This can lead to kernel memory corruption (e.g. if these
+ * interfaces are called through splice()) and privilege escalation inside
+ * userspace (e.g. if a process with access to such a device passes a file
+ * descriptor to a SUID binary as stdin/stdout/stderr).
+ *
+ * This function provides protection for the legacy API by restricting the
+ * calling context.
+ */
+static int sg_check_file_access(struct file *filp, const char *caller)
+{
+        if (filp->f_cred != current_real_cred()) {
+                pr_err_once("%s: process %d (%s) changed security contexts after opening file descriptor, this is not allowed.\n",
+                        caller, task_tgid_vnr(current), current->comm);
+                return -EPERM;
+        }
+        if (uaccess_kernel()) {
+                pr_err_once("%s: process %d (%s) called from kernel context, this is not allowed.\n",
+                        caller, task_tgid_vnr(current), current->comm);
+                return -EACCES;
+        }
+        return 0;
+}
+
 static int sg_allow_access(struct file *filp, unsigned char *cmd)
 {
         struct sg_fd *sfp = filp->private_data;
@@ -393,6 +421,14 @@ sg_read(struct file *filp, char __user *buf, size_t count, loff_t * ppos)
         struct sg_header *old_hdr = NULL;
         int retval = 0;
 
+        /*
+         * This could cause a response to be stranded. Close the associated
+         * file descriptor to free up any resources being held.
+         */
+        retval = sg_check_file_access(filp, __func__);
+        if (retval)
+                return retval;
+
         if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))
                 return -ENXIO;
         SCSI_LOG_TIMEOUT(3, sg_printk(KERN_INFO, sdp,
@@ -580,9 +616,11 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
         struct sg_header old_hdr;
         sg_io_hdr_t *hp;
         unsigned char cmnd[SG_MAX_CDB_SIZE];
+        int retval;
 
-        if (unlikely(uaccess_kernel()))
-                return -EINVAL;
+        retval = sg_check_file_access(filp, __func__);
+        if (retval)
+                return retval;
 
         if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))
                 return -ENXIO;
diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c
index 36f59a1be7e9..61389bdc7926 100644
--- a/drivers/scsi/xen-scsifront.c
+++ b/drivers/scsi/xen-scsifront.c
@@ -654,10 +654,17 @@ static int scsifront_dev_reset_handler(struct scsi_cmnd *sc)
 static int scsifront_sdev_configure(struct scsi_device *sdev)
 {
         struct vscsifrnt_info *info = shost_priv(sdev->host);
+        int err;
 
-        if (info && current == info->curr)
-                xenbus_printf(XBT_NIL, info->dev->nodename,
+        if (info && current == info->curr) {
+                err = xenbus_printf(XBT_NIL, info->dev->nodename,
                               info->dev_state_path, "%d", XenbusStateConnected);
+                if (err) {
+                        xenbus_dev_error(info->dev, err,
+                                "%s: writing dev_state_path", __func__);
+                        return err;
+                }
+        }
 
         return 0;
 }
@@ -665,10 +672,15 @@ static int scsifront_sdev_configure(struct scsi_device *sdev)
 static void scsifront_sdev_destroy(struct scsi_device *sdev)
 {
         struct vscsifrnt_info *info = shost_priv(sdev->host);
+        int err;
 
-        if (info && current == info->curr)
-                xenbus_printf(XBT_NIL, info->dev->nodename,
+        if (info && current == info->curr) {
+                err = xenbus_printf(XBT_NIL, info->dev->nodename,
                               info->dev_state_path, "%d", XenbusStateClosed);
+                if (err)
+                        xenbus_dev_error(info->dev, err,
+                                "%s: writing dev_state_path", __func__);
+        }
 }
 
 static struct scsi_host_template scsifront_sht = {
@@ -1003,9 +1015,12 @@ static void scsifront_do_lun_hotplug(struct vscsifrnt_info *info, int op)
 
                         if (scsi_add_device(info->host, chn, tgt, lun)) {
                                 dev_err(&dev->dev, "scsi_add_device\n");
-                                xenbus_printf(XBT_NIL, dev->nodename,
+                                err = xenbus_printf(XBT_NIL, dev->nodename,
                                               info->dev_state_path,
                                               "%d", XenbusStateClosed);
+                                if (err)
+                                        xenbus_dev_error(dev, err,
+                                                "%s: writing dev_state_path", __func__);
                         }
                         break;
                 case VSCSIFRONT_OP_DEL_LUN:
@@ -1019,10 +1034,14 @@ static void scsifront_do_lun_hotplug(struct vscsifrnt_info *info, int op)
                         }
                         break;
                 case VSCSIFRONT_OP_READD_LUN:
-                        if (device_state == XenbusStateConnected)
-                                xenbus_printf(XBT_NIL, dev->nodename,
+                        if (device_state == XenbusStateConnected) {
+                                err = xenbus_printf(XBT_NIL, dev->nodename,
                                               info->dev_state_path,
                                               "%d", XenbusStateConnected);
+                                if (err)
+                                        xenbus_dev_error(dev, err,
+                                                "%s: writing dev_state_path", __func__);
+                        }
                         break;
                 default:
                         break;
diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c
index f4e3bd40c72e..6ef18cf8f243 100644
--- a/drivers/soc/imx/gpcv2.c
+++ b/drivers/soc/imx/gpcv2.c
@@ -39,10 +39,15 @@
 
 #define GPC_M4_PU_PDN_FLG               0x1bc
 
-
-#define PGC_MIPI                        4
-#define PGC_PCIE                        5
-#define PGC_USB_HSIC                    8
+/*
+ * The PGC offset values in Reference Manual
+ * (Rev. 1, 01/2018 and the older ones) GPC chapter's
+ * GPC_PGC memory map are incorrect, below offset
+ * values are from design RTL.
+ */
+#define PGC_MIPI                        16
+#define PGC_PCIE                        17
+#define PGC_USB_HSIC                    20
 #define GPC_PGC_CTRL(n)                 (0x800 + (n) * 0x40)
 #define GPC_PGC_SR(n)                   (GPC_PGC_CTRL(n) + 0xc)
 
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 9dc02f390ba3..5856e792d09c 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -5,7 +5,8 @@ menu "Qualcomm SoC drivers"
 
 config QCOM_COMMAND_DB
         bool "Qualcomm Command DB"
-        depends on (ARCH_QCOM && OF) || COMPILE_TEST
+        depends on ARCH_QCOM || COMPILE_TEST
+        depends on OF_RESERVED_MEM
         help
           Command DB queries shared memory by key string for shared system
           resources. Platform drivers that require to set state of a shared
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 95120acc4d80..50d03d8b4f9a 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -194,11 +194,12 @@ static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
 
 static bool has_cpg_mstp;
 
-static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
+static int __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
 {
         struct generic_pm_domain *genpd = &pd->genpd;
         const char *name = pd->genpd.name;
         struct dev_power_governor *gov = &simple_qos_governor;
+        int error;
 
         if (pd->flags & PD_CPU) {
                 /*
@@ -251,7 +252,11 @@ static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
         rcar_sysc_power_up(&pd->ch);
 
 finalize:
-        pm_genpd_init(genpd, gov, false);
+        error = pm_genpd_init(genpd, gov, false);
+        if (error)
+                pr_err("Failed to init PM domain %s: %d\n", name, error);
+
+        return error;
 }
 
 static const struct of_device_id rcar_sysc_matches[] __initconst = {
@@ -375,6 +380,9 @@ static int __init rcar_sysc_pd_init(void)
         pr_debug("%pOF: syscier = 0x%08x\n", np, syscier);
         iowrite32(syscier, base + SYSCIER);
 
+        /*
+         * First, create all PM domains
+         */
         for (i = 0; i < info->num_areas; i++) {
                 const struct rcar_sysc_area *area = &info->areas[i];
                 struct rcar_sysc_pd *pd;
@@ -397,14 +405,29 @@ static int __init rcar_sysc_pd_init(void)
                 pd->ch.isr_bit = area->isr_bit;
                 pd->flags = area->flags;
 
-                rcar_sysc_pd_setup(pd);
-                if (area->parent >= 0)
-                        pm_genpd_add_subdomain(domains->domains[area->parent],
-                                               &pd->genpd);
+                error = rcar_sysc_pd_setup(pd);
+                if (error)
+                        goto out_put;
 
                 domains->domains[area->isr_bit] = &pd->genpd;
         }
 
+        /*
+         * Second, link all PM domains to their parents
+         */
+        for (i = 0; i < info->num_areas; i++) {
+                const struct rcar_sysc_area *area = &info->areas[i];
+
+                if (!area->name || area->parent < 0)
+                        continue;
+
+                error = pm_genpd_add_subdomain(domains->domains[area->parent],
+                                               domains->domains[area->isr_bit]);
+                if (error)
+                        pr_warn("Failed to add PM subdomain %s to parent %u\n",
+                                area->name, area->parent);
+        }
+
         error = of_genpd_add_provider_onecell(np, &domains->onecell_data);
 
 out_put:
diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c
index e8c440329708..31db510018a9 100644
--- a/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@ -30,7 +30,7 @@ void *ion_heap_map_kernel(struct ion_heap *heap,
         struct page **tmp = pages;
 
         if (!pages)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         if (buffer->flags & ION_FLAG_CACHED)
                 pgprot = PAGE_KERNEL;
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index ea194aa01a64..257b0daff01f 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -642,7 +642,7 @@ static int daqp_ao_insn_write(struct comedi_device *dev,
         /* Make sure D/A update mode is direct update */
         outb(0, dev->iobase + DAQP_AUX_REG);
 
-        for (i = 0; i > insn->n; i++) {
+        for (i = 0; i < insn->n; i++) {
                 unsigned int val = data[i];
                 int ret;
 
diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 45c05527a57a..faf4b4158cfa 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -1051,7 +1051,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
                 return _FAIL;
 
 
-        if (len > MAX_IE_SZ)
+        if (len < 0 || len > MAX_IE_SZ)
                 return _FAIL;
 
         pbss_network->IELength = len;
diff --git a/drivers/staging/rtlwifi/rtl8822be/hw.c b/drivers/staging/rtlwifi/rtl8822be/hw.c
index 7947edb239a1..88ba5b2fea6a 100644
--- a/drivers/staging/rtlwifi/rtl8822be/hw.c
+++ b/drivers/staging/rtlwifi/rtl8822be/hw.c
@@ -803,7 +803,7 @@ static void _rtl8822be_enable_aspm_back_door(struct ieee80211_hw *hw)
                 return;
 
         pci_read_config_byte(rtlpci->pdev, 0x70f, &tmp);
-        pci_write_config_byte(rtlpci->pdev, 0x70f, tmp | BIT(7));
+        pci_write_config_byte(rtlpci->pdev, 0x70f, tmp | ASPM_L1_LATENCY << 3);
 
         pci_read_config_byte(rtlpci->pdev, 0x719, &tmp);
         pci_write_config_byte(rtlpci->pdev, 0x719, tmp | BIT(3) | BIT(4));
diff --git a/drivers/staging/rtlwifi/wifi.h b/drivers/staging/rtlwifi/wifi.h
index 012fb618840b..a45f0eb69d3f 100644
--- a/drivers/staging/rtlwifi/wifi.h
+++ b/drivers/staging/rtlwifi/wifi.h
@@ -88,6 +88,7 @@
 #define RTL_USB_MAX_RX_COUNT                    100
 #define QBSS_LOAD_SIZE                          5
 #define MAX_WMMELE_LENGTH                       64
+#define ASPM_L1_LATENCY                         7
 
 #define TOTAL_CAM_ENTRY                         32
 
diff --git a/drivers/staging/typec/Kconfig b/drivers/staging/typec/Kconfig
index 3aa981fbc8f5..e45ed08a5166 100644
--- a/drivers/staging/typec/Kconfig
+++ b/drivers/staging/typec/Kconfig
@@ -11,6 +11,7 @@ config TYPEC_TCPCI
 
 config TYPEC_RT1711H
         tristate "Richtek RT1711H Type-C chip driver"
+        depends on I2C
         select TYPEC_TCPCI
         help
           Richtek RT1711H Type-C chip driver that works with
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 01ac306131c1..10db5656fd5d 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -3727,11 +3727,16 @@ core_scsi3_pri_read_keys(struct se_cmd *cmd)
                  * Check for overflow of 8byte PRI READ_KEYS payload and
                  * next reservation key list descriptor.
                  */
-                if ((add_len + 8) > (cmd->data_length - 8))
-                        break;
-
-                put_unaligned_be64(pr_reg->pr_res_key, &buf[off]);
-                off += 8;
+                if (off + 8 <= cmd->data_length) {
+                        put_unaligned_be64(pr_reg->pr_res_key, &buf[off]);
+                        off += 8;
+                }
+                /*
+                 * SPC5r17: 6.16.2 READ KEYS service action
+                 * The ADDITIONAL LENGTH field indicates the number of bytes in
+                 * the Reservation key list. The contents of the ADDITIONAL
+                 * LENGTH field are not altered based on the allocation length
+                 */
                 add_len += 8;
         }
         spin_unlock(&dev->t10_pr.registration_lock);
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 7f96dfa32b9c..d8dc3d22051f 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -656,7 +656,7 @@ static void scatter_data_area(struct tcmu_dev *udev,
 }
 
 static void gather_data_area(struct tcmu_dev *udev, struct tcmu_cmd *cmd,
-                             bool bidi)
+                             bool bidi, uint32_t read_len)
 {
         struct se_cmd *se_cmd = cmd->se_cmd;
         int i, dbi;
@@ -689,7 +689,7 @@ static void gather_data_area(struct tcmu_dev *udev, struct tcmu_cmd *cmd,
         for_each_sg(data_sg, sg, data_nents, i) {
                 int sg_remaining = sg->length;
                 to = kmap_atomic(sg_page(sg)) + sg->offset;
-                while (sg_remaining > 0) {
+                while (sg_remaining > 0 && read_len > 0) {
                         if (block_remaining == 0) {
                                 if (from)
                                         kunmap_atomic(from);
@@ -701,6 +701,8 @@ static void gather_data_area(struct tcmu_dev *udev, struct tcmu_cmd *cmd,
                         }
                         copy_bytes = min_t(size_t, sg_remaining,
                                         block_remaining);
+                        if (read_len < copy_bytes)
+                                copy_bytes = read_len;
                         offset = DATA_BLOCK_SIZE - block_remaining;
                         tcmu_flush_dcache_range(from, copy_bytes);
                         memcpy(to + sg->length - sg_remaining, from + offset,
@@ -708,8 +710,11 @@ static void gather_data_area(struct tcmu_dev *udev, struct tcmu_cmd *cmd,
 
                         sg_remaining -= copy_bytes;
                         block_remaining -= copy_bytes;
+                        read_len -= copy_bytes;
                 }
                 kunmap_atomic(to - sg->offset);
+                if (read_len == 0)
+                        break;
         }
         if (from)
                 kunmap_atomic(from);
@@ -1042,6 +1047,8 @@ static void tcmu_handle_completion(struct tcmu_cmd *cmd, struct tcmu_cmd_entry *
 {
         struct se_cmd *se_cmd = cmd->se_cmd;
         struct tcmu_dev *udev = cmd->tcmu_dev;
+        bool read_len_valid = false;
+        uint32_t read_len = se_cmd->data_length;
 
         /*
          * cmd has been completed already from timeout, just reclaim
@@ -1056,13 +1063,28 @@ static void tcmu_handle_completion(struct tcmu_cmd *cmd, struct tcmu_cmd_entry *
                 pr_warn("TCMU: Userspace set UNKNOWN_OP flag on se_cmd %p\n",
                         cmd->se_cmd);
                 entry->rsp.scsi_status = SAM_STAT_CHECK_CONDITION;
-        } else if (entry->rsp.scsi_status == SAM_STAT_CHECK_CONDITION) {
+                goto done;
+        }
+
+        if (se_cmd->data_direction == DMA_FROM_DEVICE &&
+            (entry->hdr.uflags & TCMU_UFLAG_READ_LEN) && entry->rsp.read_len) {
+                read_len_valid = true;
+                if (entry->rsp.read_len < read_len)
+                        read_len = entry->rsp.read_len;
+        }
+
+        if (entry->rsp.scsi_status == SAM_STAT_CHECK_CONDITION) {
                 transport_copy_sense_to_cmd(se_cmd, entry->rsp.sense_buffer);
-        } else if (se_cmd->se_cmd_flags & SCF_BIDI) {
+                if (!read_len_valid )
+                        goto done;
+                else
+                        se_cmd->se_cmd_flags |= SCF_TREAT_READ_AS_NORMAL;
+        }
+        if (se_cmd->se_cmd_flags & SCF_BIDI) {
                 /* Get Data-In buffer before clean up */
-                gather_data_area(udev, cmd, true);
+                gather_data_area(udev, cmd, true, read_len);
         } else if (se_cmd->data_direction == DMA_FROM_DEVICE) {
-                gather_data_area(udev, cmd, false);
+                gather_data_area(udev, cmd, false, read_len);
         } else if (se_cmd->data_direction == DMA_TO_DEVICE) {
                 /* TODO: */
         } else if (se_cmd->data_direction != DMA_NONE) {
@@ -1070,7 +1092,13 @@ static void tcmu_handle_completion(struct tcmu_cmd *cmd, struct tcmu_cmd_entry *
                         se_cmd->data_direction);
         }
 
-        target_complete_cmd(cmd->se_cmd, entry->rsp.scsi_status);
+done:
+        if (read_len_valid) {
+                pr_debug("read_len = %d\n", read_len);
+                target_complete_cmd_with_length(cmd->se_cmd,
+                                        entry->rsp.scsi_status, read_len);
+        } else
+                target_complete_cmd(cmd->se_cmd, entry->rsp.scsi_status);
 
 out:
         cmd->se_cmd = NULL;
@@ -1740,7 +1768,7 @@ static int tcmu_configure_device(struct se_device *dev)
         /* Initialise the mailbox of the ring buffer */
         mb = udev->mb_addr;
         mb->version = TCMU_MAILBOX_VERSION;
-        mb->flags = TCMU_MAILBOX_FLAG_CAP_OOOC;
+        mb->flags = TCMU_MAILBOX_FLAG_CAP_OOOC | TCMU_MAILBOX_FLAG_CAP_READ_LEN;
         mb->cmdr_off = CMDR_OFF;
         mb->cmdr_size = udev->cmdr_size;
 
diff --git a/drivers/thunderbolt/domain.c b/drivers/thunderbolt/domain.c
index 6281266b8ec0..a923ebdeb73c 100644
--- a/drivers/thunderbolt/domain.c
+++ b/drivers/thunderbolt/domain.c
@@ -213,6 +213,10 @@ static ssize_t boot_acl_store(struct device *dev, struct device_attribute *attr,
                 goto err_free_acl;
         }
         ret = tb->cm_ops->set_boot_acl(tb, acl, tb->nboot_acl);
+        if (!ret) {
+                /* Notify userspace about the change */
+                kobject_uevent(&tb->dev.kobj, KOBJ_CHANGE);
+        }
         mutex_unlock(&tb->lock);
 
 err_free_acl:
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index cbe98bc2b998..431742201709 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -124,6 +124,8 @@ struct n_tty_data {
         struct mutex output_lock;
 };
 
+#define MASK(x) ((x) & (N_TTY_BUF_SIZE - 1))
+
 static inline size_t read_cnt(struct n_tty_data *ldata)
 {
         return ldata->read_head - ldata->read_tail;
@@ -141,6 +143,7 @@ static inline unsigned char *read_buf_addr(struct n_tty_data *ldata, size_t i)
 
 static inline unsigned char echo_buf(struct n_tty_data *ldata, size_t i)
 {
+        smp_rmb(); /* Matches smp_wmb() in add_echo_byte(). */
         return ldata->echo_buf[i & (N_TTY_BUF_SIZE - 1)];
 }
 
@@ -316,9 +319,7 @@ static inline void put_tty_queue(unsigned char c, struct n_tty_data *ldata)
 static void reset_buffer_flags(struct n_tty_data *ldata)
 {
         ldata->read_head = ldata->canon_head = ldata->read_tail = 0;
-        ldata->echo_head = ldata->echo_tail = ldata->echo_commit = 0;
         ldata->commit_head = 0;
-        ldata->echo_mark = 0;
         ldata->line_start = 0;
 
         ldata->erasing = 0;
@@ -617,13 +618,20 @@ static size_t __process_echoes(struct tty_struct *tty)
         old_space = space = tty_write_room(tty);
 
         tail = ldata->echo_tail;
-        while (ldata->echo_commit != tail) {
+        while (MASK(ldata->echo_commit) != MASK(tail)) {
                 c = echo_buf(ldata, tail);
                 if (c == ECHO_OP_START) {
                         unsigned char op;
                         int no_space_left = 0;
 
                         /*
+                         * Since add_echo_byte() is called without holding
+                         * output_lock, we might see only portion of multi-byte
+                         * operation.
+                         */
+                        if (MASK(ldata->echo_commit) == MASK(tail + 1))
+                                goto not_yet_stored;
+                        /*
                          * If the buffer byte is the start of a multi-byte
                          * operation, get the next byte, which is either the
                          * op code or a control character value.
@@ -634,6 +642,8 @@ static size_t __process_echoes(struct tty_struct *tty)
                                 unsigned int num_chars, num_bs;
 
                         case ECHO_OP_ERASE_TAB:
+                                if (MASK(ldata->echo_commit) == MASK(tail + 2))
+                                        goto not_yet_stored;
                                 num_chars = echo_buf(ldata, tail + 2);
 
                                 /*
@@ -728,7 +738,8 @@ static size_t __process_echoes(struct tty_struct *tty)
         /* If the echo buffer is nearly full (so that the possibility exists
          * of echo overrun before the next commit), then discard enough
          * data at the tail to prevent a subsequent overrun */
-        while (ldata->echo_commit - tail >= ECHO_DISCARD_WATERMARK) {
+        while (ldata->echo_commit > tail &&
+               ldata->echo_commit - tail >= ECHO_DISCARD_WATERMARK) {
                 if (echo_buf(ldata, tail) == ECHO_OP_START) {
                         if (echo_buf(ldata, tail + 1) == ECHO_OP_ERASE_TAB)
                                 tail += 3;
@@ -738,6 +749,7 @@ static size_t __process_echoes(struct tty_struct *tty)
                         tail++;
         }
 
+ not_yet_stored:
         ldata->echo_tail = tail;
         return old_space - space;
 }
@@ -748,6 +760,7 @@ static void commit_echoes(struct tty_struct *tty)
         size_t nr, old, echoed;
         size_t head;
 
+        mutex_lock(&ldata->output_lock);
         head = ldata->echo_head;
         ldata->echo_mark = head;
         old = ldata->echo_commit - ldata->echo_tail;
@@ -756,10 +769,12 @@ static void commit_echoes(struct tty_struct *tty)
          * is over the threshold (and try again each time another
          * block is accumulated) */
         nr = head - ldata->echo_tail;
-        if (nr < ECHO_COMMIT_WATERMARK || (nr % ECHO_BLOCK > old % ECHO_BLOCK))
+        if (nr < ECHO_COMMIT_WATERMARK ||
+            (nr % ECHO_BLOCK > old % ECHO_BLOCK)) {
+                mutex_unlock(&ldata->output_lock);
                 return;
+        }
 
-        mutex_lock(&ldata->output_lock);
         ldata->echo_commit = head;
         echoed = __process_echoes(tty);
         mutex_unlock(&ldata->output_lock);
@@ -810,7 +825,9 @@ static void flush_echoes(struct tty_struct *tty)
 
 static inline void add_echo_byte(unsigned char c, struct n_tty_data *ldata)
 {
-        *echo_buf_addr(ldata, ldata->echo_head++) = c;
+        *echo_buf_addr(ldata, ldata->echo_head) = c;
+        smp_wmb(); /* Matches smp_rmb() in echo_buf(). */
+        ldata->echo_head++;
 }
 
 /**
@@ -978,14 +995,15 @@ static void eraser(unsigned char c, struct tty_struct *tty)
         }
 
         seen_alnums = 0;
-        while (ldata->read_head != ldata->canon_head) {
+        while (MASK(ldata->read_head) != MASK(ldata->canon_head)) {
                 head = ldata->read_head;
 
                 /* erase a single possibly multibyte character */
                 do {
                         head--;
                         c = read_buf(ldata, head);
-                } while (is_continuation(c, tty) && head != ldata->canon_head);
+                } while (is_continuation(c, tty) &&
+                         MASK(head) != MASK(ldata->canon_head));
 
                 /* do not partially erase */
                 if (is_continuation(c, tty))
@@ -1027,7 +1045,7 @@ static void eraser(unsigned char c, struct tty_struct *tty)
                                  * This info is used to go back the correct
                                  * number of columns.
                                  */
-                                while (tail != ldata->canon_head) {
+                                while (MASK(tail) != MASK(ldata->canon_head)) {
                                         tail--;
                                         c = read_buf(ldata, tail);
                                         if (c == '\t') {
@@ -1302,7 +1320,7 @@ n_tty_receive_char_special(struct tty_struct *tty, unsigned char c)
                         finish_erasing(ldata);
                         echo_char(c, tty);
                         echo_char_raw('\n', ldata);
-                        while (tail != ldata->read_head) {
+                        while (MASK(tail) != MASK(ldata->read_head)) {
                                 echo_char(read_buf(ldata, tail), tty);
                                 tail++;
                         }
@@ -1878,30 +1896,21 @@ static int n_tty_open(struct tty_struct *tty)
         struct n_tty_data *ldata;
 
         /* Currently a malloc failure here can panic */
-        ldata = vmalloc(sizeof(*ldata));
+        ldata = vzalloc(sizeof(*ldata));
         if (!ldata)
-                goto err;
+                return -ENOMEM;
 
         ldata->overrun_time = jiffies;
         mutex_init(&ldata->atomic_read_lock);
         mutex_init(&ldata->output_lock);
 
         tty->disc_data = ldata;
-        reset_buffer_flags(tty->disc_data);
-        ldata->column = 0;
-        ldata->canon_column = 0;
-        ldata->num_overrun = 0;
-        ldata->no_room = 0;
-        ldata->lnext = 0;
         tty->closing = 0;
         /* indicate buffer work may resume */
         clear_bit(TTY_LDISC_HALTED, &tty->flags);
         n_tty_set_termios(tty, NULL);
         tty_unthrottle(tty);
-
         return 0;
-err:
-        return -ENOMEM;
 }
 
 static inline int input_available_p(struct tty_struct *tty, int poll)
@@ -2411,7 +2420,7 @@ static unsigned long inq_canon(struct n_tty_data *ldata)
         tail = ldata->read_tail;
         nr = head - tail;
         /* Skip EOF-chars.. */
-        while (head != tail) {
+        while (MASK(head) != MASK(tail)) {
                 if (test_bit(tail & (N_TTY_BUF_SIZE - 1), ldata->read_flags) &&
                     read_buf(ldata, tail) == __DISABLED_CHAR)
                         nr--;
diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c
index df93b727e984..9e59f4788589 100644
--- a/drivers/tty/serdev/core.c
+++ b/drivers/tty/serdev/core.c
@@ -617,6 +617,7 @@ EXPORT_SYMBOL_GPL(__serdev_device_driver_register);
 static void __exit serdev_exit(void)
 {
         bus_unregister(&serdev_bus_type);
+        ida_destroy(&ctrl_ida);
 }
 module_exit(serdev_exit);
 
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 3296a05cda2d..f80a300b5d68 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -3339,9 +3339,7 @@ static const struct pci_device_id blacklist[] = {
         /* multi-io cards handled by parport_serial */
         { PCI_DEVICE(0x4348, 0x7053), }, /* WCH CH353 2S1P */
         { PCI_DEVICE(0x4348, 0x5053), }, /* WCH CH353 1S1P */
-        { PCI_DEVICE(0x4348, 0x7173), }, /* WCH CH355 4S */
         { PCI_DEVICE(0x1c00, 0x3250), }, /* WCH CH382 2S1P */
-        { PCI_DEVICE(0x1c00, 0x3470), }, /* WCH CH384 4S */
 
         /* Moxa Smartio MUE boards handled by 8250_moxa */
         { PCI_VDEVICE(MOXA, 0x1024), },
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 1eb1a376a041..15eb6c829d39 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -784,7 +784,7 @@ int vc_allocate(unsigned int currcons)	/* return 0 on success */
         if (!*vc->vc_uni_pagedir_loc)
                 con_set_default_unimap(vc);
 
-        vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size, GFP_KERNEL);
+        vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_KERNEL);
         if (!vc->vc_screenbuf)
                 goto err_free;
 
@@ -871,7 +871,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
 
         if (new_screen_size > (4 << 20))
                 return -EINVAL;
-        newscreen = kmalloc(new_screen_size, GFP_USER);
+        newscreen = kzalloc(new_screen_size, GFP_USER);
         if (!newscreen)
                 return -ENOMEM;
 
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index e8f4ac9400ea..5d421d7e8904 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -215,7 +215,20 @@ static ssize_t name_show(struct device *dev,
                          struct device_attribute *attr, char *buf)
 {
         struct uio_device *idev = dev_get_drvdata(dev);
-        return sprintf(buf, "%s\n", idev->info->name);
+        int ret;
+
+        mutex_lock(&idev->info_lock);
+        if (!idev->info) {
+                ret = -EINVAL;
+                dev_err(dev, "the device has been unregistered\n");
+                goto out;
+        }
+
+        ret = sprintf(buf, "%s\n", idev->info->name);
+
+out:
+        mutex_unlock(&idev->info_lock);
+        return ret;
 }
 static DEVICE_ATTR_RO(name);
 
@@ -223,7 +236,20 @@ static ssize_t version_show(struct device *dev,
                             struct device_attribute *attr, char *buf)
 {
         struct uio_device *idev = dev_get_drvdata(dev);
-        return sprintf(buf, "%s\n", idev->info->version);
+        int ret;
+
+        mutex_lock(&idev->info_lock);
+        if (!idev->info) {
+                ret = -EINVAL;
+                dev_err(dev, "the device has been unregistered\n");
+                goto out;
+        }
+
+        ret = sprintf(buf, "%s\n", idev->info->version);
+
+out:
+        mutex_unlock(&idev->info_lock);
+        return ret;
 }
 static DEVICE_ATTR_RO(version);
 
@@ -415,11 +441,15 @@ EXPORT_SYMBOL_GPL(uio_event_notify);
 static irqreturn_t uio_interrupt(int irq, void *dev_id)
 {
         struct uio_device *idev = (struct uio_device *)dev_id;
-        irqreturn_t ret = idev->info->handler(irq, idev->info);
+        irqreturn_t ret;
 
+        mutex_lock(&idev->info_lock);
+
+        ret = idev->info->handler(irq, idev->info);
         if (ret == IRQ_HANDLED)
                 uio_event_notify(idev->info);
 
+        mutex_unlock(&idev->info_lock);
         return ret;
 }
 
@@ -433,7 +463,6 @@ static int uio_open(struct inode *inode, struct file *filep)
         struct uio_device *idev;
         struct uio_listener *listener;
         int ret = 0;
-        unsigned long flags;
 
         mutex_lock(&minor_lock);
         idev = idr_find(&uio_idr, iminor(inode));
@@ -460,10 +489,16 @@ static int uio_open(struct inode *inode, struct file *filep)
         listener->event_count = atomic_read(&idev->event);
         filep->private_data = listener;
 
-        spin_lock_irqsave(&idev->info_lock, flags);
+        mutex_lock(&idev->info_lock);
+        if (!idev->info) {
+                mutex_unlock(&idev->info_lock);
+                ret = -EINVAL;
+                goto err_alloc_listener;
+        }
+
         if (idev->info && idev->info->open)
                 ret = idev->info->open(idev->info, inode);
-        spin_unlock_irqrestore(&idev->info_lock, flags);
+        mutex_unlock(&idev->info_lock);
         if (ret)
                 goto err_infoopen;
 
@@ -495,12 +530,11 @@ static int uio_release(struct inode *inode, struct file *filep)
         int ret = 0;
         struct uio_listener *listener = filep->private_data;
         struct uio_device *idev = listener->dev;
-        unsigned long flags;
 
-        spin_lock_irqsave(&idev->info_lock, flags);
+        mutex_lock(&idev->info_lock);
         if (idev->info && idev->info->release)
                 ret = idev->info->release(idev->info, inode);
-        spin_unlock_irqrestore(&idev->info_lock, flags);
+        mutex_unlock(&idev->info_lock);
 
         module_put(idev->owner);
         kfree(listener);
@@ -513,12 +547,11 @@ static __poll_t uio_poll(struct file *filep, poll_table *wait)
         struct uio_listener *listener = filep->private_data;
         struct uio_device *idev = listener->dev;
         __poll_t ret = 0;
-        unsigned long flags;
 
-        spin_lock_irqsave(&idev->info_lock, flags);
+        mutex_lock(&idev->info_lock);
         if (!idev->info || !idev->info->irq)
                 ret = -EIO;
-        spin_unlock_irqrestore(&idev->info_lock, flags);
+        mutex_unlock(&idev->info_lock);
 
         if (ret)
                 return ret;
@@ -537,12 +570,11 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
         DECLARE_WAITQUEUE(wait, current);
         ssize_t retval = 0;
         s32 event_count;
-        unsigned long flags;
 
-        spin_lock_irqsave(&idev->info_lock, flags);
+        mutex_lock(&idev->info_lock);
         if (!idev->info || !idev->info->irq)
                 retval = -EIO;
-        spin_unlock_irqrestore(&idev->info_lock, flags);
+        mutex_unlock(&idev->info_lock);
 
         if (retval)
                 return retval;
@@ -592,9 +624,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
         struct uio_device *idev = listener->dev;
         ssize_t retval;
         s32 irq_on;
-        unsigned long flags;
 
-        spin_lock_irqsave(&idev->info_lock, flags);
+        mutex_lock(&idev->info_lock);
+        if (!idev->info) {
+                retval = -EINVAL;
+                goto out;
+        }
+
         if (!idev->info || !idev->info->irq) {
                 retval = -EIO;
                 goto out;
@@ -618,7 +654,7 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
         retval = idev->info->irqcontrol(idev->info, irq_on);
 
 out:
-        spin_unlock_irqrestore(&idev->info_lock, flags);
+        mutex_unlock(&idev->info_lock);
         return retval ? retval : sizeof(s32);
 }
 
@@ -640,10 +676,20 @@ static vm_fault_t uio_vma_fault(struct vm_fault *vmf)
         struct page *page;
         unsigned long offset;
         void *addr;
+        int ret = 0;
+        int mi;
 
-        int mi = uio_find_mem_index(vmf->vma);
-        if (mi < 0)
-                return VM_FAULT_SIGBUS;
+        mutex_lock(&idev->info_lock);
+        if (!idev->info) {
+                ret = VM_FAULT_SIGBUS;
+                goto out;
+        }
+
+        mi = uio_find_mem_index(vmf->vma);
+        if (mi < 0) {
+                ret = VM_FAULT_SIGBUS;
+                goto out;
+        }
 
         /*
          * We need to subtract mi because userspace uses offset = N*PAGE_SIZE
@@ -658,7 +704,11 @@ static vm_fault_t uio_vma_fault(struct vm_fault *vmf)
                 page = vmalloc_to_page(addr);
         get_page(page);
         vmf->page = page;
-        return 0;
+
+out:
+        mutex_unlock(&idev->info_lock);
+
+        return ret;
 }
 
 static const struct vm_operations_struct uio_logical_vm_ops = {
@@ -683,6 +733,7 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
         struct uio_device *idev = vma->vm_private_data;
         int mi = uio_find_mem_index(vma);
         struct uio_mem *mem;
+
         if (mi < 0)
                 return -EINVAL;
         mem = idev->info->mem + mi;
@@ -724,30 +775,46 @@ static int uio_mmap(struct file *filep, struct vm_area_struct *vma)
 
         vma->vm_private_data = idev;
 
+        mutex_lock(&idev->info_lock);
+        if (!idev->info) {
+                ret = -EINVAL;
+                goto out;
+        }
+
         mi = uio_find_mem_index(vma);
-        if (mi < 0)
-                return -EINVAL;
+        if (mi < 0) {
+                ret = -EINVAL;
+                goto out;
+        }
 
         requested_pages = vma_pages(vma);
         actual_pages = ((idev->info->mem[mi].addr & ~PAGE_MASK)
                         + idev->info->mem[mi].size + PAGE_SIZE -1) >> PAGE_SHIFT;
-        if (requested_pages > actual_pages)
-                return -EINVAL;
+        if (requested_pages > actual_pages) {
+                ret = -EINVAL;
+                goto out;
+        }
 
         if (idev->info->mmap) {
                 ret = idev->info->mmap(idev->info, vma);
-                return ret;
+                goto out;
         }
 
         switch (idev->info->mem[mi].memtype) {
                 case UIO_MEM_PHYS:
-                        return uio_mmap_physical(vma);
+                        ret = uio_mmap_physical(vma);
+                        break;
                 case UIO_MEM_LOGICAL:
                 case UIO_MEM_VIRTUAL:
-                        return uio_mmap_logical(vma);
+                        ret = uio_mmap_logical(vma);
+                        break;
                 default:
-                        return -EINVAL;
+                        ret = -EINVAL;
         }
+
+out:
+        mutex_unlock(&idev->info_lock);
+        return 0;
 }
 
 static const struct file_operations uio_fops = {
@@ -865,7 +932,7 @@ int __uio_register_device(struct module *owner,
 
         idev->owner = owner;
         idev->info = info;
-        spin_lock_init(&idev->info_lock);
+        mutex_init(&idev->info_lock);
         init_waitqueue_head(&idev->wait);
         atomic_set(&idev->event, 0);
 
@@ -902,8 +969,9 @@ int __uio_register_device(struct module *owner,
                  * FDs at the time of unregister and therefore may not be
                  * freed until they are released.
                  */
-                ret = request_irq(info->irq, uio_interrupt,
-                                  info->irq_flags, info->name, idev);
+                ret = request_threaded_irq(info->irq, NULL, uio_interrupt,
+                                           info->irq_flags, info->name, idev);
+
                 if (ret)
                         goto err_request_irq;
         }
@@ -928,7 +996,6 @@ EXPORT_SYMBOL_GPL(__uio_register_device);
 void uio_unregister_device(struct uio_info *info)
 {
         struct uio_device *idev;
-        unsigned long flags;
 
         if (!info || !info->uio_dev)
                 return;
@@ -937,14 +1004,14 @@ void uio_unregister_device(struct uio_info *info)
 
         uio_free_minor(idev);
 
+        mutex_lock(&idev->info_lock);
         uio_dev_del_attributes(idev);
 
         if (info->irq && info->irq != UIO_IRQ_CUSTOM)
                 free_irq(info->irq, idev);
 
-        spin_lock_irqsave(&idev->info_lock, flags);
         idev->info = NULL;
-        spin_unlock_irqrestore(&idev->info_lock, flags);
+        mutex_unlock(&idev->info_lock);
 
         device_unregister(&idev->dev);
 
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index af45aa3222b5..4638d9b066be 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -124,8 +124,11 @@ static int host_start(struct ci_hdrc *ci)
 
         hcd->power_budget = ci->platdata->power_budget;
         hcd->tpl_support = ci->platdata->tpl_support;
-        if (ci->phy || ci->usb_phy)
+        if (ci->phy || ci->usb_phy) {
                 hcd->skip_phy_initialization = 1;
+                if (ci->usb_phy)
+                        hcd->usb_phy = ci->usb_phy;
+        }
 
         ehci = hcd_to_ehci(hcd);
         ehci->caps = ci->hw_bank.cap;
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 7b366a6c0b49..998b32d0167e 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1758,6 +1758,9 @@ static const struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0x11ca, 0x0201), /* VeriFone Mx870 Gadget Serial */
         .driver_info = SINGLE_RX_URB,
         },
+        { USB_DEVICE(0x1965, 0x0018), /* Uniden UBC125XLT */
+        .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
+        },
         { USB_DEVICE(0x22b8, 0x7000), /* Motorola Q Phone */
         .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
         },
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index c55def2f1320..097057d2eacf 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -378,6 +378,10 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* Corsair K70 RGB */
         { USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT },
 
+        /* Corsair Strafe */
+        { USB_DEVICE(0x1b1c, 0x1b15), .driver_info = USB_QUIRK_DELAY_INIT |
+          USB_QUIRK_DELAY_CTRL_MSG },
+
         /* Corsair Strafe RGB */
         { USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT |
           USB_QUIRK_DELAY_CTRL_MSG },
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 4a56ac772a3c..71b3b08ad516 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -1004,6 +1004,7 @@ struct dwc2_hregs_backup {
  * @frame_list_sz:      Frame list size
  * @desc_gen_cache:     Kmem cache for generic descriptors
  * @desc_hsisoc_cache:  Kmem cache for hs isochronous descriptors
+ * @unaligned_cache:    Kmem cache for DMA mode to handle non-aligned buf
  *
  * These are for peripheral mode:
  *
@@ -1177,6 +1178,8 @@ struct dwc2_hsotg {
         u32 frame_list_sz;
         struct kmem_cache *desc_gen_cache;
         struct kmem_cache *desc_hsisoc_cache;
+        struct kmem_cache *unaligned_cache;
+#define DWC2_KMEM_UNALIGNED_BUF_SIZE 1024
 
 #endif /* CONFIG_USB_DWC2_HOST || CONFIG_USB_DWC2_DUAL_ROLE */
 
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index f0d9ccf1d665..a0f82cca2d9a 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -812,6 +812,7 @@ static int dwc2_gadget_fill_isoc_desc(struct dwc2_hsotg_ep *hs_ep,
         u32 index;
         u32 maxsize = 0;
         u32 mask = 0;
+        u8 pid = 0;
 
         maxsize = dwc2_gadget_get_desc_params(hs_ep, &mask);
 
@@ -840,7 +841,11 @@ static int dwc2_gadget_fill_isoc_desc(struct dwc2_hsotg_ep *hs_ep,
                          ((len << DEV_DMA_NBYTES_SHIFT) & mask));
 
         if (hs_ep->dir_in) {
-                desc->status |= ((hs_ep->mc << DEV_DMA_ISOC_PID_SHIFT) &
+                if (len)
+                        pid = DIV_ROUND_UP(len, hs_ep->ep.maxpacket);
+                else
+                        pid = 1;
+                desc->status |= ((pid << DEV_DMA_ISOC_PID_SHIFT) &
                                  DEV_DMA_ISOC_PID_MASK) |
                                 ((len % hs_ep->ep.maxpacket) ?
                                  DEV_DMA_SHORT : 0) |
@@ -884,6 +889,7 @@ static void dwc2_gadget_start_isoc_ddma(struct dwc2_hsotg_ep *hs_ep)
         struct dwc2_dma_desc *desc;
 
         if (list_empty(&hs_ep->queue)) {
+                hs_ep->target_frame = TARGET_FRAME_INITIAL;
                 dev_dbg(hsotg->dev, "%s: No requests in queue\n", __func__);
                 return;
         }
@@ -2755,8 +2761,6 @@ static void dwc2_gadget_handle_out_token_ep_disabled(struct dwc2_hsotg_ep *ep)
          */
         tmp = dwc2_hsotg_read_frameno(hsotg);
 
-        dwc2_hsotg_complete_request(hsotg, ep, get_ep_head(ep), 0);
-
         if (using_desc_dma(hsotg)) {
                 if (ep->target_frame == TARGET_FRAME_INITIAL) {
                         /* Start first ISO Out */
@@ -2817,9 +2821,6 @@ static void dwc2_gadget_handle_nak(struct dwc2_hsotg_ep *hs_ep)
 
                 tmp = dwc2_hsotg_read_frameno(hsotg);
                 if (using_desc_dma(hsotg)) {
-                        dwc2_hsotg_complete_request(hsotg, hs_ep,
-                                                    get_ep_head(hs_ep), 0);
-
                         hs_ep->target_frame = tmp;
                         dwc2_gadget_incr_frame_num(hs_ep);
                         dwc2_gadget_start_isoc_ddma(hs_ep);
@@ -4739,9 +4740,11 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg)
         }
 
         ret = usb_add_gadget_udc(dev, &hsotg->gadget);
-        if (ret)
+        if (ret) {
+                dwc2_hsotg_ep_free_request(&hsotg->eps_out[0]->ep,
+                                           hsotg->ctrl_req);
                 return ret;
-
+        }
         dwc2_hsotg_dump(hsotg);
 
         return 0;
@@ -4755,6 +4758,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg)
 int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg)
 {
         usb_del_gadget_udc(&hsotg->gadget);
+        dwc2_hsotg_ep_free_request(&hsotg->eps_out[0]->ep, hsotg->ctrl_req);
 
         return 0;
 }
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index edaf0b6af4f0..b1104be3429c 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -1567,11 +1567,20 @@ static void dwc2_hc_start_transfer(struct dwc2_hsotg *hsotg,
         }
 
         if (hsotg->params.host_dma) {
-                dwc2_writel((u32)chan->xfer_dma,
-                            hsotg->regs + HCDMA(chan->hc_num));
+                dma_addr_t dma_addr;
+
+                if (chan->align_buf) {
+                        if (dbg_hc(chan))
+                                dev_vdbg(hsotg->dev, "align_buf\n");
+                        dma_addr = chan->align_buf;
+                } else {
+                        dma_addr = chan->xfer_dma;
+                }
+                dwc2_writel((u32)dma_addr, hsotg->regs + HCDMA(chan->hc_num));
+
                 if (dbg_hc(chan))
                         dev_vdbg(hsotg->dev, "Wrote %08lx to HCDMA(%d)\n",
-                                 (unsigned long)chan->xfer_dma, chan->hc_num);
+                                 (unsigned long)dma_addr, chan->hc_num);
         }
 
         /* Start the split */
@@ -2625,6 +2634,35 @@ static void dwc2_hc_init_xfer(struct dwc2_hsotg *hsotg,
         }
 }
 
+static int dwc2_alloc_split_dma_aligned_buf(struct dwc2_hsotg *hsotg,
+                                            struct dwc2_qh *qh,
+                                            struct dwc2_host_chan *chan)
+{
+        if (!hsotg->unaligned_cache ||
+            chan->max_packet > DWC2_KMEM_UNALIGNED_BUF_SIZE)
+                return -ENOMEM;
+
+        if (!qh->dw_align_buf) {
+                qh->dw_align_buf = kmem_cache_alloc(hsotg->unaligned_cache,
+                                                    GFP_ATOMIC | GFP_DMA);
+                if (!qh->dw_align_buf)
+                        return -ENOMEM;
+        }
+
+        qh->dw_align_buf_dma = dma_map_single(hsotg->dev, qh->dw_align_buf,
+                                              DWC2_KMEM_UNALIGNED_BUF_SIZE,
+                                              DMA_FROM_DEVICE);
+
+        if (dma_mapping_error(hsotg->dev, qh->dw_align_buf_dma)) {
+                dev_err(hsotg->dev, "can't map align_buf\n");
+                chan->align_buf = 0;
+                return -EINVAL;
+        }
+
+        chan->align_buf = qh->dw_align_buf_dma;
+        return 0;
+}
+
 #define DWC2_USB_DMA_ALIGN 4
 
 struct dma_aligned_buffer {
@@ -2802,6 +2840,32 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
         /* Set the transfer attributes */
         dwc2_hc_init_xfer(hsotg, chan, qtd);
 
+        /* For non-dword aligned buffers */
+        if (hsotg->params.host_dma && qh->do_split &&
+            chan->ep_is_in && (chan->xfer_dma & 0x3)) {
+                dev_vdbg(hsotg->dev, "Non-aligned buffer\n");
+                if (dwc2_alloc_split_dma_aligned_buf(hsotg, qh, chan)) {
+                        dev_err(hsotg->dev,
+                                "Failed to allocate memory to handle non-aligned buffer\n");
+                        /* Add channel back to free list */
+                        chan->align_buf = 0;
+                        chan->multi_count = 0;
+                        list_add_tail(&chan->hc_list_entry,
+                                      &hsotg->free_hc_list);
+                        qtd->in_process = 0;
+                        qh->channel = NULL;
+                        return -ENOMEM;
+                }
+        } else {
+                /*
+                 * We assume that DMA is always aligned in non-split
+                 * case or split out case. Warn if not.
+                 */
+                WARN_ON_ONCE(hsotg->params.host_dma &&
+                             (chan->xfer_dma & 0x3));
+                chan->align_buf = 0;
+        }
+
         if (chan->ep_type == USB_ENDPOINT_XFER_INT ||
             chan->ep_type == USB_ENDPOINT_XFER_ISOC)
                 /*
@@ -5246,6 +5310,19 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg)
                 }
         }
 
+        if (hsotg->params.host_dma) {
+                /*
+                 * Create kmem caches to handle non-aligned buffer
+                 * in Buffer DMA mode.
+                 */
+                hsotg->unaligned_cache = kmem_cache_create("dwc2-unaligned-dma",
+                                                DWC2_KMEM_UNALIGNED_BUF_SIZE, 4,
+                                                SLAB_CACHE_DMA, NULL);
+                if (!hsotg->unaligned_cache)
+                        dev_err(hsotg->dev,
+                                "unable to create dwc2 unaligned cache\n");
+        }
+
         hsotg->otg_port = 1;
         hsotg->frame_list = NULL;
         hsotg->frame_list_dma = 0;
@@ -5280,8 +5357,9 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg)
         return 0;
 
 error4:
-        kmem_cache_destroy(hsotg->desc_gen_cache);
+        kmem_cache_destroy(hsotg->unaligned_cache);
         kmem_cache_destroy(hsotg->desc_hsisoc_cache);
+        kmem_cache_destroy(hsotg->desc_gen_cache);
 error3:
         dwc2_hcd_release(hsotg);
 error2:
@@ -5322,8 +5400,9 @@ void dwc2_hcd_remove(struct dwc2_hsotg *hsotg)
         usb_remove_hcd(hcd);
         hsotg->priv = NULL;
 
-        kmem_cache_destroy(hsotg->desc_gen_cache);
+        kmem_cache_destroy(hsotg->unaligned_cache);
         kmem_cache_destroy(hsotg->desc_hsisoc_cache);
+        kmem_cache_destroy(hsotg->desc_gen_cache);
 
         dwc2_hcd_release(hsotg);
         usb_put_hcd(hcd);
@@ -5435,7 +5514,7 @@ int dwc2_host_enter_hibernation(struct dwc2_hsotg *hsotg)
         dwc2_writel(hprt0, hsotg->regs + HPRT0);
 
         /* Wait for the HPRT0.PrtSusp register field to be set */
-        if (dwc2_hsotg_wait_bit_set(hsotg, HPRT0, HPRT0_SUSP, 300))
+        if (dwc2_hsotg_wait_bit_set(hsotg, HPRT0, HPRT0_SUSP, 3000))
                 dev_warn(hsotg->dev, "Suspend wasn't generated\n");
 
         /*
@@ -5616,6 +5695,8 @@ int dwc2_host_exit_hibernation(struct dwc2_hsotg *hsotg, int rem_wakeup,
                 return ret;
         }
 
+        dwc2_hcd_rem_wakeup(hsotg);
+
         hsotg->hibernated = 0;
         hsotg->bus_suspended = 0;
         hsotg->lx_state = DWC2_L0;
diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
index 7db1ee7e7a77..5502a501f516 100644
--- a/drivers/usb/dwc2/hcd.h
+++ b/drivers/usb/dwc2/hcd.h
@@ -76,6 +76,8 @@ struct dwc2_qh;
  *                      (micro)frame
  * @xfer_buf:           Pointer to current transfer buffer position
  * @xfer_dma:           DMA address of xfer_buf
+ * @align_buf:          In Buffer DMA mode this will be used if xfer_buf is not
+ *                      DWORD aligned
  * @xfer_len:           Total number of bytes to transfer
  * @xfer_count:         Number of bytes transferred so far
  * @start_pkt_count:    Packet count at start of transfer
@@ -133,6 +135,7 @@ struct dwc2_host_chan {
 
         u8 *xfer_buf;
         dma_addr_t xfer_dma;
+        dma_addr_t align_buf;
         u32 xfer_len;
         u32 xfer_count;
         u16 start_pkt_count;
@@ -302,6 +305,9 @@ struct dwc2_hs_transfer_time {
  *                           speed.  Note that this is in "schedule slice" which
  *                           is tightly packed.
  * @ntd:                Actual number of transfer descriptors in a list
+ * @dw_align_buf:       Used instead of original buffer if its physical address
+ *                      is not dword-aligned
+ * @dw_align_buf_dma:   DMA address for dw_align_buf
  * @qtd_list:           List of QTDs for this QH
  * @channel:            Host channel currently processing transfers for this QH
  * @qh_list_entry:      Entry for QH in either the periodic or non-periodic
@@ -350,6 +356,8 @@ struct dwc2_qh {
         struct dwc2_hs_transfer_time hs_transfers[DWC2_HS_SCHEDULE_UFRAMES];
         u32 ls_start_schedule_slice;
         u16 ntd;
+        u8 *dw_align_buf;
+        dma_addr_t dw_align_buf_dma;
         struct list_head qtd_list;
         struct dwc2_host_chan *channel;
         struct list_head qh_list_entry;
diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
index fbea5e3fb947..ed7f05cf4906 100644
--- a/drivers/usb/dwc2/hcd_intr.c
+++ b/drivers/usb/dwc2/hcd_intr.c
@@ -942,14 +942,21 @@ static int dwc2_xfercomp_isoc_split_in(struct dwc2_hsotg *hsotg,
         frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index];
         len = dwc2_get_actual_xfer_length(hsotg, chan, chnum, qtd,
                                           DWC2_HC_XFER_COMPLETE, NULL);
-        if (!len) {
+        if (!len && !qtd->isoc_split_offset) {
                 qtd->complete_split = 0;
-                qtd->isoc_split_offset = 0;
                 return 0;
         }
 
         frame_desc->actual_length += len;
 
+        if (chan->align_buf) {
+                dev_vdbg(hsotg->dev, "non-aligned buffer\n");
+                dma_unmap_single(hsotg->dev, chan->qh->dw_align_buf_dma,
+                                 DWC2_KMEM_UNALIGNED_BUF_SIZE, DMA_FROM_DEVICE);
+                memcpy(qtd->urb->buf + (chan->xfer_dma - qtd->urb->dma),
+                       chan->qh->dw_align_buf, len);
+        }
+
         qtd->isoc_split_offset += len;
 
         hctsiz = dwc2_readl(hsotg->regs + HCTSIZ(chnum));
diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c
index d7c3d6c776d8..301ced1618f8 100644
--- a/drivers/usb/dwc2/hcd_queue.c
+++ b/drivers/usb/dwc2/hcd_queue.c
@@ -383,7 +383,7 @@ static unsigned long *dwc2_get_ls_map(struct dwc2_hsotg *hsotg,
         /* Get the map and adjust if this is a multi_tt hub */
         map = qh->dwc_tt->periodic_bitmaps;
         if (qh->dwc_tt->usb_tt->multi)
-                map += DWC2_ELEMENTS_PER_LS_BITMAP * qh->ttport;
+                map += DWC2_ELEMENTS_PER_LS_BITMAP * (qh->ttport - 1);
 
         return map;
 }
@@ -1696,6 +1696,9 @@ void dwc2_hcd_qh_free(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
 
         if (qh->desc_list)
                 dwc2_hcd_qh_free_ddma(hsotg, qh);
+        else if (hsotg->unaligned_cache && qh->dw_align_buf)
+                kmem_cache_free(hsotg->unaligned_cache, qh->dw_align_buf);
+
         kfree(qh);
 }
 
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index ea91310113b9..103807587dc6 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1272,7 +1272,6 @@ static int dwc3_probe(struct platform_device *pdev)
         if (!dwc->clks)
                 return -ENOMEM;
 
-        dwc->num_clks = ARRAY_SIZE(dwc3_core_clks);
         dwc->dev = dev;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1307,15 +1306,19 @@ static int dwc3_probe(struct platform_device *pdev)
         if (IS_ERR(dwc->reset))
                 return PTR_ERR(dwc->reset);
 
-        ret = clk_bulk_get(dev, dwc->num_clks, dwc->clks);
-        if (ret == -EPROBE_DEFER)
-                return ret;
-        /*
-         * Clocks are optional, but new DT platforms should support all clocks
-         * as required by the DT-binding.
-         */
-        if (ret)
-                dwc->num_clks = 0;
+        if (dev->of_node) {
+                dwc->num_clks = ARRAY_SIZE(dwc3_core_clks);
+
+                ret = clk_bulk_get(dev, dwc->num_clks, dwc->clks);
+                if (ret == -EPROBE_DEFER)
+                        return ret;
+                /*
+                 * Clocks are optional, but new DT platforms should support all
+                 * clocks as required by the DT-binding.
+                 */
+                if (ret)
+                        dwc->num_clks = 0;
+        }
 
         ret = reset_control_deassert(dwc->reset);
         if (ret)
diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c
index 6b3ccd542bd7..dbeff5e6ad14 100644
--- a/drivers/usb/dwc3/dwc3-of-simple.c
+++ b/drivers/usb/dwc3/dwc3-of-simple.c
@@ -165,8 +165,9 @@ static int dwc3_of_simple_remove(struct platform_device *pdev)
 
         reset_control_put(simple->resets);
 
-        pm_runtime_put_sync(dev);
         pm_runtime_disable(dev);
+        pm_runtime_put_noidle(dev);
+        pm_runtime_set_suspended(dev);
 
         return 0;
 }
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index c961a94d136b..f57e7c94b8e5 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -34,6 +34,7 @@
 #define PCI_DEVICE_ID_INTEL_GLK                 0x31aa
 #define PCI_DEVICE_ID_INTEL_CNPLP               0x9dee
 #define PCI_DEVICE_ID_INTEL_CNPH                0xa36e
+#define PCI_DEVICE_ID_INTEL_ICLLP               0x34ee
 
 #define PCI_INTEL_BXT_DSM_GUID          "732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511"
 #define PCI_INTEL_BXT_FUNC_PMU_PWR      4
@@ -289,6 +290,7 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GLK), },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CNPLP), },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CNPH), },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICLLP), },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB), },
         {  }    /* Terminating Entry */
 };
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index b0e67ab2f98c..a6d0203e40b6 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -490,6 +490,7 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
         qcom->dwc3 = of_find_device_by_node(dwc3_np);
         if (!qcom->dwc3) {
                 dev_err(&pdev->dev, "failed to get dwc3 platform device\n");
+                ret = -ENODEV;
                 goto depopulate;
         }
 
@@ -547,8 +548,7 @@ static int dwc3_qcom_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int dwc3_qcom_pm_suspend(struct device *dev)
+static int __maybe_unused dwc3_qcom_pm_suspend(struct device *dev)
 {
         struct dwc3_qcom *qcom = dev_get_drvdata(dev);
         int ret = 0;
@@ -560,7 +560,7 @@ static int dwc3_qcom_pm_suspend(struct device *dev)
         return ret;
 }
 
-static int dwc3_qcom_pm_resume(struct device *dev)
+static int __maybe_unused dwc3_qcom_pm_resume(struct device *dev)
 {
         struct dwc3_qcom *qcom = dev_get_drvdata(dev);
         int ret;
@@ -571,23 +571,20 @@ static int dwc3_qcom_pm_resume(struct device *dev)
 
         return ret;
 }
-#endif
 
-#ifdef CONFIG_PM
-static int dwc3_qcom_runtime_suspend(struct device *dev)
+static int __maybe_unused dwc3_qcom_runtime_suspend(struct device *dev)
 {
         struct dwc3_qcom *qcom = dev_get_drvdata(dev);
 
         return dwc3_qcom_suspend(qcom);
 }
 
-static int dwc3_qcom_runtime_resume(struct device *dev)
+static int __maybe_unused dwc3_qcom_runtime_resume(struct device *dev)
 {
         struct dwc3_qcom *qcom = dev_get_drvdata(dev);
 
         return dwc3_qcom_resume(qcom);
 }
-#endif
 
 static const struct dev_pm_ops dwc3_qcom_dev_pm_ops = {
         SET_SYSTEM_SLEEP_PM_OPS(dwc3_qcom_pm_suspend, dwc3_qcom_pm_resume)
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index f242c2bcea81..d2fa071c21b1 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1719,6 +1719,8 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                  */
                 if (w_value && !f->get_alt)
                         break;
+
+                spin_lock(&cdev->lock);
                 value = f->set_alt(f, w_index, w_value);
                 if (value == USB_GADGET_DELAYED_STATUS) {
                         DBG(cdev,
@@ -1728,6 +1730,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                         DBG(cdev, "delayed_status count %d\n",
                                         cdev->delayed_status);
                 }
+                spin_unlock(&cdev->lock);
                 break;
         case USB_REQ_GET_INTERFACE:
                 if (ctrl->bRequestType != (USB_DIR_IN|USB_RECIP_INTERFACE))
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index dce9d12c7981..33e2030503fa 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -215,6 +215,7 @@ struct ffs_io_data {
 
         struct mm_struct *mm;
         struct work_struct work;
+        struct work_struct cancellation_work;
 
         struct usb_ep *ep;
         struct usb_request *req;
@@ -1072,22 +1073,31 @@ ffs_epfile_open(struct inode *inode, struct file *file)
         return 0;
 }
 
+static void ffs_aio_cancel_worker(struct work_struct *work)
+{
+        struct ffs_io_data *io_data = container_of(work, struct ffs_io_data,
+                                                   cancellation_work);
+
+        ENTER();
+
+        usb_ep_dequeue(io_data->ep, io_data->req);
+}
+
 static int ffs_aio_cancel(struct kiocb *kiocb)
 {
         struct ffs_io_data *io_data = kiocb->private;
-        struct ffs_epfile *epfile = kiocb->ki_filp->private_data;
+        struct ffs_data *ffs = io_data->ffs;
         int value;
 
         ENTER();
 
-        spin_lock_irq(&epfile->ffs->eps_lock);
-
-        if (likely(io_data && io_data->ep && io_data->req))
-                value = usb_ep_dequeue(io_data->ep, io_data->req);
-        else
+        if (likely(io_data && io_data->ep && io_data->req)) {
+                INIT_WORK(&io_data->cancellation_work, ffs_aio_cancel_worker);
+                queue_work(ffs->io_completion_wq, &io_data->cancellation_work);
+                value = -EINPROGRESS;
+        } else {
                 value = -EINVAL;
-
-        spin_unlock_irq(&epfile->ffs->eps_lock);
+        }
 
         return value;
 }
diff --git a/drivers/usb/gadget/udc/aspeed-vhub/Kconfig b/drivers/usb/gadget/udc/aspeed-vhub/Kconfig
index f0cdf89b8503..83ba8a2eb6af 100644
--- a/drivers/usb/gadget/udc/aspeed-vhub/Kconfig
+++ b/drivers/usb/gadget/udc/aspeed-vhub/Kconfig
@@ -2,6 +2,7 @@
 config USB_ASPEED_VHUB
         tristate "Aspeed vHub UDC driver"
         depends on ARCH_ASPEED || COMPILE_TEST
+        depends on USB_LIBCOMPOSITE
         help
           USB peripheral controller for the Aspeed AST2500 family
           SoCs supporting the "vHub" functionality and USB2.0
diff --git a/drivers/usb/host/xhci-dbgcap.c b/drivers/usb/host/xhci-dbgcap.c
index 1fbfd89d0a0f..387f124a8334 100644
--- a/drivers/usb/host/xhci-dbgcap.c
+++ b/drivers/usb/host/xhci-dbgcap.c
@@ -508,16 +508,18 @@ static int xhci_do_dbc_start(struct xhci_hcd *xhci)
         return 0;
 }
 
-static void xhci_do_dbc_stop(struct xhci_hcd *xhci)
+static int xhci_do_dbc_stop(struct xhci_hcd *xhci)
 {
         struct xhci_dbc         *dbc = xhci->dbc;
 
         if (dbc->state == DS_DISABLED)
-                return;
+                return -1;
 
         writel(0, &dbc->regs->control);
         xhci_dbc_mem_cleanup(xhci);
         dbc->state = DS_DISABLED;
+
+        return 0;
 }
 
 static int xhci_dbc_start(struct xhci_hcd *xhci)
@@ -544,6 +546,7 @@ static int xhci_dbc_start(struct xhci_hcd *xhci)
 
 static void xhci_dbc_stop(struct xhci_hcd *xhci)
 {
+        int ret;
         unsigned long           flags;
         struct xhci_dbc         *dbc = xhci->dbc;
         struct dbc_port         *port = &dbc->port;
@@ -556,10 +559,11 @@ static void xhci_dbc_stop(struct xhci_hcd *xhci)
                 xhci_dbc_tty_unregister_device(xhci);
 
         spin_lock_irqsave(&dbc->lock, flags);
-        xhci_do_dbc_stop(xhci);
+        ret = xhci_do_dbc_stop(xhci);
         spin_unlock_irqrestore(&dbc->lock, flags);
 
-        pm_runtime_put_sync(xhci_to_hcd(xhci)->self.controller);
+        if (!ret)
+                pm_runtime_put_sync(xhci_to_hcd(xhci)->self.controller);
 }
 
 static void
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index acbd3d7b8828..ef350c33dc4a 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -595,7 +595,7 @@ struct xhci_ring *xhci_stream_id_to_ring(
         if (!ep->stream_info)
                 return NULL;
 
-        if (stream_id > ep->stream_info->num_streams)
+        if (stream_id >= ep->stream_info->num_streams)
                 return NULL;
         return ep->stream_info->stream_rings[stream_id];
 }
@@ -886,12 +886,12 @@ void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id)
 
         dev = xhci->devs[slot_id];
 
-        trace_xhci_free_virt_device(dev);
-
         xhci->dcbaa->dev_context_ptrs[slot_id] = 0;
         if (!dev)
                 return;
 
+        trace_xhci_free_virt_device(dev);
+
         if (dev->tt_info)
                 old_active_eps = dev->tt_info->active_eps;
 
diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index a8c1d073cba0..4b463e5202a4 100644
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -481,7 +481,7 @@ static void tegra_xusb_mbox_handle(struct tegra_xusb *tegra,
         unsigned long mask;
         unsigned int port;
         bool idle, enable;
-        int err;
+        int err = 0;
 
         memset(&rsp, 0, sizeof(rsp));
 
@@ -1223,10 +1223,10 @@ disable_rpm:
         pm_runtime_disable(&pdev->dev);
         usb_put_hcd(tegra->hcd);
 disable_xusbc:
-        if (!&pdev->dev.pm_domain)
+        if (!pdev->dev.pm_domain)
                 tegra_powergate_power_off(TEGRA_POWERGATE_XUSBC);
 disable_xusba:
-        if (!&pdev->dev.pm_domain)
+        if (!pdev->dev.pm_domain)
                 tegra_powergate_power_off(TEGRA_POWERGATE_XUSBA);
 put_padctl:
         tegra_xusb_padctl_put(tegra->padctl);
diff --git a/drivers/usb/host/xhci-trace.h b/drivers/usb/host/xhci-trace.h
index 410544ffe78f..88b427434bd8 100644
--- a/drivers/usb/host/xhci-trace.h
+++ b/drivers/usb/host/xhci-trace.h
@@ -171,6 +171,37 @@ DEFINE_EVENT(xhci_log_trb, xhci_dbc_gadget_ep_queue,
         TP_ARGS(ring, trb)
 );
 
+DECLARE_EVENT_CLASS(xhci_log_free_virt_dev,
+        TP_PROTO(struct xhci_virt_device *vdev),
+        TP_ARGS(vdev),
+        TP_STRUCT__entry(
+                __field(void *, vdev)
+                __field(unsigned long long, out_ctx)
+                __field(unsigned long long, in_ctx)
+                __field(u8, fake_port)
+                __field(u8, real_port)
+                __field(u16, current_mel)
+
+        ),
+        TP_fast_assign(
+                __entry->vdev = vdev;
+                __entry->in_ctx = (unsigned long long) vdev->in_ctx->dma;
+                __entry->out_ctx = (unsigned long long) vdev->out_ctx->dma;
+                __entry->fake_port = (u8) vdev->fake_port;
+                __entry->real_port = (u8) vdev->real_port;
+                __entry->current_mel = (u16) vdev->current_mel;
+                ),
+        TP_printk("vdev %p ctx %llx | %llx fake_port %d real_port %d current_mel %d",
+                __entry->vdev, __entry->in_ctx, __entry->out_ctx,
+                __entry->fake_port, __entry->real_port, __entry->current_mel
+        )
+);
+
+DEFINE_EVENT(xhci_log_free_virt_dev, xhci_free_virt_device,
+        TP_PROTO(struct xhci_virt_device *vdev),
+        TP_ARGS(vdev)
+);
+
 DECLARE_EVENT_CLASS(xhci_log_virt_dev,
         TP_PROTO(struct xhci_virt_device *vdev),
         TP_ARGS(vdev),
@@ -208,11 +239,6 @@ DEFINE_EVENT(xhci_log_virt_dev, xhci_alloc_virt_device,
         TP_ARGS(vdev)
 );
 
-DEFINE_EVENT(xhci_log_virt_dev, xhci_free_virt_device,
-        TP_PROTO(struct xhci_virt_device *vdev),
-        TP_ARGS(vdev)
-);
-
 DEFINE_EVENT(xhci_log_virt_dev, xhci_setup_device,
         TP_PROTO(struct xhci_virt_device *vdev),
         TP_ARGS(vdev)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 8c8da2d657fa..2f4850f25e82 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -908,6 +908,41 @@ static void xhci_disable_port_wake_on_bits(struct xhci_hcd *xhci)
         spin_unlock_irqrestore(&xhci->lock, flags);
 }
 
+static bool xhci_pending_portevent(struct xhci_hcd *xhci)
+{
+        struct xhci_port        **ports;
+        int                     port_index;
+        u32                     status;
+        u32                     portsc;
+
+        status = readl(&xhci->op_regs->status);
+        if (status & STS_EINT)
+                return true;
+        /*
+         * Checking STS_EINT is not enough as there is a lag between a change
+         * bit being set and the Port Status Change Event that it generated
+         * being written to the Event Ring. See note in xhci 1.1 section 4.19.2.
+         */
+
+        port_index = xhci->usb2_rhub.num_ports;
+        ports = xhci->usb2_rhub.ports;
+        while (port_index--) {
+                portsc = readl(ports[port_index]->addr);
+                if (portsc & PORT_CHANGE_MASK ||
+                    (portsc & PORT_PLS_MASK) == XDEV_RESUME)
+                        return true;
+        }
+        port_index = xhci->usb3_rhub.num_ports;
+        ports = xhci->usb3_rhub.ports;
+        while (port_index--) {
+                portsc = readl(ports[port_index]->addr);
+                if (portsc & PORT_CHANGE_MASK ||
+                    (portsc & PORT_PLS_MASK) == XDEV_RESUME)
+                        return true;
+        }
+        return false;
+}
+
 /*
  * Stop HC (not bus-specific)
  *
@@ -1009,7 +1044,7 @@ EXPORT_SYMBOL_GPL(xhci_suspend);
  */
 int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
 {
-        u32                     command, temp = 0, status;
+        u32                     command, temp = 0;
         struct usb_hcd          *hcd = xhci_to_hcd(xhci);
         struct usb_hcd          *secondary_hcd;
         int                     retval = 0;
@@ -1043,8 +1078,13 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
                 command = readl(&xhci->op_regs->command);
                 command |= CMD_CRS;
                 writel(command, &xhci->op_regs->command);
+                /*
+                 * Some controllers take up to 55+ ms to complete the controller
+                 * restore so setting the timeout to 100ms. Xhci specification
+                 * doesn't mention any timeout value.
+                 */
                 if (xhci_handshake(&xhci->op_regs->status,
-                              STS_RESTORE, 0, 10 * 1000)) {
+                              STS_RESTORE, 0, 100 * 1000)) {
                         xhci_warn(xhci, "WARN: xHC restore state timeout\n");
                         spin_unlock_irq(&xhci->lock);
                         return -ETIMEDOUT;
@@ -1134,8 +1174,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
  done:
         if (retval == 0) {
                 /* Resume root hubs only when have pending events. */
-                status = readl(&xhci->op_regs->status);
-                if (status & STS_EINT) {
+                if (xhci_pending_portevent(xhci)) {
                         usb_hcd_resume_root_hub(xhci->shared_hcd);
                         usb_hcd_resume_root_hub(hcd);
                 }
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 939e2f86b595..841e89ffe2e9 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -382,6 +382,10 @@ struct xhci_op_regs {
 #define PORT_PLC        (1 << 22)
 /* port configure error change - port failed to configure its link partner */
 #define PORT_CEC        (1 << 23)
+#define PORT_CHANGE_MASK        (PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \
+                                 PORT_RC | PORT_PLC | PORT_CEC)
+
+
 /* Cold Attach Status - xHC can set this bit to report device attached during
  * Sx state. Warm port reset should be perfomed to clear this bit and move port
  * to connected state.
diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c
index 8abb6cbbd98a..3be40eaa1ac9 100644
--- a/drivers/usb/misc/yurex.c
+++ b/drivers/usb/misc/yurex.c
@@ -396,8 +396,7 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count,
                           loff_t *ppos)
 {
         struct usb_yurex *dev;
-        int retval = 0;
-        int bytes_read = 0;
+        int len = 0;
         char in_buffer[20];
         unsigned long flags;
 
@@ -405,26 +404,16 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count,
 
         mutex_lock(&dev->io_mutex);
         if (!dev->interface) {          /* already disconnected */
-                retval = -ENODEV;
-                goto exit;
+                mutex_unlock(&dev->io_mutex);
+                return -ENODEV;
         }
 
         spin_lock_irqsave(&dev->lock, flags);
-        bytes_read = snprintf(in_buffer, 20, "%lld\n", dev->bbu);
+        len = snprintf(in_buffer, 20, "%lld\n", dev->bbu);
         spin_unlock_irqrestore(&dev->lock, flags);
-
-        if (*ppos < bytes_read) {
-                if (copy_to_user(buffer, in_buffer + *ppos, bytes_read - *ppos))
-                        retval = -EFAULT;
-                else {
-                        retval = bytes_read - *ppos;
-                        *ppos += bytes_read;
-                }
-        }
-
-exit:
         mutex_unlock(&dev->io_mutex);
-        return retval;
+
+        return simple_read_from_buffer(buffer, count, ppos, in_buffer, len);
 }
 
 static ssize_t yurex_write(struct file *file, const char __user *user_buffer,
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index bdd7a5ad3bf1..3bb1fff02bed 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -128,7 +128,7 @@ static int ch341_control_in(struct usb_device *dev,
         r = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), request,
                             USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
                             value, index, buf, bufsize, DEFAULT_TIMEOUT);
-        if (r < bufsize) {
+        if (r < (int)bufsize) {
                 if (r >= 0) {
                         dev_err(&dev->dev,
                                 "short control message received (%d < %u)\n",
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index eb6c26cbe579..626a29d9aa58 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -95,6 +95,9 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */
         { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
         { USB_DEVICE(0x10C4, 0x815F) }, /* Timewave HamLinkUSB */
+        { USB_DEVICE(0x10C4, 0x817C) }, /* CESINEL MEDCAL N Power Quality Monitor */
+        { USB_DEVICE(0x10C4, 0x817D) }, /* CESINEL MEDCAL NT Power Quality Monitor */
+        { USB_DEVICE(0x10C4, 0x817E) }, /* CESINEL MEDCAL S Power Quality Monitor */
         { USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */
         { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */
         { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */
@@ -112,6 +115,9 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */
         { USB_DEVICE(0x10C4, 0x8281) }, /* Nanotec Plug & Drive */
         { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesis ETRX2USB */
+        { USB_DEVICE(0x10C4, 0x82EF) }, /* CESINEL FALCO 6105 AC Power Supply */
+        { USB_DEVICE(0x10C4, 0x82F1) }, /* CESINEL MEDCAL EFD Earth Fault Detector */
+        { USB_DEVICE(0x10C4, 0x82F2) }, /* CESINEL MEDCAL ST Network Analyzer */
         { USB_DEVICE(0x10C4, 0x82F4) }, /* Starizona MicroTouch */
         { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */
         { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
@@ -124,7 +130,9 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x8470) }, /* Juniper Networks BX Series System Console */
         { USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */
         { USB_DEVICE(0x10C4, 0x84B6) }, /* Starizona Hyperion */
+        { USB_DEVICE(0x10C4, 0x851E) }, /* CESINEL MEDCAL PT Network Analyzer */
         { USB_DEVICE(0x10C4, 0x85A7) }, /* LifeScan OneTouch Verio IQ */
+        { USB_DEVICE(0x10C4, 0x85B8) }, /* CESINEL ReCon T Energy Logger */
         { USB_DEVICE(0x10C4, 0x85EA) }, /* AC-Services IBUS-IF */
         { USB_DEVICE(0x10C4, 0x85EB) }, /* AC-Services CIS-IBUS */
         { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */
@@ -134,17 +142,24 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x8857) }, /* CEL EM357 ZigBee USB Stick */
         { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */
         { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */
+        { USB_DEVICE(0x10C4, 0x88FB) }, /* CESINEL MEDCAL STII Network Analyzer */
+        { USB_DEVICE(0x10C4, 0x8938) }, /* CESINEL MEDCAL S II Network Analyzer */
         { USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */
         { USB_DEVICE(0x10C4, 0x8962) }, /* Brim Brothers charging dock */
         { USB_DEVICE(0x10C4, 0x8977) }, /* CEL MeshWorks DevKit Device */
         { USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */
+        { USB_DEVICE(0x10C4, 0x89A4) }, /* CESINEL FTBC Flexible Thyristor Bridge Controller */
+        { USB_DEVICE(0x10C4, 0x89FB) }, /* Qivicon ZigBee USB Radio Stick */
         { USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */
         { USB_DEVICE(0x10C4, 0x8A5E) }, /* CEL EM3588 ZigBee USB Stick Long Range */
         { USB_DEVICE(0x10C4, 0x8B34) }, /* Qivicon ZigBee USB Radio Stick */
         { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
+        { USB_DEVICE(0x10C4, 0xEA63) }, /* Silicon Labs Windows Update (CP2101-4/CP2102N) */
         { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */
+        { USB_DEVICE(0x10C4, 0xEA7A) }, /* Silicon Labs Windows Update (CP2105) */
+        { USB_DEVICE(0x10C4, 0xEA7B) }, /* Silicon Labs Windows Update (CP2108) */
         { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
         { USB_DEVICE(0x10C4, 0xF002) }, /* Elan Digital Systems USBwave12 */
         { USB_DEVICE(0x10C4, 0xF003) }, /* Elan Digital Systems USBpulse100 */
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 5169624d8b11..38d43c4b7ce5 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -369,8 +369,10 @@ static int keyspan_pda_get_modem_info(struct usb_serial *serial,
                              3, /* get pins */
                              USB_TYPE_VENDOR|USB_RECIP_INTERFACE|USB_DIR_IN,
                              0, 0, data, 1, 2000);
-        if (rc >= 0)
+        if (rc == 1)
                 *value = *data;
+        else if (rc >= 0)
+                rc = -EIO;
 
         kfree(data);
         return rc;
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index fdceb46d9fc6..b580b4c7fa48 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -468,6 +468,9 @@ static void mos7840_control_callback(struct urb *urb)
         }
 
         dev_dbg(dev, "%s urb buffer size is %d\n", __func__, urb->actual_length);
+        if (urb->actual_length < 1)
+                goto out;
+
         dev_dbg(dev, "%s mos7840_port->MsrLsr is %d port %d\n", __func__,
                 mos7840_port->MsrLsr, mos7840_port->port_num);
         data = urb->transfer_buffer;
diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
index 8a201dd53d36..150f43668bec 100644
--- a/drivers/usb/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm.c
@@ -418,17 +418,18 @@ static void _tcpm_log(struct tcpm_port *port, const char *fmt, va_list args)
         u64 ts_nsec = local_clock();
         unsigned long rem_nsec;
 
+        mutex_lock(&port->logbuffer_lock);
         if (!port->logbuffer[port->logbuffer_head]) {
                 port->logbuffer[port->logbuffer_head] =
                                 kzalloc(LOG_BUFFER_ENTRY_SIZE, GFP_KERNEL);
-                if (!port->logbuffer[port->logbuffer_head])
+                if (!port->logbuffer[port->logbuffer_head]) {
+                        mutex_unlock(&port->logbuffer_lock);
                         return;
+                }
         }
 
         vsnprintf(tmpbuffer, sizeof(tmpbuffer), fmt, args);
 
-        mutex_lock(&port->logbuffer_lock);
-
         if (tcpm_log_full(port)) {
                 port->logbuffer_head = max(port->logbuffer_head - 1, 0);
                 strcpy(tmpbuffer, "overflow");
@@ -724,6 +725,9 @@ static int tcpm_set_current_limit(struct tcpm_port *port, u32 max_ma, u32 mv)
 
         tcpm_log(port, "Setting voltage/current limit %u mV %u mA", mv, max_ma);
 
+        port->supply_voltage = mv;
+        port->current_limit = max_ma;
+
         if (port->tcpc->set_current_limit)
                 ret = port->tcpc->set_current_limit(port->tcpc, max_ma, mv);
 
@@ -2594,8 +2598,6 @@ static void tcpm_reset_port(struct tcpm_port *port)
         tcpm_set_attached_state(port, false);
         port->try_src_count = 0;
         port->try_snk_count = 0;
-        port->supply_voltage = 0;
-        port->current_limit = 0;
         port->usb_type = POWER_SUPPLY_USB_TYPE_C;
 
         power_supply_changed(port->psy);
@@ -3043,7 +3045,8 @@ static void run_state_machine(struct tcpm_port *port)
                     tcpm_port_is_sink(port) &&
                     time_is_after_jiffies(port->delayed_runtime)) {
                         tcpm_set_state(port, SNK_DISCOVERY,
-                                       port->delayed_runtime - jiffies);
+                                       jiffies_to_msecs(port->delayed_runtime -
+                                                        jiffies));
                         break;
                 }
                 tcpm_set_state(port, unattached_state(port), 0);
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index bd5cca5632b3..8d0a6fe748bd 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -350,6 +350,19 @@ static void ucsi_connector_change(struct work_struct *work)
         }
 
         if (con->status.change & UCSI_CONSTAT_CONNECT_CHANGE) {
+                typec_set_pwr_role(con->port, con->status.pwr_dir);
+
+                switch (con->status.partner_type) {
+                case UCSI_CONSTAT_PARTNER_TYPE_UFP:
+                        typec_set_data_role(con->port, TYPEC_HOST);
+                        break;
+                case UCSI_CONSTAT_PARTNER_TYPE_DFP:
+                        typec_set_data_role(con->port, TYPEC_DEVICE);
+                        break;
+                default:
+                        break;
+                }
+
                 if (con->status.connected)
                         ucsi_register_partner(con);
                 else
diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c
index 44eb4e1ea817..a18112a83fae 100644
--- a/drivers/usb/typec/ucsi/ucsi_acpi.c
+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
@@ -79,6 +79,11 @@ static int ucsi_acpi_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
+        /* This will make sure we can use ioremap_nocache() */
+        status = acpi_release_memory(ACPI_HANDLE(&pdev->dev), res, 1);
+        if (ACPI_FAILURE(status))
+                return -ENOMEM;
+
         /*
          * NOTE: The memory region for the data structures is used also in an
          * operation region, which means ACPI has already reserved it. Therefore
diff --git a/drivers/vfio/pci/Kconfig b/drivers/vfio/pci/Kconfig
index 24ee2605b9f0..42dc1d3d71cf 100644
--- a/drivers/vfio/pci/Kconfig
+++ b/drivers/vfio/pci/Kconfig
@@ -28,5 +28,13 @@ config VFIO_PCI_INTX
         def_bool y if !S390
 
 config VFIO_PCI_IGD
-        depends on VFIO_PCI
-        def_bool y if X86
+        bool "VFIO PCI extensions for Intel graphics (GVT-d)"
+        depends on VFIO_PCI && X86
+        default y
+        help
+          Support for Intel IGD specific extensions to enable direct
+          assignment to virtual machines.  This includes exposing an IGD
+          specific firmware table and read-only copies of the host bridge
+          and LPC bridge config space.
+
+          To enable Intel IGD assignment through vfio-pci, say Y.
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 2c75b33db4ac..3e5b17710a4f 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -343,18 +343,16 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
         struct page *page[1];
         struct vm_area_struct *vma;
         struct vm_area_struct *vmas[1];
+        unsigned int flags = 0;
         int ret;
 
+        if (prot & IOMMU_WRITE)
+                flags |= FOLL_WRITE;
+
+        down_read(&mm->mmap_sem);
         if (mm == current->mm) {
-                ret = get_user_pages_longterm(vaddr, 1, !!(prot & IOMMU_WRITE),
-                                              page, vmas);
+                ret = get_user_pages_longterm(vaddr, 1, flags, page, vmas);
         } else {
-                unsigned int flags = 0;
-
-                if (prot & IOMMU_WRITE)
-                        flags |= FOLL_WRITE;
-
-                down_read(&mm->mmap_sem);
                 ret = get_user_pages_remote(NULL, mm, vaddr, 1, flags, page,
                                             vmas, NULL);
                 /*
@@ -368,8 +366,8 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
                         ret = -EOPNOTSUPP;
                         put_page(page[0]);
                 }
-                up_read(&mm->mmap_sem);
         }
+        up_read(&mm->mmap_sem);
 
         if (ret == 1) {
                 *pfn = page_to_pfn(page[0]);
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 686dc670fd29..29756d88799b 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -1226,7 +1226,8 @@ err_used:
         if (ubufs)
                 vhost_net_ubuf_put_wait_and_free(ubufs);
 err_ubufs:
-        sockfd_put(sock);
+        if (sock)
+                sockfd_put(sock);
 err_vq:
         mutex_unlock(&vq->mutex);
 err:
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index 451e833f5931..48b154276179 100644
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -41,4 +41,4 @@ obj-$(CONFIG_XEN_PVCALLS_FRONTEND)	+= pvcalls-front.o
 xen-evtchn-y                            := evtchn.o
 xen-gntdev-y                            := gntdev.o
 xen-gntalloc-y                          := gntalloc.o
-xen-privcmd-y                           := privcmd.o
+xen-privcmd-y                           := privcmd.o privcmd-buf.o
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 762378f1811c..08e4af04d6f2 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -628,8 +628,6 @@ static void __unbind_from_irq(unsigned int irq)
                 xen_irq_info_cleanup(info);
         }
 
-        BUG_ON(info_for_irq(irq)->type == IRQT_UNBOUND);
-
         xen_free_irq(irq);
 }
 
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 2473b0a9e6e4..ba9f3eec2bd0 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -799,7 +799,7 @@ int gnttab_alloc_pages(int nr_pages, struct page **pages)
 
         return 0;
 }
-EXPORT_SYMBOL(gnttab_alloc_pages);
+EXPORT_SYMBOL_GPL(gnttab_alloc_pages);
 
 /**
  * gnttab_free_pages - free pages allocated by gnttab_alloc_pages()
@@ -820,7 +820,7 @@ void gnttab_free_pages(int nr_pages, struct page **pages)
         }
         free_xenballooned_pages(nr_pages, pages);
 }
-EXPORT_SYMBOL(gnttab_free_pages);
+EXPORT_SYMBOL_GPL(gnttab_free_pages);
 
 /* Handling of paged out grant targets (GNTST_eagain) */
 #define MAX_DELAY 256
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 8835065029d3..c93d8ef8df34 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -289,8 +289,15 @@ static void sysrq_handler(struct xenbus_watch *watch, const char *path,
                 return;
         }
 
-        if (sysrq_key != '\0')
-                xenbus_printf(xbt, "control", "sysrq", "%c", '\0');
+        if (sysrq_key != '\0') {
+                err = xenbus_printf(xbt, "control", "sysrq", "%c", '\0');
+                if (err) {
+                        pr_err("%s: Error %d writing sysrq in control/sysrq\n",
+                               __func__, err);
+                        xenbus_transaction_end(xbt, 1);
+                        return;
+                }
+        }
 
         err = xenbus_transaction_end(xbt, 0);
         if (err == -EAGAIN)
@@ -342,7 +349,12 @@ static int setup_shutdown_watcher(void)
                         continue;
                 snprintf(node, FEATURE_PATH_SIZE, "feature-%s",
                          shutdown_handlers[idx].command);
-                xenbus_printf(XBT_NIL, "control", node, "%u", 1);
+                err = xenbus_printf(XBT_NIL, "control", node, "%u", 1);
+                if (err) {
+                        pr_err("%s: Error %d writing %s\n", __func__,
+                                err, node);
+                        return err;
+                }
         }
 
         return 0;
diff --git a/drivers/xen/privcmd-buf.c b/drivers/xen/privcmd-buf.c
new file mode 100644
index 000000000000..df1ed37c3269
--- /dev/null
+++ b/drivers/xen/privcmd-buf.c
@@ -0,0 +1,210 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+
+/******************************************************************************
+ * privcmd-buf.c
+ *
+ * Mmap of hypercall buffers.
+ *
+ * Copyright (c) 2018 Juergen Gross
+ */
+
+#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/list.h>
+#include <linux/miscdevice.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+
+#include "privcmd.h"
+
+MODULE_LICENSE("GPL");
+
+static unsigned int limit = 64;
+module_param(limit, uint, 0644);
+MODULE_PARM_DESC(limit, "Maximum number of pages that may be allocated by "
+                        "the privcmd-buf device per open file");
+
+struct privcmd_buf_private {
+        struct mutex lock;
+        struct list_head list;
+        unsigned int allocated;
+};
+
+struct privcmd_buf_vma_private {
+        struct privcmd_buf_private *file_priv;
+        struct list_head list;
+        unsigned int users;
+        unsigned int n_pages;
+        struct page *pages[];
+};
+
+static int privcmd_buf_open(struct inode *ino, struct file *file)
+{
+        struct privcmd_buf_private *file_priv;
+
+        file_priv = kzalloc(sizeof(*file_priv), GFP_KERNEL);
+        if (!file_priv)
+                return -ENOMEM;
+
+        mutex_init(&file_priv->lock);
+        INIT_LIST_HEAD(&file_priv->list);
+
+        file->private_data = file_priv;
+
+        return 0;
+}
+
+static void privcmd_buf_vmapriv_free(struct privcmd_buf_vma_private *vma_priv)
+{
+        unsigned int i;
+
+        vma_priv->file_priv->allocated -= vma_priv->n_pages;
+
+        list_del(&vma_priv->list);
+
+        for (i = 0; i < vma_priv->n_pages; i++)
+                if (vma_priv->pages[i])
+                        __free_page(vma_priv->pages[i]);
+
+        kfree(vma_priv);
+}
+
+static int privcmd_buf_release(struct inode *ino, struct file *file)
+{
+        struct privcmd_buf_private *file_priv = file->private_data;
+        struct privcmd_buf_vma_private *vma_priv;
+
+        mutex_lock(&file_priv->lock);
+
+        while (!list_empty(&file_priv->list)) {
+                vma_priv = list_first_entry(&file_priv->list,
+                                            struct privcmd_buf_vma_private,
+                                            list);
+                privcmd_buf_vmapriv_free(vma_priv);
+        }
+
+        mutex_unlock(&file_priv->lock);
+
+        kfree(file_priv);
+
+        return 0;
+}
+
+static void privcmd_buf_vma_open(struct vm_area_struct *vma)
+{
+        struct privcmd_buf_vma_private *vma_priv = vma->vm_private_data;
+
+        if (!vma_priv)
+                return;
+
+        mutex_lock(&vma_priv->file_priv->lock);
+        vma_priv->users++;
+        mutex_unlock(&vma_priv->file_priv->lock);
+}
+
+static void privcmd_buf_vma_close(struct vm_area_struct *vma)
+{
+        struct privcmd_buf_vma_private *vma_priv = vma->vm_private_data;
+        struct privcmd_buf_private *file_priv;
+
+        if (!vma_priv)
+                return;
+
+        file_priv = vma_priv->file_priv;
+
+        mutex_lock(&file_priv->lock);
+
+        vma_priv->users--;
+        if (!vma_priv->users)
+                privcmd_buf_vmapriv_free(vma_priv);
+
+        mutex_unlock(&file_priv->lock);
+}
+
+static vm_fault_t privcmd_buf_vma_fault(struct vm_fault *vmf)
+{
+        pr_debug("fault: vma=%p %lx-%lx, pgoff=%lx, uv=%p\n",
+                 vmf->vma, vmf->vma->vm_start, vmf->vma->vm_end,
+                 vmf->pgoff, (void *)vmf->address);
+
+        return VM_FAULT_SIGBUS;
+}
+
+static const struct vm_operations_struct privcmd_buf_vm_ops = {
+        .open = privcmd_buf_vma_open,
+        .close = privcmd_buf_vma_close,
+        .fault = privcmd_buf_vma_fault,
+};
+
+static int privcmd_buf_mmap(struct file *file, struct vm_area_struct *vma)
+{
+        struct privcmd_buf_private *file_priv = file->private_data;
+        struct privcmd_buf_vma_private *vma_priv;
+        unsigned long count = vma_pages(vma);
+        unsigned int i;
+        int ret = 0;
+
+        if (!(vma->vm_flags & VM_SHARED) || count > limit ||
+            file_priv->allocated + count > limit)
+                return -EINVAL;
+
+        vma_priv = kzalloc(sizeof(*vma_priv) + count * sizeof(void *),
+                           GFP_KERNEL);
+        if (!vma_priv)
+                return -ENOMEM;
+
+        vma_priv->n_pages = count;
+        count = 0;
+        for (i = 0; i < vma_priv->n_pages; i++) {
+                vma_priv->pages[i] = alloc_page(GFP_KERNEL | __GFP_ZERO);
+                if (!vma_priv->pages[i])
+                        break;
+                count++;
+        }
+
+        mutex_lock(&file_priv->lock);
+
+        file_priv->allocated += count;
+
+        vma_priv->file_priv = file_priv;
+        vma_priv->users = 1;
+
+        vma->vm_flags |= VM_IO | VM_DONTEXPAND;
+        vma->vm_ops = &privcmd_buf_vm_ops;
+        vma->vm_private_data = vma_priv;
+
+        list_add(&vma_priv->list, &file_priv->list);
+
+        if (vma_priv->n_pages != count)
+                ret = -ENOMEM;
+        else
+                for (i = 0; i < vma_priv->n_pages; i++) {
+                        ret = vm_insert_page(vma, vma->vm_start + i * PAGE_SIZE,
+                                             vma_priv->pages[i]);
+                        if (ret)
+                                break;
+                }
+
+        if (ret)
+                privcmd_buf_vmapriv_free(vma_priv);
+
+        mutex_unlock(&file_priv->lock);
+
+        return ret;
+}
+
+const struct file_operations xen_privcmdbuf_fops = {
+        .owner = THIS_MODULE,
+        .open = privcmd_buf_open,
+        .release = privcmd_buf_release,
+        .mmap = privcmd_buf_mmap,
+};
+EXPORT_SYMBOL_GPL(xen_privcmdbuf_fops);
+
+struct miscdevice xen_privcmdbuf_dev = {
+        .minor = MISC_DYNAMIC_MINOR,
+        .name = "xen/hypercall",
+        .fops = &xen_privcmdbuf_fops,
+};
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 8ae0349d9f0a..7e6e682104dc 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -1007,12 +1007,21 @@ static int __init privcmd_init(void)
                 pr_err("Could not register Xen privcmd device\n");
                 return err;
         }
+
+        err = misc_register(&xen_privcmdbuf_dev);
+        if (err != 0) {
+                pr_err("Could not register Xen hypercall-buf device\n");
+                misc_deregister(&privcmd_dev);
+                return err;
+        }
+
         return 0;
 }
 
 static void __exit privcmd_exit(void)
 {
         misc_deregister(&privcmd_dev);
+        misc_deregister(&xen_privcmdbuf_dev);
 }
 
 module_init(privcmd_init);
diff --git a/drivers/xen/privcmd.h b/drivers/xen/privcmd.h
index 14facaeed36f..0dd9f8f67ee3 100644
--- a/drivers/xen/privcmd.h
+++ b/drivers/xen/privcmd.h
@@ -1,3 +1,6 @@
 #include <linux/fs.h>
 
 extern const struct file_operations xen_privcmd_fops;
+extern const struct file_operations xen_privcmdbuf_fops;
+
+extern struct miscdevice xen_privcmdbuf_dev;
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 7bc88fd43cfc..e2f3e8b0fba9 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -1012,6 +1012,7 @@ static void scsiback_do_add_lun(struct vscsibk_info *info, const char *state,
 {
         struct v2p_entry *entry;
         unsigned long flags;
+        int err;
 
         if (try) {
                 spin_lock_irqsave(&info->v2p_lock, flags);
@@ -1027,8 +1028,11 @@ static void scsiback_do_add_lun(struct vscsibk_info *info, const char *state,
                         scsiback_del_translation_entry(info, vir);
                 }
         } else if (!try) {
-                xenbus_printf(XBT_NIL, info->dev->nodename, state,
+                err = xenbus_printf(XBT_NIL, info->dev->nodename, state,
                               "%d", XenbusStateClosed);
+                if (err)
+                        xenbus_dev_error(info->dev, err,
+                                "%s: writing %s", __func__, state);
         }
 }
 
@@ -1067,8 +1071,11 @@ static void scsiback_do_1lun_hotplug(struct vscsibk_info *info, int op,
         snprintf(str, sizeof(str), "vscsi-devs/%s/p-dev", ent);
         val = xenbus_read(XBT_NIL, dev->nodename, str, NULL);
         if (IS_ERR(val)) {
-                xenbus_printf(XBT_NIL, dev->nodename, state,
+                err = xenbus_printf(XBT_NIL, dev->nodename, state,
                               "%d", XenbusStateClosed);
+                if (err)
+                        xenbus_dev_error(info->dev, err,
+                                "%s: writing %s", __func__, state);
                 return;
         }
         strlcpy(phy, val, VSCSI_NAMELEN);
@@ -1079,8 +1086,11 @@ static void scsiback_do_1lun_hotplug(struct vscsibk_info *info, int op,
         err = xenbus_scanf(XBT_NIL, dev->nodename, str, "%u:%u:%u:%u",
                            &vir.hst, &vir.chn, &vir.tgt, &vir.lun);
         if (XENBUS_EXIST_ERR(err)) {
-                xenbus_printf(XBT_NIL, dev->nodename, state,
+                err = xenbus_printf(XBT_NIL, dev->nodename, state,
                               "%d", XenbusStateClosed);
+                if (err)
+                        xenbus_dev_error(info->dev, err,
+                                "%s: writing %s", __func__, state);
                 return;
         }