Merge 4.18-rc7 into driver-core-next

We need the driver core changes in here as well for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

530 files changed, 5473 insertions, 2485 deletions

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/psloop.c b/drivers/acpi/acpica/psloop.c
index bc5f05906bd1..ee840be150b5 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -497,6 +497,18 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                         status =
                             acpi_ps_create_op(walk_state, aml_op_start, &op);
                         if (ACPI_FAILURE(status)) {
+                                /*
+                                 * ACPI_PARSE_MODULE_LEVEL means that we are loading a table by
+                                 * executing it as a control method. However, if we encounter
+                                 * an error while loading the table, we need to keep trying to
+                                 * load the table rather than aborting the table load. Set the
+                                 * status to AE_OK to proceed with the table load.
+                                 */
+                                if ((walk_state->
+                                     parse_flags & ACPI_PARSE_MODULE_LEVEL)
+                                    && status == AE_ALREADY_EXISTS) {
+                                        status = AE_OK;
+                                }
                                 if (status == AE_CTRL_PARSE_CONTINUE) {
                                         continue;
                                 }
@@ -694,6 +706,20 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                             acpi_ps_next_parse_state(walk_state, op, status);
                         if (status == AE_CTRL_PENDING) {
                                 status = AE_OK;
+                        } else
+                            if ((walk_state->
+                                 parse_flags & ACPI_PARSE_MODULE_LEVEL)
+                                && ACPI_FAILURE(status)) {
+                                /*
+                                 * ACPI_PARSE_MODULE_LEVEL means that we are loading a table by
+                                 * executing it as a control method. However, if we encounter
+                                 * an error while loading the table, we need to keep trying to
+                                 * load the table rather than aborting the table load. Set the
+                                 * status to AE_OK to proceed with the table load. If we get a
+                                 * failure at this point, it means that the dispatcher got an
+                                 * error while processing Op (most likely an AML operand error.
+                                 */
+                                status = AE_OK;
                         }
                 }
 
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 442a9e24f439..917f77f4cb55 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -2042,7 +2042,7 @@ 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"),
+                        DMI_MATCH(DMI_PRODUCT_FAMILY, "Thinkpad X1 Carbon 6th"),
                 },
         },
         { },
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/dd.c b/drivers/base/dd.c
index fb62f1be40d3..edfc9f0b1180 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -496,14 +496,6 @@ re_probe:
                         goto probe_failed;
         }
 
-        /*
-         * Ensure devices are listed in devices_kset in correct order
-         * It's important to move Dev to the end of devices_kset before
-         * calling .probe, because it could be recursive and parent Dev
-         * should always go first
-         */
-        devices_kset_move_last(dev);
-
         if (dev->bus->probe) {
                 ret = dev->bus->probe(dev);
                 if (ret)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 8c12213875c6..946da9bddcb8 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 74a05561b620..3fb95c8d9fd8 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -112,12 +112,16 @@ struct nbd_device {
         struct task_struct *task_setup;
 };
 
+#define NBD_CMD_REQUEUED        1
+
 struct nbd_cmd {
         struct nbd_device *nbd;
+        struct mutex lock;
         int index;
         int cookie;
-        struct completion send_complete;
         blk_status_t status;
+        unsigned long flags;
+        u32 cmd_cookie;
 };
 
 #if IS_ENABLED(CONFIG_DEBUG_FS)
@@ -146,6 +150,35 @@ static inline struct device *nbd_to_dev(struct nbd_device *nbd)
         return disk_to_dev(nbd->disk);
 }
 
+static void nbd_requeue_cmd(struct nbd_cmd *cmd)
+{
+        struct request *req = blk_mq_rq_from_pdu(cmd);
+
+        if (!test_and_set_bit(NBD_CMD_REQUEUED, &cmd->flags))
+                blk_mq_requeue_request(req, true);
+}
+
+#define NBD_COOKIE_BITS 32
+
+static u64 nbd_cmd_handle(struct nbd_cmd *cmd)
+{
+        struct request *req = blk_mq_rq_from_pdu(cmd);
+        u32 tag = blk_mq_unique_tag(req);
+        u64 cookie = cmd->cmd_cookie;
+
+        return (cookie << NBD_COOKIE_BITS) | tag;
+}
+
+static u32 nbd_handle_to_tag(u64 handle)
+{
+        return (u32)handle;
+}
+
+static u32 nbd_handle_to_cookie(u64 handle)
+{
+        return (u32)(handle >> NBD_COOKIE_BITS);
+}
+
 static const char *nbdcmd_to_ascii(int cmd)
 {
         switch (cmd) {
@@ -319,6 +352,9 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,
         }
         config = nbd->config;
 
+        if (!mutex_trylock(&cmd->lock))
+                return BLK_EH_RESET_TIMER;
+
         if (config->num_connections > 1) {
                 dev_err_ratelimited(nbd_to_dev(nbd),
                                     "Connection timed out, retrying (%d/%d alive)\n",
@@ -343,7 +379,8 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,
                                         nbd_mark_nsock_dead(nbd, nsock, 1);
                                 mutex_unlock(&nsock->tx_lock);
                         }
-                        blk_mq_requeue_request(req, true);
+                        mutex_unlock(&cmd->lock);
+                        nbd_requeue_cmd(cmd);
                         nbd_config_put(nbd);
                         return BLK_EH_DONE;
                 }
@@ -353,6 +390,7 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,
         }
         set_bit(NBD_TIMEDOUT, &config->runtime_flags);
         cmd->status = BLK_STS_IOERR;
+        mutex_unlock(&cmd->lock);
         sock_shutdown(nbd);
         nbd_config_put(nbd);
 done:
@@ -430,9 +468,9 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
         struct iov_iter from;
         unsigned long size = blk_rq_bytes(req);
         struct bio *bio;
+        u64 handle;
         u32 type;
         u32 nbd_cmd_flags = 0;
-        u32 tag = blk_mq_unique_tag(req);
         int sent = nsock->sent, skip = 0;
 
         iov_iter_kvec(&from, WRITE | ITER_KVEC, &iov, 1, sizeof(request));
@@ -474,6 +512,8 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
                         goto send_pages;
                 }
                 iov_iter_advance(&from, sent);
+        } else {
+                cmd->cmd_cookie++;
         }
         cmd->index = index;
         cmd->cookie = nsock->cookie;
@@ -482,7 +522,8 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
                 request.from = cpu_to_be64((u64)blk_rq_pos(req) << 9);
                 request.len = htonl(size);
         }
-        memcpy(request.handle, &tag, sizeof(tag));
+        handle = nbd_cmd_handle(cmd);
+        memcpy(request.handle, &handle, sizeof(handle));
 
         dev_dbg(nbd_to_dev(nbd), "request %p: sending control (%s@%llu,%uB)\n",
                 req, nbdcmd_to_ascii(type),
@@ -500,6 +541,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
                                 nsock->pending = req;
                                 nsock->sent = sent;
                         }
+                        set_bit(NBD_CMD_REQUEUED, &cmd->flags);
                         return BLK_STS_RESOURCE;
                 }
                 dev_err_ratelimited(disk_to_dev(nbd->disk),
@@ -541,6 +583,7 @@ send_pages:
                                          */
                                         nsock->pending = req;
                                         nsock->sent = sent;
+                                        set_bit(NBD_CMD_REQUEUED, &cmd->flags);
                                         return BLK_STS_RESOURCE;
                                 }
                                 dev_err(disk_to_dev(nbd->disk),
@@ -573,10 +616,12 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)
         struct nbd_reply reply;
         struct nbd_cmd *cmd;
         struct request *req = NULL;
+        u64 handle;
         u16 hwq;
         u32 tag;
         struct kvec iov = {.iov_base = &reply, .iov_len = sizeof(reply)};
         struct iov_iter to;
+        int ret = 0;
 
         reply.magic = 0;
         iov_iter_kvec(&to, READ | ITER_KVEC, &iov, 1, sizeof(reply));
@@ -594,8 +639,8 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)
                 return ERR_PTR(-EPROTO);
         }
 
-        memcpy(&tag, reply.handle, sizeof(u32));
-
+        memcpy(&handle, reply.handle, sizeof(handle));
+        tag = nbd_handle_to_tag(handle);
         hwq = blk_mq_unique_tag_to_hwq(tag);
         if (hwq < nbd->tag_set.nr_hw_queues)
                 req = blk_mq_tag_to_rq(nbd->tag_set.tags[hwq],
@@ -606,11 +651,25 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)
                 return ERR_PTR(-ENOENT);
         }
         cmd = blk_mq_rq_to_pdu(req);
+
+        mutex_lock(&cmd->lock);
+        if (cmd->cmd_cookie != nbd_handle_to_cookie(handle)) {
+                dev_err(disk_to_dev(nbd->disk), "Double reply on req %p, cmd_cookie %u, handle cookie %u\n",
+                        req, cmd->cmd_cookie, nbd_handle_to_cookie(handle));
+                ret = -ENOENT;
+                goto out;
+        }
+        if (test_bit(NBD_CMD_REQUEUED, &cmd->flags)) {
+                dev_err(disk_to_dev(nbd->disk), "Raced with timeout on req %p\n",
+                        req);
+                ret = -ENOENT;
+                goto out;
+        }
         if (ntohl(reply.error)) {
                 dev_err(disk_to_dev(nbd->disk), "Other side returned error (%d)\n",
                         ntohl(reply.error));
                 cmd->status = BLK_STS_IOERR;
-                return cmd;
+                goto out;
         }
 
         dev_dbg(nbd_to_dev(nbd), "request %p: got reply\n", req);
@@ -635,18 +694,18 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index)
                                 if (nbd_disconnected(config) ||
                                     config->num_connections <= 1) {
                                         cmd->status = BLK_STS_IOERR;
-                                        return cmd;
+                                        goto out;
                                 }
-                                return ERR_PTR(-EIO);
+                                ret = -EIO;
+                                goto out;
                         }
                         dev_dbg(nbd_to_dev(nbd), "request %p: got %d bytes data\n",
                                 req, bvec.bv_len);
                 }
-        } else {
-                /* See the comment in nbd_queue_rq. */
-                wait_for_completion(&cmd->send_complete);
         }
-        return cmd;
+out:
+        mutex_unlock(&cmd->lock);
+        return ret ? ERR_PTR(ret) : cmd;
 }
 
 static void recv_work(struct work_struct *work)
@@ -805,7 +864,7 @@ again:
          */
         blk_mq_start_request(req);
         if (unlikely(nsock->pending && nsock->pending != req)) {
-                blk_mq_requeue_request(req, true);
+                nbd_requeue_cmd(cmd);
                 ret = 0;
                 goto out;
         }
@@ -818,7 +877,7 @@ again:
                 dev_err_ratelimited(disk_to_dev(nbd->disk),
                                     "Request send failed, requeueing\n");
                 nbd_mark_nsock_dead(nbd, nsock, 1);
-                blk_mq_requeue_request(req, true);
+                nbd_requeue_cmd(cmd);
                 ret = 0;
         }
 out:
@@ -842,7 +901,8 @@ static blk_status_t nbd_queue_rq(struct blk_mq_hw_ctx *hctx,
          * that the server is misbehaving (or there was an error) before we're
          * done sending everything over the wire.
          */
-        init_completion(&cmd->send_complete);
+        mutex_lock(&cmd->lock);
+        clear_bit(NBD_CMD_REQUEUED, &cmd->flags);
 
         /* We can be called directly from the user space process, which means we
          * could possibly have signals pending so our sendmsg will fail.  In
@@ -854,7 +914,7 @@ static blk_status_t nbd_queue_rq(struct blk_mq_hw_ctx *hctx,
                 ret = BLK_STS_IOERR;
         else if (!ret)
                 ret = BLK_STS_OK;
-        complete(&cmd->send_complete);
+        mutex_unlock(&cmd->lock);
 
         return ret;
 }
@@ -1460,6 +1520,8 @@ static int nbd_init_request(struct blk_mq_tag_set *set, struct request *rq,
 {
         struct nbd_cmd *cmd = blk_mq_rq_to_pdu(rq);
         cmd->nbd = set->driver_data;
+        cmd->flags = 0;
+        mutex_init(&cmd->lock);
         return 0;
 }
 
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/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index 53fe633df1e8..c9bf2c219841 100644
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -11,7 +11,7 @@
 
 #include "agp.h"
 
-static int alpha_core_agp_vm_fault(struct vm_fault *vmf)
+static vm_fault_t alpha_core_agp_vm_fault(struct vm_fault *vmf)
 {
         alpha_agp_info *agp = agp_bridge->dev_private_data;
         dma_addr_t dma_addr;
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index e50c29c97ca7..c69e39fdd02b 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -156,7 +156,7 @@ static u64 amd64_configure(struct pci_dev *hammer, u64 gatt_table)
 
         /* Address to map to */
         pci_read_config_dword(hammer, AMD64_GARTAPERTUREBASE, &tmp);
-        aperturebase = tmp << 25;
+        aperturebase = (u64)tmp << 25;
         aper_base = (aperturebase & PCI_BASE_ADDRESS_MEM_MASK);
 
         enable_gart_translation(hammer, gatt_table);
@@ -277,7 +277,7 @@ static int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, u16 cap)
         pci_read_config_dword(nb, AMD64_GARTAPERTURECTL, &nb_order);
         nb_order = (nb_order >> 1) & 7;
         pci_read_config_dword(nb, AMD64_GARTAPERTUREBASE, &nb_base);
-        nb_aper = nb_base << 25;
+        nb_aper = (u64)nb_base << 25;
 
         /* Northbridge seems to contain crap. Try the AGP bridge. */
 
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/mem.c b/drivers/char/mem.c
index ffeb60d3434c..df66a9dd0aae 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -708,6 +708,7 @@ static int mmap_zero(struct file *file, struct vm_area_struct *vma)
 #endif
         if (vma->vm_flags & VM_SHARED)
                 return shmem_zero_setup(vma);
+        vma_set_anonymous(vma);
         return 0;
 }
 
diff --git a/drivers/char/random.c b/drivers/char/random.c
index a8fb0020ba5c..bd449ad52442 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)
@@ -1897,14 +1895,22 @@ static int
 write_pool(struct entropy_store *r, const char __user *buffer, size_t count)
 {
         size_t bytes;
-        __u32 buf[16];
+        __u32 t, buf[16];
         const char __user *p = buffer;
 
         while (count > 0) {
+                int b, i = 0;
+
                 bytes = min(count, sizeof(buf));
                 if (copy_from_user(&buf, p, bytes))
                         return -EFAULT;
 
+                for (b = bytes ; b > 0 ; b -= sizeof(__u32), i++) {
+                        if (!arch_get_random_int(&t))
+                                break;
+                        buf[i] ^= t;
+                }
+
                 count -= bytes;
                 p += bytes;
 
@@ -1992,8 +1998,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 +2331,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/clk-aspeed.c b/drivers/clk/clk-aspeed.c
index 38b366b00c57..7b70a074095d 100644
--- a/drivers/clk/clk-aspeed.c
+++ b/drivers/clk/clk-aspeed.c
@@ -24,7 +24,7 @@
 #define ASPEED_MPLL_PARAM       0x20
 #define ASPEED_HPLL_PARAM       0x24
 #define  AST2500_HPLL_BYPASS_EN BIT(20)
-#define  AST2400_HPLL_STRAPPED  BIT(18)
+#define  AST2400_HPLL_PROGRAMMED BIT(18)
 #define  AST2400_HPLL_BYPASS_EN BIT(17)
 #define ASPEED_MISC_CTRL        0x2c
 #define  UART_DIV13_EN          BIT(12)
@@ -91,8 +91,8 @@ static const struct aspeed_gate_data aspeed_gates[] = {
         [ASPEED_CLK_GATE_GCLK] =        {  1,  7, "gclk-gate",          NULL,   0 }, /* 2D engine */
         [ASPEED_CLK_GATE_MCLK] =        {  2, -1, "mclk-gate",          "mpll", CLK_IS_CRITICAL }, /* SDRAM */
         [ASPEED_CLK_GATE_VCLK] =        {  3,  6, "vclk-gate",          NULL,   0 }, /* Video Capture */
-        [ASPEED_CLK_GATE_BCLK] =        {  4,  8, "bclk-gate",          "bclk", 0 }, /* PCIe/PCI */
-        [ASPEED_CLK_GATE_DCLK] =        {  5, -1, "dclk-gate",          NULL,   0 }, /* DAC */
+        [ASPEED_CLK_GATE_BCLK] =        {  4,  8, "bclk-gate",          "bclk", CLK_IS_CRITICAL }, /* PCIe/PCI */
+        [ASPEED_CLK_GATE_DCLK] =        {  5, -1, "dclk-gate",          NULL,   CLK_IS_CRITICAL }, /* DAC */
         [ASPEED_CLK_GATE_REFCLK] =      {  6, -1, "refclk-gate",        "clkin", CLK_IS_CRITICAL },
         [ASPEED_CLK_GATE_USBPORT2CLK] = {  7,  3, "usb-port2-gate",     NULL,   0 }, /* USB2.0 Host port 2 */
         [ASPEED_CLK_GATE_LCLK] =        {  8,  5, "lclk-gate",          NULL,   0 }, /* LPC */
@@ -212,9 +212,22 @@ static int aspeed_clk_is_enabled(struct clk_hw *hw)
 {
         struct aspeed_clk_gate *gate = to_aspeed_clk_gate(hw);
         u32 clk = BIT(gate->clock_idx);
+        u32 rst = BIT(gate->reset_idx);
         u32 enval = (gate->flags & CLK_GATE_SET_TO_DISABLE) ? 0 : clk;
         u32 reg;
 
+        /*
+         * If the IP is in reset, treat the clock as not enabled,
+         * this happens with some clocks such as the USB one when
+         * coming from cold reset. Without this, aspeed_clk_enable()
+         * will fail to lift the reset.
+         */
+        if (gate->reset_idx >= 0) {
+                regmap_read(gate->map, ASPEED_RESET_CTRL, &reg);
+                if (reg & rst)
+                        return 0;
+        }
+
         regmap_read(gate->map, ASPEED_CLK_STOP_CTRL, &reg);
 
         return ((reg & clk) == enval) ? 1 : 0;
@@ -565,29 +578,45 @@ builtin_platform_driver(aspeed_clk_driver);
 static void __init aspeed_ast2400_cc(struct regmap *map)
 {
         struct clk_hw *hw;
-        u32 val, freq, div;
+        u32 val, div, clkin, hpll;
+        const u16 hpll_rates[][4] = {
+                {384, 360, 336, 408},
+                {400, 375, 350, 425},
+        };
+        int rate;
 
         /*
          * CLKIN is the crystal oscillator, 24, 48 or 25MHz selected by
          * strapping
          */
         regmap_read(map, ASPEED_STRAP, &val);
-        if (val & CLKIN_25MHZ_EN)
-                freq = 25000000;
-        else if (val & AST2400_CLK_SOURCE_SEL)
-                freq = 48000000;
-        else
-                freq = 24000000;
-        hw = clk_hw_register_fixed_rate(NULL, "clkin", NULL, 0, freq);
-        pr_debug("clkin @%u MHz\n", freq / 1000000);
+        rate = (val >> 8) & 3;
+        if (val & CLKIN_25MHZ_EN) {
+                clkin = 25000000;
+                hpll = hpll_rates[1][rate];
+        } else if (val & AST2400_CLK_SOURCE_SEL) {
+                clkin = 48000000;
+                hpll = hpll_rates[0][rate];
+        } else {
+                clkin = 24000000;
+                hpll = hpll_rates[0][rate];
+        }
+        hw = clk_hw_register_fixed_rate(NULL, "clkin", NULL, 0, clkin);
+        pr_debug("clkin @%u MHz\n", clkin / 1000000);
 
         /*
          * High-speed PLL clock derived from the crystal. This the CPU clock,
-         * and we assume that it is enabled
+         * and we assume that it is enabled. It can be configured through the
+         * HPLL_PARAM register, or set to a specified frequency by strapping.
          */
         regmap_read(map, ASPEED_HPLL_PARAM, &val);
-        WARN(val & AST2400_HPLL_STRAPPED, "hpll is strapped not configured");
-        aspeed_clk_data->hws[ASPEED_CLK_HPLL] = aspeed_ast2400_calc_pll("hpll", val);
+        if (val & AST2400_HPLL_PROGRAMMED)
+                hw = aspeed_ast2400_calc_pll("hpll", val);
+        else
+                hw = clk_hw_register_fixed_rate(NULL, "hpll", "clkin", 0,
+                                hpll * 1000000);
+
+        aspeed_clk_data->hws[ASPEED_CLK_HPLL] = hw;
 
         /*
          * Strap bits 11:10 define the CPU/AHB clock frequency ratio (aka HCLK)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 9760b526ca31..e2ed078abd90 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -24,7 +24,6 @@
 #include <linux/pm_runtime.h>
 #include <linux/sched.h>
 #include <linux/clkdev.h>
-#include <linux/stringify.h>
 
 #include "clk.h"
 
@@ -2559,7 +2558,7 @@ static const struct {
         unsigned long flag;
         const char *name;
 } clk_flags[] = {
-#define ENTRY(f) { f, __stringify(f) }
+#define ENTRY(f) { f, #f }
         ENTRY(CLK_SET_RATE_GATE),
         ENTRY(CLK_SET_PARENT_GATE),
         ENTRY(CLK_SET_RATE_PARENT),
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/meson/clk-audio-divider.c b/drivers/clk/meson/clk-audio-divider.c
index 58f546e04807..e4cf96ba704e 100644
--- a/drivers/clk/meson/clk-audio-divider.c
+++ b/drivers/clk/meson/clk-audio-divider.c
@@ -51,7 +51,7 @@ static unsigned long audio_divider_recalc_rate(struct clk_hw *hw,
         struct meson_clk_audio_div_data *adiv = meson_clk_audio_div_data(clk);
         unsigned long divider;
 
-        divider = meson_parm_read(clk->map, &adiv->div);
+        divider = meson_parm_read(clk->map, &adiv->div) + 1;
 
         return DIV_ROUND_UP_ULL((u64)parent_rate, divider);
 }
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index 240658404367..177fffb9ebef 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -498,6 +498,7 @@ static struct clk_regmap gxbb_fclk_div2 = {
                 .ops = &clk_regmap_gate_ops,
                 .parent_names = (const char *[]){ "fclk_div2_div" },
                 .num_parents = 1,
+                .flags = CLK_IS_CRITICAL,
         },
 };
 
diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index 6860bd5a37c5..44e4e27eddad 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -35,6 +35,7 @@
 #define CLK_SEL         0x10
 #define CLK_DIS         0x14
 
+#define  ARMADA_37XX_DVFS_LOAD_1 1
 #define LOAD_LEVEL_NR   4
 
 #define ARMADA_37XX_NB_L0L1     0x18
@@ -507,6 +508,40 @@ static long clk_pm_cpu_round_rate(struct clk_hw *hw, unsigned long rate,
         return -EINVAL;
 }
 
+/*
+ * Switching the CPU from the L2 or L3 frequencies (300 and 200 Mhz
+ * respectively) to L0 frequency (1.2 Ghz) requires a significant
+ * amount of time to let VDD stabilize to the appropriate
+ * voltage. This amount of time is large enough that it cannot be
+ * covered by the hardware countdown register. Due to this, the CPU
+ * might start operating at L0 before the voltage is stabilized,
+ * leading to CPU stalls.
+ *
+ * To work around this problem, we prevent switching directly from the
+ * L2/L3 frequencies to the L0 frequency, and instead switch to the L1
+ * frequency in-between. The sequence therefore becomes:
+ * 1. First switch from L2/L3(200/300MHz) to L1(600MHZ)
+ * 2. Sleep 20ms for stabling VDD voltage
+ * 3. Then switch from L1(600MHZ) to L0(1200Mhz).
+ */
+static void clk_pm_cpu_set_rate_wa(unsigned long rate, struct regmap *base)
+{
+        unsigned int cur_level;
+
+        if (rate != 1200 * 1000 * 1000)
+                return;
+
+        regmap_read(base, ARMADA_37XX_NB_CPU_LOAD, &cur_level);
+        cur_level &= ARMADA_37XX_NB_CPU_LOAD_MASK;
+        if (cur_level <= ARMADA_37XX_DVFS_LOAD_1)
+                return;
+
+        regmap_update_bits(base, ARMADA_37XX_NB_CPU_LOAD,
+                           ARMADA_37XX_NB_CPU_LOAD_MASK,
+                           ARMADA_37XX_DVFS_LOAD_1);
+        msleep(20);
+}
+
 static int clk_pm_cpu_set_rate(struct clk_hw *hw, unsigned long rate,
                                unsigned long parent_rate)
 {
@@ -537,6 +572,9 @@ static int clk_pm_cpu_set_rate(struct clk_hw *hw, unsigned long rate,
                          */
                         reg = ARMADA_37XX_NB_CPU_LOAD;
                         mask = ARMADA_37XX_NB_CPU_LOAD_MASK;
+
+                        clk_pm_cpu_set_rate_wa(rate, base);
+
                         regmap_update_bits(base, reg, mask, load_level);
 
                         return rate;
diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c
index 9f35b3fe1d97..ff8d66fd94e6 100644
--- a/drivers/clk/qcom/gcc-msm8996.c
+++ b/drivers/clk/qcom/gcc-msm8996.c
@@ -2781,6 +2781,7 @@ static struct clk_branch gcc_ufs_rx_cfg_clk = {
 
 static struct clk_branch gcc_ufs_tx_symbol_0_clk = {
         .halt_reg = 0x75018,
+        .halt_check = BRANCH_HALT_SKIP,
         .clkr = {
                 .enable_reg = 0x75018,
                 .enable_mask = BIT(0),
diff --git a/drivers/clk/qcom/mmcc-msm8996.c b/drivers/clk/qcom/mmcc-msm8996.c
index 1a25ee4f3658..4b20d1b67a1b 100644
--- a/drivers/clk/qcom/mmcc-msm8996.c
+++ b/drivers/clk/qcom/mmcc-msm8996.c
@@ -2910,6 +2910,7 @@ static struct gdsc mmagic_bimc_gdsc = {
                 .name = "mmagic_bimc",
         },
         .pwrsts = PWRSTS_OFF_ON,
+        .flags = ALWAYS_ON,
 };
 
 static struct gdsc mmagic_video_gdsc = {
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/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index ece120da3353..3c3971256130 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -2394,6 +2394,18 @@ static bool __init intel_pstate_no_acpi_pss(void)
         return true;
 }
 
+static bool __init intel_pstate_no_acpi_pcch(void)
+{
+        acpi_status status;
+        acpi_handle handle;
+
+        status = acpi_get_handle(NULL, "\\_SB", &handle);
+        if (ACPI_FAILURE(status))
+                return true;
+
+        return !acpi_has_method(handle, "PCCH");
+}
+
 static bool __init intel_pstate_has_acpi_ppc(void)
 {
         int i;
@@ -2453,7 +2465,10 @@ static bool __init intel_pstate_platform_pwr_mgmt_exists(void)
 
         switch (plat_info[idx].data) {
         case PSS:
-                return intel_pstate_no_acpi_pss();
+                if (!intel_pstate_no_acpi_pss())
+                        return false;
+
+                return intel_pstate_no_acpi_pcch();
         case PPC:
                 return intel_pstate_has_acpi_ppc() && !force_load;
         }
diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c
index 3f0ce2ae35ee..0c56c9759672 100644
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
@@ -580,6 +580,10 @@ static int __init pcc_cpufreq_init(void)
 {
         int ret;
 
+        /* Skip initialization if another cpufreq driver is there. */
+        if (cpufreq_get_current_driver())
+                return 0;
+
         if (acpi_disabled)
                 return 0;
 
diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
index 01bddacf5c3b..efc9a7ae4857 100644
--- a/drivers/cpufreq/qcom-cpufreq-kryo.c
+++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
@@ -87,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) {
@@ -97,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) {
@@ -183,6 +183,7 @@ static struct platform_driver qcom_cpufreq_kryo_driver = {
 static const struct of_device_id qcom_cpufreq_kryo_match_list[] __initconst = {
         { .compatible = "qcom,apq8096", },
         { .compatible = "qcom,msm8996", },
+        {}
 };
 
 /*
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/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/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c
index d3cf9502e7e7..58faeb1cef63 100644
--- a/drivers/gpio/gpio-uniphier.c
+++ b/drivers/gpio/gpio-uniphier.c
@@ -181,7 +181,11 @@ static int uniphier_gpio_to_irq(struct gpio_chip *chip, unsigned int offset)
         fwspec.fwnode = of_node_to_fwnode(chip->parent->of_node);
         fwspec.param_count = 2;
         fwspec.param[0] = offset - UNIPHIER_GPIO_IRQ_OFFSET;
-        fwspec.param[1] = IRQ_TYPE_NONE;
+        /*
+         * IRQ_TYPE_NONE is rejected by the parent irq domain. Set LEVEL_HIGH
+         * temporarily. Anyway, ->irq_set_type() will override it later.
+         */
+        fwspec.param[1] = IRQ_TYPE_LEVEL_HIGH;
 
         return irq_create_fwspec_mapping(&fwspec);
 }
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 28d968088131..53a14ee8ad6d 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -64,7 +64,8 @@ static void of_gpio_flags_quirks(struct device_node *np,
          * Note that active low is the default.
          */
         if (IS_ENABLED(CONFIG_REGULATOR) &&
-            (of_device_is_compatible(np, "reg-fixed-voltage") ||
+            (of_device_is_compatible(np, "regulator-fixed") ||
+             of_device_is_compatible(np, "reg-fixed-voltage") ||
              of_device_is_compatible(np, "regulator-gpio"))) {
                 /*
                  * The regulator GPIO handles are specified such that the
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_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
index f4c474a95875..71efcf38f11b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
@@ -57,6 +57,10 @@
 #define ACP_I2S_COMP2_CAP_REG_OFFSET            0xa8
 #define ACP_I2S_COMP1_PLAY_REG_OFFSET           0x6c
 #define ACP_I2S_COMP2_PLAY_REG_OFFSET           0x68
+#define ACP_BT_PLAY_REGS_START                  0x14970
+#define ACP_BT_PLAY_REGS_END                    0x14a24
+#define ACP_BT_COMP1_REG_OFFSET                 0xac
+#define ACP_BT_COMP2_REG_OFFSET                 0xa8
 
 #define mmACP_PGFSM_RETAIN_REG                  0x51c9
 #define mmACP_PGFSM_CONFIG_REG                  0x51ca
@@ -77,7 +81,7 @@
 #define ACP_SOFT_RESET_DONE_TIME_OUT_VALUE      0x000000FF
 
 #define ACP_TIMEOUT_LOOP                        0x000000FF
-#define ACP_DEVS                                3
+#define ACP_DEVS                                4
 #define ACP_SRC_ID                              162
 
 enum {
@@ -316,14 +320,13 @@ static int acp_hw_init(void *handle)
         if (adev->acp.acp_cell == NULL)
                 return -ENOMEM;
 
-        adev->acp.acp_res = kcalloc(4, sizeof(struct resource), GFP_KERNEL);
-
+        adev->acp.acp_res = kcalloc(5, sizeof(struct resource), GFP_KERNEL);
         if (adev->acp.acp_res == NULL) {
                 kfree(adev->acp.acp_cell);
                 return -ENOMEM;
         }
 
-        i2s_pdata = kcalloc(2, sizeof(struct i2s_platform_data), GFP_KERNEL);
+        i2s_pdata = kcalloc(3, sizeof(struct i2s_platform_data), GFP_KERNEL);
         if (i2s_pdata == NULL) {
                 kfree(adev->acp.acp_res);
                 kfree(adev->acp.acp_cell);
@@ -358,6 +361,20 @@ static int acp_hw_init(void *handle)
         i2s_pdata[1].i2s_reg_comp1 = ACP_I2S_COMP1_CAP_REG_OFFSET;
         i2s_pdata[1].i2s_reg_comp2 = ACP_I2S_COMP2_CAP_REG_OFFSET;
 
+        i2s_pdata[2].quirks = DW_I2S_QUIRK_COMP_REG_OFFSET;
+        switch (adev->asic_type) {
+        case CHIP_STONEY:
+                i2s_pdata[2].quirks |= DW_I2S_QUIRK_16BIT_IDX_OVERRIDE;
+                break;
+        default:
+                break;
+        }
+
+        i2s_pdata[2].cap = DWC_I2S_PLAY | DWC_I2S_RECORD;
+        i2s_pdata[2].snd_rates = SNDRV_PCM_RATE_8000_96000;
+        i2s_pdata[2].i2s_reg_comp1 = ACP_BT_COMP1_REG_OFFSET;
+        i2s_pdata[2].i2s_reg_comp2 = ACP_BT_COMP2_REG_OFFSET;
+
         adev->acp.acp_res[0].name = "acp2x_dma";
         adev->acp.acp_res[0].flags = IORESOURCE_MEM;
         adev->acp.acp_res[0].start = acp_base;
@@ -373,13 +390,18 @@ static int acp_hw_init(void *handle)
         adev->acp.acp_res[2].start = acp_base + ACP_I2S_CAP_REGS_START;
         adev->acp.acp_res[2].end = acp_base + ACP_I2S_CAP_REGS_END;
 
-        adev->acp.acp_res[3].name = "acp2x_dma_irq";
-        adev->acp.acp_res[3].flags = IORESOURCE_IRQ;
-        adev->acp.acp_res[3].start = amdgpu_irq_create_mapping(adev, 162);
-        adev->acp.acp_res[3].end = adev->acp.acp_res[3].start;
+        adev->acp.acp_res[3].name = "acp2x_dw_bt_i2s_play_cap";
+        adev->acp.acp_res[3].flags = IORESOURCE_MEM;
+        adev->acp.acp_res[3].start = acp_base + ACP_BT_PLAY_REGS_START;
+        adev->acp.acp_res[3].end = acp_base + ACP_BT_PLAY_REGS_END;
+
+        adev->acp.acp_res[4].name = "acp2x_dma_irq";
+        adev->acp.acp_res[4].flags = IORESOURCE_IRQ;
+        adev->acp.acp_res[4].start = amdgpu_irq_create_mapping(adev, 162);
+        adev->acp.acp_res[4].end = adev->acp.acp_res[4].start;
 
         adev->acp.acp_cell[0].name = "acp_audio_dma";
-        adev->acp.acp_cell[0].num_resources = 4;
+        adev->acp.acp_cell[0].num_resources = 5;
         adev->acp.acp_cell[0].resources = &adev->acp.acp_res[0];
         adev->acp.acp_cell[0].platform_data = &adev->asic_type;
         adev->acp.acp_cell[0].pdata_size = sizeof(adev->asic_type);
@@ -396,6 +418,12 @@ static int acp_hw_init(void *handle)
         adev->acp.acp_cell[2].platform_data = &i2s_pdata[1];
         adev->acp.acp_cell[2].pdata_size = sizeof(struct i2s_platform_data);
 
+        adev->acp.acp_cell[3].name = "designware-i2s";
+        adev->acp.acp_cell[3].num_resources = 1;
+        adev->acp.acp_cell[3].resources = &adev->acp.acp_res[3];
+        adev->acp.acp_cell[3].platform_data = &i2s_pdata[2];
+        adev->acp.acp_cell[3].pdata_size = sizeof(struct i2s_platform_data);
+
         r = mfd_add_hotplug_devices(adev->acp.parent, adev->acp.acp_cell,
                                                                 ACP_DEVS);
         if (r)
@@ -451,7 +479,6 @@ static int acp_hw_init(void *handle)
         val = cgs_read_register(adev->acp.cgs_device, mmACP_SOFT_RESET);
         val &= ~ACP_SOFT_RESET__SoftResetAud_MASK;
         cgs_write_register(adev->acp.cgs_device, mmACP_SOFT_RESET, val);
-
         return 0;
 }
 
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..ca8bf1c9a98e 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
  *
@@ -569,6 +575,7 @@ static const struct amdgpu_px_quirk amdgpu_px_quirk_list[] = {
         { 0x1002, 0x6900, 0x1002, 0x0124, AMDGPU_PX_QUIRK_FORCE_ATPX },
         { 0x1002, 0x6900, 0x1028, 0x0812, AMDGPU_PX_QUIRK_FORCE_ATPX },
         { 0x1002, 0x6900, 0x1028, 0x0813, AMDGPU_PX_QUIRK_FORCE_ATPX },
+        { 0x1002, 0x6900, 0x1025, 0x125A, AMDGPU_PX_QUIRK_FORCE_ATPX },
         { 0, 0, 0, 0, 0 },
 };
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 82312a7bc6ad..9c85a90be293 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -927,6 +927,10 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,
                 r = amdgpu_bo_vm_update_pte(p);
                 if (r)
                         return r;
+
+                r = reservation_object_reserve_shared(vm->root.base.bo->tbo.resv);
+                if (r)
+                        return r;
         }
 
         return amdgpu_cs_sync_rings(p);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 6e5284e6c028..2c5f093e79e3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2747,6 +2747,9 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
         if (r)
                 return r;
 
+        /* Make sure IB tests flushed */
+        flush_delayed_work(&adev->late_init_work);
+
         /* blat the mode back in */
         if (fbcon) {
                 if (!amdgpu_device_has_dc_support(adev)) {
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_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_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..fdcb498f6d19 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -107,6 +107,9 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
                 return;
         list_add_tail(&base->bo_list, &bo->va);
 
+        if (bo->tbo.type == ttm_bo_type_kernel)
+                list_move(&base->vm_status, &vm->relocated);
+
         if (bo->tbo.resv != vm->root.base.bo->tbo.resv)
                 return;
 
@@ -468,7 +471,6 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
                         pt->parent = amdgpu_bo_ref(parent->base.bo);
 
                         amdgpu_vm_bo_base_init(&entry->base, vm, pt);
-                        list_move(&entry->base.vm_status, &vm->relocated);
                 }
 
                 if (level < AMDGPU_VM_PTB) {
@@ -1463,7 +1465,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 +1480,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 +1495,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/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/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 4304d9e408b8..ace9ad578ca0 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -83,22 +83,21 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
         enum i2c_mot_mode mot = (msg->request & DP_AUX_I2C_MOT) ?
                 I2C_MOT_TRUE : I2C_MOT_FALSE;
         enum ddc_result res;
-        uint32_t read_bytes = msg->size;
+        ssize_t read_bytes;
 
         if (WARN_ON(msg->size > 16))
                 return -E2BIG;
 
         switch (msg->request & ~DP_AUX_I2C_MOT) {
         case DP_AUX_NATIVE_READ:
-                res = dal_ddc_service_read_dpcd_data(
+                read_bytes = dal_ddc_service_read_dpcd_data(
                                 TO_DM_AUX(aux)->ddc_service,
                                 false,
                                 I2C_MOT_UNDEF,
                                 msg->address,
                                 msg->buffer,
-                                msg->size,
-                                &read_bytes);
-                break;
+                                msg->size);
+                return read_bytes;
         case DP_AUX_NATIVE_WRITE:
                 res = dal_ddc_service_write_dpcd_data(
                                 TO_DM_AUX(aux)->ddc_service,
@@ -109,15 +108,14 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
                                 msg->size);
                 break;
         case DP_AUX_I2C_READ:
-                res = dal_ddc_service_read_dpcd_data(
+                read_bytes = dal_ddc_service_read_dpcd_data(
                                 TO_DM_AUX(aux)->ddc_service,
                                 true,
                                 mot,
                                 msg->address,
                                 msg->buffer,
-                                msg->size,
-                                &read_bytes);
-                break;
+                                msg->size);
+                return read_bytes;
         case DP_AUX_I2C_WRITE:
                 res = dal_ddc_service_write_dpcd_data(
                                 TO_DM_AUX(aux)->ddc_service,
@@ -139,9 +137,7 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
                  r == DDC_RESULT_SUCESSFULL);
 #endif
 
-        if (res != DDC_RESULT_SUCESSFULL)
-                return -EIO;
-        return read_bytes;
+        return msg->size;
 }
 
 static enum drm_connector_status
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
index 5a3346124a01..5a2e952c5bea 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c
@@ -255,8 +255,9 @@ static void pp_to_dc_clock_levels_with_latency(
                         DC_DECODE_PP_CLOCK_TYPE(dc_clk_type));
 
         for (i = 0; i < clk_level_info->num_levels; i++) {
-                DRM_DEBUG("DM_PPLIB:\t %d\n", pp_clks->data[i].clocks_in_khz);
-                clk_level_info->data[i].clocks_in_khz = pp_clks->data[i].clocks_in_khz;
+                DRM_DEBUG("DM_PPLIB:\t %d in 10kHz\n", pp_clks->data[i].clocks_in_khz);
+                /* translate 10kHz to kHz */
+                clk_level_info->data[i].clocks_in_khz = pp_clks->data[i].clocks_in_khz * 10;
                 clk_level_info->data[i].latency_in_us = pp_clks->data[i].latency_in_us;
         }
 }
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
index ae48d603ebd6..49c2face1e7a 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c
@@ -629,14 +629,13 @@ bool dal_ddc_service_query_ddc_data(
         return ret;
 }
 
-enum ddc_result dal_ddc_service_read_dpcd_data(
+ssize_t dal_ddc_service_read_dpcd_data(
         struct ddc_service *ddc,
         bool i2c,
         enum i2c_mot_mode mot,
         uint32_t address,
         uint8_t *data,
-        uint32_t len,
-        uint32_t *read)
+        uint32_t len)
 {
         struct aux_payload read_payload = {
                 .i2c_over_aux = i2c,
@@ -653,8 +652,6 @@ enum ddc_result dal_ddc_service_read_dpcd_data(
                 .mot = mot
         };
 
-        *read = 0;
-
         if (len > DEFAULT_AUX_MAX_DATA_SIZE) {
                 BREAK_TO_DEBUGGER();
                 return DDC_RESULT_FAILED_INVALID_OPERATION;
@@ -664,8 +661,7 @@ enum ddc_result dal_ddc_service_read_dpcd_data(
                 ddc->ctx->i2caux,
                 ddc->ddc_pin,
                 &command)) {
-                *read = command.payloads->length;
-                return DDC_RESULT_SUCESSFULL;
+                return (ssize_t)command.payloads->length;
         }
 
         return DDC_RESULT_FAILED_OPERATION;
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index 7857cb42b3e6..bdd121485cbc 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -1767,12 +1767,10 @@ static void dp_test_send_link_training(struct dc_link *link)
         dp_retrain_link_dp_test(link, &link_settings, false);
 }
 
-/* TODO hbr2 compliance eye output is unstable
+/* TODO Raven hbr2 compliance eye output is unstable
  * (toggling on and off) with debugger break
  * This caueses intermittent PHY automation failure
  * Need to look into the root cause */
-static uint8_t force_tps4_for_cp2520 = 1;
-
 static void dp_test_send_phy_test_pattern(struct dc_link *link)
 {
         union phy_test_pattern dpcd_test_pattern;
@@ -1832,13 +1830,13 @@ static void dp_test_send_phy_test_pattern(struct dc_link *link)
                 break;
         case PHY_TEST_PATTERN_CP2520_1:
                 /* CP2520 pattern is unstable, temporarily use TPS4 instead */
-                test_pattern = (force_tps4_for_cp2520 == 1) ?
+                test_pattern = (link->dc->caps.force_dp_tps4_for_cp2520 == 1) ?
                                 DP_TEST_PATTERN_TRAINING_PATTERN4 :
                                 DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE;
                 break;
         case PHY_TEST_PATTERN_CP2520_2:
                 /* CP2520 pattern is unstable, temporarily use TPS4 instead */
-                test_pattern = (force_tps4_for_cp2520 == 1) ?
+                test_pattern = (link->dc->caps.force_dp_tps4_for_cp2520 == 1) ?
                                 DP_TEST_PATTERN_TRAINING_PATTERN4 :
                                 DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE;
                 break;
diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 9cfde0ccf4e9..53c71296f3dd 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -76,6 +76,7 @@ struct dc_caps {
         bool is_apu;
         bool dual_link_dvi;
         bool post_blend_color_processing;
+        bool force_dp_tps4_for_cp2520;
 };
 
 struct dc_dcc_surface_param {
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
index b235a75355b8..bae752332a9f 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
@@ -741,6 +741,29 @@ static struct mem_input_funcs dce_mi_funcs = {
         .mem_input_is_flip_pending = dce_mi_is_flip_pending
 };
 
+static struct mem_input_funcs dce112_mi_funcs = {
+        .mem_input_program_display_marks = dce112_mi_program_display_marks,
+        .allocate_mem_input = dce_mi_allocate_dmif,
+        .free_mem_input = dce_mi_free_dmif,
+        .mem_input_program_surface_flip_and_addr =
+                        dce_mi_program_surface_flip_and_addr,
+        .mem_input_program_pte_vm = dce_mi_program_pte_vm,
+        .mem_input_program_surface_config =
+                        dce_mi_program_surface_config,
+        .mem_input_is_flip_pending = dce_mi_is_flip_pending
+};
+
+static struct mem_input_funcs dce120_mi_funcs = {
+        .mem_input_program_display_marks = dce120_mi_program_display_marks,
+        .allocate_mem_input = dce_mi_allocate_dmif,
+        .free_mem_input = dce_mi_free_dmif,
+        .mem_input_program_surface_flip_and_addr =
+                        dce_mi_program_surface_flip_and_addr,
+        .mem_input_program_pte_vm = dce_mi_program_pte_vm,
+        .mem_input_program_surface_config =
+                        dce_mi_program_surface_config,
+        .mem_input_is_flip_pending = dce_mi_is_flip_pending
+};
 
 void dce_mem_input_construct(
         struct dce_mem_input *dce_mi,
@@ -769,7 +792,7 @@ void dce112_mem_input_construct(
         const struct dce_mem_input_mask *mi_mask)
 {
         dce_mem_input_construct(dce_mi, ctx, inst, regs, mi_shift, mi_mask);
-        dce_mi->base.funcs->mem_input_program_display_marks = dce112_mi_program_display_marks;
+        dce_mi->base.funcs = &dce112_mi_funcs;
 }
 
 void dce120_mem_input_construct(
@@ -781,5 +804,5 @@ void dce120_mem_input_construct(
         const struct dce_mem_input_mask *mi_mask)
 {
         dce_mem_input_construct(dce_mi, ctx, inst, regs, mi_shift, mi_mask);
-        dce_mi->base.funcs->mem_input_program_display_marks = dce120_mi_program_display_marks;
+        dce_mi->base.funcs = &dce120_mi_funcs;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
index 38ec0d609297..344dd2e69e7c 100644
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
@@ -678,9 +678,22 @@ bool dce100_validate_bandwidth(
         struct dc  *dc,
         struct dc_state *context)
 {
-        /* TODO implement when needed but for now hardcode max value*/
-        context->bw.dce.dispclk_khz = 681000;
-        context->bw.dce.yclk_khz = 250000 * MEMORY_TYPE_MULTIPLIER;
+        int i;
+        bool at_least_one_pipe = false;
+
+        for (i = 0; i < dc->res_pool->pipe_count; i++) {
+                if (context->res_ctx.pipe_ctx[i].stream)
+                        at_least_one_pipe = true;
+        }
+
+        if (at_least_one_pipe) {
+                /* TODO implement when needed but for now hardcode max value*/
+                context->bw.dce.dispclk_khz = 681000;
+                context->bw.dce.yclk_khz = 250000 * MEMORY_TYPE_MULTIPLIER;
+        } else {
+                context->bw.dce.dispclk_khz = 0;
+                context->bw.dce.yclk_khz = 0;
+        }
 
         return true;
 }
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index df5cb2d1d164..34dac84066a0 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -1027,6 +1027,8 @@ static bool construct(
         dc->caps.max_slave_planes = 1;
         dc->caps.is_apu = true;
         dc->caps.post_blend_color_processing = false;
+        /* Raven DP PHY HBR2 eye diagram pattern is not stable. Use TP4 */
+        dc->caps.force_dp_tps4_for_cp2520 = true;
 
         if (dc->ctx->dce_environment == DCE_ENV_PRODUCTION_DRV)
                 dc->debug = debug_defaults_drv;
diff --git a/drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h b/drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h
index 30b3a08b91be..090b7a8dd67b 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h
@@ -102,14 +102,13 @@ bool dal_ddc_service_query_ddc_data(
                 uint8_t *read_buf,
                 uint32_t read_size);
 
-enum ddc_result dal_ddc_service_read_dpcd_data(
+ssize_t dal_ddc_service_read_dpcd_data(
                 struct ddc_service *ddc,
                 bool i2c,
                 enum i2c_mot_mode mot,
                 uint32_t address,
                 uint8_t *data,
-                uint32_t len,
-                uint32_t *read);
+                uint32_t len);
 
 enum ddc_result dal_ddc_service_write_dpcd_data(
                 struct ddc_service *ddc,
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/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/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
index d644a9bb9078..9f407c48d4f0 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
@@ -381,6 +381,7 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr)
         uint32_t fw_to_load;
         int result = 0;
         struct SMU_DRAMData_TOC *toc;
+        uint32_t num_entries = 0;
 
         if (!hwmgr->reload_fw) {
                 pr_info("skip reloading...\n");
@@ -422,41 +423,41 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr)
         }
 
         toc = (struct SMU_DRAMData_TOC *)smu_data->header;
-        toc->num_entries = 0;
         toc->structure_version = 1;
 
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_RLC_G, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_RLC_G, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_CE, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_CE, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_PFP, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_PFP, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_ME, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_ME, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_MEC, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_MEC, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_MEC_JT1, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_MEC_JT1, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_CP_MEC_JT2, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_CP_MEC_JT2, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_SDMA0, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_SDMA0, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_SDMA1, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_SDMA1, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
         if (!hwmgr->not_vf)
                 PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr,
-                                UCODE_ID_MEC_STORAGE, &toc->entry[toc->num_entries++]),
+                                UCODE_ID_MEC_STORAGE, &toc->entry[num_entries++]),
                                 "Failed to Get Firmware Entry.", return -EINVAL);
 
+        toc->num_entries = num_entries;
         smu7_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_DRV_DRAM_ADDR_HI, upper_32_bits(smu_data->header_buffer.mc_addr));
         smu7_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_DRV_DRAM_ADDR_LO, lower_32_bits(smu_data->header_buffer.mc_addr));
 
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/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index 03eeee11dd5b..42a40daff132 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -519,8 +519,9 @@ static irqreturn_t armada_drm_irq(int irq, void *arg)
         u32 v, stat = readl_relaxed(dcrtc->base + LCD_SPU_IRQ_ISR);
 
         /*
-         * This is rediculous - rather than writing bits to clear, we
-         * have to set the actual status register value.  This is racy.
+         * Reading the ISR appears to clear bits provided CLEAN_SPU_IRQ_ISR
+         * is set.  Writing has some other effect to acknowledge the IRQ -
+         * without this, we only get a single IRQ.
          */
         writel_relaxed(0, dcrtc->base + LCD_SPU_IRQ_ISR);
 
@@ -1116,16 +1117,22 @@ armada_drm_crtc_set_property(struct drm_crtc *crtc,
 static int armada_drm_crtc_enable_vblank(struct drm_crtc *crtc)
 {
         struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
+        unsigned long flags;
 
+        spin_lock_irqsave(&dcrtc->irq_lock, flags);
         armada_drm_crtc_enable_irq(dcrtc, VSYNC_IRQ_ENA);
+        spin_unlock_irqrestore(&dcrtc->irq_lock, flags);
         return 0;
 }
 
 static void armada_drm_crtc_disable_vblank(struct drm_crtc *crtc)
 {
         struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
+        unsigned long flags;
 
+        spin_lock_irqsave(&dcrtc->irq_lock, flags);
         armada_drm_crtc_disable_irq(dcrtc, VSYNC_IRQ_ENA);
+        spin_unlock_irqrestore(&dcrtc->irq_lock, flags);
 }
 
 static const struct drm_crtc_funcs armada_crtc_funcs = {
@@ -1415,6 +1422,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
                        CFG_PDWN64x66, dcrtc->base + LCD_SPU_SRAM_PARA1);
         writel_relaxed(0x2032ff81, dcrtc->base + LCD_SPU_DMA_CTRL1);
         writel_relaxed(dcrtc->irq_ena, dcrtc->base + LCD_SPU_IRQ_ENA);
+        readl_relaxed(dcrtc->base + LCD_SPU_IRQ_ISR);
         writel_relaxed(0, dcrtc->base + LCD_SPU_IRQ_ISR);
 
         ret = devm_request_irq(dev, irq, armada_drm_irq, 0, "armada_drm_crtc",
diff --git a/drivers/gpu/drm/armada/armada_hw.h b/drivers/gpu/drm/armada/armada_hw.h
index 27319a8335e2..345dc4d0851e 100644
--- a/drivers/gpu/drm/armada/armada_hw.h
+++ b/drivers/gpu/drm/armada/armada_hw.h
@@ -160,6 +160,7 @@ enum {
         CFG_ALPHAM_GRA          = 0x1 << 16,
         CFG_ALPHAM_CFG          = 0x2 << 16,
         CFG_ALPHA_MASK          = 0xff << 8,
+#define CFG_ALPHA(x)            ((x) << 8)
         CFG_PIXCMD_MASK         = 0xff,
 };
 
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index c391955009d6..afa7ded3ae31 100644
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -28,6 +28,7 @@ struct armada_ovl_plane_properties {
         uint16_t contrast;
         uint16_t saturation;
         uint32_t colorkey_mode;
+        uint32_t colorkey_enable;
 };
 
 struct armada_ovl_plane {
@@ -54,11 +55,13 @@ armada_ovl_update_attr(struct armada_ovl_plane_properties *prop,
         writel_relaxed(0x00002000, dcrtc->base + LCD_SPU_CBSH_HUE);
 
         spin_lock_irq(&dcrtc->irq_lock);
-        armada_updatel(prop->colorkey_mode | CFG_ALPHAM_GRA,
-                     CFG_CKMODE_MASK | CFG_ALPHAM_MASK | CFG_ALPHA_MASK,
-                     dcrtc->base + LCD_SPU_DMA_CTRL1);
-
-        armada_updatel(ADV_GRACOLORKEY, 0, dcrtc->base + LCD_SPU_ADV_REG);
+        armada_updatel(prop->colorkey_mode,
+                       CFG_CKMODE_MASK | CFG_ALPHAM_MASK | CFG_ALPHA_MASK,
+                       dcrtc->base + LCD_SPU_DMA_CTRL1);
+        if (dcrtc->variant->has_spu_adv_reg)
+                armada_updatel(prop->colorkey_enable,
+                               ADV_GRACOLORKEY | ADV_VIDCOLORKEY,
+                               dcrtc->base + LCD_SPU_ADV_REG);
         spin_unlock_irq(&dcrtc->irq_lock);
 }
 
@@ -321,8 +324,17 @@ static int armada_ovl_plane_set_property(struct drm_plane *plane,
                 dplane->prop.colorkey_vb |= K2B(val);
                 update_attr = true;
         } else if (property == priv->colorkey_mode_prop) {
-                dplane->prop.colorkey_mode &= ~CFG_CKMODE_MASK;
-                dplane->prop.colorkey_mode |= CFG_CKMODE(val);
+                if (val == CKMODE_DISABLE) {
+                        dplane->prop.colorkey_mode =
+                                CFG_CKMODE(CKMODE_DISABLE) |
+                                CFG_ALPHAM_CFG | CFG_ALPHA(255);
+                        dplane->prop.colorkey_enable = 0;
+                } else {
+                        dplane->prop.colorkey_mode =
+                                CFG_CKMODE(val) |
+                                CFG_ALPHAM_GRA | CFG_ALPHA(0);
+                        dplane->prop.colorkey_enable = ADV_GRACOLORKEY;
+                }
                 update_attr = true;
         } else if (property == priv->brightness_prop) {
                 dplane->prop.brightness = val - 256;
@@ -453,7 +465,9 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)
         dplane->prop.colorkey_yr = 0xfefefe00;
         dplane->prop.colorkey_ug = 0x01010100;
         dplane->prop.colorkey_vb = 0x01010100;
-        dplane->prop.colorkey_mode = CFG_CKMODE(CKMODE_RGB);
+        dplane->prop.colorkey_mode = CFG_CKMODE(CKMODE_RGB) |
+                                     CFG_ALPHAM_GRA | CFG_ALPHA(0);
+        dplane->prop.colorkey_enable = ADV_GRACOLORKEY;
         dplane->prop.brightness = 0;
         dplane->prop.contrast = 0x4000;
         dplane->prop.saturation = 0x4000;
diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c
index 250effa0e6b8..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>
@@ -72,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;
@@ -82,7 +81,6 @@ 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;
@@ -1017,21 +1015,36 @@ static void sii8620_stop_video(struct sii8620 *ctx)
 
 static void sii8620_set_format(struct sii8620 *ctx)
 {
+        u8 out_fmt;
+
         if (sii8620_is_mhl3(ctx)) {
                 sii8620_setbits(ctx, REG_M3_P0CTRL,
                                 BIT_M3_P0CTRL_MHL3_P0_PIXEL_MODE_PACKED,
                                 ctx->use_packed_pixel ? ~0 : 0);
         } else {
+                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 {
                         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);
+        else
+                out_fmt = VAL_TPI_FORMAT(RGB, FULL);
+
         sii8620_write_seq(ctx,
                 REG_TPI_INPUT, VAL_TPI_FORMAT(RGB, FULL),
-                REG_TPI_OUTPUT, VAL_TPI_FORMAT(RGB, FULL),
+                REG_TPI_OUTPUT, out_fmt,
         );
 }
 
@@ -1082,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 |
@@ -1102,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 |
@@ -1131,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);
 
@@ -1149,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 {
@@ -1167,7 +1189,7 @@ 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) - 1; ++i)
@@ -1196,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)
@@ -1661,14 +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);
-        } 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)
@@ -2242,8 +2268,6 @@ static bool sii8620_mode_fixup(struct drm_bridge *bridge,
         mutex_lock(&ctx->lock);
 
         ctx->use_packed_pixel = sii8620_is_packing_required(ctx, adjusted_mode);
-        ctx->video_code = drm_match_cea_mode(adjusted_mode);
-        ctx->pixel_clock = adjusted_mode->clock;
 
         mutex_unlock(&ctx->lock);
 
diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c
index 50c73c0a20b9..d638c0fb3418 100644
--- a/drivers/gpu/drm/drm_lease.c
+++ b/drivers/gpu/drm/drm_lease.c
@@ -553,24 +553,13 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev,
 
         /* Clone the lessor file to create a new file for us */
         DRM_DEBUG_LEASE("Allocating lease file\n");
-        path_get(&lessor_file->f_path);
-        lessee_file = alloc_file(&lessor_file->f_path,
-                                 lessor_file->f_mode,
-                                 fops_get(lessor_file->f_inode->i_fop));
-
+        lessee_file = filp_clone_open(lessor_file);
         if (IS_ERR(lessee_file)) {
                 ret = PTR_ERR(lessee_file);
                 goto out_lessee;
         }
 
-        /* Initialize the new file for DRM */
-        DRM_DEBUG_LEASE("Initializing the file with %p\n", lessee_file->f_op->open);
-        ret = lessee_file->f_op->open(lessee_file->f_inode, lessee_file);
-        if (ret)
-                goto out_lessee_file;
-
         lessee_priv = lessee_file->private_data;
-
         /* Change the file to a master one */
         drm_master_put(&lessee_priv->master);
         lessee_priv->master = lessee;
@@ -588,9 +577,6 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev,
         DRM_DEBUG_LEASE("drm_mode_create_lease_ioctl succeeded\n");
         return 0;
 
-out_lessee_file:
-        fput(lessee_file);
-
 out_lessee:
         drm_master_put(&lessee);
 
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/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index b51c05d03f14..7f562410f9cf 100644
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -862,6 +862,7 @@ static int cmd_reg_handler(struct parser_exec_state *s,
 {
         struct intel_vgpu *vgpu = s->vgpu;
         struct intel_gvt *gvt = vgpu->gvt;
+        u32 ctx_sr_ctl;
 
         if (offset + 4 > gvt->device_info.mmio_size) {
                 gvt_vgpu_err("%s access to (%x) outside of MMIO range\n",
@@ -894,6 +895,28 @@ static int cmd_reg_handler(struct parser_exec_state *s,
                 patch_value(s, cmd_ptr(s, index), VGT_PVINFO_PAGE);
         }
 
+        /* TODO
+         * Right now only scan LRI command on KBL and in inhibit context.
+         * It's good enough to support initializing mmio by lri command in
+         * vgpu inhibit context on KBL.
+         */
+        if (IS_KABYLAKE(s->vgpu->gvt->dev_priv) &&
+                        intel_gvt_mmio_is_in_ctx(gvt, offset) &&
+                        !strncmp(cmd, "lri", 3)) {
+                intel_gvt_hypervisor_read_gpa(s->vgpu,
+                        s->workload->ring_context_gpa + 12, &ctx_sr_ctl, 4);
+                /* check inhibit context */
+                if (ctx_sr_ctl & 1) {
+                        u32 data = cmd_val(s, index + 1);
+
+                        if (intel_gvt_mmio_has_mode_mask(s->vgpu->gvt, offset))
+                                intel_vgpu_mask_mmio_write(vgpu,
+                                                        offset, &data, 4);
+                        else
+                                vgpu_vreg(vgpu, offset) = data;
+                }
+        }
+
         /* TODO: Update the global mask if this MMIO is a masked-MMIO */
         intel_gvt_mmio_set_cmd_accessed(gvt, offset);
         return 0;
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/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 05d15a095310..858967daf04b 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -268,6 +268,8 @@ struct intel_gvt_mmio {
 #define F_CMD_ACCESSED  (1 << 5)
 /* This reg could be accessed by unaligned address */
 #define F_UNALIGN       (1 << 6)
+/* This reg is saved/restored in context */
+#define F_IN_CTX        (1 << 7)
 
         struct gvt_mmio_block *mmio_block;
         unsigned int num_mmio_block;
@@ -639,6 +641,33 @@ static inline bool intel_gvt_mmio_has_mode_mask(
         return gvt->mmio.mmio_attribute[offset >> 2] & F_MODE_MASK;
 }
 
+/**
+ * intel_gvt_mmio_is_in_ctx - check if a MMIO has in-ctx mask
+ * @gvt: a GVT device
+ * @offset: register offset
+ *
+ * Returns:
+ * True if a MMIO has a in-context mask, false if it isn't.
+ *
+ */
+static inline bool intel_gvt_mmio_is_in_ctx(
+                        struct intel_gvt *gvt, unsigned int offset)
+{
+        return gvt->mmio.mmio_attribute[offset >> 2] & F_IN_CTX;
+}
+
+/**
+ * intel_gvt_mmio_set_in_ctx - mask a MMIO in logical context
+ * @gvt: a GVT device
+ * @offset: register offset
+ *
+ */
+static inline void intel_gvt_mmio_set_in_ctx(
+                        struct intel_gvt *gvt, unsigned int offset)
+{
+        gvt->mmio.mmio_attribute[offset >> 2] |= F_IN_CTX;
+}
+
 int intel_gvt_debugfs_add_vgpu(struct intel_vgpu *vgpu);
 void intel_gvt_debugfs_remove_vgpu(struct intel_vgpu *vgpu);
 int intel_gvt_debugfs_init(struct intel_gvt *gvt);
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index bcbc47a88a70..8f1caacdc78a 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -3046,6 +3046,30 @@ int intel_vgpu_default_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,
 }
 
 /**
+ * intel_vgpu_mask_mmio_write - write mask register
+ * @vgpu: a vGPU
+ * @offset: access offset
+ * @p_data: write data buffer
+ * @bytes: access data length
+ *
+ * Returns:
+ * Zero on success, negative error code if failed.
+ */
+int intel_vgpu_mask_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,
+                void *p_data, unsigned int bytes)
+{
+        u32 mask, old_vreg;
+
+        old_vreg = vgpu_vreg(vgpu, offset);
+        write_vreg(vgpu, offset, p_data, bytes);
+        mask = vgpu_vreg(vgpu, offset) >> 16;
+        vgpu_vreg(vgpu, offset) = (old_vreg & ~mask) |
+                                (vgpu_vreg(vgpu, offset) & mask);
+
+        return 0;
+}
+
+/**
  * intel_gvt_in_force_nonpriv_whitelist - if a mmio is in whitelist to be
  * force-nopriv register
  *
diff --git a/drivers/gpu/drm/i915/gvt/mmio.h b/drivers/gpu/drm/i915/gvt/mmio.h
index 71b620875943..dac8c6401e26 100644
--- a/drivers/gpu/drm/i915/gvt/mmio.h
+++ b/drivers/gpu/drm/i915/gvt/mmio.h
@@ -98,4 +98,6 @@ bool intel_gvt_in_force_nonpriv_whitelist(struct intel_gvt *gvt,
 int intel_vgpu_mmio_reg_rw(struct intel_vgpu *vgpu, unsigned int offset,
                            void *pdata, unsigned int bytes, bool is_read);
 
+int intel_vgpu_mask_mmio_write(struct intel_vgpu *vgpu, unsigned int offset,
+                                  void *p_data, unsigned int bytes);
 #endif
diff --git a/drivers/gpu/drm/i915/gvt/mmio_context.c b/drivers/gpu/drm/i915/gvt/mmio_context.c
index 0f949554d118..5ca9caf7552a 100644
--- a/drivers/gpu/drm/i915/gvt/mmio_context.c
+++ b/drivers/gpu/drm/i915/gvt/mmio_context.c
@@ -581,7 +581,9 @@ void intel_gvt_init_engine_mmio_context(struct intel_gvt *gvt)
 
         for (mmio = gvt->engine_mmio_list.mmio;
              i915_mmio_reg_valid(mmio->reg); mmio++) {
-                if (mmio->in_context)
+                if (mmio->in_context) {
                         gvt->engine_mmio_list.ctx_mmio_count[mmio->ring_id]++;
+                        intel_gvt_mmio_set_in_ctx(gvt, mmio->reg.reg);
+                }
         }
 }
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 7014a96546f4..71e1aa54f774 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -652,6 +652,7 @@ enum intel_sbi_destination {
 #define QUIRK_BACKLIGHT_PRESENT (1<<3)
 #define QUIRK_PIN_SWIZZLED_PAGES (1<<5)
 #define QUIRK_INCREASE_T12_DELAY (1<<6)
+#define QUIRK_INCREASE_DDI_DISABLED_TIME (1<<7)
 
 struct intel_fbdev;
 struct intel_fbc_work;
@@ -2245,9 +2246,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 d44ad7bc1e94..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);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 4a02747ac658..c16cb025755e 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1998,10 +1998,38 @@ static void valleyview_pipestat_irq_handler(struct drm_i915_private *dev_priv,
 
 static u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)
 {
-        u32 hotplug_status = I915_READ(PORT_HOTPLUG_STAT);
+        u32 hotplug_status = 0, hotplug_status_mask;
+        int i;
+
+        if (IS_G4X(dev_priv) ||
+            IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
+                hotplug_status_mask = HOTPLUG_INT_STATUS_G4X |
+                        DP_AUX_CHANNEL_MASK_INT_STATUS_G4X;
+        else
+                hotplug_status_mask = HOTPLUG_INT_STATUS_I915;
 
-        if (hotplug_status)
+        /*
+         * We absolutely have to clear all the pending interrupt
+         * bits in PORT_HOTPLUG_STAT. Otherwise the ISR port
+         * interrupt bit won't have an edge, and the i965/g4x
+         * edge triggered IIR will not notice that an interrupt
+         * is still pending. We can't use PORT_HOTPLUG_EN to
+         * guarantee the edge as the act of toggling the enable
+         * bits can itself generate a new hotplug interrupt :(
+         */
+        for (i = 0; i < 10; i++) {
+                u32 tmp = I915_READ(PORT_HOTPLUG_STAT) & hotplug_status_mask;
+
+                if (tmp == 0)
+                        return hotplug_status;
+
+                hotplug_status |= tmp;
                 I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
+        }
+
+        WARN_ONCE(1,
+                  "PORT_HOTPLUG_STAT did not clear (0x%08x)\n",
+                  I915_READ(PORT_HOTPLUG_STAT));
 
         return hotplug_status;
 }
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_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index f4a8598a2d39..fed26d6e4e27 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1782,15 +1782,24 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)
         I915_WRITE(TRANS_DDI_FUNC_CTL(cpu_transcoder), temp);
 }
 
-void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,
-                                       enum transcoder cpu_transcoder)
+void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state)
 {
+        struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
+        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
+        enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
         i915_reg_t reg = TRANS_DDI_FUNC_CTL(cpu_transcoder);
         uint32_t val = I915_READ(reg);
 
         val &= ~(TRANS_DDI_FUNC_ENABLE | TRANS_DDI_PORT_MASK | TRANS_DDI_DP_VC_PAYLOAD_ALLOC);
         val |= TRANS_DDI_PORT_NONE;
         I915_WRITE(reg, val);
+
+        if (dev_priv->quirks & QUIRK_INCREASE_DDI_DISABLED_TIME &&
+            intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
+                DRM_DEBUG_KMS("Quirk Increase DDI disabled time\n");
+                /* Quirk time at 100ms for reliable operation */
+                msleep(100);
+        }
 }
 
 int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder,
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2cc6faa1daa8..dec0d60921bf 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5809,7 +5809,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
                 intel_ddi_set_vc_payload_alloc(intel_crtc->config, false);
 
         if (!transcoder_is_dsi(cpu_transcoder))
-                intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);
+                intel_ddi_disable_transcoder_func(old_crtc_state);
 
         if (INTEL_GEN(dev_priv) >= 9)
                 skylake_scaler_disable(intel_crtc);
@@ -14646,6 +14646,18 @@ static void quirk_increase_t12_delay(struct drm_device *dev)
         DRM_INFO("Applying T12 delay quirk\n");
 }
 
+/*
+ * GeminiLake NUC HDMI outputs require additional off time
+ * this allows the onboard retimer to correctly sync to signal
+ */
+static void quirk_increase_ddi_disabled_time(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = to_i915(dev);
+
+        dev_priv->quirks |= QUIRK_INCREASE_DDI_DISABLED_TIME;
+        DRM_INFO("Applying Increase DDI Disabled quirk\n");
+}
+
 struct intel_quirk {
         int device;
         int subsystem_vendor;
@@ -14732,6 +14744,13 @@ static struct intel_quirk intel_quirks[] = {
 
         /* Toshiba Satellite P50-C-18C */
         { 0x191B, 0x1179, 0xF840, quirk_increase_t12_delay },
+
+        /* GeminiLake NUC */
+        { 0x3185, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
+        { 0x3184, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
+        /* ASRock ITX*/
+        { 0x3185, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
+        { 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
 };
 
 static void intel_init_quirks(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 0361130500a6..b8eefbffc77d 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1388,8 +1388,7 @@ void hsw_fdi_link_train(struct intel_crtc *crtc,
 void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port);
 bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe);
 void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state);
-void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,
-                                       enum transcoder cpu_transcoder);
+void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state);
 void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state);
 void intel_ddi_disable_pipe_clock(const  struct intel_crtc_state *crtc_state);
 struct intel_encoder *
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 56dd7a9a8e25..dd5312b02a8d 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -612,6 +612,9 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)
                 return PTR_ERR(imx_ldb->regmap);
         }
 
+        /* disable LDB by resetting the control register to POR default */
+        regmap_write(imx_ldb->regmap, IOMUXC_GPR2, 0);
+
         imx_ldb->dev = dev;
 
         if (of_id)
@@ -652,14 +655,14 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)
                 if (ret || i < 0 || i > 1)
                         return -EINVAL;
 
+                if (!of_device_is_available(child))
+                        continue;
+
                 if (dual && i > 0) {
                         dev_warn(dev, "dual-channel mode, ignoring second output\n");
                         continue;
                 }
 
-                if (!of_device_is_available(child))
-                        continue;
-
                 channel = &imx_ldb->channel[i];
                 channel->ldb = imx_ldb;
                 channel->chno = i;
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/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c
index 501d2d290e9c..70dce544984e 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c
@@ -55,6 +55,9 @@ nv04_display_create(struct drm_device *dev)
         nouveau_display(dev)->init = nv04_display_init;
         nouveau_display(dev)->fini = nv04_display_fini;
 
+        /* Pre-nv50 doesn't support atomic, so don't expose the ioctls */
+        dev->driver->driver_features &= ~DRIVER_ATOMIC;
+
         nouveau_hw_save_vga_fonts(dev, 1);
 
         nv04_crtc_create(dev, 0);
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index b83465ae7c1b..9bae4db84cfb 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -1585,8 +1585,9 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
  *****************************************************************************/
 
 static void
-nv50_disp_atomic_commit_core(struct nouveau_drm *drm, u32 *interlock)
+nv50_disp_atomic_commit_core(struct drm_atomic_state *state, u32 *interlock)
 {
+        struct nouveau_drm *drm = nouveau_drm(state->dev);
         struct nv50_disp *disp = nv50_disp(drm->dev);
         struct nv50_core *core = disp->core;
         struct nv50_mstm *mstm;
@@ -1618,6 +1619,22 @@ nv50_disp_atomic_commit_core(struct nouveau_drm *drm, u32 *interlock)
 }
 
 static void
+nv50_disp_atomic_commit_wndw(struct drm_atomic_state *state, u32 *interlock)
+{
+        struct drm_plane_state *new_plane_state;
+        struct drm_plane *plane;
+        int i;
+
+        for_each_new_plane_in_state(state, plane, new_plane_state, i) {
+                struct nv50_wndw *wndw = nv50_wndw(plane);
+                if (interlock[wndw->interlock.type] & wndw->interlock.data) {
+                        if (wndw->func->update)
+                                wndw->func->update(wndw, interlock);
+                }
+        }
+}
+
+static void
 nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
 {
         struct drm_device *dev = state->dev;
@@ -1684,7 +1701,8 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
                         help->disable(encoder);
                         interlock[NV50_DISP_INTERLOCK_CORE] |= 1;
                         if (outp->flush_disable) {
-                                nv50_disp_atomic_commit_core(drm, interlock);
+                                nv50_disp_atomic_commit_wndw(state, interlock);
+                                nv50_disp_atomic_commit_core(state, interlock);
                                 memset(interlock, 0x00, sizeof(interlock));
                         }
                 }
@@ -1693,15 +1711,8 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
         /* Flush disable. */
         if (interlock[NV50_DISP_INTERLOCK_CORE]) {
                 if (atom->flush_disable) {
-                        for_each_new_plane_in_state(state, plane, new_plane_state, i) {
-                                struct nv50_wndw *wndw = nv50_wndw(plane);
-                                if (interlock[wndw->interlock.type] & wndw->interlock.data) {
-                                        if (wndw->func->update)
-                                                wndw->func->update(wndw, interlock);
-                                }
-                        }
-
-                        nv50_disp_atomic_commit_core(drm, interlock);
+                        nv50_disp_atomic_commit_wndw(state, interlock);
+                        nv50_disp_atomic_commit_core(state, interlock);
                         memset(interlock, 0x00, sizeof(interlock));
                 }
         }
@@ -1762,18 +1773,14 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
         }
 
         /* Flush update. */
-        for_each_new_plane_in_state(state, plane, new_plane_state, i) {
-                struct nv50_wndw *wndw = nv50_wndw(plane);
-                if (interlock[wndw->interlock.type] & wndw->interlock.data) {
-                        if (wndw->func->update)
-                                wndw->func->update(wndw, interlock);
-                }
-        }
+        nv50_disp_atomic_commit_wndw(state, interlock);
 
         if (interlock[NV50_DISP_INTERLOCK_CORE]) {
                 if (interlock[NV50_DISP_INTERLOCK_BASE] ||
+                    interlock[NV50_DISP_INTERLOCK_OVLY] ||
+                    interlock[NV50_DISP_INTERLOCK_WNDW] ||
                     !atom->state.legacy_cursor_update)
-                        nv50_disp_atomic_commit_core(drm, interlock);
+                        nv50_disp_atomic_commit_core(state, interlock);
                 else
                         disp->core->func->update(disp->core, interlock, false);
         }
@@ -1871,7 +1878,7 @@ nv50_disp_atomic_commit(struct drm_device *dev,
                 nv50_disp_atomic_commit_tail(state);
 
         drm_for_each_crtc(crtc, dev) {
-                if (crtc->state->enable) {
+                if (crtc->state->active) {
                         if (!drm->have_disp_power_ref) {
                                 drm->have_disp_power_ref = true;
                                 return 0;
@@ -2119,10 +2126,6 @@ nv50_display_destroy(struct drm_device *dev)
         kfree(disp);
 }
 
-MODULE_PARM_DESC(atomic, "Expose atomic ioctl (default: disabled)");
-static int nouveau_atomic = 0;
-module_param_named(atomic, nouveau_atomic, int, 0400);
-
 int
 nv50_display_create(struct drm_device *dev)
 {
@@ -2147,8 +2150,6 @@ nv50_display_create(struct drm_device *dev)
         disp->disp = &nouveau_display(dev)->disp;
         dev->mode_config.funcs = &nv50_disp_func;
         dev->driver->driver_features |= DRIVER_PREFER_XBGR_30BPP;
-        if (nouveau_atomic)
-                dev->driver->driver_features |= DRIVER_ATOMIC;
 
         /* small shared memory area we use for notifiers and semaphores */
         ret = nouveau_bo_new(&drm->client, 4096, 0x1000, TTM_PL_FLAG_VRAM,
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index debbbf0fd4bd..408b955e5c39 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -267,6 +267,7 @@ nouveau_backlight_init(struct drm_device *dev)
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct nvif_device *device = &drm->client.device;
         struct drm_connector *connector;
+        struct drm_connector_list_iter conn_iter;
 
         INIT_LIST_HEAD(&drm->bl_connectors);
 
@@ -275,7 +276,8 @@ nouveau_backlight_init(struct drm_device *dev)
                 return 0;
         }
 
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+        drm_connector_list_iter_begin(dev, &conn_iter);
+        drm_for_each_connector_iter(connector, &conn_iter) {
                 if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS &&
                     connector->connector_type != DRM_MODE_CONNECTOR_eDP)
                         continue;
@@ -292,7 +294,7 @@ nouveau_backlight_init(struct drm_device *dev)
                         break;
                 }
         }
-
+        drm_connector_list_iter_end(&conn_iter);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 7b557c354307..af68eae4c626 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -1208,14 +1208,19 @@ nouveau_connector_create(struct drm_device *dev, int index)
         struct nouveau_display *disp = nouveau_display(dev);
         struct nouveau_connector *nv_connector = NULL;
         struct drm_connector *connector;
+        struct drm_connector_list_iter conn_iter;
         int type, ret = 0;
         bool dummy;
 
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+        drm_connector_list_iter_begin(dev, &conn_iter);
+        nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) {
                 nv_connector = nouveau_connector(connector);
-                if (nv_connector->index == index)
+                if (nv_connector->index == index) {
+                        drm_connector_list_iter_end(&conn_iter);
                         return connector;
+                }
         }
+        drm_connector_list_iter_end(&conn_iter);
 
         nv_connector = kzalloc(sizeof(*nv_connector), GFP_KERNEL);
         if (!nv_connector)
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h
index a4d1a059bd3d..dc7454e7f19a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.h
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.h
@@ -33,6 +33,7 @@
 #include <drm/drm_encoder.h>
 #include <drm/drm_dp_helper.h>
 #include "nouveau_crtc.h"
+#include "nouveau_encoder.h"
 
 struct nvkm_i2c_port;
 
@@ -60,19 +61,46 @@ static inline struct nouveau_connector *nouveau_connector(
         return container_of(con, struct nouveau_connector, base);
 }
 
+static inline bool
+nouveau_connector_is_mst(struct drm_connector *connector)
+{
+        const struct nouveau_encoder *nv_encoder;
+        const struct drm_encoder *encoder;
+
+        if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
+                return false;
+
+        nv_encoder = find_encoder(connector, DCB_OUTPUT_ANY);
+        if (!nv_encoder)
+                return false;
+
+        encoder = &nv_encoder->base.base;
+        return encoder->encoder_type == DRM_MODE_ENCODER_DPMST;
+}
+
+#define nouveau_for_each_non_mst_connector_iter(connector, iter) \
+        drm_for_each_connector_iter(connector, iter) \
+                for_each_if(!nouveau_connector_is_mst(connector))
+
 static inline struct nouveau_connector *
 nouveau_crtc_connector_get(struct nouveau_crtc *nv_crtc)
 {
         struct drm_device *dev = nv_crtc->base.dev;
         struct drm_connector *connector;
+        struct drm_connector_list_iter conn_iter;
+        struct nouveau_connector *nv_connector = NULL;
         struct drm_crtc *crtc = to_drm_crtc(nv_crtc);
 
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-                if (connector->encoder && connector->encoder->crtc == crtc)
-                        return nouveau_connector(connector);
+        drm_connector_list_iter_begin(dev, &conn_iter);
+        nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) {
+                if (connector->encoder && connector->encoder->crtc == crtc) {
+                        nv_connector = nouveau_connector(connector);
+                        break;
+                }
         }
+        drm_connector_list_iter_end(&conn_iter);
 
-        return NULL;
+        return nv_connector;
 }
 
 struct drm_connector *
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 774b429142bc..ec7861457b84 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -404,6 +404,7 @@ nouveau_display_init(struct drm_device *dev)
         struct nouveau_display *disp = nouveau_display(dev);
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct drm_connector *connector;
+        struct drm_connector_list_iter conn_iter;
         int ret;
 
         ret = disp->init(dev);
@@ -411,10 +412,12 @@ nouveau_display_init(struct drm_device *dev)
                 return ret;
 
         /* enable hotplug interrupts */
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+        drm_connector_list_iter_begin(dev, &conn_iter);
+        nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) {
                 struct nouveau_connector *conn = nouveau_connector(connector);
                 nvif_notify_get(&conn->hpd);
         }
+        drm_connector_list_iter_end(&conn_iter);
 
         /* enable flip completion events */
         nvif_notify_get(&drm->flip);
@@ -427,6 +430,7 @@ nouveau_display_fini(struct drm_device *dev, bool suspend)
         struct nouveau_display *disp = nouveau_display(dev);
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct drm_connector *connector;
+        struct drm_connector_list_iter conn_iter;
 
         if (!suspend) {
                 if (drm_drv_uses_atomic_modeset(dev))
@@ -439,10 +443,12 @@ nouveau_display_fini(struct drm_device *dev, bool suspend)
         nvif_notify_put(&drm->flip);
 
         /* disable hotplug interrupts */
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+        drm_connector_list_iter_begin(dev, &conn_iter);
+        nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) {
                 struct nouveau_connector *conn = nouveau_connector(connector);
                 nvif_notify_put(&conn->hpd);
         }
+        drm_connector_list_iter_end(&conn_iter);
 
         drm_kms_helper_poll_disable(dev);
         disp->fini(dev);
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 775443c9af94..f5d3158f0378 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -81,6 +81,10 @@ MODULE_PARM_DESC(modeset, "enable driver (default: auto, "
 int nouveau_modeset = -1;
 module_param_named(modeset, nouveau_modeset, int, 0400);
 
+MODULE_PARM_DESC(atomic, "Expose atomic ioctl (default: disabled)");
+static int nouveau_atomic = 0;
+module_param_named(atomic, nouveau_atomic, int, 0400);
+
 MODULE_PARM_DESC(runpm, "disable (0), force enable (1), optimus only default (-1)");
 static int nouveau_runtime_pm = -1;
 module_param_named(runpm, nouveau_runtime_pm, int, 0400);
@@ -509,6 +513,9 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
 
         pci_set_master(pdev);
 
+        if (nouveau_atomic)
+                driver_pci.driver_features |= DRIVER_ATOMIC;
+
         ret = drm_get_pci_dev(pdev, pent, &driver_pci);
         if (ret) {
                 nvkm_device_del(&device);
@@ -874,22 +881,11 @@ nouveau_pmops_runtime_resume(struct device *dev)
 static int
 nouveau_pmops_runtime_idle(struct device *dev)
 {
-        struct pci_dev *pdev = to_pci_dev(dev);
-        struct drm_device *drm_dev = pci_get_drvdata(pdev);
-        struct nouveau_drm *drm = nouveau_drm(drm_dev);
-        struct drm_crtc *crtc;
-
         if (!nouveau_pmops_runtime()) {
                 pm_runtime_forbid(dev);
                 return -EBUSY;
         }
 
-        list_for_each_entry(crtc, &drm->dev->mode_config.crtc_list, head) {
-                if (crtc->enabled) {
-                        DRM_DEBUG_DRIVER("failing to power off - crtc active\n");
-                        return -EBUSY;
-                }
-        }
         pm_runtime_mark_last_busy(dev);
         pm_runtime_autosuspend(dev);
         /* we don't want the main rpm_idle to call suspend - we want to autosuspend */
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 300daee74209..e6ccafcb9c41 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -616,7 +616,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                 struct nouveau_bo *nvbo;
                 uint32_t data;
 
-                if (unlikely(r->bo_index > req->nr_buffers)) {
+                if (unlikely(r->bo_index >= req->nr_buffers)) {
                         NV_PRINTK(err, cli, "reloc bo index invalid\n");
                         ret = -EINVAL;
                         break;
@@ -626,7 +626,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                 if (b->presumed.valid)
                         continue;
 
-                if (unlikely(r->reloc_bo_index > req->nr_buffers)) {
+                if (unlikely(r->reloc_bo_index >= req->nr_buffers)) {
                         NV_PRINTK(err, cli, "reloc container bo index invalid\n");
                         ret = -EINVAL;
                         break;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
index 73b5d46104bd..434d2fc5bb1c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
@@ -140,6 +140,9 @@ nvkm_fb_init(struct nvkm_subdev *subdev)
         if (fb->func->init)
                 fb->func->init(fb);
 
+        if (fb->func->init_remapper)
+                fb->func->init_remapper(fb);
+
         if (fb->func->init_page) {
                 ret = fb->func->init_page(fb);
                 if (WARN_ON(ret))
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c
index dffe1f5e1071..8205ce436b3e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c
@@ -37,6 +37,14 @@ gp100_fb_init_unkn(struct nvkm_fb *base)
 }
 
 void
+gp100_fb_init_remapper(struct nvkm_fb *fb)
+{
+        struct nvkm_device *device = fb->subdev.device;
+        /* Disable address remapper. */
+        nvkm_mask(device, 0x100c14, 0x00040000, 0x00000000);
+}
+
+void
 gp100_fb_init(struct nvkm_fb *base)
 {
         struct gf100_fb *fb = gf100_fb(base);
@@ -56,6 +64,7 @@ gp100_fb = {
         .dtor = gf100_fb_dtor,
         .oneinit = gf100_fb_oneinit,
         .init = gp100_fb_init,
+        .init_remapper = gp100_fb_init_remapper,
         .init_page = gm200_fb_init_page,
         .init_unkn = gp100_fb_init_unkn,
         .ram_new = gp100_ram_new,
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c
index b84b9861ef26..b4d74e815674 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c
@@ -31,6 +31,7 @@ gp102_fb = {
         .dtor = gf100_fb_dtor,
         .oneinit = gf100_fb_oneinit,
         .init = gp100_fb_init,
+        .init_remapper = gp100_fb_init_remapper,
         .init_page = gm200_fb_init_page,
         .ram_new = gp100_ram_new,
 };
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
index 2857f31466bf..1e4ad61c19e1 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
@@ -11,6 +11,7 @@ struct nvkm_fb_func {
         u32 (*tags)(struct nvkm_fb *);
         int (*oneinit)(struct nvkm_fb *);
         void (*init)(struct nvkm_fb *);
+        void (*init_remapper)(struct nvkm_fb *);
         int (*init_page)(struct nvkm_fb *);
         void (*init_unkn)(struct nvkm_fb *);
         void (*intr)(struct nvkm_fb *);
@@ -69,5 +70,6 @@ int gf100_fb_init_page(struct nvkm_fb *);
 
 int gm200_fb_init_page(struct nvkm_fb *);
 
+void gp100_fb_init_remapper(struct nvkm_fb *);
 void gp100_fb_init_unkn(struct nvkm_fb *);
 #endif
diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile
index 2589f4acd5ae..9c81301d0eed 100644
--- a/drivers/gpu/drm/sun4i/Makefile
+++ b/drivers/gpu/drm/sun4i/Makefile
@@ -32,7 +32,10 @@ obj-$(CONFIG_DRM_SUN4I)		+= sun4i-tcon.o
 obj-$(CONFIG_DRM_SUN4I)         += sun4i_tv.o
 obj-$(CONFIG_DRM_SUN4I)         += sun6i_drc.o
 
-obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o sun4i-frontend.o
+obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o
+ifdef CONFIG_DRM_SUN4I_BACKEND
+obj-$(CONFIG_DRM_SUN4I)         += sun4i-frontend.o
+endif
 obj-$(CONFIG_DRM_SUN4I_HDMI)    += sun4i-drm-hdmi.o
 obj-$(CONFIG_DRM_SUN6I_DSI)     += sun6i-dsi.o
 obj-$(CONFIG_DRM_SUN8I_DW_HDMI) += sun8i-drm-hdmi.o
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 776c1513e582..a2bd5876c633 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -398,7 +398,7 @@ int tegra_drm_submit(struct tegra_drm_context *context,
                  * unaligned offset is malformed and cause commands stream
                  * corruption on the buffer address relocation.
                  */
-                if (offset & 3 || offset >= obj->gem.size) {
+                if (offset & 3 || offset > obj->gem.size) {
                         err = -EINVAL;
                         goto fail;
                 }
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/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index f1d5f76e9c33..d88073e7d22d 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -218,6 +218,9 @@ static int host1x_probe(struct platform_device *pdev)
                 return err;
         }
 
+        if (IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL))
+                goto skip_iommu;
+
         host->group = iommu_group_get(&pdev->dev);
         if (host->group) {
                 struct iommu_domain_geometry *geometry;
diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c
index e2f4a4d93d20..527a1cddb14f 100644
--- a/drivers/gpu/host1x/job.c
+++ b/drivers/gpu/host1x/job.c
@@ -569,7 +569,8 @@ void host1x_job_unpin(struct host1x_job *job)
         for (i = 0; i < job->num_unpins; i++) {
                 struct host1x_job_unpin_data *unpin = &job->unpins[i];
 
-                if (!IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL) && host->domain) {
+                if (!IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL) &&
+                    unpin->size && host->domain) {
                         iommu_unmap(host->domain, job->addr_phys[i],
                                     unpin->size);
                         free_iova(&host->iova,
diff --git a/drivers/gpu/ipu-v3/ipu-csi.c b/drivers/gpu/ipu-v3/ipu-csi.c
index caa05b0702e1..5450a2db1219 100644
--- a/drivers/gpu/ipu-v3/ipu-csi.c
+++ b/drivers/gpu/ipu-v3/ipu-csi.c
@@ -339,7 +339,8 @@ static void fill_csi_bus_cfg(struct ipu_csi_bus_config *csicfg,
                 break;
         case V4L2_MBUS_BT656:
                 csicfg->ext_vsync = 0;
-                if (V4L2_FIELD_HAS_BOTH(mbus_fmt->field))
+                if (V4L2_FIELD_HAS_BOTH(mbus_fmt->field) ||
+                    mbus_fmt->field == V4L2_FIELD_ALTERNATE)
                         csicfg->clk_mode = IPU_CSI_CLK_MODE_CCIR656_INTERLACED;
                 else
                         csicfg->clk_mode = IPU_CSI_CLK_MODE_CCIR656_PROGRESSIVE;
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/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/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_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/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-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 75d6ab177055..7379043711df 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -237,12 +237,16 @@ static void i2c_davinci_calc_clk_dividers(struct davinci_i2c_dev *dev)
         /*
          * It's not always possible to have 1 to 2 ratio when d=7, so fall back
          * to minimal possible clkh in this case.
+         *
+         * Note:
+         * CLKH is not allowed to be 0, in this case I2C clock is not generated
+         * at all
          */
-        if (clk >= clkl + d) {
+        if (clk > clkl + d) {
                 clkh = clk - clkl - d;
                 clkl -= d;
         } else {
-                clkh = 0;
+                clkh = 1;
                 clkl = clk - (d << 1);
         }
 
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-imx.c b/drivers/i2c/busses/i2c-imx.c
index 0207e194f84b..498c5e891649 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -368,6 +368,7 @@ static int i2c_imx_dma_xfer(struct imx_i2c_struct *i2c_imx,
                 goto err_desc;
         }
 
+        reinit_completion(&dma->cmd_complete);
         txdesc->callback = i2c_imx_dma_callback;
         txdesc->callback_param = i2c_imx;
         if (dma_submit_error(dmaengine_submit(txdesc))) {
@@ -622,7 +623,6 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx,
          * The first byte must be transmitted by the CPU.
          */
         imx_i2c_write_reg(i2c_8bit_addr_from_msg(msgs), i2c_imx, IMX_I2C_I2DR);
-        reinit_completion(&i2c_imx->dma->cmd_complete);
         time_left = wait_for_completion_timeout(
                                 &i2c_imx->dma->cmd_complete,
                                 msecs_to_jiffies(DMA_TIMEOUT));
@@ -681,7 +681,6 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
         if (result)
                 return result;
 
-        reinit_completion(&i2c_imx->dma->cmd_complete);
         time_left = wait_for_completion_timeout(
                                 &i2c_imx->dma->cmd_complete,
                                 msecs_to_jiffies(DMA_TIMEOUT));
@@ -1010,7 +1009,7 @@ static int i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx,
         i2c_imx->pinctrl_pins_gpio = pinctrl_lookup_state(i2c_imx->pinctrl,
                         "gpio");
         rinfo->sda_gpiod = devm_gpiod_get(&pdev->dev, "sda", GPIOD_IN);
-        rinfo->scl_gpiod = devm_gpiod_get(&pdev->dev, "scl", GPIOD_OUT_HIGH);
+        rinfo->scl_gpiod = devm_gpiod_get(&pdev->dev, "scl", GPIOD_OUT_HIGH_OPEN_DRAIN);
 
         if (PTR_ERR(rinfo->sda_gpiod) == -EPROBE_DEFER ||
             PTR_ERR(rinfo->scl_gpiod) == -EPROBE_DEFER) {
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 5e310efd9446..3c1c817f6968 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -32,6 +32,7 @@
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/reset.h>
 #include <linux/slab.h>
 
 /* register offsets */
@@ -111,8 +112,9 @@
 #define ID_ARBLOST      (1 << 3)
 #define ID_NACK         (1 << 4)
 /* persistent flags */
+#define ID_P_NO_RXDMA   (1 << 30) /* HW forbids RXDMA sometimes */
 #define ID_P_PM_BLOCKED (1 << 31)
-#define ID_P_MASK       ID_P_PM_BLOCKED
+#define ID_P_MASK       (ID_P_PM_BLOCKED | ID_P_NO_RXDMA)
 
 enum rcar_i2c_type {
         I2C_RCAR_GEN1,
@@ -141,6 +143,8 @@ struct rcar_i2c_priv {
         struct dma_chan *dma_rx;
         struct scatterlist sg;
         enum dma_data_direction dma_direction;
+
+        struct reset_control *rstc;
 };
 
 #define rcar_i2c_priv_to_dev(p)         ((p)->adap.dev.parent)
@@ -370,6 +374,11 @@ static void rcar_i2c_dma_unmap(struct rcar_i2c_priv *priv)
         dma_unmap_single(chan->device->dev, sg_dma_address(&priv->sg),
                          sg_dma_len(&priv->sg), priv->dma_direction);
 
+        /* Gen3 can only do one RXDMA per transfer and we just completed it */
+        if (priv->devtype == I2C_RCAR_GEN3 &&
+            priv->dma_direction == DMA_FROM_DEVICE)
+                priv->flags |= ID_P_NO_RXDMA;
+
         priv->dma_direction = DMA_NONE;
 }
 
@@ -407,8 +416,9 @@ static void rcar_i2c_dma(struct rcar_i2c_priv *priv)
         unsigned char *buf;
         int len;
 
-        /* Do not use DMA if it's not available or for messages < 8 bytes */
-        if (IS_ERR(chan) || msg->len < 8 || !(msg->flags & I2C_M_DMA_SAFE))
+        /* Do various checks to see if DMA is feasible at all */
+        if (IS_ERR(chan) || msg->len < 8 || !(msg->flags & I2C_M_DMA_SAFE) ||
+            (read && priv->flags & ID_P_NO_RXDMA))
                 return;
 
         if (read) {
@@ -739,6 +749,25 @@ static void rcar_i2c_release_dma(struct rcar_i2c_priv *priv)
         }
 }
 
+/* I2C is a special case, we need to poll the status of a reset */
+static int rcar_i2c_do_reset(struct rcar_i2c_priv *priv)
+{
+        int i, ret;
+
+        ret = reset_control_reset(priv->rstc);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < LOOP_TIMEOUT; i++) {
+                ret = reset_control_status(priv->rstc);
+                if (ret == 0)
+                        return 0;
+                udelay(1);
+        }
+
+        return -ETIMEDOUT;
+}
+
 static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
                                 struct i2c_msg *msgs,
                                 int num)
@@ -750,6 +779,16 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
 
         pm_runtime_get_sync(dev);
 
+        /* Gen3 needs a reset before allowing RXDMA once */
+        if (priv->devtype == I2C_RCAR_GEN3) {
+                priv->flags |= ID_P_NO_RXDMA;
+                if (!IS_ERR(priv->rstc)) {
+                        ret = rcar_i2c_do_reset(priv);
+                        if (ret == 0)
+                                priv->flags &= ~ID_P_NO_RXDMA;
+                }
+        }
+
         rcar_i2c_init(priv);
 
         ret = rcar_i2c_bus_barrier(priv);
@@ -920,6 +959,15 @@ static int rcar_i2c_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto out_pm_put;
 
+        if (priv->devtype == I2C_RCAR_GEN3) {
+                priv->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
+                if (!IS_ERR(priv->rstc)) {
+                        ret = reset_control_status(priv->rstc);
+                        if (ret < 0)
+                                priv->rstc = ERR_PTR(-ENOTSUPP);
+                }
+        }
+
         /* Stay always active when multi-master to keep arbitration working */
         if (of_property_read_bool(dev->of_node, "multi-master"))
                 priv->flags |= ID_P_PM_BLOCKED;
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/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/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index e3e330f59c2c..b3ba9a222550 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -6113,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/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..f5ae24865355 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,9 @@ static const struct acpi_device_id elan_acpi_id[] = {
         { "ELAN060C", 0 },
         { "ELAN0611", 0 },
         { "ELAN0612", 0 },
+        { "ELAN0618", 0 },
+        { "ELAN061D", 0 },
+        { "ELAN0622", 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/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index b353d494ad40..136f6e7bf797 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -527,6 +527,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "N24_25BU"),
                 },
         },
+        {
+                /* Lenovo LaVie Z */
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo LaVie Z"),
+                },
+        },
         { }
 };
 
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..115ff26e9ced 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>
@@ -485,14 +484,37 @@ static int dmar_forcedac;
 static int intel_iommu_strict;
 static int intel_iommu_superpage = 1;
 static int intel_iommu_ecs = 1;
+static int intel_iommu_pasid28;
 static int iommu_identity_mapping;
 
 #define IDENTMAP_ALL            1
 #define IDENTMAP_GFX            2
 #define IDENTMAP_AZALIA         4
 
-#define ecs_enabled(iommu)      (intel_iommu_ecs && ecap_ecs(iommu->ecap))
-#define pasid_enabled(iommu)    (ecs_enabled(iommu) && ecap_pasid(iommu->ecap))
+/* Broadwell and Skylake have broken ECS support — normal so-called "second
+ * level" translation of DMA requests-without-PASID doesn't actually happen
+ * unless you also set the NESTE bit in an extended context-entry. Which of
+ * course means that SVM doesn't work because it's trying to do nested
+ * translation of the physical addresses it finds in the process page tables,
+ * through the IOVA->phys mapping found in the "second level" page tables.
+ *
+ * The VT-d specification was retroactively changed to change the definition
+ * of the capability bits and pretend that Broadwell/Skylake never happened...
+ * but unfortunately the wrong bit was changed. It's ECS which is broken, but
+ * for some reason it was the PASID capability bit which was redefined (from
+ * bit 28 on BDW/SKL to bit 40 in future).
+ *
+ * So our test for ECS needs to eschew those implementations which set the old
+ * PASID capabiity bit 28, since those are the ones on which ECS is broken.
+ * Unless we are working around the 'pasid28' limitations, that is, by putting
+ * the device into passthrough mode for normal DMA and thus masking the bug.
+ */
+#define ecs_enabled(iommu) (intel_iommu_ecs && ecap_ecs(iommu->ecap) && \
+                            (intel_iommu_pasid28 || !ecap_broken_pasid(iommu->ecap)))
+/* PASID support is thus enabled if ECS is enabled and *either* of the old
+ * or new capability bits are set. */
+#define pasid_enabled(iommu) (ecs_enabled(iommu) &&                     \
+                              (ecap_pasid(iommu->ecap) || ecap_broken_pasid(iommu->ecap)))
 
 int intel_iommu_gfx_mapped;
 EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped);
@@ -555,6 +577,11 @@ static int __init intel_iommu_setup(char *str)
                         printk(KERN_INFO
                                 "Intel-IOMMU: disable extended context table support\n");
                         intel_iommu_ecs = 0;
+                } else if (!strncmp(str, "pasid28", 7)) {
+                        printk(KERN_INFO
+                                "Intel-IOMMU: enable pre-production PASID support\n");
+                        intel_iommu_pasid28 = 1;
+                        iommu_identity_mapping |= IDENTMAP_GFX;
                 } else if (!strncmp(str, "tboot_noforce", 13)) {
                         printk(KERN_INFO
                                 "Intel-IOMMU: not forcing on after tboot. This could expose security risk for tboot\n");
@@ -3713,30 +3740,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/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/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..87107c995cb5 100644
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -136,6 +136,7 @@ struct dm_writecache {
         struct dm_target *ti;
         struct dm_dev *dev;
         struct dm_dev *ssd_dev;
+        sector_t start_sector;
         void *memory_map;
         uint64_t memory_map_size;
         size_t metadata_sectors;
@@ -259,7 +260,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;
@@ -293,6 +294,10 @@ static int persistent_memory_claim(struct dm_writecache *wc)
         }
 
         dax_read_unlock(id);
+
+        wc->memory_map += (size_t)wc->start_sector << SECTOR_SHIFT;
+        wc->memory_map_size -= (size_t)wc->start_sector << SECTOR_SHIFT;
+
         return 0;
 err3:
         kvfree(pages);
@@ -311,7 +316,7 @@ static int persistent_memory_claim(struct dm_writecache *wc)
 static void persistent_memory_release(struct dm_writecache *wc)
 {
         if (wc->memory_vmapped)
-                vunmap(wc->memory_map);
+                vunmap(wc->memory_map - ((size_t)wc->start_sector << SECTOR_SHIFT));
 }
 
 static struct page *persistent_memory_page(void *addr)
@@ -359,7 +364,7 @@ static void *memory_data(struct dm_writecache *wc, struct wc_entry *e)
 
 static sector_t cache_sector(struct dm_writecache *wc, struct wc_entry *e)
 {
-        return wc->metadata_sectors +
+        return wc->start_sector + wc->metadata_sectors +
                 ((sector_t)e->index << (wc->block_size_bits - SECTOR_SHIFT));
 }
 
@@ -471,6 +476,7 @@ static void ssd_commit_flushed(struct dm_writecache *wc)
                 if (unlikely(region.sector + region.count > wc->metadata_sectors))
                         region.count = wc->metadata_sectors - region.sector;
 
+                region.sector += wc->start_sector;
                 atomic_inc(&endio.count);
                 req.bi_op = REQ_OP_WRITE;
                 req.bi_op_flags = REQ_SYNC;
@@ -859,7 +865,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 +1487,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;
                 }
@@ -1946,14 +1952,6 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv)
         }
         wc->memory_map_size = i_size_read(wc->ssd_dev->bdev->bd_inode);
 
-        if (WC_MODE_PMEM(wc)) {
-                r = persistent_memory_claim(wc);
-                if (r) {
-                        ti->error = "Unable to map persistent memory for cache";
-                        goto bad;
-                }
-        }
-
         /*
          * Parse the cache block size
          */
@@ -1982,7 +1980,16 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv)
 
         while (opt_params) {
                 string = dm_shift_arg(&as), opt_params--;
-                if (!strcasecmp(string, "high_watermark") && opt_params >= 1) {
+                if (!strcasecmp(string, "start_sector") && opt_params >= 1) {
+                        unsigned long long start_sector;
+                        string = dm_shift_arg(&as), opt_params--;
+                        if (sscanf(string, "%llu%c", &start_sector, &dummy) != 1)
+                                goto invalid_optional;
+                        wc->start_sector = start_sector;
+                        if (wc->start_sector != start_sector ||
+                            wc->start_sector >= wc->memory_map_size >> SECTOR_SHIFT)
+                                goto invalid_optional;
+                } else if (!strcasecmp(string, "high_watermark") && opt_params >= 1) {
                         string = dm_shift_arg(&as), opt_params--;
                         if (sscanf(string, "%d%c", &high_wm_percent, &dummy) != 1)
                                 goto invalid_optional;
@@ -2039,12 +2046,20 @@ invalid_optional:
                 goto bad;
         }
 
-        if (!WC_MODE_PMEM(wc)) {
+        if (WC_MODE_PMEM(wc)) {
+                r = persistent_memory_claim(wc);
+                if (r) {
+                        ti->error = "Unable to map persistent memory for cache";
+                        goto bad;
+                }
+        } else {
                 struct dm_io_region region;
                 struct dm_io_request req;
                 size_t n_blocks, n_metadata_blocks;
                 uint64_t n_bitmap_bits;
 
+                wc->memory_map_size -= (uint64_t)wc->start_sector << SECTOR_SHIFT;
+
                 bio_list_init(&wc->flush_list);
                 wc->flush_thread = kthread_create(writecache_flush_thread, wc, "dm_writecache_flush");
                 if (IS_ERR(wc->flush_thread)) {
@@ -2097,7 +2112,7 @@ invalid_optional:
                 }
 
                 region.bdev = wc->ssd_dev->bdev;
-                region.sector = 0;
+                region.sector = wc->start_sector;
                 region.count = wc->metadata_sectors;
                 req.bi_op = REQ_OP_READ;
                 req.bi_op_flags = REQ_SYNC;
@@ -2265,7 +2280,7 @@ static void writecache_status(struct dm_target *ti, status_type_t type,
 
 static struct target_type writecache_target = {
         .name                   = "writecache",
-        .version                = {1, 0, 0},
+        .version                = {1, 1, 0},
         .module                 = THIS_MODULE,
         .ctr                    = writecache_ctr,
         .dtr                    = writecache_dtr,
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/cxl/api.c b/drivers/misc/cxl/api.c
index 753b1a698fc4..6b16946f9b05 100644
--- a/drivers/misc/cxl/api.c
+++ b/drivers/misc/cxl/api.c
@@ -103,15 +103,15 @@ static struct file *cxl_getfile(const char *name,
         d_instantiate(path.dentry, inode);
 
         file = alloc_file(&path, OPEN_FMODE(flags), fops);
-        if (IS_ERR(file))
-                goto err_dput;
+        if (IS_ERR(file)) {
+                path_put(&path);
+                goto err_fs;
+        }
         file->f_flags = flags & (O_ACCMODE | O_NONBLOCK);
         file->private_data = priv;
 
         return file;
 
-err_dput:
-        path_put(&path);
 err_inode:
         iput(inode);
 err_fs:
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/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 98663c50ded0..4d5d01cb8141 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -743,15 +743,20 @@ const struct bond_option *bond_opt_get(unsigned int option)
 static int bond_option_mode_set(struct bonding *bond,
                                 const struct bond_opt_value *newval)
 {
-        if (!bond_mode_uses_arp(newval->value) && bond->params.arp_interval) {
-                netdev_dbg(bond->dev, "%s mode is incompatible with arp monitoring, start mii monitoring\n",
-                           newval->string);
-                /* disable arp monitoring */
-                bond->params.arp_interval = 0;
-                /* set miimon to default value */
-                bond->params.miimon = BOND_DEFAULT_MIIMON;
-                netdev_dbg(bond->dev, "Setting MII monitoring interval to %d\n",
-                           bond->params.miimon);
+        if (!bond_mode_uses_arp(newval->value)) {
+                if (bond->params.arp_interval) {
+                        netdev_dbg(bond->dev, "%s mode is incompatible with arp monitoring, start mii monitoring\n",
+                                   newval->string);
+                        /* disable arp monitoring */
+                        bond->params.arp_interval = 0;
+                }
+
+                if (!bond->params.miimon) {
+                        /* set miimon to default value */
+                        bond->params.miimon = BOND_DEFAULT_MIIMON;
+                        netdev_dbg(bond->dev, "Setting MII monitoring interval to %d\n",
+                                   bond->params.miimon);
+                }
         }
 
         if (newval->value == BOND_MODE_ALB)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index b397a33f3d32..9b449400376b 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -634,10 +634,12 @@ static int m_can_clk_start(struct m_can_priv *priv)
         int err;
 
         err = pm_runtime_get_sync(priv->device);
-        if (err)
+        if (err < 0) {
                 pm_runtime_put_noidle(priv->device);
+                return err;
+        }
 
-        return err;
+        return 0;
 }
 
 static void m_can_clk_stop(struct m_can_priv *priv)
@@ -1109,7 +1111,8 @@ static void m_can_chip_config(struct net_device *dev)
 
         } else {
         /* Version 3.1.x or 3.2.x */
-                cccr &= ~(CCCR_TEST | CCCR_MON | CCCR_BRSE | CCCR_FDOE);
+                cccr &= ~(CCCR_TEST | CCCR_MON | CCCR_BRSE | CCCR_FDOE |
+                          CCCR_NISO);
 
                 /* Only 3.2.x has NISO Bit implemented */
                 if (priv->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO)
@@ -1642,8 +1645,6 @@ static int m_can_plat_probe(struct platform_device *pdev)
         priv->can.clock.freq = clk_get_rate(cclk);
         priv->mram_base = mram_addr;
 
-        m_can_of_parse_mram(priv, mram_config_vals);
-
         platform_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
 
@@ -1666,6 +1667,8 @@ static int m_can_plat_probe(struct platform_device *pdev)
                 goto clk_disable;
         }
 
+        m_can_of_parse_mram(priv, mram_config_vals);
+
         devm_can_led_init(dev);
 
         of_can_transceiver(dev);
@@ -1687,8 +1690,6 @@ failed_ret:
         return ret;
 }
 
-/* TODO: runtime PM with power down or sleep mode  */
-
 static __maybe_unused int m_can_suspend(struct device *dev)
 {
         struct net_device *ndev = dev_get_drvdata(dev);
@@ -1715,8 +1716,6 @@ static __maybe_unused int m_can_resume(struct device *dev)
 
         pinctrl_pm_select_default_state(dev);
 
-        m_can_init_ram(priv);
-
         priv->can.state = CAN_STATE_ERROR_ACTIVE;
 
         if (netif_running(ndev)) {
@@ -1726,6 +1725,7 @@ static __maybe_unused int m_can_resume(struct device *dev)
                 if (ret)
                         return ret;
 
+                m_can_init_ram(priv);
                 m_can_start(ndev);
                 netif_device_attach(ndev);
                 netif_start_queue(ndev);
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index c7427bdd3a4b..2949a381a94d 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -86,6 +86,11 @@ static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
                 return 0;
         }
         cdm = of_iomap(np_cdm, 0);
+        if (!cdm) {
+                of_node_put(np_cdm);
+                dev_err(&ofdev->dev, "can't map clock node!\n");
+                return 0;
+        }
 
         if (in_8(&cdm->ipb_clk_sel) & 0x1)
                 freq *= 2;
diff --git a/drivers/net/can/peak_canfd/peak_pciefd_main.c b/drivers/net/can/peak_canfd/peak_pciefd_main.c
index b9e28578bc7b..455a3797a200 100644
--- a/drivers/net/can/peak_canfd/peak_pciefd_main.c
+++ b/drivers/net/can/peak_canfd/peak_pciefd_main.c
@@ -58,6 +58,10 @@ MODULE_LICENSE("GPL v2");
 #define PCIEFD_REG_SYS_VER1             0x0040  /* version reg #1 */
 #define PCIEFD_REG_SYS_VER2             0x0044  /* version reg #2 */
 
+#define PCIEFD_FW_VERSION(x, y, z)      (((u32)(x) << 24) | \
+                                         ((u32)(y) << 16) | \
+                                         ((u32)(z) << 8))
+
 /* System Control Registers Bits */
 #define PCIEFD_SYS_CTL_TS_RST           0x00000001      /* timestamp clock */
 #define PCIEFD_SYS_CTL_CLK_EN           0x00000002      /* system clock */
@@ -782,6 +786,21 @@ static int peak_pciefd_probe(struct pci_dev *pdev,
                  "%ux CAN-FD PCAN-PCIe FPGA v%u.%u.%u:\n", can_count,
                  hw_ver_major, hw_ver_minor, hw_ver_sub);
 
+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
+        /* FW < v3.3.0 DMA logic doesn't handle correctly the mix of 32-bit and
+         * 64-bit logical addresses: this workaround forces usage of 32-bit
+         * DMA addresses only when such a fw is detected.
+         */
+        if (PCIEFD_FW_VERSION(hw_ver_major, hw_ver_minor, hw_ver_sub) <
+            PCIEFD_FW_VERSION(3, 3, 0)) {
+                err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+                if (err)
+                        dev_warn(&pdev->dev,
+                                 "warning: can't set DMA mask %llxh (err %d)\n",
+                                 DMA_BIT_MASK(32), err);
+        }
+#endif
+
         /* stop system clock */
         pciefd_sys_writereg(pciefd, PCIEFD_SYS_CTL_CLK_EN,
                             PCIEFD_REG_SYS_CTL_CLR);
diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index 89aec07c225f..5a24039733ef 100644
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -2,6 +2,7 @@
  *
  * Copyright (C) 2012 - 2014 Xilinx, Inc.
  * Copyright (C) 2009 PetaLogix. All rights reserved.
+ * Copyright (C) 2017 Sandvik Mining and Construction Oy
  *
  * Description:
  * This driver is developed for Axi CAN IP and for Zynq CANPS Controller.
@@ -25,8 +26,10 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/skbuff.h>
+#include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/can/dev.h>
@@ -101,7 +104,7 @@ enum xcan_reg {
 #define XCAN_INTR_ALL           (XCAN_IXR_TXOK_MASK | XCAN_IXR_BSOFF_MASK |\
                                  XCAN_IXR_WKUP_MASK | XCAN_IXR_SLP_MASK | \
                                  XCAN_IXR_RXNEMP_MASK | XCAN_IXR_ERROR_MASK | \
-                                 XCAN_IXR_ARBLST_MASK | XCAN_IXR_RXOK_MASK)
+                                 XCAN_IXR_RXOFLW_MASK | XCAN_IXR_ARBLST_MASK)
 
 /* CAN register bit shift - XCAN_<REG>_<BIT>_SHIFT */
 #define XCAN_BTR_SJW_SHIFT              7  /* Synchronous jump width */
@@ -118,6 +121,7 @@ enum xcan_reg {
 /**
  * struct xcan_priv - This definition define CAN driver instance
  * @can:                        CAN private data structure.
+ * @tx_lock:                    Lock for synchronizing TX interrupt handling
  * @tx_head:                    Tx CAN packets ready to send on the queue
  * @tx_tail:                    Tx CAN packets successfully sended on the queue
  * @tx_max:                     Maximum number packets the driver can send
@@ -132,6 +136,7 @@ enum xcan_reg {
  */
 struct xcan_priv {
         struct can_priv can;
+        spinlock_t tx_lock;
         unsigned int tx_head;
         unsigned int tx_tail;
         unsigned int tx_max;
@@ -159,6 +164,11 @@ static const struct can_bittiming_const xcan_bittiming_const = {
         .brp_inc = 1,
 };
 
+#define XCAN_CAP_WATERMARK      0x0001
+struct xcan_devtype_data {
+        unsigned int caps;
+};
+
 /**
  * xcan_write_reg_le - Write a value to the device register little endian
  * @priv:       Driver private data structure
@@ -238,6 +248,10 @@ static int set_reset_mode(struct net_device *ndev)
                 usleep_range(500, 10000);
         }
 
+        /* reset clears FIFOs */
+        priv->tx_head = 0;
+        priv->tx_tail = 0;
+
         return 0;
 }
 
@@ -392,6 +406,7 @@ static int xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         struct net_device_stats *stats = &ndev->stats;
         struct can_frame *cf = (struct can_frame *)skb->data;
         u32 id, dlc, data[2] = {0, 0};
+        unsigned long flags;
 
         if (can_dropped_invalid_skb(ndev, skb))
                 return NETDEV_TX_OK;
@@ -439,6 +454,9 @@ static int xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                 data[1] = be32_to_cpup((__be32 *)(cf->data + 4));
 
         can_put_echo_skb(skb, ndev, priv->tx_head % priv->tx_max);
+
+        spin_lock_irqsave(&priv->tx_lock, flags);
+
         priv->tx_head++;
 
         /* Write the Frame to Xilinx CAN TX FIFO */
@@ -454,10 +472,16 @@ static int xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                 stats->tx_bytes += cf->can_dlc;
         }
 
+        /* Clear TX-FIFO-empty interrupt for xcan_tx_interrupt() */
+        if (priv->tx_max > 1)
+                priv->write_reg(priv, XCAN_ICR_OFFSET, XCAN_IXR_TXFEMP_MASK);
+
         /* Check if the TX buffer is full */
         if ((priv->tx_head - priv->tx_tail) == priv->tx_max)
                 netif_stop_queue(ndev);
 
+        spin_unlock_irqrestore(&priv->tx_lock, flags);
+
         return NETDEV_TX_OK;
 }
 
@@ -530,6 +554,123 @@ static int xcan_rx(struct net_device *ndev)
 }
 
 /**
+ * xcan_current_error_state - Get current error state from HW
+ * @ndev:       Pointer to net_device structure
+ *
+ * Checks the current CAN error state from the HW. Note that this
+ * only checks for ERROR_PASSIVE and ERROR_WARNING.
+ *
+ * Return:
+ * ERROR_PASSIVE or ERROR_WARNING if either is active, ERROR_ACTIVE
+ * otherwise.
+ */
+static enum can_state xcan_current_error_state(struct net_device *ndev)
+{
+        struct xcan_priv *priv = netdev_priv(ndev);
+        u32 status = priv->read_reg(priv, XCAN_SR_OFFSET);
+
+        if ((status & XCAN_SR_ESTAT_MASK) == XCAN_SR_ESTAT_MASK)
+                return CAN_STATE_ERROR_PASSIVE;
+        else if (status & XCAN_SR_ERRWRN_MASK)
+                return CAN_STATE_ERROR_WARNING;
+        else
+                return CAN_STATE_ERROR_ACTIVE;
+}
+
+/**
+ * xcan_set_error_state - Set new CAN error state
+ * @ndev:       Pointer to net_device structure
+ * @new_state:  The new CAN state to be set
+ * @cf:         Error frame to be populated or NULL
+ *
+ * Set new CAN error state for the device, updating statistics and
+ * populating the error frame if given.
+ */
+static void xcan_set_error_state(struct net_device *ndev,
+                                 enum can_state new_state,
+                                 struct can_frame *cf)
+{
+        struct xcan_priv *priv = netdev_priv(ndev);
+        u32 ecr = priv->read_reg(priv, XCAN_ECR_OFFSET);
+        u32 txerr = ecr & XCAN_ECR_TEC_MASK;
+        u32 rxerr = (ecr & XCAN_ECR_REC_MASK) >> XCAN_ESR_REC_SHIFT;
+
+        priv->can.state = new_state;
+
+        if (cf) {
+                cf->can_id |= CAN_ERR_CRTL;
+                cf->data[6] = txerr;
+                cf->data[7] = rxerr;
+        }
+
+        switch (new_state) {
+        case CAN_STATE_ERROR_PASSIVE:
+                priv->can.can_stats.error_passive++;
+                if (cf)
+                        cf->data[1] = (rxerr > 127) ?
+                                        CAN_ERR_CRTL_RX_PASSIVE :
+                                        CAN_ERR_CRTL_TX_PASSIVE;
+                break;
+        case CAN_STATE_ERROR_WARNING:
+                priv->can.can_stats.error_warning++;
+                if (cf)
+                        cf->data[1] |= (txerr > rxerr) ?
+                                        CAN_ERR_CRTL_TX_WARNING :
+                                        CAN_ERR_CRTL_RX_WARNING;
+                break;
+        case CAN_STATE_ERROR_ACTIVE:
+                if (cf)
+                        cf->data[1] |= CAN_ERR_CRTL_ACTIVE;
+                break;
+        default:
+                /* non-ERROR states are handled elsewhere */
+                WARN_ON(1);
+                break;
+        }
+}
+
+/**
+ * xcan_update_error_state_after_rxtx - Update CAN error state after RX/TX
+ * @ndev:       Pointer to net_device structure
+ *
+ * If the device is in a ERROR-WARNING or ERROR-PASSIVE state, check if
+ * the performed RX/TX has caused it to drop to a lesser state and set
+ * the interface state accordingly.
+ */
+static void xcan_update_error_state_after_rxtx(struct net_device *ndev)
+{
+        struct xcan_priv *priv = netdev_priv(ndev);
+        enum can_state old_state = priv->can.state;
+        enum can_state new_state;
+
+        /* changing error state due to successful frame RX/TX can only
+         * occur from these states
+         */
+        if (old_state != CAN_STATE_ERROR_WARNING &&
+            old_state != CAN_STATE_ERROR_PASSIVE)
+                return;
+
+        new_state = xcan_current_error_state(ndev);
+
+        if (new_state != old_state) {
+                struct sk_buff *skb;
+                struct can_frame *cf;
+
+                skb = alloc_can_err_skb(ndev, &cf);
+
+                xcan_set_error_state(ndev, new_state, skb ? cf : NULL);
+
+                if (skb) {
+                        struct net_device_stats *stats = &ndev->stats;
+
+                        stats->rx_packets++;
+                        stats->rx_bytes += cf->can_dlc;
+                        netif_rx(skb);
+                }
+        }
+}
+
+/**
  * xcan_err_interrupt - error frame Isr
  * @ndev:       net_device pointer
  * @isr:        interrupt status register value
@@ -544,16 +685,12 @@ static void xcan_err_interrupt(struct net_device *ndev, u32 isr)
         struct net_device_stats *stats = &ndev->stats;
         struct can_frame *cf;
         struct sk_buff *skb;
-        u32 err_status, status, txerr = 0, rxerr = 0;
+        u32 err_status;
 
         skb = alloc_can_err_skb(ndev, &cf);
 
         err_status = priv->read_reg(priv, XCAN_ESR_OFFSET);
         priv->write_reg(priv, XCAN_ESR_OFFSET, err_status);
-        txerr = priv->read_reg(priv, XCAN_ECR_OFFSET) & XCAN_ECR_TEC_MASK;
-        rxerr = ((priv->read_reg(priv, XCAN_ECR_OFFSET) &
-                        XCAN_ECR_REC_MASK) >> XCAN_ESR_REC_SHIFT);
-        status = priv->read_reg(priv, XCAN_SR_OFFSET);
 
         if (isr & XCAN_IXR_BSOFF_MASK) {
                 priv->can.state = CAN_STATE_BUS_OFF;
@@ -563,28 +700,10 @@ static void xcan_err_interrupt(struct net_device *ndev, u32 isr)
                 can_bus_off(ndev);
                 if (skb)
                         cf->can_id |= CAN_ERR_BUSOFF;
-        } else if ((status & XCAN_SR_ESTAT_MASK) == XCAN_SR_ESTAT_MASK) {
-                priv->can.state = CAN_STATE_ERROR_PASSIVE;
-                priv->can.can_stats.error_passive++;
-                if (skb) {
-                        cf->can_id |= CAN_ERR_CRTL;
-                        cf->data[1] = (rxerr > 127) ?
-                                        CAN_ERR_CRTL_RX_PASSIVE :
-                                        CAN_ERR_CRTL_TX_PASSIVE;
-                        cf->data[6] = txerr;
-                        cf->data[7] = rxerr;
-                }
-        } else if (status & XCAN_SR_ERRWRN_MASK) {
-                priv->can.state = CAN_STATE_ERROR_WARNING;
-                priv->can.can_stats.error_warning++;
-                if (skb) {
-                        cf->can_id |= CAN_ERR_CRTL;
-                        cf->data[1] |= (txerr > rxerr) ?
-                                        CAN_ERR_CRTL_TX_WARNING :
-                                        CAN_ERR_CRTL_RX_WARNING;
-                        cf->data[6] = txerr;
-                        cf->data[7] = rxerr;
-                }
+        } else {
+                enum can_state new_state = xcan_current_error_state(ndev);
+
+                xcan_set_error_state(ndev, new_state, skb ? cf : NULL);
         }
 
         /* Check for Arbitration lost interrupt */
@@ -600,7 +719,6 @@ static void xcan_err_interrupt(struct net_device *ndev, u32 isr)
         if (isr & XCAN_IXR_RXOFLW_MASK) {
                 stats->rx_over_errors++;
                 stats->rx_errors++;
-                priv->write_reg(priv, XCAN_SRR_OFFSET, XCAN_SRR_RESET_MASK);
                 if (skb) {
                         cf->can_id |= CAN_ERR_CRTL;
                         cf->data[1] |= CAN_ERR_CRTL_RX_OVERFLOW;
@@ -709,26 +827,20 @@ static int xcan_rx_poll(struct napi_struct *napi, int quota)
 
         isr = priv->read_reg(priv, XCAN_ISR_OFFSET);
         while ((isr & XCAN_IXR_RXNEMP_MASK) && (work_done < quota)) {
-                if (isr & XCAN_IXR_RXOK_MASK) {
-                        priv->write_reg(priv, XCAN_ICR_OFFSET,
-                                XCAN_IXR_RXOK_MASK);
-                        work_done += xcan_rx(ndev);
-                } else {
-                        priv->write_reg(priv, XCAN_ICR_OFFSET,
-                                XCAN_IXR_RXNEMP_MASK);
-                        break;
-                }
+                work_done += xcan_rx(ndev);
                 priv->write_reg(priv, XCAN_ICR_OFFSET, XCAN_IXR_RXNEMP_MASK);
                 isr = priv->read_reg(priv, XCAN_ISR_OFFSET);
         }
 
-        if (work_done)
+        if (work_done) {
                 can_led_event(ndev, CAN_LED_EVENT_RX);
+                xcan_update_error_state_after_rxtx(ndev);
+        }
 
         if (work_done < quota) {
                 napi_complete_done(napi, work_done);
                 ier = priv->read_reg(priv, XCAN_IER_OFFSET);
-                ier |= (XCAN_IXR_RXOK_MASK | XCAN_IXR_RXNEMP_MASK);
+                ier |= XCAN_IXR_RXNEMP_MASK;
                 priv->write_reg(priv, XCAN_IER_OFFSET, ier);
         }
         return work_done;
@@ -743,18 +855,71 @@ static void xcan_tx_interrupt(struct net_device *ndev, u32 isr)
 {
         struct xcan_priv *priv = netdev_priv(ndev);
         struct net_device_stats *stats = &ndev->stats;
+        unsigned int frames_in_fifo;
+        int frames_sent = 1; /* TXOK => at least 1 frame was sent */
+        unsigned long flags;
+        int retries = 0;
+
+        /* Synchronize with xmit as we need to know the exact number
+         * of frames in the FIFO to stay in sync due to the TXFEMP
+         * handling.
+         * This also prevents a race between netif_wake_queue() and
+         * netif_stop_queue().
+         */
+        spin_lock_irqsave(&priv->tx_lock, flags);
+
+        frames_in_fifo = priv->tx_head - priv->tx_tail;
+
+        if (WARN_ON_ONCE(frames_in_fifo == 0)) {
+                /* clear TXOK anyway to avoid getting back here */
+                priv->write_reg(priv, XCAN_ICR_OFFSET, XCAN_IXR_TXOK_MASK);
+                spin_unlock_irqrestore(&priv->tx_lock, flags);
+                return;
+        }
+
+        /* Check if 2 frames were sent (TXOK only means that at least 1
+         * frame was sent).
+         */
+        if (frames_in_fifo > 1) {
+                WARN_ON(frames_in_fifo > priv->tx_max);
+
+                /* Synchronize TXOK and isr so that after the loop:
+                 * (1) isr variable is up-to-date at least up to TXOK clear
+                 *     time. This avoids us clearing a TXOK of a second frame
+                 *     but not noticing that the FIFO is now empty and thus
+                 *     marking only a single frame as sent.
+                 * (2) No TXOK is left. Having one could mean leaving a
+                 *     stray TXOK as we might process the associated frame
+                 *     via TXFEMP handling as we read TXFEMP *after* TXOK
+                 *     clear to satisfy (1).
+                 */
+                while ((isr & XCAN_IXR_TXOK_MASK) && !WARN_ON(++retries == 100)) {
+                        priv->write_reg(priv, XCAN_ICR_OFFSET, XCAN_IXR_TXOK_MASK);
+                        isr = priv->read_reg(priv, XCAN_ISR_OFFSET);
+                }
 
-        while ((priv->tx_head - priv->tx_tail > 0) &&
-                        (isr & XCAN_IXR_TXOK_MASK)) {
+                if (isr & XCAN_IXR_TXFEMP_MASK) {
+                        /* nothing in FIFO anymore */
+                        frames_sent = frames_in_fifo;
+                }
+        } else {
+                /* single frame in fifo, just clear TXOK */
                 priv->write_reg(priv, XCAN_ICR_OFFSET, XCAN_IXR_TXOK_MASK);
+        }
+
+        while (frames_sent--) {
                 can_get_echo_skb(ndev, priv->tx_tail %
                                         priv->tx_max);
                 priv->tx_tail++;
                 stats->tx_packets++;
-                isr = priv->read_reg(priv, XCAN_ISR_OFFSET);
         }
-        can_led_event(ndev, CAN_LED_EVENT_TX);
+
         netif_wake_queue(ndev);
+
+        spin_unlock_irqrestore(&priv->tx_lock, flags);
+
+        can_led_event(ndev, CAN_LED_EVENT_TX);
+        xcan_update_error_state_after_rxtx(ndev);
 }
 
 /**
@@ -773,6 +938,7 @@ static irqreturn_t xcan_interrupt(int irq, void *dev_id)
         struct net_device *ndev = (struct net_device *)dev_id;
         struct xcan_priv *priv = netdev_priv(ndev);
         u32 isr, ier;
+        u32 isr_errors;
 
         /* Get the interrupt status from Xilinx CAN */
         isr = priv->read_reg(priv, XCAN_ISR_OFFSET);
@@ -791,18 +957,17 @@ static irqreturn_t xcan_interrupt(int irq, void *dev_id)
                 xcan_tx_interrupt(ndev, isr);
 
         /* Check for the type of error interrupt and Processing it */
-        if (isr & (XCAN_IXR_ERROR_MASK | XCAN_IXR_RXOFLW_MASK |
-                        XCAN_IXR_BSOFF_MASK | XCAN_IXR_ARBLST_MASK)) {
-                priv->write_reg(priv, XCAN_ICR_OFFSET, (XCAN_IXR_ERROR_MASK |
-                                XCAN_IXR_RXOFLW_MASK | XCAN_IXR_BSOFF_MASK |
-                                XCAN_IXR_ARBLST_MASK));
+        isr_errors = isr & (XCAN_IXR_ERROR_MASK | XCAN_IXR_RXOFLW_MASK |
+                            XCAN_IXR_BSOFF_MASK | XCAN_IXR_ARBLST_MASK);
+        if (isr_errors) {
+                priv->write_reg(priv, XCAN_ICR_OFFSET, isr_errors);
                 xcan_err_interrupt(ndev, isr);
         }
 
         /* Check for the type of receive interrupt and Processing it */
-        if (isr & (XCAN_IXR_RXNEMP_MASK | XCAN_IXR_RXOK_MASK)) {
+        if (isr & XCAN_IXR_RXNEMP_MASK) {
                 ier = priv->read_reg(priv, XCAN_IER_OFFSET);
-                ier &= ~(XCAN_IXR_RXNEMP_MASK | XCAN_IXR_RXOK_MASK);
+                ier &= ~XCAN_IXR_RXNEMP_MASK;
                 priv->write_reg(priv, XCAN_IER_OFFSET, ier);
                 napi_schedule(&priv->napi);
         }
@@ -819,13 +984,9 @@ static irqreturn_t xcan_interrupt(int irq, void *dev_id)
 static void xcan_chip_stop(struct net_device *ndev)
 {
         struct xcan_priv *priv = netdev_priv(ndev);
-        u32 ier;
 
         /* Disable interrupts and leave the can in configuration mode */
-        ier = priv->read_reg(priv, XCAN_IER_OFFSET);
-        ier &= ~XCAN_INTR_ALL;
-        priv->write_reg(priv, XCAN_IER_OFFSET, ier);
-        priv->write_reg(priv, XCAN_SRR_OFFSET, XCAN_SRR_RESET_MASK);
+        set_reset_mode(ndev);
         priv->can.state = CAN_STATE_STOPPED;
 }
 
@@ -958,10 +1119,15 @@ static const struct net_device_ops xcan_netdev_ops = {
  */
 static int __maybe_unused xcan_suspend(struct device *dev)
 {
-        if (!device_may_wakeup(dev))
-                return pm_runtime_force_suspend(dev);
+        struct net_device *ndev = dev_get_drvdata(dev);
 
-        return 0;
+        if (netif_running(ndev)) {
+                netif_stop_queue(ndev);
+                netif_device_detach(ndev);
+                xcan_chip_stop(ndev);
+        }
+
+        return pm_runtime_force_suspend(dev);
 }
 
 /**
@@ -973,11 +1139,27 @@ static int __maybe_unused xcan_suspend(struct device *dev)
  */
 static int __maybe_unused xcan_resume(struct device *dev)
 {
-        if (!device_may_wakeup(dev))
-                return pm_runtime_force_resume(dev);
+        struct net_device *ndev = dev_get_drvdata(dev);
+        int ret;
 
-        return 0;
+        ret = pm_runtime_force_resume(dev);
+        if (ret) {
+                dev_err(dev, "pm_runtime_force_resume failed on resume\n");
+                return ret;
+        }
+
+        if (netif_running(ndev)) {
+                ret = xcan_chip_start(ndev);
+                if (ret) {
+                        dev_err(dev, "xcan_chip_start failed on resume\n");
+                        return ret;
+                }
+
+                netif_device_attach(ndev);
+                netif_start_queue(ndev);
+        }
 
+        return 0;
 }
 
 /**
@@ -992,14 +1174,6 @@ static int __maybe_unused xcan_runtime_suspend(struct device *dev)
         struct net_device *ndev = dev_get_drvdata(dev);
         struct xcan_priv *priv = netdev_priv(ndev);
 
-        if (netif_running(ndev)) {
-                netif_stop_queue(ndev);
-                netif_device_detach(ndev);
-        }
-
-        priv->write_reg(priv, XCAN_MSR_OFFSET, XCAN_MSR_SLEEP_MASK);
-        priv->can.state = CAN_STATE_SLEEPING;
-
         clk_disable_unprepare(priv->bus_clk);
         clk_disable_unprepare(priv->can_clk);
 
@@ -1018,7 +1192,6 @@ static int __maybe_unused xcan_runtime_resume(struct device *dev)
         struct net_device *ndev = dev_get_drvdata(dev);
         struct xcan_priv *priv = netdev_priv(ndev);
         int ret;
-        u32 isr, status;
 
         ret = clk_prepare_enable(priv->bus_clk);
         if (ret) {
@@ -1032,27 +1205,6 @@ static int __maybe_unused xcan_runtime_resume(struct device *dev)
                 return ret;
         }
 
-        priv->write_reg(priv, XCAN_SRR_OFFSET, XCAN_SRR_RESET_MASK);
-        isr = priv->read_reg(priv, XCAN_ISR_OFFSET);
-        status = priv->read_reg(priv, XCAN_SR_OFFSET);
-
-        if (netif_running(ndev)) {
-                if (isr & XCAN_IXR_BSOFF_MASK) {
-                        priv->can.state = CAN_STATE_BUS_OFF;
-                        priv->write_reg(priv, XCAN_SRR_OFFSET,
-                                        XCAN_SRR_RESET_MASK);
-                } else if ((status & XCAN_SR_ESTAT_MASK) ==
-                                        XCAN_SR_ESTAT_MASK) {
-                        priv->can.state = CAN_STATE_ERROR_PASSIVE;
-                } else if (status & XCAN_SR_ERRWRN_MASK) {
-                        priv->can.state = CAN_STATE_ERROR_WARNING;
-                } else {
-                        priv->can.state = CAN_STATE_ERROR_ACTIVE;
-                }
-                netif_device_attach(ndev);
-                netif_start_queue(ndev);
-        }
-
         return 0;
 }
 
@@ -1061,6 +1213,18 @@ static const struct dev_pm_ops xcan_dev_pm_ops = {
         SET_RUNTIME_PM_OPS(xcan_runtime_suspend, xcan_runtime_resume, NULL)
 };
 
+static const struct xcan_devtype_data xcan_zynq_data = {
+        .caps = XCAN_CAP_WATERMARK,
+};
+
+/* Match table for OF platform binding */
+static const struct of_device_id xcan_of_match[] = {
+        { .compatible = "xlnx,zynq-can-1.0", .data = &xcan_zynq_data },
+        { .compatible = "xlnx,axi-can-1.00.a", },
+        { /* end of list */ },
+};
+MODULE_DEVICE_TABLE(of, xcan_of_match);
+
 /**
  * xcan_probe - Platform registration call
  * @pdev:       Handle to the platform device structure
@@ -1075,8 +1239,10 @@ static int xcan_probe(struct platform_device *pdev)
         struct resource *res; /* IO mem resources */
         struct net_device *ndev;
         struct xcan_priv *priv;
+        const struct of_device_id *of_id;
+        int caps = 0;
         void __iomem *addr;
-        int ret, rx_max, tx_max;
+        int ret, rx_max, tx_max, tx_fifo_depth;
 
         /* Get the virtual base address for the device */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1086,7 +1252,8 @@ static int xcan_probe(struct platform_device *pdev)
                 goto err;
         }
 
-        ret = of_property_read_u32(pdev->dev.of_node, "tx-fifo-depth", &tx_max);
+        ret = of_property_read_u32(pdev->dev.of_node, "tx-fifo-depth",
+                                   &tx_fifo_depth);
         if (ret < 0)
                 goto err;
 
@@ -1094,6 +1261,30 @@ static int xcan_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto err;
 
+        of_id = of_match_device(xcan_of_match, &pdev->dev);
+        if (of_id) {
+                const struct xcan_devtype_data *devtype_data = of_id->data;
+
+                if (devtype_data)
+                        caps = devtype_data->caps;
+        }
+
+        /* There is no way to directly figure out how many frames have been
+         * sent when the TXOK interrupt is processed. If watermark programming
+         * is supported, we can have 2 frames in the FIFO and use TXFEMP
+         * to determine if 1 or 2 frames have been sent.
+         * Theoretically we should be able to use TXFWMEMP to determine up
+         * to 3 frames, but it seems that after putting a second frame in the
+         * FIFO, with watermark at 2 frames, it can happen that TXFWMEMP (less
+         * than 2 frames in FIFO) is set anyway with no TXOK (a frame was
+         * sent), which is not a sensible state - possibly TXFWMEMP is not
+         * completely synchronized with the rest of the bits?
+         */
+        if (caps & XCAN_CAP_WATERMARK)
+                tx_max = min(tx_fifo_depth, 2);
+        else
+                tx_max = 1;
+
         /* Create a CAN device instance */
         ndev = alloc_candev(sizeof(struct xcan_priv), tx_max);
         if (!ndev)
@@ -1108,6 +1299,7 @@ static int xcan_probe(struct platform_device *pdev)
                                         CAN_CTRLMODE_BERR_REPORTING;
         priv->reg_base = addr;
         priv->tx_max = tx_max;
+        spin_lock_init(&priv->tx_lock);
 
         /* Get IRQ for the device */
         ndev->irq = platform_get_irq(pdev, 0);
@@ -1172,9 +1364,9 @@ static int xcan_probe(struct platform_device *pdev)
 
         pm_runtime_put(&pdev->dev);
 
-        netdev_dbg(ndev, "reg_base=0x%p irq=%d clock=%d, tx fifo depth:%d\n",
+        netdev_dbg(ndev, "reg_base=0x%p irq=%d clock=%d, tx fifo depth: actual %d, using %d\n",
                         priv->reg_base, ndev->irq, priv->can.clock.freq,
-                        priv->tx_max);
+                        tx_fifo_depth, priv->tx_max);
 
         return 0;
 
@@ -1208,14 +1400,6 @@ static int xcan_remove(struct platform_device *pdev)
         return 0;
 }
 
-/* Match table for OF platform binding */
-static const struct of_device_id xcan_of_match[] = {
-        { .compatible = "xlnx,zynq-can-1.0", },
-        { .compatible = "xlnx,axi-can-1.00.a", },
-        { /* end of list */ },
-};
-MODULE_DEVICE_TABLE(of, xcan_of_match);
-
 static struct platform_driver xcan_driver = {
         .probe = xcan_probe,
         .remove = xcan_remove,
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 437cd6eb4faa..9ef07a06aceb 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -343,6 +343,7 @@ static const struct irq_domain_ops mv88e6xxx_g1_irq_domain_ops = {
         .xlate  = irq_domain_xlate_twocell,
 };
 
+/* To be called with reg_lock held */
 static void mv88e6xxx_g1_irq_free_common(struct mv88e6xxx_chip *chip)
 {
         int irq, virq;
@@ -362,9 +363,15 @@ static void mv88e6xxx_g1_irq_free_common(struct mv88e6xxx_chip *chip)
 
 static void mv88e6xxx_g1_irq_free(struct mv88e6xxx_chip *chip)
 {
-        mv88e6xxx_g1_irq_free_common(chip);
-
+        /*
+         * free_irq must be called without reg_lock taken because the irq
+         * handler takes this lock, too.
+         */
         free_irq(chip->irq, chip);
+
+        mutex_lock(&chip->reg_lock);
+        mv88e6xxx_g1_irq_free_common(chip);
+        mutex_unlock(&chip->reg_lock);
 }
 
 static int mv88e6xxx_g1_irq_setup_common(struct mv88e6xxx_chip *chip)
@@ -469,10 +476,12 @@ static int mv88e6xxx_irq_poll_setup(struct mv88e6xxx_chip *chip)
 
 static void mv88e6xxx_irq_poll_free(struct mv88e6xxx_chip *chip)
 {
-        mv88e6xxx_g1_irq_free_common(chip);
-
         kthread_cancel_delayed_work_sync(&chip->irq_poll_work);
         kthread_destroy_worker(chip->kworker);
+
+        mutex_lock(&chip->reg_lock);
+        mv88e6xxx_g1_irq_free_common(chip);
+        mutex_unlock(&chip->reg_lock);
 }
 
 int mv88e6xxx_wait(struct mv88e6xxx_chip *chip, int addr, int reg, u16 mask)
@@ -4506,12 +4515,10 @@ out_g2_irq:
         if (chip->info->g2_irqs > 0)
                 mv88e6xxx_g2_irq_free(chip);
 out_g1_irq:
-        mutex_lock(&chip->reg_lock);
         if (chip->irq > 0)
                 mv88e6xxx_g1_irq_free(chip);
         else
                 mv88e6xxx_irq_poll_free(chip);
-        mutex_unlock(&chip->reg_lock);
 out:
         if (pdata)
                 dev_put(pdata->netdev);
@@ -4539,12 +4546,10 @@ static void mv88e6xxx_remove(struct mdio_device *mdiodev)
         if (chip->info->g2_irqs > 0)
                 mv88e6xxx_g2_irq_free(chip);
 
-        mutex_lock(&chip->reg_lock);
         if (chip->irq > 0)
                 mv88e6xxx_g1_irq_free(chip);
         else
                 mv88e6xxx_irq_poll_free(chip);
-        mutex_unlock(&chip->reg_lock);
 }
 
 static const struct of_device_id mv88e6xxx_of_match[] = {
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index 5b7658bcf020..5c3ef9fc8207 100644
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -32,7 +32,7 @@ config EL3
 
 config 3C515
         tristate "3c515 ISA \"Fast EtherLink\""
-        depends on ISA && ISA_DMA_API
+        depends on ISA && ISA_DMA_API && !PPC32
         ---help---
           If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
           network card, say Y here.
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index d5c15e8bb3de..9e5cf5583c87 100644
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -44,7 +44,7 @@ config AMD8111_ETH
 
 config LANCE
         tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
-        depends on ISA && ISA_DMA_API && !ARM
+        depends on ISA && ISA_DMA_API && !ARM && !PPC32
         ---help---
           If you have a network (Ethernet) card of this type, say Y here.
           Some LinkSys cards are of this type.
@@ -138,7 +138,7 @@ config PCMCIA_NMCLAN
 
 config NI65
         tristate "NI6510 support"
-        depends on ISA && ISA_DMA_API && !ARM
+        depends on ISA && ISA_DMA_API && !ARM && !PPC32
         ---help---
           If you have a network (Ethernet) card of this type, say Y here.
 
@@ -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/aquantia/atlantic/aq_cfg.h b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
index fc7383106946..91eb8910b1c9 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
@@ -63,8 +63,6 @@
 
 #define AQ_CFG_NAPI_WEIGHT     64U
 
-#define AQ_CFG_MULTICAST_ADDRESS_MAX     32U
-
 /*#define AQ_CFG_MAC_ADDR_PERMANENT {0x30, 0x0E, 0xE3, 0x12, 0x34, 0x56}*/
 
 #define AQ_NIC_FC_OFF    0U
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
index a2d416b24ffc..2c6ebd91a9f2 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
@@ -98,6 +98,8 @@ struct aq_stats_s {
 #define AQ_HW_MEDIA_TYPE_TP    1U
 #define AQ_HW_MEDIA_TYPE_FIBRE 2U
 
+#define AQ_HW_MULTICAST_ADDRESS_MAX     32U
+
 struct aq_hw_s {
         atomic_t flags;
         u8 rbl_enabled:1;
@@ -177,7 +179,7 @@ struct aq_hw_ops {
                                     unsigned int packet_filter);
 
         int (*hw_multicast_list_set)(struct aq_hw_s *self,
-                                     u8 ar_mac[AQ_CFG_MULTICAST_ADDRESS_MAX]
+                                     u8 ar_mac[AQ_HW_MULTICAST_ADDRESS_MAX]
                                      [ETH_ALEN],
                                      u32 count);
 
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
index ba5fe8c4125d..e3ae29e523f0 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
@@ -135,17 +135,10 @@ err_exit:
 static void aq_ndev_set_multicast_settings(struct net_device *ndev)
 {
         struct aq_nic_s *aq_nic = netdev_priv(ndev);
-        int err = 0;
 
-        err = aq_nic_set_packet_filter(aq_nic, ndev->flags);
-        if (err < 0)
-                return;
+        aq_nic_set_packet_filter(aq_nic, ndev->flags);
 
-        if (netdev_mc_count(ndev)) {
-                err = aq_nic_set_multicast_list(aq_nic, ndev);
-                if (err < 0)
-                        return;
-        }
+        aq_nic_set_multicast_list(aq_nic, ndev);
 }
 
 static const struct net_device_ops aq_ndev_ops = {
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index 1a1a6380c128..7a22d0257e04 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -563,34 +563,41 @@ err_exit:
 
 int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev)
 {
+        unsigned int packet_filter = self->packet_filter;
         struct netdev_hw_addr *ha = NULL;
         unsigned int i = 0U;
 
-        self->mc_list.count = 0U;
-
-        netdev_for_each_mc_addr(ha, ndev) {
-                ether_addr_copy(self->mc_list.ar[i++], ha->addr);
-                ++self->mc_list.count;
+        self->mc_list.count = 0;
+        if (netdev_uc_count(ndev) > AQ_HW_MULTICAST_ADDRESS_MAX) {
+                packet_filter |= IFF_PROMISC;
+        } else {
+                netdev_for_each_uc_addr(ha, ndev) {
+                        ether_addr_copy(self->mc_list.ar[i++], ha->addr);
 
-                if (i >= AQ_CFG_MULTICAST_ADDRESS_MAX)
-                        break;
+                        if (i >= AQ_HW_MULTICAST_ADDRESS_MAX)
+                                break;
+                }
         }
 
-        if (i >= AQ_CFG_MULTICAST_ADDRESS_MAX) {
-                /* Number of filters is too big: atlantic does not support this.
-                 * Force all multi filter to support this.
-                 * With this we disable all UC filters and setup "all pass"
-                 * multicast mask
-                 */
-                self->packet_filter |= IFF_ALLMULTI;
-                self->aq_nic_cfg.mc_list_count = 0;
-                return self->aq_hw_ops->hw_packet_filter_set(self->aq_hw,
-                                                             self->packet_filter);
+        if (i + netdev_mc_count(ndev) > AQ_HW_MULTICAST_ADDRESS_MAX) {
+                packet_filter |= IFF_ALLMULTI;
         } else {
-                return self->aq_hw_ops->hw_multicast_list_set(self->aq_hw,
-                                                    self->mc_list.ar,
-                                                    self->mc_list.count);
+                netdev_for_each_mc_addr(ha, ndev) {
+                        ether_addr_copy(self->mc_list.ar[i++], ha->addr);
+
+                        if (i >= AQ_HW_MULTICAST_ADDRESS_MAX)
+                                break;
+                }
+        }
+
+        if (i > 0 && i < AQ_HW_MULTICAST_ADDRESS_MAX) {
+                packet_filter |= IFF_MULTICAST;
+                self->mc_list.count = i;
+                self->aq_hw_ops->hw_multicast_list_set(self->aq_hw,
+                                                       self->mc_list.ar,
+                                                       self->mc_list.count);
         }
+        return aq_nic_set_packet_filter(self, packet_filter);
 }
 
 int aq_nic_set_mtu(struct aq_nic_s *self, int new_mtu)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
index faa533a0ec47..fecfc401f95d 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
@@ -75,7 +75,7 @@ struct aq_nic_s {
         struct aq_hw_link_status_s link_status;
         struct {
                 u32 count;
-                u8 ar[AQ_CFG_MULTICAST_ADDRESS_MAX][ETH_ALEN];
+                u8 ar[AQ_HW_MULTICAST_ADDRESS_MAX][ETH_ALEN];
         } mc_list;
 
         struct pci_dev *pdev;
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
index 67e2f9fb9402..8cc6abadc03b 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
@@ -765,7 +765,7 @@ static int hw_atl_a0_hw_packet_filter_set(struct aq_hw_s *self,
 
 static int hw_atl_a0_hw_multicast_list_set(struct aq_hw_s *self,
                                            u8 ar_mac
-                                           [AQ_CFG_MULTICAST_ADDRESS_MAX]
+                                           [AQ_HW_MULTICAST_ADDRESS_MAX]
                                            [ETH_ALEN],
                                            u32 count)
 {
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
index 819f6bcf9b4e..956860a69797 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -784,7 +784,7 @@ static int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self,
 
 static int hw_atl_b0_hw_multicast_list_set(struct aq_hw_s *self,
                                            u8 ar_mac
-                                           [AQ_CFG_MULTICAST_ADDRESS_MAX]
+                                           [AQ_HW_MULTICAST_ADDRESS_MAX]
                                            [ETH_ALEN],
                                            u32 count)
 {
@@ -812,7 +812,7 @@ static int hw_atl_b0_hw_multicast_list_set(struct aq_hw_s *self,
 
                 hw_atl_rpfl2_uc_flr_en_set(self,
                                            (self->aq_nic_cfg->is_mc_list_enabled),
-                                    HW_ATL_B0_MAC_MIN + i);
+                                           HW_ATL_B0_MAC_MIN + i);
         }
 
         err = aq_hw_err_from_flags(self);
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/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 94270f654b3b..7087b88550db 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -1686,6 +1686,7 @@ static struct sk_buff *atl1c_alloc_skb(struct atl1c_adapter *adapter)
         skb = build_skb(page_address(page) + adapter->rx_page_offset,
                         adapter->rx_frag_size);
         if (likely(skb)) {
+                skb_reserve(skb, NET_SKB_PAD);
                 adapter->rx_page_offset += adapter->rx_frag_size;
                 if (adapter->rx_page_offset >= PAGE_SIZE)
                         adapter->rx_page = NULL;
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/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index d5fca2e5a9bc..a1f60f89e059 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1946,8 +1946,8 @@ static int bcm_sysport_open(struct net_device *dev)
         if (!priv->is_lite)
                 priv->crc_fwd = !!(umac_readl(priv, UMAC_CMD) & CMD_CRC_FWD);
         else
-                priv->crc_fwd = !!(gib_readl(priv, GIB_CONTROL) &
-                                   GIB_FCS_STRIP);
+                priv->crc_fwd = !((gib_readl(priv, GIB_CONTROL) &
+                                  GIB_FCS_STRIP) >> GIB_FCS_STRIP_SHIFT);
 
         phydev = of_phy_connect(dev, priv->phy_dn, bcm_sysport_adj_link,
                                 0, priv->phy_interface);
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h
index d6e5d0cbf3a3..cf440b91fd04 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.h
+++ b/drivers/net/ethernet/broadcom/bcmsysport.h
@@ -278,7 +278,8 @@ struct bcm_rsb {
 #define  GIB_GTX_CLK_EXT_CLK            (0 << GIB_GTX_CLK_SEL_SHIFT)
 #define  GIB_GTX_CLK_125MHZ             (1 << GIB_GTX_CLK_SEL_SHIFT)
 #define  GIB_GTX_CLK_250MHZ             (2 << GIB_GTX_CLK_SEL_SHIFT)
-#define  GIB_FCS_STRIP                  (1 << 6)
+#define  GIB_FCS_STRIP_SHIFT            6
+#define  GIB_FCS_STRIP                  (1 << GIB_FCS_STRIP_SHIFT)
 #define  GIB_LCL_LOOP_EN                (1 << 7)
 #define  GIB_LCL_LOOP_TXEN              (1 << 8)
 #define  GIB_RMT_LOOP_EN                (1 << 9)
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_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index da18aa239acb..a4a90b6cdb46 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -3388,14 +3388,18 @@ static int bnx2x_set_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)
                         DP(BNX2X_MSG_ETHTOOL,
                            "rss re-configured, UDP 4-tupple %s\n",
                            udp_rss_requested ? "enabled" : "disabled");
-                        return bnx2x_rss(bp, &bp->rss_conf_obj, false, true);
+                        if (bp->state == BNX2X_STATE_OPEN)
+                                return bnx2x_rss(bp, &bp->rss_conf_obj, false,
+                                                 true);
                 } else if ((info->flow_type == UDP_V6_FLOW) &&
                            (bp->rss_conf_obj.udp_rss_v6 != udp_rss_requested)) {
                         bp->rss_conf_obj.udp_rss_v6 = udp_rss_requested;
                         DP(BNX2X_MSG_ETHTOOL,
                            "rss re-configured, UDP 4-tupple %s\n",
                            udp_rss_requested ? "enabled" : "disabled");
-                        return bnx2x_rss(bp, &bp->rss_conf_obj, false, true);
+                        if (bp->state == BNX2X_STATE_OPEN)
+                                return bnx2x_rss(bp, &bp->rss_conf_obj, false,
+                                                 true);
                 }
                 return 0;
 
@@ -3509,7 +3513,10 @@ static int bnx2x_set_rxfh(struct net_device *dev, const u32 *indir,
                 bp->rss_conf_obj.ind_table[i] = indir[i] + bp->fp->cl_id;
         }
 
-        return bnx2x_config_rss_eth(bp, false);
+        if (bp->state == BNX2X_STATE_OPEN)
+                return bnx2x_config_rss_eth(bp, false);
+
+        return 0;
 }
 
 /**
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/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 176fc9f4d7de..4394c1162be4 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -5712,7 +5712,9 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)
         }
         vnic->uc_filter_count = 1;
 
-        vnic->rx_mask = CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;
+        vnic->rx_mask = 0;
+        if (bp->dev->flags & IFF_BROADCAST)
+                vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;
 
         if ((bp->dev->flags & IFF_PROMISC) && bnxt_promisc_ok(bp))
                 vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;
@@ -5917,7 +5919,7 @@ unsigned int bnxt_get_max_func_irqs(struct bnxt *bp)
         return min_t(unsigned int, hw_resc->max_irqs, hw_resc->max_cp_rings);
 }
 
-void bnxt_set_max_func_irqs(struct bnxt *bp, unsigned int max_irqs)
+static void bnxt_set_max_func_irqs(struct bnxt *bp, unsigned int max_irqs)
 {
         bp->hw_resc.max_irqs = max_irqs;
 }
@@ -6888,7 +6890,7 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)
                 rc = bnxt_request_irq(bp);
                 if (rc) {
                         netdev_err(bp->dev, "bnxt_request_irq err: %x\n", rc);
-                        goto open_err;
+                        goto open_err_irq;
                 }
         }
 
@@ -6928,6 +6930,8 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)
 open_err:
         bnxt_debug_dev_exit(bp);
         bnxt_disable_napi(bp);
+
+open_err_irq:
         bnxt_del_napi(bp);
 
 open_err_free_mem:
@@ -7214,13 +7218,16 @@ static void bnxt_set_rx_mode(struct net_device *dev)
 
         mask &= ~(CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS |
                   CFA_L2_SET_RX_MASK_REQ_MASK_MCAST |
-                  CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST);
+                  CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST |
+                  CFA_L2_SET_RX_MASK_REQ_MASK_BCAST);
 
         if ((dev->flags & IFF_PROMISC) && bnxt_promisc_ok(bp))
                 mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;
 
         uc_update = bnxt_uc_list_updated(bp);
 
+        if (dev->flags & IFF_BROADCAST)
+                mask |= CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;
         if (dev->flags & IFF_ALLMULTI) {
                 mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;
                 vnic->mc_list_count = 0;
@@ -8502,11 +8509,11 @@ int bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx, bool shared)
         int rx, tx, cp;
 
         _bnxt_get_max_rings(bp, &rx, &tx, &cp);
+        *max_rx = rx;
+        *max_tx = tx;
         if (!rx || !tx || !cp)
                 return -ENOMEM;
 
-        *max_rx = rx;
-        *max_tx = tx;
         return bnxt_trim_rings(bp, max_rx, max_tx, cp, shared);
 }
 
@@ -8520,8 +8527,11 @@ static int bnxt_get_dflt_rings(struct bnxt *bp, int *max_rx, int *max_tx,
                 /* Not enough rings, try disabling agg rings. */
                 bp->flags &= ~BNXT_FLAG_AGG_RINGS;
                 rc = bnxt_get_max_rings(bp, max_rx, max_tx, shared);
-                if (rc)
+                if (rc) {
+                        /* set BNXT_FLAG_AGG_RINGS back for consistency */
+                        bp->flags |= BNXT_FLAG_AGG_RINGS;
                         return rc;
+                }
                 bp->flags |= BNXT_FLAG_NO_AGG_RINGS;
                 bp->dev->hw_features &= ~(NETIF_F_LRO | NETIF_F_GRO_HW);
                 bp->dev->features &= ~(NETIF_F_LRO | NETIF_F_GRO_HW);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 9b14eb610b9f..91575ef97c8c 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1470,7 +1470,6 @@ void bnxt_set_max_func_stat_ctxs(struct bnxt *bp, unsigned int max);
 unsigned int bnxt_get_max_func_cp_rings(struct bnxt *bp);
 void bnxt_set_max_func_cp_rings(struct bnxt *bp, unsigned int max);
 unsigned int bnxt_get_max_func_irqs(struct bnxt *bp);
-void bnxt_set_max_func_irqs(struct bnxt *bp, unsigned int max);
 int bnxt_get_avail_msix(struct bnxt *bp, int num);
 int bnxt_reserve_rings(struct bnxt *bp);
 void bnxt_tx_disable(struct bnxt *bp);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
index 795f45024c20..491bd40a254d 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
@@ -27,6 +27,15 @@
 #define BNXT_FID_INVALID                        0xffff
 #define VLAN_TCI(vid, prio)     ((vid) | ((prio) << VLAN_PRIO_SHIFT))
 
+#define is_vlan_pcp_wildcarded(vlan_tci_mask)   \
+        ((ntohs(vlan_tci_mask) & VLAN_PRIO_MASK) == 0x0000)
+#define is_vlan_pcp_exactmatch(vlan_tci_mask)   \
+        ((ntohs(vlan_tci_mask) & VLAN_PRIO_MASK) == VLAN_PRIO_MASK)
+#define is_vlan_pcp_zero(vlan_tci)      \
+        ((ntohs(vlan_tci) & VLAN_PRIO_MASK) == 0x0000)
+#define is_vid_exactmatch(vlan_tci_mask)        \
+        ((ntohs(vlan_tci_mask) & VLAN_VID_MASK) == VLAN_VID_MASK)
+
 /* Return the dst fid of the func for flow forwarding
  * For PFs: src_fid is the fid of the PF
  * For VF-reps: src_fid the fid of the VF
@@ -389,6 +398,21 @@ static bool is_exactmatch(void *mask, int len)
         return true;
 }
 
+static bool is_vlan_tci_allowed(__be16  vlan_tci_mask,
+                                __be16  vlan_tci)
+{
+        /* VLAN priority must be either exactly zero or fully wildcarded and
+         * VLAN id must be exact match.
+         */
+        if (is_vid_exactmatch(vlan_tci_mask) &&
+            ((is_vlan_pcp_exactmatch(vlan_tci_mask) &&
+              is_vlan_pcp_zero(vlan_tci)) ||
+             is_vlan_pcp_wildcarded(vlan_tci_mask)))
+                return true;
+
+        return false;
+}
+
 static bool bits_set(void *key, int len)
 {
         const u8 *p = key;
@@ -803,9 +827,9 @@ static bool bnxt_tc_can_offload(struct bnxt *bp, struct bnxt_tc_flow *flow)
         /* Currently VLAN fields cannot be partial wildcard */
         if (bits_set(&flow->l2_key.inner_vlan_tci,
                      sizeof(flow->l2_key.inner_vlan_tci)) &&
-            !is_exactmatch(&flow->l2_mask.inner_vlan_tci,
-                           sizeof(flow->l2_mask.inner_vlan_tci))) {
-                netdev_info(bp->dev, "Wildcard match unsupported for VLAN TCI\n");
+            !is_vlan_tci_allowed(flow->l2_mask.inner_vlan_tci,
+                                 flow->l2_key.inner_vlan_tci)) {
+                netdev_info(bp->dev, "Unsupported VLAN TCI\n");
                 return false;
         }
         if (bits_set(&flow->l2_key.inner_vlan_tpid,
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
index 347e4f946eb2..840f6e505f73 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
@@ -169,7 +169,6 @@ static int bnxt_req_msix_vecs(struct bnxt_en_dev *edev, int ulp_id,
                 edev->ulp_tbl[ulp_id].msix_requested = avail_msix;
         }
         bnxt_fill_msix_vecs(bp, ent);
-        bnxt_set_max_func_irqs(bp, bnxt_get_max_func_irqs(bp) - avail_msix);
         bnxt_set_max_func_cp_rings(bp, max_cp_rings - avail_msix);
         edev->flags |= BNXT_EN_FLAG_MSIX_REQUESTED;
         return avail_msix;
@@ -192,7 +191,6 @@ static int bnxt_free_msix_vecs(struct bnxt_en_dev *edev, int ulp_id)
         msix_requested = edev->ulp_tbl[ulp_id].msix_requested;
         bnxt_set_max_func_cp_rings(bp, max_cp_rings + msix_requested);
         edev->ulp_tbl[ulp_id].msix_requested = 0;
-        bnxt_set_max_func_irqs(bp, bnxt_get_max_func_irqs(bp) + msix_requested);
         edev->flags &= ~BNXT_EN_FLAG_MSIX_REQUESTED;
         if (netif_running(dev)) {
                 bnxt_close_nic(bp, true, false);
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/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 3be87efdc93d..aa1374d0af93 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -6,11 +6,15 @@
  * Copyright (C) 2004 Sun Microsystems Inc.
  * Copyright (C) 2005-2016 Broadcom Corporation.
  * Copyright (C) 2016-2017 Broadcom Limited.
+ * Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"
+ * refers to Broadcom Inc. and/or its subsidiaries.
  *
  * Firmware is:
  *      Derived from proprietary unpublished source code,
  *      Copyright (C) 2000-2016 Broadcom Corporation.
  *      Copyright (C) 2016-2017 Broadcom Ltd.
+ *      Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"
+ *      refers to Broadcom Inc. and/or its subsidiaries.
  *
  *      Permission is hereby granted for the distribution of this firmware
  *      data in hexadecimal or equivalent format, provided this copyright
@@ -9290,6 +9294,15 @@ static int tg3_chip_reset(struct tg3 *tp)
 
         tg3_restore_clk(tp);
 
+        /* Increase the core clock speed to fix tx timeout issue for 5762
+         * with 100Mbps link speed.
+         */
+        if (tg3_asic_rev(tp) == ASIC_REV_5762) {
+                val = tr32(TG3_CPMU_CLCK_ORIDE_ENABLE);
+                tw32(TG3_CPMU_CLCK_ORIDE_ENABLE, val |
+                     TG3_CPMU_MAC_ORIDE_ENABLE);
+        }
+
         /* Reprobe ASF enable state.  */
         tg3_flag_clear(tp, ENABLE_ASF);
         tp->phy_flags &= ~(TG3_PHYFLG_1G_ON_VAUX_OK |
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index 1d61aa3efda1..a772a33b685c 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -7,6 +7,8 @@
  * Copyright (C) 2004 Sun Microsystems Inc.
  * Copyright (C) 2007-2016 Broadcom Corporation.
  * Copyright (C) 2016-2017 Broadcom Limited.
+ * Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"
+ * refers to Broadcom Inc. and/or its subsidiaries.
  */
 
 #ifndef _T3_H
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 86659823b259..3d45f4c92cf6 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -166,6 +166,7 @@
 #define GEM_DCFG6               0x0294 /* Design Config 6 */
 #define GEM_DCFG7               0x0298 /* Design Config 7 */
 #define GEM_DCFG8               0x029C /* Design Config 8 */
+#define GEM_DCFG10              0x02A4 /* Design Config 10 */
 
 #define GEM_TXBDCTRL    0x04cc /* TX Buffer Descriptor control register */
 #define GEM_RXBDCTRL    0x04d0 /* RX Buffer Descriptor control register */
@@ -490,6 +491,12 @@
 #define GEM_SCR2CMP_OFFSET                      0
 #define GEM_SCR2CMP_SIZE                        8
 
+/* Bitfields in DCFG10 */
+#define GEM_TXBD_RDBUFF_OFFSET                  12
+#define GEM_TXBD_RDBUFF_SIZE                    4
+#define GEM_RXBD_RDBUFF_OFFSET                  8
+#define GEM_RXBD_RDBUFF_SIZE                    4
+
 /* Bitfields in TISUBN */
 #define GEM_SUBNSINCR_OFFSET                    0
 #define GEM_SUBNSINCR_SIZE                      16
@@ -635,6 +642,7 @@
 #define MACB_CAPS_USRIO_DISABLED                0x00000010
 #define MACB_CAPS_JUMBO                         0x00000020
 #define MACB_CAPS_GEM_HAS_PTP                   0x00000040
+#define MACB_CAPS_BD_RD_PREFETCH                0x00000080
 #define MACB_CAPS_FIFO_MODE                     0x10000000
 #define MACB_CAPS_GIGABIT_MODE_AVAILABLE        0x20000000
 #define MACB_CAPS_SG_DISABLED                   0x40000000
@@ -1203,6 +1211,9 @@ struct macb {
         unsigned int max_tuples;
 
         struct tasklet_struct   hresp_err_tasklet;
+
+        int     rx_bd_rd_prefetch;
+        int     tx_bd_rd_prefetch;
 };
 
 #ifdef CONFIG_MACB_USE_HWSTAMP
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 3e93df5d4e3b..a6c911bb5ce2 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -1811,23 +1811,25 @@ static void macb_free_consistent(struct macb *bp)
 {
         struct macb_queue *queue;
         unsigned int q;
+        int size;
 
-        queue = &bp->queues[0];
         bp->macbgem_ops.mog_free_rx_buffers(bp);
-        if (queue->rx_ring) {
-                dma_free_coherent(&bp->pdev->dev, RX_RING_BYTES(bp),
-                                queue->rx_ring, queue->rx_ring_dma);
-                queue->rx_ring = NULL;
-        }
 
         for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
                 kfree(queue->tx_skb);
                 queue->tx_skb = NULL;
                 if (queue->tx_ring) {
-                        dma_free_coherent(&bp->pdev->dev, TX_RING_BYTES(bp),
+                        size = TX_RING_BYTES(bp) + bp->tx_bd_rd_prefetch;
+                        dma_free_coherent(&bp->pdev->dev, size,
                                           queue->tx_ring, queue->tx_ring_dma);
                         queue->tx_ring = NULL;
                 }
+                if (queue->rx_ring) {
+                        size = RX_RING_BYTES(bp) + bp->rx_bd_rd_prefetch;
+                        dma_free_coherent(&bp->pdev->dev, size,
+                                          queue->rx_ring, queue->rx_ring_dma);
+                        queue->rx_ring = NULL;
+                }
         }
 }
 
@@ -1874,7 +1876,7 @@ static int macb_alloc_consistent(struct macb *bp)
         int size;
 
         for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
-                size = TX_RING_BYTES(bp);
+                size = TX_RING_BYTES(bp) + bp->tx_bd_rd_prefetch;
                 queue->tx_ring = dma_alloc_coherent(&bp->pdev->dev, size,
                                                     &queue->tx_ring_dma,
                                                     GFP_KERNEL);
@@ -1890,7 +1892,7 @@ static int macb_alloc_consistent(struct macb *bp)
                 if (!queue->tx_skb)
                         goto out_err;
 
-                size = RX_RING_BYTES(bp);
+                size = RX_RING_BYTES(bp) + bp->rx_bd_rd_prefetch;
                 queue->rx_ring = dma_alloc_coherent(&bp->pdev->dev, size,
                                                  &queue->rx_ring_dma, GFP_KERNEL);
                 if (!queue->rx_ring)
@@ -3726,6 +3728,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;
 
@@ -3795,7 +3799,7 @@ static const struct macb_config np4_config = {
 static const struct macb_config zynqmp_config = {
         .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE |
                         MACB_CAPS_JUMBO |
-                        MACB_CAPS_GEM_HAS_PTP,
+                        MACB_CAPS_GEM_HAS_PTP | MACB_CAPS_BD_RD_PREFETCH,
         .dma_burst_length = 16,
         .clk_init = macb_clk_init,
         .init = macb_init,
@@ -3856,7 +3860,7 @@ static int macb_probe(struct platform_device *pdev)
         void __iomem *mem;
         const char *mac;
         struct macb *bp;
-        int err;
+        int err, val;
 
         regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         mem = devm_ioremap_resource(&pdev->dev, regs);
@@ -3945,6 +3949,18 @@ static int macb_probe(struct platform_device *pdev)
         else
                 dev->max_mtu = ETH_DATA_LEN;
 
+        if (bp->caps & MACB_CAPS_BD_RD_PREFETCH) {
+                val = GEM_BFEXT(RXBD_RDBUFF, gem_readl(bp, DCFG10));
+                if (val)
+                        bp->rx_bd_rd_prefetch = (2 << (val - 1)) *
+                                                macb_dma_desc_get_size(bp);
+
+                val = GEM_BFEXT(TXBD_RDBUFF, gem_readl(bp, DCFG10));
+                if (val)
+                        bp->tx_bd_rd_prefetch = (2 << (val - 1)) *
+                                                macb_dma_desc_get_size(bp);
+        }
+
         mac = of_get_mac_address(np);
         if (mac) {
                 ether_addr_copy(bp->dev->dev_addr, mac);
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/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig
index 043e3c11c42b..92d88c5f76fb 100644
--- a/drivers/net/ethernet/cavium/Kconfig
+++ b/drivers/net/ethernet/cavium/Kconfig
@@ -15,7 +15,7 @@ if NET_VENDOR_CAVIUM
 
 config THUNDER_NIC_PF
         tristate "Thunder Physical function driver"
-        depends on 64BIT
+        depends on 64BIT && PCI
         select THUNDER_NIC_BGX
         ---help---
           This driver supports Thunder's NIC physical function.
@@ -28,13 +28,13 @@ config THUNDER_NIC_PF
 config THUNDER_NIC_VF
         tristate "Thunder Virtual function driver"
         imply CAVIUM_PTP
-        depends on 64BIT
+        depends on 64BIT && PCI
         ---help---
           This driver supports Thunder's NIC virtual function
 
 config  THUNDER_NIC_BGX
         tristate "Thunder MAC interface driver (BGX)"
-        depends on 64BIT
+        depends on 64BIT && PCI
         select PHYLIB
         select MDIO_THUNDER
         select THUNDER_NIC_RGX
@@ -44,7 +44,7 @@ config	THUNDER_NIC_BGX
 
 config  THUNDER_NIC_RGX
         tristate "Thunder MAC interface driver (RGX)"
-        depends on 64BIT
+        depends on 64BIT && PCI
         select PHYLIB
         select MDIO_THUNDER
         ---help---
@@ -53,7 +53,7 @@ config	THUNDER_NIC_RGX
 
 config CAVIUM_PTP
         tristate "Cavium PTP coprocessor as PTP clock"
-        depends on 64BIT
+        depends on 64BIT && PCI
         imply PTP_1588_CLOCK
         default y
         ---help---
@@ -65,7 +65,7 @@ config CAVIUM_PTP
 
 config LIQUIDIO
         tristate "Cavium LiquidIO support"
-        depends on 64BIT
+        depends on 64BIT && PCI
         depends on MAY_USE_DEVLINK
         imply PTP_1588_CLOCK
         select FW_LOADER
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 8a815bb57177..7e8454d3b1ad 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -91,6 +91,9 @@ static int octeon_console_debug_enabled(u32 console)
  */
 #define LIO_SYNC_OCTEON_TIME_INTERVAL_MS 60000
 
+/* time to wait for possible in-flight requests in milliseconds */
+#define WAIT_INFLIGHT_REQUEST   msecs_to_jiffies(1000)
+
 struct lio_trusted_vf_ctx {
         struct completion complete;
         int status;
@@ -259,7 +262,7 @@ static inline void pcierror_quiesce_device(struct octeon_device *oct)
         force_io_queues_off(oct);
 
         /* To allow for in-flight requests */
-        schedule_timeout_uninterruptible(100);
+        schedule_timeout_uninterruptible(WAIT_INFLIGHT_REQUEST);
 
         if (wait_for_pending_requests(oct))
                 dev_err(&oct->pci_dev->dev, "There were pending requests\n");
diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
index 3f6afb54a5eb..bb43ddb7539e 100644
--- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
@@ -643,13 +643,21 @@ static int octeon_mgmt_set_mac_address(struct net_device *netdev, void *addr)
 static int octeon_mgmt_change_mtu(struct net_device *netdev, int new_mtu)
 {
         struct octeon_mgmt *p = netdev_priv(netdev);
-        int size_without_fcs = new_mtu + OCTEON_MGMT_RX_HEADROOM;
+        int max_packet = new_mtu + ETH_HLEN + ETH_FCS_LEN;
 
         netdev->mtu = new_mtu;
 
-        cvmx_write_csr(p->agl + AGL_GMX_RX_FRM_MAX, size_without_fcs);
+        /* HW lifts the limit if the frame is VLAN tagged
+         * (+4 bytes per each tag, up to two tags)
+         */
+        cvmx_write_csr(p->agl + AGL_GMX_RX_FRM_MAX, max_packet);
+        /* Set the hardware to truncate packets larger than the MTU. The jabber
+         * register must be set to a multiple of 8 bytes, so round up. JABBER is
+         * an unconditional limit, so we need to account for two possible VLAN
+         * tags.
+         */
         cvmx_write_csr(p->agl + AGL_GMX_RX_JABBER,
-                       (size_without_fcs + 7) & 0xfff8);
+                       (max_packet + 7 + VLAN_HLEN * 2) & 0xfff8);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index 7b795edd9d3a..a19172dbe6be 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -51,6 +51,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
+#include <linux/nospec.h>
 
 #include "common.h"
 #include "cxgb3_ioctl.h"
@@ -2268,6 +2269,7 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
 
                 if (t.qset_idx >= nqsets)
                         return -EINVAL;
+                t.qset_idx = array_index_nospec(t.qset_idx, nqsets);
 
                 q = &adapter->params.sge.qset[q1 + t.qset_idx];
                 t.rspq_size = q->rspq_size;
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/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 974a868a4824..3720c3e11ebb 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -8702,7 +8702,7 @@ static int t4_get_flash_params(struct adapter *adap)
         };
 
         unsigned int part, manufacturer;
-        unsigned int density, size;
+        unsigned int density, size = 0;
         u32 flashid = 0;
         int ret;
 
@@ -8772,11 +8772,6 @@ static int t4_get_flash_params(struct adapter *adap)
                 case 0x22: /* 256MB */
                         size = 1 << 28;
                         break;
-
-                default:
-                        dev_err(adap->pdev_dev, "Micron Flash Part has bad size, ID = %#x, Density code = %#x\n",
-                                flashid, density);
-                        return -EINVAL;
                 }
                 break;
         }
@@ -8792,10 +8787,6 @@ static int t4_get_flash_params(struct adapter *adap)
                 case 0x17: /* 64MB */
                         size = 1 << 26;
                         break;
-                default:
-                        dev_err(adap->pdev_dev, "ISSI Flash Part has bad size, ID = %#x, Density code = %#x\n",
-                                flashid, density);
-                        return -EINVAL;
                 }
                 break;
         }
@@ -8811,10 +8802,6 @@ static int t4_get_flash_params(struct adapter *adap)
                 case 0x18: /* 16MB */
                         size = 1 << 24;
                         break;
-                default:
-                        dev_err(adap->pdev_dev, "Macronix Flash Part has bad size, ID = %#x, Density code = %#x\n",
-                                flashid, density);
-                        return -EINVAL;
                 }
                 break;
         }
@@ -8830,17 +8817,21 @@ static int t4_get_flash_params(struct adapter *adap)
                 case 0x18: /* 16MB */
                         size = 1 << 24;
                         break;
-                default:
-                        dev_err(adap->pdev_dev, "Winbond Flash Part has bad size, ID = %#x, Density code = %#x\n",
-                                flashid, density);
-                        return -EINVAL;
                 }
                 break;
         }
-        default:
-                dev_err(adap->pdev_dev, "Unsupported Flash Part, ID = %#x\n",
-                        flashid);
-                return -EINVAL;
+        }
+
+        /* If we didn't recognize the FLASH part, that's no real issue: the
+         * Hardware/Software contract says that Hardware will _*ALWAYS*_
+         * use a FLASH part which is at least 4MB in size and has 64KB
+         * sectors.  The unrecognized FLASH part is likely to be much larger
+         * than 4MB, but that's all we really need.
+         */
+        if (size == 0) {
+                dev_warn(adap->pdev_dev, "Unknown Flash Part, ID = %#x, assuming 4MB\n",
+                         flashid);
+                size = 1 << 22;
         }
 
         /* Store decoded Flash size and fall through into vetting code. */
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig
index 5ab912937aff..ec0b545197e2 100644
--- a/drivers/net/ethernet/cirrus/Kconfig
+++ b/drivers/net/ethernet/cirrus/Kconfig
@@ -19,6 +19,7 @@ if NET_VENDOR_CIRRUS
 config CS89x0
         tristate "CS89x0 support"
         depends on ISA || EISA || ARM
+        depends on !PPC32
         ---help---
           Support for CS89x0 chipset based Ethernet cards. If you have a
           network (Ethernet) card of this type, say Y and read the file
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/huawei/hinic/hinic_tx.c b/drivers/net/ethernet/huawei/hinic/hinic_tx.c
index 9128858479c4..2353ec829c04 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_tx.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_tx.c
@@ -229,6 +229,7 @@ netdev_tx_t hinic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 txq->txq_stats.tx_busy++;
                 u64_stats_update_end(&txq->txq_stats.syncp);
                 err = NETDEV_TX_BUSY;
+                wqe_size = 0;
                 goto flush_skbs;
         }
 
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index d0e196bff081..ffe7acbeaa22 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -329,7 +329,8 @@ static void replenish_rx_pool(struct ibmvnic_adapter *adapter,
         return;
 
 failure:
-        dev_info(dev, "replenish pools failure\n");
+        if (lpar_rc != H_PARAMETER && lpar_rc != H_CLOSED)
+                dev_err_ratelimited(dev, "rx: replenish packet buffer failed\n");
         pool->free_map[pool->next_free] = index;
         pool->rx_buff[index].skb = NULL;
 
@@ -1617,7 +1618,8 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
                                       &tx_crq);
         }
         if (lpar_rc != H_SUCCESS) {
-                dev_err(dev, "tx failed with code %ld\n", lpar_rc);
+                if (lpar_rc != H_CLOSED && lpar_rc != H_PARAMETER)
+                        dev_err_ratelimited(dev, "tx: send failed\n");
                 dev_kfree_skb_any(skb);
                 tx_buff->skb = NULL;
 
@@ -1825,8 +1827,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,
 
                 rc = ibmvnic_login(netdev);
                 if (rc) {
-                        adapter->state = VNIC_PROBED;
-                        return 0;
+                        adapter->state = reset_state;
+                        return rc;
                 }
 
                 if (adapter->reset_reason == VNIC_RESET_CHANGE_PARAM ||
@@ -3204,6 +3206,25 @@ static union ibmvnic_crq *ibmvnic_next_crq(struct ibmvnic_adapter *adapter)
         return crq;
 }
 
+static void print_subcrq_error(struct device *dev, int rc, const char *func)
+{
+        switch (rc) {
+        case H_PARAMETER:
+                dev_warn_ratelimited(dev,
+                                     "%s failed: Send request is malformed or adapter failover pending. (rc=%d)\n",
+                                     func, rc);
+                break;
+        case H_CLOSED:
+                dev_warn_ratelimited(dev,
+                                     "%s failed: Backing queue closed. Adapter is down or failover pending. (rc=%d)\n",
+                                     func, rc);
+                break;
+        default:
+                dev_err_ratelimited(dev, "%s failed: (rc=%d)\n", func, rc);
+                break;
+        }
+}
+
 static int send_subcrq(struct ibmvnic_adapter *adapter, u64 remote_handle,
                        union sub_crq *sub_crq)
 {
@@ -3230,11 +3251,8 @@ static int send_subcrq(struct ibmvnic_adapter *adapter, u64 remote_handle,
                                 cpu_to_be64(u64_crq[2]),
                                 cpu_to_be64(u64_crq[3]));
 
-        if (rc) {
-                if (rc == H_CLOSED)
-                        dev_warn(dev, "CRQ Queue closed\n");
-                dev_err(dev, "Send error (rc=%d)\n", rc);
-        }
+        if (rc)
+                print_subcrq_error(dev, rc, __func__);
 
         return rc;
 }
@@ -3252,11 +3270,8 @@ static int send_subcrq_indirect(struct ibmvnic_adapter *adapter,
                                 cpu_to_be64(remote_handle),
                                 ioba, num_entries);
 
-        if (rc) {
-                if (rc == H_CLOSED)
-                        dev_warn(dev, "CRQ Queue closed\n");
-                dev_err(dev, "Send (indirect) error (rc=%d)\n", rc);
-        }
+        if (rc)
+                print_subcrq_error(dev, rc, __func__);
 
         return rc;
 }
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index ed6dbcfd4e96..b151ae316546 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2199,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);
@@ -2248,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);
@@ -2311,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;
@@ -2372,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++;
@@ -2427,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_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 3f5c350716bb..0bd1294ba517 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -1871,7 +1871,12 @@ s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
         if (enable_addr != 0)
                 rar_high |= IXGBE_RAH_AV;
 
+        /* Record lower 32 bits of MAC address and then make
+         * sure that write is flushed to hardware before writing
+         * the upper 16 bits and setting the valid bit.
+         */
         IXGBE_WRITE_REG(hw, IXGBE_RAL(index), rar_low);
+        IXGBE_WRITE_FLUSH(hw);
         IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
 
         return 0;
@@ -1903,8 +1908,13 @@ s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index)
         rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));
         rar_high &= ~(0x0000FFFF | IXGBE_RAH_AV);
 
-        IXGBE_WRITE_REG(hw, IXGBE_RAL(index), 0);
+        /* Clear the address valid bit and upper 16 bits of the address
+         * before clearing the lower bits. This way we aren't updating
+         * a live filter.
+         */
         IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
+        IXGBE_WRITE_FLUSH(hw);
+        IXGBE_WRITE_REG(hw, IXGBE_RAL(index), 0);
 
         /* clear VMDq pool/queue selection for this RAR */
         hw->mac.ops.clear_vmdq(hw, index, IXGBE_CLEAR_VMDQ_ALL);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
index c116f459945d..da4322e4daed 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
@@ -839,7 +839,7 @@ int ixgbe_ipsec_tx(struct ixgbe_ring *tx_ring,
         }
 
         itd->sa_idx = xs->xso.offload_handle - IXGBE_IPSEC_BASE_TX_INDEX;
-        if (unlikely(itd->sa_idx > IXGBE_IPSEC_MAX_SA_COUNT)) {
+        if (unlikely(itd->sa_idx >= IXGBE_IPSEC_MAX_SA_COUNT)) {
                 netdev_err(tx_ring->netdev, "%s: bad sa_idx=%d handle=%lu\n",
                            __func__, itd->sa_idx, xs->xso.offload_handle);
                 return 0;
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/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 9f54ccbddea7..3360f7b9ee73 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -474,10 +474,10 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv,
 {
         const struct mlx4_en_frag_info *frag_info = priv->frag_info;
         unsigned int truesize = 0;
+        bool release = true;
         int nr, frag_size;
         struct page *page;
         dma_addr_t dma;
-        bool release;
 
         /* Collect used fragments while replacing them in the HW descriptors */
         for (nr = 0;; frags++) {
@@ -500,7 +500,11 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv,
                         release = page_count(page) != 1 ||
                                   page_is_pfmemalloc(page) ||
                                   page_to_nid(page) != numa_mem_id();
-                } else {
+                } else if (!priv->rx_headroom) {
+                        /* rx_headroom for non XDP setup is always 0.
+                         * When XDP is set, the above condition will
+                         * guarantee page is always released.
+                         */
                         u32 sz_align = ALIGN(frag_size, SMP_CACHE_BYTES);
 
                         frags->page_offset += sz_align;
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index 7b1b5ac986d0..31bd56727022 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -2958,7 +2958,7 @@ int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,
         u32 srqn = qp_get_srqn(qpc) & 0xffffff;
         int use_srq = (qp_get_srqn(qpc) >> 24) & 1;
         struct res_srq *srq;
-        int local_qpn = be32_to_cpu(qpc->local_qpn) & 0xffffff;
+        int local_qpn = vhcr->in_modifier & 0xffffff;
 
         err = adjust_qp_sched_queue(dev, slave, qpc, inbox);
         if (err)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/alloc.c b/drivers/net/ethernet/mellanox/mlx5/core/alloc.c
index 323ffe8bf7e4..456f30007ad6 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/alloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/alloc.c
@@ -123,7 +123,7 @@ int mlx5_frag_buf_alloc_node(struct mlx5_core_dev *dev, int size,
         int i;
 
         buf->size = size;
-        buf->npages = 1 << get_order(size);
+        buf->npages = DIV_ROUND_UP(size, PAGE_SIZE);
         buf->page_shift = PAGE_SHIFT;
         buf->frags = kcalloc(buf->npages, sizeof(struct mlx5_buf_list),
                              GFP_KERNEL);
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_arfs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
index 75e4308ba786..d258bb679271 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c
@@ -381,14 +381,14 @@ static void arfs_may_expire_flow(struct mlx5e_priv *priv)
         HLIST_HEAD(del_list);
         spin_lock_bh(&priv->fs.arfs.arfs_lock);
         mlx5e_for_each_arfs_rule(arfs_rule, htmp, priv->fs.arfs.arfs_tables, i, j) {
-                if (quota++ > MLX5E_ARFS_EXPIRY_QUOTA)
-                        break;
                 if (!work_pending(&arfs_rule->arfs_work) &&
                     rps_may_expire_flow(priv->netdev,
                                         arfs_rule->rxq, arfs_rule->flow_id,
                                         arfs_rule->filter_id)) {
                         hlist_del_init(&arfs_rule->hlist);
                         hlist_add_head(&arfs_rule->hlist, &del_list);
+                        if (quota++ > MLX5E_ARFS_EXPIRY_QUOTA)
+                                break;
                 }
         }
         spin_unlock_bh(&priv->fs.arfs.arfs_lock);
@@ -711,6 +711,9 @@ int mlx5e_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
             skb->protocol != htons(ETH_P_IPV6))
                 return -EPROTONOSUPPORT;
 
+        if (skb->encapsulation)
+                return -EPROTONOSUPPORT;
+
         arfs_t = arfs_get_table(arfs, arfs_get_ip_proto(skb), skb->protocol);
         if (!arfs_t)
                 return -EPROTONOSUPPORT;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
index 0a52f31fef37..86bc9ac99586 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
@@ -275,7 +275,8 @@ int mlx5e_dcbnl_ieee_setets_core(struct mlx5e_priv *priv, struct ieee_ets *ets)
 }
 
 static int mlx5e_dbcnl_validate_ets(struct net_device *netdev,
-                                    struct ieee_ets *ets)
+                                    struct ieee_ets *ets,
+                                    bool zero_sum_allowed)
 {
         bool have_ets_tc = false;
         int bw_sum = 0;
@@ -300,8 +301,9 @@ static int mlx5e_dbcnl_validate_ets(struct net_device *netdev,
         }
 
         if (have_ets_tc && bw_sum != 100) {
-                netdev_err(netdev,
-                           "Failed to validate ETS: BW sum is illegal\n");
+                if (bw_sum || (!bw_sum && !zero_sum_allowed))
+                        netdev_err(netdev,
+                                   "Failed to validate ETS: BW sum is illegal\n");
                 return -EINVAL;
         }
         return 0;
@@ -316,7 +318,7 @@ static int mlx5e_dcbnl_ieee_setets(struct net_device *netdev,
         if (!MLX5_CAP_GEN(priv->mdev, ets))
                 return -EOPNOTSUPP;
 
-        err = mlx5e_dbcnl_validate_ets(netdev, ets);
+        err = mlx5e_dbcnl_validate_ets(netdev, ets, false);
         if (err)
                 return err;
 
@@ -642,12 +644,9 @@ static u8 mlx5e_dcbnl_setall(struct net_device *netdev)
                           ets.prio_tc[i]);
         }
 
-        err = mlx5e_dbcnl_validate_ets(netdev, &ets);
-        if (err) {
-                netdev_err(netdev,
-                           "%s, Failed to validate ETS: %d\n", __func__, err);
+        err = mlx5e_dbcnl_validate_ets(netdev, &ets, true);
+        if (err)
                 goto out;
-        }
 
         err = mlx5e_dcbnl_ieee_setets_core(priv, &ets);
         if (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/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 0edf4751a8ba..3a2c4e548226 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1957,6 +1957,10 @@ static bool actions_match_supported(struct mlx5e_priv *priv,
         else
                 actions = flow->nic_attr->action;
 
+        if (flow->flags & MLX5E_TC_FLOW_EGRESS &&
+            !(actions & MLX5_FLOW_CONTEXT_ACTION_DECAP))
+                return false;
+
         if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
                 return modify_header_match_supported(&parse_attr->spec, exts);
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index f63dfbcd29fe..dd01ad4c0b54 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;
@@ -2218,6 +2216,6 @@ free_out:
 
 u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw)
 {
-        return esw->mode;
+        return ESW_ALLOWED(esw) ? esw->mode : SRIOV_NONE;
 }
 EXPORT_SYMBOL_GPL(mlx5_eswitch_mode);
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..6ddb2565884d 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"
@@ -1886,7 +1887,7 @@ mlx5_add_flow_rules(struct mlx5_flow_table *ft,
         if (flow_act->action == MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO) {
                 if (!fwd_next_prio_supported(ft))
                         return ERR_PTR(-EOPNOTSUPP);
-                if (dest)
+                if (dest_num)
                         return ERR_PTR(-EINVAL);
                 mutex_lock(&root->chain_lock);
                 next_ft = find_next_chained_ft(prio);
@@ -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/clock.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
index 1e062e6b2587..3f767cde4c1d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
@@ -488,6 +488,7 @@ void mlx5_pps_event(struct mlx5_core_dev *mdev,
 void mlx5_init_clock(struct mlx5_core_dev *mdev)
 {
         struct mlx5_clock *clock = &mdev->clock;
+        u64 overflow_cycles;
         u64 ns;
         u64 frac = 0;
         u32 dev_freq;
@@ -511,10 +512,17 @@ void mlx5_init_clock(struct mlx5_core_dev *mdev)
 
         /* Calculate period in seconds to call the overflow watchdog - to make
          * sure counter is checked at least once every wrap around.
+         * The period is calculated as the minimum between max HW cycles count
+         * (The clock source mask) and max amount of cycles that can be
+         * multiplied by clock multiplier where the result doesn't exceed
+         * 64bits.
          */
-        ns = cyclecounter_cyc2ns(&clock->cycles, clock->cycles.mask,
+        overflow_cycles = div64_u64(~0ULL >> 1, clock->cycles.mult);
+        overflow_cycles = min(overflow_cycles, clock->cycles.mask >> 1);
+
+        ns = cyclecounter_cyc2ns(&clock->cycles, overflow_cycles,
                                  frac, &frac);
-        do_div(ns, NSEC_PER_SEC / 2 / HZ);
+        do_div(ns, NSEC_PER_SEC / HZ);
         clock->overflow_period = ns;
 
         mdev->clock_info_page = alloc_page(GFP_KERNEL);
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/mlx5/core/wq.c b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
index b97bb72b4db4..86478a6b99c5 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/wq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
@@ -113,35 +113,45 @@ err_db_free:
         return err;
 }
 
-static void mlx5e_qp_set_frag_buf(struct mlx5_frag_buf *buf,
-                                  struct mlx5_wq_qp *qp)
+static void mlx5_qp_set_frag_buf(struct mlx5_frag_buf *buf,
+                                 struct mlx5_wq_qp *qp)
 {
+        struct mlx5_frag_buf_ctrl *sq_fbc;
         struct mlx5_frag_buf *rqb, *sqb;
 
-        rqb = &qp->rq.fbc.frag_buf;
+        rqb  = &qp->rq.fbc.frag_buf;
         *rqb = *buf;
         rqb->size   = mlx5_wq_cyc_get_byte_size(&qp->rq);
-        rqb->npages = 1 << get_order(rqb->size);
+        rqb->npages = DIV_ROUND_UP(rqb->size, PAGE_SIZE);
 
-        sqb = &qp->sq.fbc.frag_buf;
-        *sqb = *buf;
-        sqb->size   = mlx5_wq_cyc_get_byte_size(&qp->rq);
-        sqb->npages = 1 << get_order(sqb->size);
+        sq_fbc = &qp->sq.fbc;
+        sqb    = &sq_fbc->frag_buf;
+        *sqb   = *buf;
+        sqb->size   = mlx5_wq_cyc_get_byte_size(&qp->sq);
+        sqb->npages = DIV_ROUND_UP(sqb->size, PAGE_SIZE);
         sqb->frags += rqb->npages; /* first part is for the rq */
+        if (sq_fbc->strides_offset)
+                sqb->frags--;
 }
 
 int mlx5_wq_qp_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
                       void *qpc, struct mlx5_wq_qp *wq,
                       struct mlx5_wq_ctrl *wq_ctrl)
 {
+        u32 sq_strides_offset;
         int err;
 
         mlx5_fill_fbc(MLX5_GET(qpc, qpc, log_rq_stride) + 4,
                       MLX5_GET(qpc, qpc, log_rq_size),
                       &wq->rq.fbc);
-        mlx5_fill_fbc(ilog2(MLX5_SEND_WQE_BB),
-                      MLX5_GET(qpc, qpc, log_sq_size),
-                      &wq->sq.fbc);
+
+        sq_strides_offset =
+                ((wq->rq.fbc.frag_sz_m1 + 1) % PAGE_SIZE) / MLX5_SEND_WQE_BB;
+
+        mlx5_fill_fbc_offset(ilog2(MLX5_SEND_WQE_BB),
+                             MLX5_GET(qpc, qpc, log_sq_size),
+                             sq_strides_offset,
+                             &wq->sq.fbc);
 
         err = mlx5_db_alloc_node(mdev, &wq_ctrl->db, param->db_numa_node);
         if (err) {
@@ -156,7 +166,7 @@ int mlx5_wq_qp_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
                 goto err_db_free;
         }
 
-        mlx5e_qp_set_frag_buf(&wq_ctrl->buf, wq);
+        mlx5_qp_set_frag_buf(&wq_ctrl->buf, wq);
 
         wq->rq.db  = &wq_ctrl->db.db[MLX5_RCV_DBR];
         wq->sq.db  = &wq_ctrl->db.db[MLX5_SND_DBR];
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/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 6aaaf3d9ba31..77b2adb29341 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -4756,6 +4756,12 @@ static void mlxsw_sp_rt6_destroy(struct mlxsw_sp_rt6 *mlxsw_sp_rt6)
         kfree(mlxsw_sp_rt6);
 }
 
+static bool mlxsw_sp_fib6_rt_can_mp(const struct fib6_info *rt)
+{
+        /* RTF_CACHE routes are ignored */
+        return (rt->fib6_flags & (RTF_GATEWAY | RTF_ADDRCONF)) == RTF_GATEWAY;
+}
+
 static struct fib6_info *
 mlxsw_sp_fib6_entry_rt(const struct mlxsw_sp_fib6_entry *fib6_entry)
 {
@@ -4765,11 +4771,11 @@ mlxsw_sp_fib6_entry_rt(const struct mlxsw_sp_fib6_entry *fib6_entry)
 
 static struct mlxsw_sp_fib6_entry *
 mlxsw_sp_fib6_node_mp_entry_find(const struct mlxsw_sp_fib_node *fib_node,
-                                 const struct fib6_info *nrt, bool append)
+                                 const struct fib6_info *nrt, bool replace)
 {
         struct mlxsw_sp_fib6_entry *fib6_entry;
 
-        if (!append)
+        if (!mlxsw_sp_fib6_rt_can_mp(nrt) || replace)
                 return NULL;
 
         list_for_each_entry(fib6_entry, &fib_node->entry_list, common.list) {
@@ -4784,7 +4790,8 @@ mlxsw_sp_fib6_node_mp_entry_find(const struct mlxsw_sp_fib_node *fib_node,
                         break;
                 if (rt->fib6_metric < nrt->fib6_metric)
                         continue;
-                if (rt->fib6_metric == nrt->fib6_metric)
+                if (rt->fib6_metric == nrt->fib6_metric &&
+                    mlxsw_sp_fib6_rt_can_mp(rt))
                         return fib6_entry;
                 if (rt->fib6_metric > nrt->fib6_metric)
                         break;
@@ -5163,7 +5170,7 @@ static struct mlxsw_sp_fib6_entry *
 mlxsw_sp_fib6_node_entry_find(const struct mlxsw_sp_fib_node *fib_node,
                               const struct fib6_info *nrt, bool replace)
 {
-        struct mlxsw_sp_fib6_entry *fib6_entry;
+        struct mlxsw_sp_fib6_entry *fib6_entry, *fallback = NULL;
 
         list_for_each_entry(fib6_entry, &fib_node->entry_list, common.list) {
                 struct fib6_info *rt = mlxsw_sp_fib6_entry_rt(fib6_entry);
@@ -5172,13 +5179,18 @@ mlxsw_sp_fib6_node_entry_find(const struct mlxsw_sp_fib_node *fib_node,
                         continue;
                 if (rt->fib6_table->tb6_id != nrt->fib6_table->tb6_id)
                         break;
-                if (replace && rt->fib6_metric == nrt->fib6_metric)
-                        return fib6_entry;
+                if (replace && rt->fib6_metric == nrt->fib6_metric) {
+                        if (mlxsw_sp_fib6_rt_can_mp(rt) ==
+                            mlxsw_sp_fib6_rt_can_mp(nrt))
+                                return fib6_entry;
+                        if (mlxsw_sp_fib6_rt_can_mp(nrt))
+                                fallback = fallback ?: fib6_entry;
+                }
                 if (rt->fib6_metric > nrt->fib6_metric)
-                        return fib6_entry;
+                        return fallback ?: fib6_entry;
         }
 
-        return NULL;
+        return fallback;
 }
 
 static int
@@ -5304,8 +5316,7 @@ static void mlxsw_sp_fib6_entry_replace(struct mlxsw_sp *mlxsw_sp,
 }
 
 static int mlxsw_sp_router_fib6_add(struct mlxsw_sp *mlxsw_sp,
-                                    struct fib6_info *rt, bool replace,
-                                    bool append)
+                                    struct fib6_info *rt, bool replace)
 {
         struct mlxsw_sp_fib6_entry *fib6_entry;
         struct mlxsw_sp_fib_node *fib_node;
@@ -5331,7 +5342,7 @@ static int mlxsw_sp_router_fib6_add(struct mlxsw_sp *mlxsw_sp,
         /* Before creating a new entry, try to append route to an existing
          * multipath entry.
          */
-        fib6_entry = mlxsw_sp_fib6_node_mp_entry_find(fib_node, rt, append);
+        fib6_entry = mlxsw_sp_fib6_node_mp_entry_find(fib_node, rt, replace);
         if (fib6_entry) {
                 err = mlxsw_sp_fib6_entry_nexthop_add(mlxsw_sp, fib6_entry, rt);
                 if (err)
@@ -5339,14 +5350,6 @@ static int mlxsw_sp_router_fib6_add(struct mlxsw_sp *mlxsw_sp,
                 return 0;
         }
 
-        /* We received an append event, yet did not find any route to
-         * append to.
-         */
-        if (WARN_ON(append)) {
-                err = -EINVAL;
-                goto err_fib6_entry_append;
-        }
-
         fib6_entry = mlxsw_sp_fib6_entry_create(mlxsw_sp, fib_node, rt);
         if (IS_ERR(fib6_entry)) {
                 err = PTR_ERR(fib6_entry);
@@ -5364,7 +5367,6 @@ static int mlxsw_sp_router_fib6_add(struct mlxsw_sp *mlxsw_sp,
 err_fib6_node_entry_link:
         mlxsw_sp_fib6_entry_destroy(mlxsw_sp, fib6_entry);
 err_fib6_entry_create:
-err_fib6_entry_append:
 err_fib6_entry_nexthop_add:
         mlxsw_sp_fib_node_put(mlxsw_sp, fib_node);
         return err;
@@ -5715,7 +5717,7 @@ static void mlxsw_sp_router_fib6_event_work(struct work_struct *work)
         struct mlxsw_sp_fib_event_work *fib_work =
                 container_of(work, struct mlxsw_sp_fib_event_work, work);
         struct mlxsw_sp *mlxsw_sp = fib_work->mlxsw_sp;
-        bool replace, append;
+        bool replace;
         int err;
 
         rtnl_lock();
@@ -5726,10 +5728,8 @@ static void mlxsw_sp_router_fib6_event_work(struct work_struct *work)
         case FIB_EVENT_ENTRY_APPEND: /* fall through */
         case FIB_EVENT_ENTRY_ADD:
                 replace = fib_work->event == FIB_EVENT_ENTRY_REPLACE;
-                append = fib_work->event == FIB_EVENT_ENTRY_APPEND;
                 err = mlxsw_sp_router_fib6_add(mlxsw_sp,
-                                               fib_work->fen6_info.rt, replace,
-                                               append);
+                                               fib_work->fen6_info.rt, replace);
                 if (err)
                         mlxsw_sp_router_fib_abort(mlxsw_sp);
                 mlxsw_sp_rt6_release(fib_work->fen6_info.rt);
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/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
index 78afe75129ab..382bb93cb090 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
@@ -317,7 +317,7 @@ nfp_tun_write_neigh(struct net_device *netdev, struct nfp_app *app,
         payload.dst_ipv4 = flow->daddr;
 
         /* If entry has expired send dst IP with all other fields 0. */
-        if (!(neigh->nud_state & NUD_VALID)) {
+        if (!(neigh->nud_state & NUD_VALID) || neigh->dead) {
                 nfp_tun_del_route_from_cache(app, payload.dst_ipv4);
                 /* Trigger ARP to verify invalid neighbour state. */
                 neigh_event_send(neigh, NULL);
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.h b/drivers/net/ethernet/qlogic/qed/qed.h
index 00db3401b898..1dfaccd151f0 100644
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -502,6 +502,7 @@ enum BAR_ID {
 struct qed_nvm_image_info {
         u32 num_images;
         struct bist_nvm_image_att *image_att;
+        bool valid;
 };
 
 #define DRV_MODULE_VERSION                    \
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
index f0b01385d5cb..e0680ce91328 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
@@ -709,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
@@ -723,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
diff --git a/drivers/net/ethernet/qlogic/qed/qed_debug.c b/drivers/net/ethernet/qlogic/qed/qed_debug.c
index a14e48489029..4340c4c90bcb 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_debug.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_debug.c
@@ -6723,7 +6723,7 @@ static enum dbg_status qed_parse_mcp_trace_buf(u8 *trace_buf,
                 format_idx = header & MFW_TRACE_EVENTID_MASK;
 
                 /* Skip message if its index doesn't exist in the meta data */
-                if (format_idx > s_mcp_trace_meta.formats_num) {
+                if (format_idx >= s_mcp_trace_meta.formats_num) {
                         u8 format_size =
                                 (u8)((header & MFW_TRACE_PRM_SIZE_MASK) >>
                                      MFW_TRACE_PRM_SIZE_SHIFT);
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_l2.c b/drivers/net/ethernet/qlogic/qed/qed_l2.c
index 99973e10b179..5ede6408649d 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_l2.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_l2.c
@@ -665,7 +665,7 @@ qed_sp_update_mcast_bin(struct qed_hwfn *p_hwfn,
 
         p_ramrod->common.update_approx_mcast_flg = 1;
         for (i = 0; i < ETH_MULTICAST_MAC_BINS_IN_REGS; i++) {
-                u32 *p_bins = (u32 *)p_params->bins;
+                u32 *p_bins = p_params->bins;
 
                 p_ramrod->approx_mcast.bins[i] = cpu_to_le32(p_bins[i]);
         }
@@ -1476,8 +1476,8 @@ qed_sp_eth_filter_mcast(struct qed_hwfn *p_hwfn,
                         enum spq_mode comp_mode,
                         struct qed_spq_comp_cb *p_comp_data)
 {
-        unsigned long bins[ETH_MULTICAST_MAC_BINS_IN_REGS];
         struct vport_update_ramrod_data *p_ramrod = NULL;
+        u32 bins[ETH_MULTICAST_MAC_BINS_IN_REGS];
         struct qed_spq_entry *p_ent = NULL;
         struct qed_sp_init_data init_data;
         u8 abs_vport_id = 0;
@@ -1513,26 +1513,25 @@ qed_sp_eth_filter_mcast(struct qed_hwfn *p_hwfn,
         /* explicitly clear out the entire vector */
         memset(&p_ramrod->approx_mcast.bins, 0,
                sizeof(p_ramrod->approx_mcast.bins));
-        memset(bins, 0, sizeof(unsigned long) *
-               ETH_MULTICAST_MAC_BINS_IN_REGS);
+        memset(bins, 0, sizeof(bins));
         /* filter ADD op is explicit set op and it removes
          *  any existing filters for the vport
          */
         if (p_filter_cmd->opcode == QED_FILTER_ADD) {
                 for (i = 0; i < p_filter_cmd->num_mc_addrs; i++) {
-                        u32 bit;
+                        u32 bit, nbits;
 
                         bit = qed_mcast_bin_from_mac(p_filter_cmd->mac[i]);
-                        __set_bit(bit, bins);
+                        nbits = sizeof(u32) * BITS_PER_BYTE;
+                        bins[bit / nbits] |= 1 << (bit % nbits);
                 }
 
                 /* Convert to correct endianity */
                 for (i = 0; i < ETH_MULTICAST_MAC_BINS_IN_REGS; i++) {
                         struct vport_update_ramrod_mcast *p_ramrod_bins;
-                        u32 *p_bins = (u32 *)bins;
 
                         p_ramrod_bins = &p_ramrod->approx_mcast;
-                        p_ramrod_bins->bins[i] = cpu_to_le32(p_bins[i]);
+                        p_ramrod_bins->bins[i] = cpu_to_le32(bins[i]);
                 }
         }
 
diff --git a/drivers/net/ethernet/qlogic/qed/qed_l2.h b/drivers/net/ethernet/qlogic/qed/qed_l2.h
index 806a8da257e9..8d80f1095d17 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_l2.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_l2.h
@@ -215,7 +215,7 @@ struct qed_sp_vport_update_params {
         u8                              anti_spoofing_en;
         u8                              update_accept_any_vlan_flg;
         u8                              accept_any_vlan;
-        unsigned long                   bins[8];
+        u32                             bins[8];
         struct qed_rss_params           *rss_params;
         struct qed_filter_accept_flags  accept_flags;
         struct qed_sge_tpa_params       *sge_tpa_params;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 5c10fd7210c3..758a9a5127fa 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -371,7 +371,7 @@ static struct qed_dev *qed_probe(struct pci_dev *pdev,
                 goto err2;
         }
 
-        DP_INFO(cdev, "qed_probe completed successffuly\n");
+        DP_INFO(cdev, "qed_probe completed successfully\n");
 
         return cdev;
 
@@ -789,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_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
index 4e0b443c9519..cdd645024a32 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -592,6 +592,9 @@ int qed_mcp_nvm_wr_cmd(struct qed_hwfn *p_hwfn,
         *o_mcp_resp = mb_params.mcp_resp;
         *o_mcp_param = mb_params.mcp_param;
 
+        /* nvm_info needs to be updated */
+        p_hwfn->nvm_info.valid = false;
+
         return 0;
 }
 
@@ -1208,6 +1211,7 @@ static void qed_mcp_handle_link_change(struct qed_hwfn *p_hwfn,
                 break;
         default:
                 p_link->speed = 0;
+                p_link->link_up = 0;
         }
 
         if (p_link->link_up && p_link->speed)
@@ -1305,9 +1309,15 @@ int qed_mcp_set_link(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, bool b_up)
         phy_cfg.pause |= (params->pause.forced_tx) ? ETH_PAUSE_TX : 0;
         phy_cfg.adv_speed = params->speed.advertised_speeds;
         phy_cfg.loopback_mode = params->loopback_mode;
-        if (p_hwfn->mcp_info->capabilities & FW_MB_PARAM_FEATURE_SUPPORT_EEE) {
-                if (params->eee.enable)
-                        phy_cfg.eee_cfg |= EEE_CFG_EEE_ENABLED;
+
+        /* There are MFWs that share this capability regardless of whether
+         * this is feasible or not. And given that at the very least adv_caps
+         * would be set internally by qed, we want to make sure LFA would
+         * still work.
+         */
+        if ((p_hwfn->mcp_info->capabilities &
+             FW_MB_PARAM_FEATURE_SUPPORT_EEE) && params->eee.enable) {
+                phy_cfg.eee_cfg |= EEE_CFG_EEE_ENABLED;
                 if (params->eee.tx_lpi_enable)
                         phy_cfg.eee_cfg |= EEE_CFG_TX_LPI;
                 if (params->eee.adv_caps & QED_EEE_1G_ADV)
@@ -2555,11 +2565,14 @@ int qed_mcp_bist_nvm_get_image_att(struct qed_hwfn *p_hwfn,
 
 int qed_mcp_nvm_info_populate(struct qed_hwfn *p_hwfn)
 {
-        struct qed_nvm_image_info *nvm_info = &p_hwfn->nvm_info;
+        struct qed_nvm_image_info nvm_info;
         struct qed_ptt *p_ptt;
         int rc;
         u32 i;
 
+        if (p_hwfn->nvm_info.valid)
+                return 0;
+
         p_ptt = qed_ptt_acquire(p_hwfn);
         if (!p_ptt) {
                 DP_ERR(p_hwfn, "failed to acquire ptt\n");
@@ -2567,29 +2580,29 @@ int qed_mcp_nvm_info_populate(struct qed_hwfn *p_hwfn)
         }
 
         /* Acquire from MFW the amount of available images */
-        nvm_info->num_images = 0;
+        nvm_info.num_images = 0;
         rc = qed_mcp_bist_nvm_get_num_images(p_hwfn,
-                                             p_ptt, &nvm_info->num_images);
+                                             p_ptt, &nvm_info.num_images);
         if (rc == -EOPNOTSUPP) {
                 DP_INFO(p_hwfn, "DRV_MSG_CODE_BIST_TEST is not supported\n");
                 goto out;
-        } else if (rc || !nvm_info->num_images) {
+        } else if (rc || !nvm_info.num_images) {
                 DP_ERR(p_hwfn, "Failed getting number of images\n");
                 goto err0;
         }
 
-        nvm_info->image_att = kmalloc_array(nvm_info->num_images,
-                                            sizeof(struct bist_nvm_image_att),
-                                            GFP_KERNEL);
-        if (!nvm_info->image_att) {
+        nvm_info.image_att = kmalloc_array(nvm_info.num_images,
+                                           sizeof(struct bist_nvm_image_att),
+                                           GFP_KERNEL);
+        if (!nvm_info.image_att) {
                 rc = -ENOMEM;
                 goto err0;
         }
 
         /* Iterate over images and get their attributes */
-        for (i = 0; i < nvm_info->num_images; i++) {
+        for (i = 0; i < nvm_info.num_images; i++) {
                 rc = qed_mcp_bist_nvm_get_image_att(p_hwfn, p_ptt,
-                                                    &nvm_info->image_att[i], i);
+                                                    &nvm_info.image_att[i], i);
                 if (rc) {
                         DP_ERR(p_hwfn,
                                "Failed getting image index %d attributes\n", i);
@@ -2597,14 +2610,22 @@ int qed_mcp_nvm_info_populate(struct qed_hwfn *p_hwfn)
                 }
 
                 DP_VERBOSE(p_hwfn, QED_MSG_SP, "image index %d, size %x\n", i,
-                           nvm_info->image_att[i].len);
+                           nvm_info.image_att[i].len);
         }
 out:
+        /* Update hwfn's nvm_info */
+        if (nvm_info.num_images) {
+                p_hwfn->nvm_info.num_images = nvm_info.num_images;
+                kfree(p_hwfn->nvm_info.image_att);
+                p_hwfn->nvm_info.image_att = nvm_info.image_att;
+                p_hwfn->nvm_info.valid = true;
+        }
+
         qed_ptt_release(p_hwfn, p_ptt);
         return 0;
 
 err1:
-        kfree(nvm_info->image_att);
+        kfree(nvm_info.image_att);
 err0:
         qed_ptt_release(p_hwfn, p_ptt);
         return rc;
@@ -2641,6 +2662,7 @@ qed_mcp_get_nvm_image_att(struct qed_hwfn *p_hwfn,
                 return -EINVAL;
         }
 
+        qed_mcp_nvm_info_populate(p_hwfn);
         for (i = 0; i < p_hwfn->nvm_info.num_images; i++)
                 if (type == p_hwfn->nvm_info.image_att[i].image_type)
                         break;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.c b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
index f01bf52bc381..26e918d7f2f9 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_sriov.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
@@ -2831,7 +2831,7 @@ qed_iov_vp_update_mcast_bin_param(struct qed_hwfn *p_hwfn,
 
         p_data->update_approx_mcast_flg = 1;
         memcpy(p_data->bins, p_mcast_tlv->bins,
-               sizeof(unsigned long) * ETH_MULTICAST_MAC_BINS_IN_REGS);
+               sizeof(u32) * ETH_MULTICAST_MAC_BINS_IN_REGS);
         *tlvs_mask |= 1 << QED_IOV_VP_UPDATE_MCAST;
 }
 
@@ -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/qed/qed_vf.c b/drivers/net/ethernet/qlogic/qed/qed_vf.c
index 2d7fcd6a0777..be6ddde1a104 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_vf.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_vf.c
@@ -1126,7 +1126,7 @@ int qed_vf_pf_vport_update(struct qed_hwfn *p_hwfn,
                 resp_size += sizeof(struct pfvf_def_resp_tlv);
 
                 memcpy(p_mcast_tlv->bins, p_params->bins,
-                       sizeof(unsigned long) * ETH_MULTICAST_MAC_BINS_IN_REGS);
+                       sizeof(u32) * ETH_MULTICAST_MAC_BINS_IN_REGS);
         }
 
         update_rx = p_params->accept_flags.update_rx_mode_config;
@@ -1272,7 +1272,7 @@ void qed_vf_pf_filter_mcast(struct qed_hwfn *p_hwfn,
                         u32 bit;
 
                         bit = qed_mcast_bin_from_mac(p_filter_cmd->mac[i]);
-                        __set_bit(bit, sp_params.bins);
+                        sp_params.bins[bit / 32] |= 1 << (bit % 32);
                 }
         }
 
diff --git a/drivers/net/ethernet/qlogic/qed/qed_vf.h b/drivers/net/ethernet/qlogic/qed/qed_vf.h
index 4f05d5eb3cf5..033409db86ae 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_vf.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_vf.h
@@ -392,7 +392,12 @@ struct vfpf_vport_update_mcast_bin_tlv {
         struct channel_tlv tl;
         u8 padding[4];
 
-        u64 bins[8];
+        /* There are only 256 approx bins, and in HSI they're divided into
+         * 32-bit values. As old VFs used to set-bit to the values on its side,
+         * the upper half of the array is never expected to contain any data.
+         */
+        u64 bins[4];
+        u64 obsolete_bins[4];
 };
 
 struct vfpf_vport_update_accept_param_tlv {
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/qlogic/qlcnic/qlcnic_sysfs.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
index 891f03a7a33d..8d7b9bb910f2 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c
@@ -1128,6 +1128,8 @@ static ssize_t qlcnic_83xx_sysfs_flash_write_handler(struct file *filp,
         struct qlcnic_adapter *adapter = dev_get_drvdata(dev);
 
         ret = kstrtoul(buf, 16, &data);
+        if (ret)
+                return ret;
 
         switch (data) {
         case QLC_83XX_FLASH_SECTOR_ERASE_CMD:
diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c
index 5803cd6db406..206f0266463e 100644
--- a/drivers/net/ethernet/qualcomm/qca_spi.c
+++ b/drivers/net/ethernet/qualcomm/qca_spi.c
@@ -658,7 +658,7 @@ qcaspi_netdev_open(struct net_device *dev)
                 return ret;
         }
 
-        netif_start_queue(qca->net_dev);
+        /* SPI thread takes care of TX queue */
 
         return 0;
 }
@@ -760,6 +760,9 @@ qcaspi_netdev_tx_timeout(struct net_device *dev)
         qca->net_dev->stats.tx_errors++;
         /* Trigger tx queue flush and QCA7000 reset */
         qca->sync = QCASPI_SYNC_UNKNOWN;
+
+        if (qca->spi_thread)
+                wake_up_process(qca->spi_thread);
 }
 
 static int
@@ -878,22 +881,22 @@ qca_spi_probe(struct spi_device *spi)
 
         if ((qcaspi_clkspeed < QCASPI_CLK_SPEED_MIN) ||
             (qcaspi_clkspeed > QCASPI_CLK_SPEED_MAX)) {
-                dev_info(&spi->dev, "Invalid clkspeed: %d\n",
-                         qcaspi_clkspeed);
+                dev_err(&spi->dev, "Invalid clkspeed: %d\n",
+                        qcaspi_clkspeed);
                 return -EINVAL;
         }
 
         if ((qcaspi_burst_len < QCASPI_BURST_LEN_MIN) ||
             (qcaspi_burst_len > QCASPI_BURST_LEN_MAX)) {
-                dev_info(&spi->dev, "Invalid burst len: %d\n",
-                         qcaspi_burst_len);
+                dev_err(&spi->dev, "Invalid burst len: %d\n",
+                        qcaspi_burst_len);
                 return -EINVAL;
         }
 
         if ((qcaspi_pluggable < QCASPI_PLUGGABLE_MIN) ||
             (qcaspi_pluggable > QCASPI_PLUGGABLE_MAX)) {
-                dev_info(&spi->dev, "Invalid pluggable: %d\n",
-                         qcaspi_pluggable);
+                dev_err(&spi->dev, "Invalid pluggable: %d\n",
+                        qcaspi_pluggable);
                 return -EINVAL;
         }
 
@@ -955,8 +958,8 @@ qca_spi_probe(struct spi_device *spi)
         }
 
         if (register_netdev(qcaspi_devs)) {
-                dev_info(&spi->dev, "Unable to register net device %s\n",
-                         qcaspi_devs->name);
+                dev_err(&spi->dev, "Unable to register net device %s\n",
+                        qcaspi_devs->name);
                 free_netdev(qcaspi_devs);
                 return -EFAULT;
         }
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 75dfac0248f4..eaedc11ed686 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
 
@@ -7734,8 +7734,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 return rc;
         }
 
-        /* override BIOS settings, use userspace tools to enable WOL */
-        __rtl8169_set_wol(tp, 0);
+        tp->saved_wolopts = __rtl8169_get_wol(tp);
 
         if (rtl_tbi_enabled(tp)) {
                 tp->set_speed = rtl8169_set_speed_tbi;
@@ -7789,6 +7788,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 NETIF_F_HW_VLAN_CTAG_RX;
         dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
                 NETIF_F_HIGHDMA;
+        dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
 
         tp->cp_cmd |= RxChkSum | RxVlan;
 
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/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 68f122140966..0d811c02ff34 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -980,6 +980,13 @@ static void ravb_adjust_link(struct net_device *ndev)
         struct ravb_private *priv = netdev_priv(ndev);
         struct phy_device *phydev = ndev->phydev;
         bool new_state = false;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->lock, flags);
+
+        /* Disable TX and RX right over here, if E-MAC change is ignored */
+        if (priv->no_avb_link)
+                ravb_rcv_snd_disable(ndev);
 
         if (phydev->link) {
                 if (phydev->duplex != priv->duplex) {
@@ -997,18 +1004,21 @@ static void ravb_adjust_link(struct net_device *ndev)
                         ravb_modify(ndev, ECMR, ECMR_TXF, 0);
                         new_state = true;
                         priv->link = phydev->link;
-                        if (priv->no_avb_link)
-                                ravb_rcv_snd_enable(ndev);
                 }
         } else if (priv->link) {
                 new_state = true;
                 priv->link = 0;
                 priv->speed = 0;
                 priv->duplex = -1;
-                if (priv->no_avb_link)
-                        ravb_rcv_snd_disable(ndev);
         }
 
+        /* Enable TX and RX right over here, if E-MAC change is ignored */
+        if (priv->no_avb_link && phydev->link)
+                ravb_rcv_snd_enable(ndev);
+
+        mmiowb();
+        spin_unlock_irqrestore(&priv->lock, flags);
+
         if (new_state && netif_msg_link(priv))
                 phy_print_status(phydev);
 }
@@ -1096,75 +1106,6 @@ static int ravb_phy_start(struct net_device *ndev)
         return 0;
 }
 
-static int ravb_get_link_ksettings(struct net_device *ndev,
-                                   struct ethtool_link_ksettings *cmd)
-{
-        struct ravb_private *priv = netdev_priv(ndev);
-        unsigned long flags;
-
-        if (!ndev->phydev)
-                return -ENODEV;
-
-        spin_lock_irqsave(&priv->lock, flags);
-        phy_ethtool_ksettings_get(ndev->phydev, cmd);
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        return 0;
-}
-
-static int ravb_set_link_ksettings(struct net_device *ndev,
-                                   const struct ethtool_link_ksettings *cmd)
-{
-        struct ravb_private *priv = netdev_priv(ndev);
-        unsigned long flags;
-        int error;
-
-        if (!ndev->phydev)
-                return -ENODEV;
-
-        spin_lock_irqsave(&priv->lock, flags);
-
-        /* Disable TX and RX */
-        ravb_rcv_snd_disable(ndev);
-
-        error = phy_ethtool_ksettings_set(ndev->phydev, cmd);
-        if (error)
-                goto error_exit;
-
-        if (cmd->base.duplex == DUPLEX_FULL)
-                priv->duplex = 1;
-        else
-                priv->duplex = 0;
-
-        ravb_set_duplex(ndev);
-
-error_exit:
-        mdelay(1);
-
-        /* Enable TX and RX */
-        ravb_rcv_snd_enable(ndev);
-
-        mmiowb();
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        return error;
-}
-
-static int ravb_nway_reset(struct net_device *ndev)
-{
-        struct ravb_private *priv = netdev_priv(ndev);
-        int error = -ENODEV;
-        unsigned long flags;
-
-        if (ndev->phydev) {
-                spin_lock_irqsave(&priv->lock, flags);
-                error = phy_start_aneg(ndev->phydev);
-                spin_unlock_irqrestore(&priv->lock, flags);
-        }
-
-        return error;
-}
-
 static u32 ravb_get_msglevel(struct net_device *ndev)
 {
         struct ravb_private *priv = netdev_priv(ndev);
@@ -1377,7 +1318,7 @@ static int ravb_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
 }
 
 static const struct ethtool_ops ravb_ethtool_ops = {
-        .nway_reset             = ravb_nway_reset,
+        .nway_reset             = phy_ethtool_nway_reset,
         .get_msglevel           = ravb_get_msglevel,
         .set_msglevel           = ravb_set_msglevel,
         .get_link               = ethtool_op_get_link,
@@ -1387,8 +1328,8 @@ static const struct ethtool_ops ravb_ethtool_ops = {
         .get_ringparam          = ravb_get_ringparam,
         .set_ringparam          = ravb_set_ringparam,
         .get_ts_info            = ravb_get_ts_info,
-        .get_link_ksettings     = ravb_get_link_ksettings,
-        .set_link_ksettings     = ravb_set_link_ksettings,
+        .get_link_ksettings     = phy_ethtool_get_link_ksettings,
+        .set_link_ksettings     = phy_ethtool_set_link_ksettings,
         .get_wol                = ravb_get_wol,
         .set_wol                = ravb_set_wol,
 };
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index e9007b613f17..5614fd231bbe 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1927,8 +1927,15 @@ static void sh_eth_adjust_link(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
         struct phy_device *phydev = ndev->phydev;
+        unsigned long flags;
         int new_state = 0;
 
+        spin_lock_irqsave(&mdp->lock, flags);
+
+        /* Disable TX and RX right over here, if E-MAC change is ignored */
+        if (mdp->cd->no_psr || mdp->no_ether_link)
+                sh_eth_rcv_snd_disable(ndev);
+
         if (phydev->link) {
                 if (phydev->duplex != mdp->duplex) {
                         new_state = 1;
@@ -1947,18 +1954,21 @@ static void sh_eth_adjust_link(struct net_device *ndev)
                         sh_eth_modify(ndev, ECMR, ECMR_TXF, 0);
                         new_state = 1;
                         mdp->link = phydev->link;
-                        if (mdp->cd->no_psr || mdp->no_ether_link)
-                                sh_eth_rcv_snd_enable(ndev);
                 }
         } else if (mdp->link) {
                 new_state = 1;
                 mdp->link = 0;
                 mdp->speed = 0;
                 mdp->duplex = -1;
-                if (mdp->cd->no_psr || mdp->no_ether_link)
-                        sh_eth_rcv_snd_disable(ndev);
         }
 
+        /* Enable TX and RX right over here, if E-MAC change is ignored */
+        if ((mdp->cd->no_psr || mdp->no_ether_link) && phydev->link)
+                sh_eth_rcv_snd_enable(ndev);
+
+        mmiowb();
+        spin_unlock_irqrestore(&mdp->lock, flags);
+
         if (new_state && netif_msg_link(mdp))
                 phy_print_status(phydev);
 }
@@ -2030,60 +2040,6 @@ static int sh_eth_phy_start(struct net_device *ndev)
         return 0;
 }
 
-static int sh_eth_get_link_ksettings(struct net_device *ndev,
-                                     struct ethtool_link_ksettings *cmd)
-{
-        struct sh_eth_private *mdp = netdev_priv(ndev);
-        unsigned long flags;
-
-        if (!ndev->phydev)
-                return -ENODEV;
-
-        spin_lock_irqsave(&mdp->lock, flags);
-        phy_ethtool_ksettings_get(ndev->phydev, cmd);
-        spin_unlock_irqrestore(&mdp->lock, flags);
-
-        return 0;
-}
-
-static int sh_eth_set_link_ksettings(struct net_device *ndev,
-                                     const struct ethtool_link_ksettings *cmd)
-{
-        struct sh_eth_private *mdp = netdev_priv(ndev);
-        unsigned long flags;
-        int ret;
-
-        if (!ndev->phydev)
-                return -ENODEV;
-
-        spin_lock_irqsave(&mdp->lock, flags);
-
-        /* disable tx and rx */
-        sh_eth_rcv_snd_disable(ndev);
-
-        ret = phy_ethtool_ksettings_set(ndev->phydev, cmd);
-        if (ret)
-                goto error_exit;
-
-        if (cmd->base.duplex == DUPLEX_FULL)
-                mdp->duplex = 1;
-        else
-                mdp->duplex = 0;
-
-        if (mdp->cd->set_duplex)
-                mdp->cd->set_duplex(ndev);
-
-error_exit:
-        mdelay(1);
-
-        /* enable tx and rx */
-        sh_eth_rcv_snd_enable(ndev);
-
-        spin_unlock_irqrestore(&mdp->lock, flags);
-
-        return ret;
-}
-
 /* If it is ever necessary to increase SH_ETH_REG_DUMP_MAX_REGS, the
  * version must be bumped as well.  Just adding registers up to that
  * limit is fine, as long as the existing register indices don't
@@ -2263,22 +2219,6 @@ static void sh_eth_get_regs(struct net_device *ndev, struct ethtool_regs *regs,
         pm_runtime_put_sync(&mdp->pdev->dev);
 }
 
-static int sh_eth_nway_reset(struct net_device *ndev)
-{
-        struct sh_eth_private *mdp = netdev_priv(ndev);
-        unsigned long flags;
-        int ret;
-
-        if (!ndev->phydev)
-                return -ENODEV;
-
-        spin_lock_irqsave(&mdp->lock, flags);
-        ret = phy_start_aneg(ndev->phydev);
-        spin_unlock_irqrestore(&mdp->lock, flags);
-
-        return ret;
-}
-
 static u32 sh_eth_get_msglevel(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -2429,7 +2369,7 @@ static int sh_eth_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
 static const struct ethtool_ops sh_eth_ethtool_ops = {
         .get_regs_len   = sh_eth_get_regs_len,
         .get_regs       = sh_eth_get_regs,
-        .nway_reset     = sh_eth_nway_reset,
+        .nway_reset     = phy_ethtool_nway_reset,
         .get_msglevel   = sh_eth_get_msglevel,
         .set_msglevel   = sh_eth_set_msglevel,
         .get_link       = ethtool_op_get_link,
@@ -2438,8 +2378,8 @@ static const struct ethtool_ops sh_eth_ethtool_ops = {
         .get_sset_count     = sh_eth_get_sset_count,
         .get_ringparam  = sh_eth_get_ringparam,
         .set_ringparam  = sh_eth_set_ringparam,
-        .get_link_ksettings = sh_eth_get_link_ksettings,
-        .set_link_ksettings = sh_eth_set_link_ksettings,
+        .get_link_ksettings = phy_ethtool_get_link_ksettings,
+        .set_link_ksettings = phy_ethtool_set_link_ksettings,
         .get_wol        = sh_eth_get_wol,
         .set_wol        = sh_eth_set_wol,
 };
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 23f0785c0573..7eeac3d6cfe8 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -4288,9 +4288,9 @@ static int efx_ef10_filter_pri(struct efx_ef10_filter_table *table,
         return -EPROTONOSUPPORT;
 }
 
-static s32 efx_ef10_filter_insert(struct efx_nic *efx,
-                                  struct efx_filter_spec *spec,
-                                  bool replace_equal)
+static s32 efx_ef10_filter_insert_locked(struct efx_nic *efx,
+                                         struct efx_filter_spec *spec,
+                                         bool replace_equal)
 {
         DECLARE_BITMAP(mc_rem_map, EFX_EF10_FILTER_SEARCH_LIMIT);
         struct efx_ef10_nic_data *nic_data = efx->nic_data;
@@ -4307,7 +4307,7 @@ static s32 efx_ef10_filter_insert(struct efx_nic *efx,
         bool is_mc_recip;
         s32 rc;
 
-        down_read(&efx->filter_sem);
+        WARN_ON(!rwsem_is_locked(&efx->filter_sem));
         table = efx->filter_state;
         down_write(&table->lock);
 
@@ -4498,10 +4498,22 @@ out_unlock:
         if (rss_locked)
                 mutex_unlock(&efx->rss_lock);
         up_write(&table->lock);
-        up_read(&efx->filter_sem);
         return rc;
 }
 
+static s32 efx_ef10_filter_insert(struct efx_nic *efx,
+                                  struct efx_filter_spec *spec,
+                                  bool replace_equal)
+{
+        s32 ret;
+
+        down_read(&efx->filter_sem);
+        ret = efx_ef10_filter_insert_locked(efx, spec, replace_equal);
+        up_read(&efx->filter_sem);
+
+        return ret;
+}
+
 static void efx_ef10_filter_update_rx_scatter(struct efx_nic *efx)
 {
         /* no need to do anything here on EF10 */
@@ -5285,7 +5297,7 @@ static int efx_ef10_filter_insert_addr_list(struct efx_nic *efx,
                 EFX_WARN_ON_PARANOID(ids[i] != EFX_EF10_FILTER_ID_INVALID);
                 efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO, filter_flags, 0);
                 efx_filter_set_eth_local(&spec, vlan->vid, addr_list[i].addr);
-                rc = efx_ef10_filter_insert(efx, &spec, true);
+                rc = efx_ef10_filter_insert_locked(efx, &spec, true);
                 if (rc < 0) {
                         if (rollback) {
                                 netif_info(efx, drv, efx->net_dev,
@@ -5314,7 +5326,7 @@ static int efx_ef10_filter_insert_addr_list(struct efx_nic *efx,
                 efx_filter_init_rx(&spec, EFX_FILTER_PRI_AUTO, filter_flags, 0);
                 eth_broadcast_addr(baddr);
                 efx_filter_set_eth_local(&spec, vlan->vid, baddr);
-                rc = efx_ef10_filter_insert(efx, &spec, true);
+                rc = efx_ef10_filter_insert_locked(efx, &spec, true);
                 if (rc < 0) {
                         netif_warn(efx, drv, efx->net_dev,
                                    "Broadcast filter insert failed rc=%d\n", rc);
@@ -5370,7 +5382,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx,
         if (vlan->vid != EFX_FILTER_VID_UNSPEC)
                 efx_filter_set_eth_local(&spec, vlan->vid, NULL);
 
-        rc = efx_ef10_filter_insert(efx, &spec, true);
+        rc = efx_ef10_filter_insert_locked(efx, &spec, true);
         if (rc < 0) {
                 const char *um = multicast ? "Multicast" : "Unicast";
                 const char *encap_name = "";
@@ -5430,7 +5442,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx,
                                            filter_flags, 0);
                         eth_broadcast_addr(baddr);
                         efx_filter_set_eth_local(&spec, vlan->vid, baddr);
-                        rc = efx_ef10_filter_insert(efx, &spec, true);
+                        rc = efx_ef10_filter_insert_locked(efx, &spec, true);
                         if (rc < 0) {
                                 netif_warn(efx, drv, efx->net_dev,
                                            "Broadcast filter insert failed rc=%d\n",
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index ad4a354ce570..ce3a177081a8 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1871,12 +1871,6 @@ static void efx_remove_filters(struct efx_nic *efx)
         up_write(&efx->filter_sem);
 }
 
-static void efx_restore_filters(struct efx_nic *efx)
-{
-        down_read(&efx->filter_sem);
-        efx->type->filter_table_restore(efx);
-        up_read(&efx->filter_sem);
-}
 
 /**************************************************************************
  *
@@ -2688,6 +2682,7 @@ void efx_reset_down(struct efx_nic *efx, enum reset_type method)
         efx_disable_interrupts(efx);
 
         mutex_lock(&efx->mac_lock);
+        down_write(&efx->filter_sem);
         mutex_lock(&efx->rss_lock);
         if (efx->port_initialized && method != RESET_TYPE_INVISIBLE &&
             method != RESET_TYPE_DATAPATH)
@@ -2745,9 +2740,8 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok)
         if (efx->type->rx_restore_rss_contexts)
                 efx->type->rx_restore_rss_contexts(efx);
         mutex_unlock(&efx->rss_lock);
-        down_read(&efx->filter_sem);
-        efx_restore_filters(efx);
-        up_read(&efx->filter_sem);
+        efx->type->filter_table_restore(efx);
+        up_write(&efx->filter_sem);
         if (efx->type->sriov_reset)
                 efx->type->sriov_reset(efx);
 
@@ -2764,6 +2758,7 @@ fail:
         efx->port_initialized = false;
 
         mutex_unlock(&efx->rss_lock);
+        up_write(&efx->filter_sem);
         mutex_unlock(&efx->mac_lock);
 
         return rc;
@@ -3180,6 +3175,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)
 {
@@ -3472,7 +3468,9 @@ static int efx_pci_probe_main(struct efx_nic *efx)
 
         efx_init_napi(efx);
 
+        down_write(&efx->filter_sem);
         rc = efx->type->init(efx);
+        up_write(&efx->filter_sem);
         if (rc) {
                 netif_err(efx, probe, efx->net_dev,
                           "failed to initialise NIC\n");
@@ -3764,7 +3762,9 @@ static int efx_pm_resume(struct device *dev)
         rc = efx->type->reset(efx, RESET_TYPE_ALL);
         if (rc)
                 return rc;
+        down_write(&efx->filter_sem);
         rc = efx->type->init(efx);
+        up_write(&efx->filter_sem);
         if (rc)
                 return rc;
         rc = efx_pm_thaw(dev);
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/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index 2e6e2a96b4f2..f9a61f90cfbc 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -37,7 +37,7 @@
  *              is done in the "stmmac files"
  */
 
-/* struct emac_variant - Descrive dwmac-sun8i hardware variant
+/* struct emac_variant - Describe dwmac-sun8i hardware variant
  * @default_syscon_value:       The default value of the EMAC register in syscon
  *                              This value is used for disabling properly EMAC
  *                              and used as a good starting value in case of the
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 cba46b62a1cd..60f59abab009 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1804,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/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 6d141f3931eb..72da77b94ecd 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -94,7 +94,6 @@ static int dwmac1000_validate_ucast_entries(int ucast_entries)
 /**
  * stmmac_axi_setup - parse DT parameters for programming the AXI register
  * @pdev: platform device
- * @priv: driver private struct.
  * Description:
  * if required, from device-tree the AXI internal register can be tuned
  * by using platform parameters.
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 a1a6445b5a7e..f270beebb428 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1387,6 +1387,10 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd)
 
 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);
 }
 
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
index 16c3bfbe1992..757a3b37ae8a 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -218,6 +218,7 @@ issue:
         ret = of_mdiobus_register(bus, np1);
         if (ret) {
                 mdiobus_free(bus);
+                lp->mii_bus = NULL;
                 return ret;
         }
         return 0;
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/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..31c3d77b4733 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;
 }
@@ -1239,6 +1274,7 @@ int netvsc_poll(struct napi_struct *napi, int budget)
         struct hv_device *device = netvsc_channel_to_device(channel);
         struct net_device *ndev = hv_get_drvdata(device);
         int work_done = 0;
+        int ret;
 
         /* If starting a new interval */
         if (!nvchan->desc)
@@ -1250,16 +1286,18 @@ int netvsc_poll(struct napi_struct *napi, int budget)
                 nvchan->desc = hv_pkt_iter_next(channel, nvchan->desc);
         }
 
-        /* If send of pending receive completions suceeded
-         *   and did not exhaust NAPI budget this time
-         *   and not doing busy poll
+        /* Send any pending receive completions */
+        ret = send_recv_completions(ndev, net_device, nvchan);
+
+        /* If it did not exhaust NAPI budget this time
+         *  and not doing busy poll
          * then re-enable host interrupts
-         *     and reschedule if ring is not empty.
+         *  and reschedule if ring is not empty
+         *   or sending receive completion failed.
          */
-        if (send_recv_completions(ndev, net_device, nvchan) == 0 &&
-            work_done < budget &&
+        if (work_done < budget &&
             napi_complete_done(napi, work_done) &&
-            hv_end_read(&channel->inbound) &&
+            (ret || hv_end_read(&channel->inbound)) &&
             napi_schedule_prep(napi)) {
                 hv_begin_read(&channel->inbound);
                 __napi_schedule(napi);
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..408ece27131c 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,13 @@ 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;
+        return 0;
 
 err_dev_remv:
         rndis_filter_device_remove(dev, net_device);
diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c
index 64f1b1e77bc0..23a52b9293f3 100644
--- a/drivers/net/ieee802154/adf7242.c
+++ b/drivers/net/ieee802154/adf7242.c
@@ -275,6 +275,8 @@ struct adf7242_local {
         struct spi_message stat_msg;
         struct spi_transfer stat_xfer;
         struct dentry *debugfs_root;
+        struct delayed_work work;
+        struct workqueue_struct *wqueue;
         unsigned long flags;
         int tx_stat;
         bool promiscuous;
@@ -575,10 +577,26 @@ static int adf7242_cmd_rx(struct adf7242_local *lp)
         /* Wait until the ACK is sent */
         adf7242_wait_status(lp, RC_STATUS_PHY_RDY, RC_STATUS_MASK, __LINE__);
         adf7242_clear_irqstat(lp);
+        mod_delayed_work(lp->wqueue, &lp->work, msecs_to_jiffies(400));
 
         return adf7242_cmd(lp, CMD_RC_RX);
 }
 
+static void adf7242_rx_cal_work(struct work_struct *work)
+{
+        struct adf7242_local *lp =
+        container_of(work, struct adf7242_local, work.work);
+
+        /* Reissuing RC_RX every 400ms - to adjust for offset
+         * drift in receiver (datasheet page 61, OCL section)
+         */
+
+        if (!test_bit(FLAG_XMIT, &lp->flags)) {
+                adf7242_cmd(lp, CMD_RC_PHY_RDY);
+                adf7242_cmd_rx(lp);
+        }
+}
+
 static int adf7242_set_txpower(struct ieee802154_hw *hw, int mbm)
 {
         struct adf7242_local *lp = hw->priv;
@@ -686,7 +704,7 @@ static int adf7242_start(struct ieee802154_hw *hw)
         enable_irq(lp->spi->irq);
         set_bit(FLAG_START, &lp->flags);
 
-        return adf7242_cmd(lp, CMD_RC_RX);
+        return adf7242_cmd_rx(lp);
 }
 
 static void adf7242_stop(struct ieee802154_hw *hw)
@@ -694,6 +712,7 @@ static void adf7242_stop(struct ieee802154_hw *hw)
         struct adf7242_local *lp = hw->priv;
 
         disable_irq(lp->spi->irq);
+        cancel_delayed_work_sync(&lp->work);
         adf7242_cmd(lp, CMD_RC_IDLE);
         clear_bit(FLAG_START, &lp->flags);
         adf7242_clear_irqstat(lp);
@@ -719,7 +738,10 @@ static int adf7242_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
         adf7242_write_reg(lp, REG_CH_FREQ1, freq >> 8);
         adf7242_write_reg(lp, REG_CH_FREQ2, freq >> 16);
 
-        return adf7242_cmd(lp, CMD_RC_RX);
+        if (test_bit(FLAG_START, &lp->flags))
+                return adf7242_cmd_rx(lp);
+        else
+                return adf7242_cmd(lp, CMD_RC_PHY_RDY);
 }
 
 static int adf7242_set_hw_addr_filt(struct ieee802154_hw *hw,
@@ -814,6 +836,7 @@ static int adf7242_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
         /* ensure existing instances of the IRQ handler have completed */
         disable_irq(lp->spi->irq);
         set_bit(FLAG_XMIT, &lp->flags);
+        cancel_delayed_work_sync(&lp->work);
         reinit_completion(&lp->tx_complete);
         adf7242_cmd(lp, CMD_RC_PHY_RDY);
         adf7242_clear_irqstat(lp);
@@ -952,6 +975,7 @@ static irqreturn_t adf7242_isr(int irq, void *data)
         unsigned int xmit;
         u8 irq1;
 
+        mod_delayed_work(lp->wqueue, &lp->work, msecs_to_jiffies(400));
         adf7242_read_reg(lp, REG_IRQ1_SRC1, &irq1);
 
         if (!(irq1 & (IRQ_RX_PKT_RCVD | IRQ_CSMA_CA)))
@@ -1241,6 +1265,9 @@ static int adf7242_probe(struct spi_device *spi)
         spi_message_add_tail(&lp->stat_xfer, &lp->stat_msg);
 
         spi_set_drvdata(spi, lp);
+        INIT_DELAYED_WORK(&lp->work, adf7242_rx_cal_work);
+        lp->wqueue = alloc_ordered_workqueue(dev_name(&spi->dev),
+                                             WQ_MEM_RECLAIM);
 
         ret = adf7242_hw_init(lp);
         if (ret)
@@ -1284,6 +1311,9 @@ static int adf7242_remove(struct spi_device *spi)
         if (!IS_ERR_OR_NULL(lp->debugfs_root))
                 debugfs_remove_recursive(lp->debugfs_root);
 
+        cancel_delayed_work_sync(&lp->work);
+        destroy_workqueue(lp->wqueue);
+
         ieee802154_unregister_hw(lp->hw);
         mutex_destroy(&lp->bmux);
         ieee802154_free_hw(lp->hw);
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 77abedf0b524..3d9e91579866 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -940,7 +940,7 @@ at86rf230_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
 static int
 at86rf230_ed(struct ieee802154_hw *hw, u8 *level)
 {
-        BUG_ON(!level);
+        WARN_ON(!level);
         *level = 0xbe;
         return 0;
 }
@@ -1121,8 +1121,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_hw *hw,
         if (changed & IEEE802154_AFILT_SADDR_CHANGED) {
                 u16 addr = le16_to_cpu(filt->short_addr);
 
-                dev_vdbg(&lp->spi->dev,
-                         "at86rf230_set_hw_addr_filt called for saddr\n");
+                dev_vdbg(&lp->spi->dev, "%s called for saddr\n", __func__);
                 __at86rf230_write(lp, RG_SHORT_ADDR_0, addr);
                 __at86rf230_write(lp, RG_SHORT_ADDR_1, addr >> 8);
         }
@@ -1130,8 +1129,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_hw *hw,
         if (changed & IEEE802154_AFILT_PANID_CHANGED) {
                 u16 pan = le16_to_cpu(filt->pan_id);
 
-                dev_vdbg(&lp->spi->dev,
-                         "at86rf230_set_hw_addr_filt called for pan id\n");
+                dev_vdbg(&lp->spi->dev, "%s called for pan id\n", __func__);
                 __at86rf230_write(lp, RG_PAN_ID_0, pan);
                 __at86rf230_write(lp, RG_PAN_ID_1, pan >> 8);
         }
@@ -1140,15 +1138,13 @@ at86rf230_set_hw_addr_filt(struct ieee802154_hw *hw,
                 u8 i, addr[8];
 
                 memcpy(addr, &filt->ieee_addr, 8);
-                dev_vdbg(&lp->spi->dev,
-                         "at86rf230_set_hw_addr_filt called for IEEE addr\n");
+                dev_vdbg(&lp->spi->dev, "%s called for IEEE addr\n", __func__);
                 for (i = 0; i < 8; i++)
                         __at86rf230_write(lp, RG_IEEE_ADDR_0 + i, addr[i]);
         }
 
         if (changed & IEEE802154_AFILT_PANC_CHANGED) {
-                dev_vdbg(&lp->spi->dev,
-                         "at86rf230_set_hw_addr_filt called for panc change\n");
+                dev_vdbg(&lp->spi->dev, "%s called for panc change\n", __func__);
                 if (filt->pan_coord)
                         at86rf230_write_subreg(lp, SR_AACK_I_AM_COORD, 1);
                 else
@@ -1252,7 +1248,6 @@ at86rf230_set_cca_mode(struct ieee802154_hw *hw,
         return at86rf230_write_subreg(lp, SR_CCA_MODE, val);
 }
 
-
 static int
 at86rf230_set_cca_ed_level(struct ieee802154_hw *hw, s32 mbm)
 {
diff --git a/drivers/net/ieee802154/fakelb.c b/drivers/net/ieee802154/fakelb.c
index 0d673f7682ee..176395e4b7bb 100644
--- a/drivers/net/ieee802154/fakelb.c
+++ b/drivers/net/ieee802154/fakelb.c
@@ -49,7 +49,7 @@ struct fakelb_phy {
 
 static int fakelb_hw_ed(struct ieee802154_hw *hw, u8 *level)
 {
-        BUG_ON(!level);
+        WARN_ON(!level);
         *level = 0xbe;
 
         return 0;
diff --git a/drivers/net/ieee802154/mcr20a.c b/drivers/net/ieee802154/mcr20a.c
index de0d7f28a181..e428277781ac 100644
--- a/drivers/net/ieee802154/mcr20a.c
+++ b/drivers/net/ieee802154/mcr20a.c
@@ -15,10 +15,11 @@
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/spi/spi.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/skbuff.h>
 #include <linux/of_gpio.h>
 #include <linux/regmap.h>
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index d02f0a7c534e..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);
 
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/phy/marvell.c b/drivers/net/phy/marvell.c
index b8f57e9b9379..1cd439bdf608 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -130,8 +130,9 @@
 #define MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS              BIT(12)
 #define MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE     BIT(14)
 
-#define MII_88E1121_PHY_LED_CTRL        16
+#define MII_PHY_LED_CTRL                16
 #define MII_88E1121_PHY_LED_DEF         0x0030
+#define MII_88E1510_PHY_LED_DEF         0x1177
 
 #define MII_M1011_PHY_STATUS            0x11
 #define MII_M1011_PHY_STATUS_1000       0x8000
@@ -632,8 +633,40 @@ error:
         return err;
 }
 
+static void marvell_config_led(struct phy_device *phydev)
+{
+        u16 def_config;
+        int err;
+
+        switch (MARVELL_PHY_FAMILY_ID(phydev->phy_id)) {
+        /* Default PHY LED config: LED[0] .. Link, LED[1] .. Activity */
+        case MARVELL_PHY_FAMILY_ID(MARVELL_PHY_ID_88E1121R):
+        case MARVELL_PHY_FAMILY_ID(MARVELL_PHY_ID_88E1318S):
+                def_config = MII_88E1121_PHY_LED_DEF;
+                break;
+        /* Default PHY LED config:
+         * LED[0] .. 1000Mbps Link
+         * LED[1] .. 100Mbps Link
+         * LED[2] .. Blink, Activity
+         */
+        case MARVELL_PHY_FAMILY_ID(MARVELL_PHY_ID_88E1510):
+                def_config = MII_88E1510_PHY_LED_DEF;
+                break;
+        default:
+                return;
+        }
+
+        err = phy_write_paged(phydev, MII_MARVELL_LED_PAGE, MII_PHY_LED_CTRL,
+                              def_config);
+        if (err < 0)
+                pr_warn("Fail to config marvell phy LED.\n");
+}
+
 static int marvell_config_init(struct phy_device *phydev)
 {
+        /* Set defalut LED */
+        marvell_config_led(phydev);
+
         /* Set registers from marvell,reg-init DT property */
         return marvell_of_reg_init(phydev);
 }
@@ -813,21 +846,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
         return genphy_soft_reset(phydev);
 }
 
-static int m88e1121_config_init(struct phy_device *phydev)
-{
-        int err;
-
-        /* Default PHY LED config: LED[0] .. Link, LED[1] .. Activity */
-        err = phy_write_paged(phydev, MII_MARVELL_LED_PAGE,
-                              MII_88E1121_PHY_LED_CTRL,
-                              MII_88E1121_PHY_LED_DEF);
-        if (err < 0)
-                return err;
-
-        /* Set marvell,reg-init configuration from device tree */
-        return marvell_config_init(phydev);
-}
-
 static int m88e1318_config_init(struct phy_device *phydev)
 {
         if (phy_interrupt_is_valid(phydev)) {
@@ -841,7 +859,7 @@ static int m88e1318_config_init(struct phy_device *phydev)
                         return err;
         }
 
-        return m88e1121_config_init(phydev);
+        return marvell_config_init(phydev);
 }
 
 static int m88e1510_config_init(struct phy_device *phydev)
@@ -2087,7 +2105,7 @@ static struct phy_driver marvell_drivers[] = {
                 .features = PHY_GBIT_FEATURES,
                 .flags = PHY_HAS_INTERRUPT,
                 .probe = &m88e1121_probe,
-                .config_init = &m88e1121_config_init,
+                .config_init = &marvell_config_init,
                 .config_aneg = &m88e1121_config_aneg,
                 .read_status = &marvell_read_status,
                 .ack_interrupt = &marvell_ack_interrupt,
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 537297d2b4b4..6c9b24fe3148 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -514,7 +514,7 @@ static int phy_start_aneg_priv(struct phy_device *phydev, bool sync)
          * negotiation may already be done and aneg interrupt may not be
          * generated.
          */
-        if (phy_interrupt_is_valid(phydev) && (phydev->state == PHY_AN)) {
+        if (phydev->irq != PHY_POLL && phydev->state == PHY_AN) {
                 err = phy_aneg_done(phydev);
                 if (err > 0) {
                         trigger = true;
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index bd0f339f69fd..b9f5f40a7ac1 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1724,11 +1724,8 @@ EXPORT_SYMBOL(genphy_loopback);
 
 static int __set_phy_supported(struct phy_device *phydev, u32 max_speed)
 {
-        /* The default values for phydev->supported are provided by the PHY
-         * driver "features" member, we want to reset to sane defaults first
-         * before supporting higher speeds.
-         */
-        phydev->supported &= PHY_DEFAULT_FEATURES;
+        phydev->supported &= ~(PHY_1000BT_FEATURES | PHY_100BT_FEATURES |
+                               PHY_10BT_FEATURES);
 
         switch (max_speed) {
         default:
diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index d437f4f5ed52..740655261e5b 100644
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
@@ -349,7 +349,6 @@ static int sfp_register_bus(struct sfp_bus *bus)
         }
         if (bus->started)
                 bus->socket_ops->start(bus->sfp);
-        bus->netdev->sfp_bus = bus;
         bus->registered = true;
         return 0;
 }
@@ -364,7 +363,6 @@ static void sfp_unregister_bus(struct sfp_bus *bus)
                 if (bus->phydev && ops && ops->disconnect_phy)
                         ops->disconnect_phy(bus->upstream);
         }
-        bus->netdev->sfp_bus = NULL;
         bus->registered = false;
 }
 
@@ -436,6 +434,14 @@ void sfp_upstream_stop(struct sfp_bus *bus)
 }
 EXPORT_SYMBOL_GPL(sfp_upstream_stop);
 
+static void sfp_upstream_clear(struct sfp_bus *bus)
+{
+        bus->upstream_ops = NULL;
+        bus->upstream = NULL;
+        bus->netdev->sfp_bus = NULL;
+        bus->netdev = NULL;
+}
+
 /**
  * sfp_register_upstream() - Register the neighbouring device
  * @fwnode: firmware node for the SFP bus
@@ -461,9 +467,13 @@ struct sfp_bus *sfp_register_upstream(struct fwnode_handle *fwnode,
                 bus->upstream_ops = ops;
                 bus->upstream = upstream;
                 bus->netdev = ndev;
+                ndev->sfp_bus = bus;
 
-                if (bus->sfp)
+                if (bus->sfp) {
                         ret = sfp_register_bus(bus);
+                        if (ret)
+                                sfp_upstream_clear(bus);
+                }
                 rtnl_unlock();
         }
 
@@ -488,8 +498,7 @@ void sfp_unregister_upstream(struct sfp_bus *bus)
         rtnl_lock();
         if (bus->sfp)
                 sfp_unregister_bus(bus);
-        bus->upstream = NULL;
-        bus->netdev = NULL;
+        sfp_upstream_clear(bus);
         rtnl_unlock();
 
         sfp_bus_put(bus);
@@ -561,6 +570,13 @@ void sfp_module_remove(struct sfp_bus *bus)
 }
 EXPORT_SYMBOL_GPL(sfp_module_remove);
 
+static void sfp_socket_clear(struct sfp_bus *bus)
+{
+        bus->sfp_dev = NULL;
+        bus->sfp = NULL;
+        bus->socket_ops = NULL;
+}
+
 struct sfp_bus *sfp_register_socket(struct device *dev, struct sfp *sfp,
                                     const struct sfp_socket_ops *ops)
 {
@@ -573,8 +589,11 @@ struct sfp_bus *sfp_register_socket(struct device *dev, struct sfp *sfp,
                 bus->sfp = sfp;
                 bus->socket_ops = ops;
 
-                if (bus->netdev)
+                if (bus->netdev) {
                         ret = sfp_register_bus(bus);
+                        if (ret)
+                                sfp_socket_clear(bus);
+                }
                 rtnl_unlock();
         }
 
@@ -592,9 +611,7 @@ void sfp_unregister_socket(struct sfp_bus *bus)
         rtnl_lock();
         if (bus->netdev)
                 sfp_unregister_bus(bus);
-        bus->sfp_dev = NULL;
-        bus->sfp = NULL;
-        bus->socket_ops = NULL;
+        sfp_socket_clear(bus);
         rtnl_unlock();
 
         sfp_bus_put(bus);
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/tun.c b/drivers/net/tun.c
index a192a017cc68..f5727baac84a 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1688,7 +1688,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
                 case XDP_TX:
                         get_page(alloc_frag->page);
                         alloc_frag->offset += buflen;
-                        if (tun_xdp_tx(tun->dev, &xdp))
+                        if (tun_xdp_tx(tun->dev, &xdp) < 0)
                                 goto err_redirect;
                         rcu_read_unlock();
                         local_bh_enable();
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 3d4f7959dabb..b1b3d8f7e67d 100644
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -642,10 +642,12 @@ static void ax88772_restore_phy(struct usbnet *dev)
                                      priv->presvd_phy_advertise);
 
                 /* Restore BMCR */
+                if (priv->presvd_phy_bmcr & BMCR_ANENABLE)
+                        priv->presvd_phy_bmcr |= BMCR_ANRESTART;
+
                 asix_mdio_write_nopm(dev->net, dev->mii.phy_id, MII_BMCR,
                                      priv->presvd_phy_bmcr);
 
-                mii_nway_restart(&dev->mii);
                 priv->presvd_phy_advertise = 0;
                 priv->presvd_phy_bmcr = 0;
         }
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 8dff87ec6d99..ed10d49eb5e0 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);
@@ -3313,6 +3344,7 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev)
         pkt_cnt = 0;
         count = 0;
         length = 0;
+        spin_lock_irqsave(&tqp->lock, flags);
         for (skb = tqp->next; pkt_cnt < tqp->qlen; skb = skb->next) {
                 if (skb_is_gso(skb)) {
                         if (pkt_cnt) {
@@ -3321,7 +3353,8 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev)
                         }
                         count = 1;
                         length = skb->len - TX_OVERHEAD;
-                        skb2 = skb_dequeue(tqp);
+                        __skb_unlink(skb, tqp);
+                        spin_unlock_irqrestore(&tqp->lock, flags);
                         goto gso_skb;
                 }
 
@@ -3330,6 +3363,7 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev)
                 skb_totallen = skb->len + roundup(skb_totallen, sizeof(u32));
                 pkt_cnt++;
         }
+        spin_unlock_irqrestore(&tqp->lock, flags);
 
         /* copy to a single skb */
         skb = alloc_skb(skb_totallen, GFP_ATOMIC);
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 8e8b51f171f4..cb0cc30c3d6a 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1246,12 +1246,14 @@ 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, 0)},    /* 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 */
         {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */
         {QMI_QUIRK_SET_DTR(0x2c7c, 0x0125, 4)}, /* Quectel EC25, EC20 R2.0  Mini PCIe */
         {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */
+        {QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */
         {QMI_FIXED_INTF(0x2c7c, 0x0296, 4)},    /* Quectel BG96 */
         {QMI_QUIRK_SET_DTR(0x2c7c, 0x0306, 4)}, /* Quectel EP06 Mini PCIe */
 
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/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 5f565bd574da..48ba80a8ca5c 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -681,7 +681,7 @@ static void rtl8150_set_multicast(struct net_device *netdev)
                    (netdev->flags & IFF_ALLMULTI)) {
                 rx_creg &= 0xfffe;
                 rx_creg |= 0x0002;
-                dev_info(&netdev->dev, "%s: allmulti set\n", netdev->name);
+                dev_dbg(&netdev->dev, "%s: allmulti set\n", netdev->name);
         } else {
                 /* ~RX_MULTICAST, ~RX_PROMISCUOUS */
                 rx_creg &= 0x00fc;
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 7a6a1fe79309..05553d252446 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -82,6 +82,9 @@ static bool turbo_mode = true;
 module_param(turbo_mode, bool, 0644);
 MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
 
+static int smsc75xx_link_ok_nopm(struct usbnet *dev);
+static int smsc75xx_phy_gig_workaround(struct usbnet *dev);
+
 static int __must_check __smsc75xx_read_reg(struct usbnet *dev, u32 index,
                                             u32 *data, int in_pm)
 {
@@ -852,6 +855,9 @@ static int smsc75xx_phy_initialize(struct usbnet *dev)
                 return -EIO;
         }
 
+        /* phy workaround for gig link */
+        smsc75xx_phy_gig_workaround(dev);
+
         smsc75xx_mdio_write(dev->net, dev->mii.phy_id, MII_ADVERTISE,
                 ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP |
                 ADVERTISE_PAUSE_ASYM);
@@ -987,6 +993,62 @@ static int smsc75xx_wait_ready(struct usbnet *dev, int in_pm)
         return -EIO;
 }
 
+static int smsc75xx_phy_gig_workaround(struct usbnet *dev)
+{
+        struct mii_if_info *mii = &dev->mii;
+        int ret = 0, timeout = 0;
+        u32 buf, link_up = 0;
+
+        /* Set the phy in Gig loopback */
+        smsc75xx_mdio_write(dev->net, mii->phy_id, MII_BMCR, 0x4040);
+
+        /* Wait for the link up */
+        do {
+                link_up = smsc75xx_link_ok_nopm(dev);
+                usleep_range(10000, 20000);
+                timeout++;
+        } while ((!link_up) && (timeout < 1000));
+
+        if (timeout >= 1000) {
+                netdev_warn(dev->net, "Timeout waiting for PHY link up\n");
+                return -EIO;
+        }
+
+        /* phy reset */
+        ret = smsc75xx_read_reg(dev, PMT_CTL, &buf);
+        if (ret < 0) {
+                netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n", ret);
+                return ret;
+        }
+
+        buf |= PMT_CTL_PHY_RST;
+
+        ret = smsc75xx_write_reg(dev, PMT_CTL, buf);
+        if (ret < 0) {
+                netdev_warn(dev->net, "Failed to write PMT_CTL: %d\n", ret);
+                return ret;
+        }
+
+        timeout = 0;
+        do {
+                usleep_range(10000, 20000);
+                ret = smsc75xx_read_reg(dev, PMT_CTL, &buf);
+                if (ret < 0) {
+                        netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n",
+                                    ret);
+                        return ret;
+                }
+                timeout++;
+        } while ((buf & PMT_CTL_PHY_RST) && (timeout < 100));
+
+        if (timeout >= 100) {
+                netdev_warn(dev->net, "timeout waiting for PHY Reset\n");
+                return -EIO;
+        }
+
+        return 0;
+}
+
 static int smsc75xx_reset(struct usbnet *dev)
 {
         struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
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..e857cb3335f6 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;
 }
@@ -638,9 +636,62 @@ static int vxlan_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff)
         return eth_gro_complete(skb, nhoff + sizeof(struct vxlanhdr));
 }
 
-/* Add new entry to forwarding table -- assumes lock held */
+static struct vxlan_fdb *vxlan_fdb_alloc(struct vxlan_dev *vxlan,
+                                         const u8 *mac, __u16 state,
+                                         __be32 src_vni, __u8 ndm_flags)
+{
+        struct vxlan_fdb *f;
+
+        f = kmalloc(sizeof(*f), GFP_ATOMIC);
+        if (!f)
+                return NULL;
+        f->state = state;
+        f->flags = ndm_flags;
+        f->updated = f->used = jiffies;
+        f->vni = src_vni;
+        INIT_LIST_HEAD(&f->remotes);
+        memcpy(f->eth_addr, mac, ETH_ALEN);
+
+        return f;
+}
+
 static int vxlan_fdb_create(struct vxlan_dev *vxlan,
                             const u8 *mac, union vxlan_addr *ip,
+                            __u16 state, __be16 port, __be32 src_vni,
+                            __be32 vni, __u32 ifindex, __u8 ndm_flags,
+                            struct vxlan_fdb **fdb)
+{
+        struct vxlan_rdst *rd = NULL;
+        struct vxlan_fdb *f;
+        int rc;
+
+        if (vxlan->cfg.addrmax &&
+            vxlan->addrcnt >= vxlan->cfg.addrmax)
+                return -ENOSPC;
+
+        netdev_dbg(vxlan->dev, "add %pM -> %pIS\n", mac, ip);
+        f = vxlan_fdb_alloc(vxlan, mac, state, src_vni, ndm_flags);
+        if (!f)
+                return -ENOMEM;
+
+        rc = vxlan_fdb_append(f, ip, port, vni, ifindex, &rd);
+        if (rc < 0) {
+                kfree(f);
+                return rc;
+        }
+
+        ++vxlan->addrcnt;
+        hlist_add_head_rcu(&f->hlist,
+                           vxlan_fdb_head(vxlan, mac, src_vni));
+
+        *fdb = f;
+
+        return 0;
+}
+
+/* Add new entry to forwarding table -- assumes lock held */
+static int vxlan_fdb_update(struct vxlan_dev *vxlan,
+                            const u8 *mac, union vxlan_addr *ip,
                             __u16 state, __u16 flags,
                             __be16 port, __be32 src_vni, __be32 vni,
                             __u32 ifindex, __u8 ndm_flags)
@@ -689,37 +740,17 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan,
                 if (!(flags & NLM_F_CREATE))
                         return -ENOENT;
 
-                if (vxlan->cfg.addrmax &&
-                    vxlan->addrcnt >= vxlan->cfg.addrmax)
-                        return -ENOSPC;
-
                 /* Disallow replace to add a multicast entry */
                 if ((flags & NLM_F_REPLACE) &&
                     (is_multicast_ether_addr(mac) || is_zero_ether_addr(mac)))
                         return -EOPNOTSUPP;
 
                 netdev_dbg(vxlan->dev, "add %pM -> %pIS\n", mac, ip);
-                f = kmalloc(sizeof(*f), GFP_ATOMIC);
-                if (!f)
-                        return -ENOMEM;
-
-                notify = 1;
-                f->state = state;
-                f->flags = ndm_flags;
-                f->updated = f->used = jiffies;
-                f->vni = src_vni;
-                INIT_LIST_HEAD(&f->remotes);
-                memcpy(f->eth_addr, mac, ETH_ALEN);
-
-                rc = vxlan_fdb_append(f, ip, port, vni, ifindex, &rd);
-                if (rc < 0) {
-                        kfree(f);
+                rc = vxlan_fdb_create(vxlan, mac, ip, state, port, src_vni,
+                                      vni, ifindex, ndm_flags, &f);
+                if (rc < 0)
                         return rc;
-                }
-
-                ++vxlan->addrcnt;
-                hlist_add_head_rcu(&f->hlist,
-                                   vxlan_fdb_head(vxlan, mac, src_vni));
+                notify = 1;
         }
 
         if (notify) {
@@ -743,13 +774,15 @@ static void vxlan_fdb_free(struct rcu_head *head)
         kfree(f);
 }
 
-static void vxlan_fdb_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f)
+static void vxlan_fdb_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f,
+                              bool do_notify)
 {
         netdev_dbg(vxlan->dev,
                     "delete %pM\n", f->eth_addr);
 
         --vxlan->addrcnt;
-        vxlan_fdb_notify(vxlan, f, first_remote_rtnl(f), RTM_DELNEIGH);
+        if (do_notify)
+                vxlan_fdb_notify(vxlan, f, first_remote_rtnl(f), RTM_DELNEIGH);
 
         hlist_del_rcu(&f->hlist);
         call_rcu(&f->rcu, vxlan_fdb_free);
@@ -865,7 +898,7 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
                 return -EAFNOSUPPORT;
 
         spin_lock_bh(&vxlan->hash_lock);
-        err = vxlan_fdb_create(vxlan, addr, &ip, ndm->ndm_state, flags,
+        err = vxlan_fdb_update(vxlan, addr, &ip, ndm->ndm_state, flags,
                                port, src_vni, vni, ifindex, ndm->ndm_flags);
         spin_unlock_bh(&vxlan->hash_lock);
 
@@ -899,7 +932,7 @@ static int __vxlan_fdb_delete(struct vxlan_dev *vxlan,
                 goto out;
         }
 
-        vxlan_fdb_destroy(vxlan, f);
+        vxlan_fdb_destroy(vxlan, f, true);
 
 out:
         return 0;
@@ -1008,7 +1041,7 @@ static bool vxlan_snoop(struct net_device *dev,
 
                 /* close off race between vxlan_flush and incoming packets */
                 if (netif_running(dev))
-                        vxlan_fdb_create(vxlan, src_mac, src_ip,
+                        vxlan_fdb_update(vxlan, src_mac, src_ip,
                                          NUD_REACHABLE,
                                          NLM_F_EXCL|NLM_F_CREATE,
                                          vxlan->cfg.dst_port,
@@ -2366,7 +2399,7 @@ static void vxlan_cleanup(struct timer_list *t)
                                            "garbage collect %pM\n",
                                            f->eth_addr);
                                 f->state = NUD_STALE;
-                                vxlan_fdb_destroy(vxlan, f);
+                                vxlan_fdb_destroy(vxlan, f, true);
                         } else if (time_before(timeout, next_timer))
                                 next_timer = timeout;
                 }
@@ -2417,7 +2450,7 @@ static void vxlan_fdb_delete_default(struct vxlan_dev *vxlan, __be32 vni)
         spin_lock_bh(&vxlan->hash_lock);
         f = __vxlan_find_mac(vxlan, all_zeros_mac, vni);
         if (f)
-                vxlan_fdb_destroy(vxlan, f);
+                vxlan_fdb_destroy(vxlan, f, true);
         spin_unlock_bh(&vxlan->hash_lock);
 }
 
@@ -2471,7 +2504,7 @@ static void vxlan_flush(struct vxlan_dev *vxlan, bool do_all)
                                 continue;
                         /* the all_zeros_mac entry is deleted at vxlan_uninit */
                         if (!is_zero_ether_addr(f->eth_addr))
-                                vxlan_fdb_destroy(vxlan, f);
+                                vxlan_fdb_destroy(vxlan, f, true);
                 }
         }
         spin_unlock_bh(&vxlan->hash_lock);
@@ -3162,6 +3195,7 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev,
 {
         struct vxlan_net *vn = net_generic(net, vxlan_net_id);
         struct vxlan_dev *vxlan = netdev_priv(dev);
+        struct vxlan_fdb *f = NULL;
         int err;
 
         err = vxlan_dev_configure(net, dev, conf, false, extack);
@@ -3175,24 +3209,35 @@ static int __vxlan_dev_create(struct net *net, struct net_device *dev,
                 err = vxlan_fdb_create(vxlan, all_zeros_mac,
                                        &vxlan->default_dst.remote_ip,
                                        NUD_REACHABLE | NUD_PERMANENT,
-                                       NLM_F_EXCL | NLM_F_CREATE,
                                        vxlan->cfg.dst_port,
                                        vxlan->default_dst.remote_vni,
                                        vxlan->default_dst.remote_vni,
                                        vxlan->default_dst.remote_ifindex,
-                                       NTF_SELF);
+                                       NTF_SELF, &f);
                 if (err)
                         return err;
         }
 
         err = register_netdevice(dev);
+        if (err)
+                goto errout;
+
+        err = rtnl_configure_link(dev, NULL);
         if (err) {
-                vxlan_fdb_delete_default(vxlan, vxlan->default_dst.remote_vni);
-                return err;
+                unregister_netdevice(dev);
+                goto errout;
         }
 
+        /* notify default fdb entry */
+        if (f)
+                vxlan_fdb_notify(vxlan, f, first_remote_rtnl(f), RTM_NEWNEIGH);
+
         list_add(&vxlan->next, &vn->vxlan_list);
         return 0;
+errout:
+        if (f)
+                vxlan_fdb_destroy(vxlan, f, false);
+        return err;
 }
 
 static int vxlan_nl2conf(struct nlattr *tb[], struct nlattr *data[],
@@ -3427,6 +3472,7 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
         struct vxlan_rdst *dst = &vxlan->default_dst;
         struct vxlan_rdst old_dst;
         struct vxlan_config conf;
+        struct vxlan_fdb *f = NULL;
         int err;
 
         err = vxlan_nl2conf(tb, data,
@@ -3455,16 +3501,16 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
                         err = vxlan_fdb_create(vxlan, all_zeros_mac,
                                                &dst->remote_ip,
                                                NUD_REACHABLE | NUD_PERMANENT,
-                                               NLM_F_CREATE | NLM_F_APPEND,
                                                vxlan->cfg.dst_port,
                                                dst->remote_vni,
                                                dst->remote_vni,
                                                dst->remote_ifindex,
-                                               NTF_SELF);
+                                               NTF_SELF, &f);
                         if (err) {
                                 spin_unlock_bh(&vxlan->hash_lock);
                                 return err;
                         }
+                        vxlan_fdb_notify(vxlan, f, first_remote_rtnl(f), RTM_NEWNEIGH);
                 }
                 spin_unlock_bh(&vxlan->hash_lock);
         }
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index e9c2fb318c03..836e0a47b94a 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -6058,8 +6058,19 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk)
                            ath10k_mac_max_vht_nss(vht_mcs_mask)));
 
         if (changed & IEEE80211_RC_BW_CHANGED) {
-                ath10k_dbg(ar, ATH10K_DBG_MAC, "mac update sta %pM peer bw %d\n",
-                           sta->addr, bw);
+                enum wmi_phy_mode mode;
+
+                mode = chan_to_phymode(&def);
+                ath10k_dbg(ar, ATH10K_DBG_MAC, "mac update sta %pM peer bw %d phymode %d\n",
+                                sta->addr, bw, mode);
+
+                err = ath10k_wmi_peer_set_param(ar, arvif->vdev_id, sta->addr,
+                                WMI_PEER_PHYMODE, mode);
+                if (err) {
+                        ath10k_warn(ar, "failed to update STA %pM peer phymode %d: %d\n",
+                                        sta->addr, mode, err);
+                        goto exit;
+                }
 
                 err = ath10k_wmi_peer_set_param(ar, arvif->vdev_id, sta->addr,
                                                 WMI_PEER_CHAN_WIDTH, bw);
@@ -6100,6 +6111,7 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk)
                                     sta->addr);
         }
 
+exit:
         mutex_unlock(&ar->conf_mutex);
 }
 
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index b48db54e9865..d68afb65402a 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -6144,6 +6144,7 @@ enum wmi_peer_param {
         WMI_PEER_NSS        = 0x5,
         WMI_PEER_USE_4ADDR  = 0x6,
         WMI_PEER_DEBUG      = 0xa,
+        WMI_PEER_PHYMODE    = 0xd,
         WMI_PEER_DUMMY_VAR  = 0xff, /* dummy parameter for STA PS workaround */
 };
 
diff --git a/drivers/net/wireless/ath/wcn36xx/testmode.c b/drivers/net/wireless/ath/wcn36xx/testmode.c
index 1279064a3b71..51a038022c8b 100644
--- a/drivers/net/wireless/ath/wcn36xx/testmode.c
+++ b/drivers/net/wireless/ath/wcn36xx/testmode.c
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
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/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index c99a191e8d69..a907d7b065fa 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -4296,6 +4296,13 @@ void brcmf_sdio_remove(struct brcmf_sdio *bus)
         brcmf_dbg(TRACE, "Enter\n");
 
         if (bus) {
+                /* Stop watchdog task */
+                if (bus->watchdog_tsk) {
+                        send_sig(SIGTERM, bus->watchdog_tsk, 1);
+                        kthread_stop(bus->watchdog_tsk);
+                        bus->watchdog_tsk = NULL;
+                }
+
                 /* De-register interrupt handler */
                 brcmf_sdiod_intr_unregister(bus->sdiodev);
 
diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
index 6e3cf9817730..88f4c89f89ba 100644
--- a/drivers/net/wireless/marvell/mwifiex/usb.c
+++ b/drivers/net/wireless/marvell/mwifiex/usb.c
@@ -644,11 +644,6 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf)
                                          MWIFIEX_FUNC_SHUTDOWN);
         }
 
-        if (adapter->workqueue)
-                flush_workqueue(adapter->workqueue);
-
-        mwifiex_usb_free(card);
-
         mwifiex_dbg(adapter, FATAL,
                     "%s: removing card\n", __func__);
         mwifiex_remove_card(adapter);
@@ -1356,6 +1351,8 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter)
 {
         struct usb_card_rec *card = (struct usb_card_rec *)adapter->card;
 
+        mwifiex_usb_free(card);
+
         mwifiex_usb_cleanup_tx_aggr(adapter);
 
         card->adapter = NULL;
diff --git a/drivers/net/wireless/mediatek/mt7601u/phy.c b/drivers/net/wireless/mediatek/mt7601u/phy.c
index 9d2f9a776ef1..b804abd464ae 100644
--- a/drivers/net/wireless/mediatek/mt7601u/phy.c
+++ b/drivers/net/wireless/mediatek/mt7601u/phy.c
@@ -986,13 +986,15 @@ static void mt7601u_agc_tune(struct mt7601u_dev *dev)
          */
         spin_lock_bh(&dev->con_mon_lock);
         avg_rssi = ewma_rssi_read(&dev->avg_rssi);
-        WARN_ON_ONCE(avg_rssi == 0);
+        spin_unlock_bh(&dev->con_mon_lock);
+        if (avg_rssi == 0)
+                return;
+
         avg_rssi = -avg_rssi;
         if (avg_rssi <= -70)
                 val -= 0x20;
         else if (avg_rssi <= -60)
                 val -= 0x10;
-        spin_unlock_bh(&dev->con_mon_lock);
 
         if (val != mt7601u_bbp_rr(dev, 66))
                 mt7601u_bbp_wr(dev, 66, val);
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/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
index 220e2b710208..ae0ca8006849 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
@@ -654,8 +654,7 @@ qtnf_disconnect(struct wiphy *wiphy, struct net_device *dev,
         vif = qtnf_mac_get_base_vif(mac);
         if (!vif) {
                 pr_err("MAC%u: primary VIF is not configured\n", mac->macid);
-                ret = -EFAULT;
-                goto out;
+                return -EFAULT;
         }
 
         if (vif->wdev.iftype != NL80211_IFTYPE_STATION) {
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index 39c817eddd78..54c9f6ab0c8c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -484,18 +484,21 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
 
 }
 
-void rtl_deinit_deferred_work(struct ieee80211_hw *hw)
+void rtl_deinit_deferred_work(struct ieee80211_hw *hw, bool ips_wq)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         del_timer_sync(&rtlpriv->works.watchdog_timer);
 
-        cancel_delayed_work(&rtlpriv->works.watchdog_wq);
-        cancel_delayed_work(&rtlpriv->works.ips_nic_off_wq);
-        cancel_delayed_work(&rtlpriv->works.ps_work);
-        cancel_delayed_work(&rtlpriv->works.ps_rfon_wq);
-        cancel_delayed_work(&rtlpriv->works.fwevt_wq);
-        cancel_delayed_work(&rtlpriv->works.c2hcmd_wq);
+        cancel_delayed_work_sync(&rtlpriv->works.watchdog_wq);
+        if (ips_wq)
+                cancel_delayed_work(&rtlpriv->works.ips_nic_off_wq);
+        else
+                cancel_delayed_work_sync(&rtlpriv->works.ips_nic_off_wq);
+        cancel_delayed_work_sync(&rtlpriv->works.ps_work);
+        cancel_delayed_work_sync(&rtlpriv->works.ps_rfon_wq);
+        cancel_delayed_work_sync(&rtlpriv->works.fwevt_wq);
+        cancel_delayed_work_sync(&rtlpriv->works.c2hcmd_wq);
 }
 EXPORT_SYMBOL_GPL(rtl_deinit_deferred_work);
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h b/drivers/net/wireless/realtek/rtlwifi/base.h
index 912f205779c3..a7ae40eaa3cd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.h
+++ b/drivers/net/wireless/realtek/rtlwifi/base.h
@@ -121,7 +121,7 @@ void rtl_init_rfkill(struct ieee80211_hw *hw);
 void rtl_deinit_rfkill(struct ieee80211_hw *hw);
 
 void rtl_watch_dog_timer_callback(struct timer_list *t);
-void rtl_deinit_deferred_work(struct ieee80211_hw *hw);
+void rtl_deinit_deferred_work(struct ieee80211_hw *hw, bool ips_wq);
 
 bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);
 int rtlwifi_rate_mapping(struct ieee80211_hw *hw, bool isht,
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
index cfea57efa7f4..4bf7967590ca 100644
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -130,7 +130,6 @@ found_alt:
                        firmware->size);
                 rtlpriv->rtlhal.wowlan_fwsize = firmware->size;
         }
-        rtlpriv->rtlhal.fwsize = firmware->size;
         release_firmware(firmware);
 }
 
@@ -196,7 +195,7 @@ static void rtl_op_stop(struct ieee80211_hw *hw)
                 /* reset sec info */
                 rtl_cam_reset_sec_info(hw);
 
-                rtl_deinit_deferred_work(hw);
+                rtl_deinit_deferred_work(hw, false);
         }
         rtlpriv->intf_ops->adapter_stop(hw);
 
diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c
index ae13bcfb3bf0..5d1fda16fc8c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/pci.c
+++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
@@ -2377,7 +2377,7 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
                 ieee80211_unregister_hw(hw);
                 rtlmac->mac80211_registered = 0;
         } else {
-                rtl_deinit_deferred_work(hw);
+                rtl_deinit_deferred_work(hw, false);
                 rtlpriv->intf_ops->adapter_stop(hw);
         }
         rtlpriv->cfg->ops->disable_interrupt(hw);
diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wireless/realtek/rtlwifi/ps.c
index 71af24e2e051..479a4cfc245d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/ps.c
+++ b/drivers/net/wireless/realtek/rtlwifi/ps.c
@@ -71,7 +71,7 @@ bool rtl_ps_disable_nic(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         /*<1> Stop all timer */
-        rtl_deinit_deferred_work(hw);
+        rtl_deinit_deferred_work(hw, true);
 
         /*<2> Disable Interrupt */
         rtlpriv->cfg->ops->disable_interrupt(hw);
@@ -292,7 +292,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         enum rf_pwrstate rtstate;
 
-        cancel_delayed_work(&rtlpriv->works.ips_nic_off_wq);
+        cancel_delayed_work_sync(&rtlpriv->works.ips_nic_off_wq);
 
         mutex_lock(&rtlpriv->locks.ips_mutex);
         if (ppsc->inactiveps) {
diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
index f9faffc498bc..2ac5004d7a40 100644
--- a/drivers/net/wireless/realtek/rtlwifi/usb.c
+++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
@@ -1132,7 +1132,7 @@ void rtl_usb_disconnect(struct usb_interface *intf)
                 ieee80211_unregister_hw(hw);
                 rtlmac->mac80211_registered = 0;
         } else {
-                rtl_deinit_deferred_work(hw);
+                rtl_deinit_deferred_work(hw, false);
                 rtlpriv->intf_ops->adapter_stop(hw);
         }
         /*deinit rfkill */
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 46df030b2c3f..bf65501e6ed6 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -100,6 +100,22 @@ static struct class *nvme_subsys_class;
 static void nvme_ns_remove(struct nvme_ns *ns);
 static int nvme_revalidate_disk(struct gendisk *disk);
 static void nvme_put_subsystem(struct nvme_subsystem *subsys);
+static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
+                                           unsigned nsid);
+
+static void nvme_set_queue_dying(struct nvme_ns *ns)
+{
+        /*
+         * Revalidating a dead namespace sets capacity to 0. This will end
+         * buffered writers dirtying pages that can't be synced.
+         */
+        if (!ns->disk || test_and_set_bit(NVME_NS_DEAD, &ns->flags))
+                return;
+        revalidate_disk(ns->disk);
+        blk_set_queue_dying(ns->queue);
+        /* Forcibly unquiesce queues to avoid blocking dispatch */
+        blk_mq_unquiesce_queue(ns->queue);
+}
 
 static void nvme_queue_scan(struct nvme_ctrl *ctrl)
 {
@@ -1044,14 +1060,17 @@ EXPORT_SYMBOL_GPL(nvme_set_queue_count);
 
 static void nvme_enable_aen(struct nvme_ctrl *ctrl)
 {
-        u32 result;
+        u32 result, supported_aens = ctrl->oaes & NVME_AEN_SUPPORTED;
         int status;
 
-        status = nvme_set_features(ctrl, NVME_FEAT_ASYNC_EVENT,
-                        ctrl->oaes & NVME_AEN_SUPPORTED, NULL, 0, &result);
+        if (!supported_aens)
+                return;
+
+        status = nvme_set_features(ctrl, NVME_FEAT_ASYNC_EVENT, supported_aens,
+                        NULL, 0, &result);
         if (status)
                 dev_warn(ctrl->device, "Failed to configure AEN (cfg %x)\n",
-                         ctrl->oaes & NVME_AEN_SUPPORTED);
+                         supported_aens);
 }
 
 static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
@@ -1151,19 +1170,15 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
 
 static void nvme_update_formats(struct nvme_ctrl *ctrl)
 {
-        struct nvme_ns *ns, *next;
-        LIST_HEAD(rm_list);
+        struct nvme_ns *ns;
 
-        down_write(&ctrl->namespaces_rwsem);
-        list_for_each_entry(ns, &ctrl->namespaces, list) {
-                if (ns->disk && nvme_revalidate_disk(ns->disk)) {
-                        list_move_tail(&ns->list, &rm_list);
-                }
-        }
-        up_write(&ctrl->namespaces_rwsem);
+        down_read(&ctrl->namespaces_rwsem);
+        list_for_each_entry(ns, &ctrl->namespaces, list)
+                if (ns->disk && nvme_revalidate_disk(ns->disk))
+                        nvme_set_queue_dying(ns);
+        up_read(&ctrl->namespaces_rwsem);
 
-        list_for_each_entry_safe(ns, next, &rm_list, list)
-                nvme_ns_remove(ns);
+        nvme_remove_invalid_namespaces(ctrl, NVME_NSID_ALL);
 }
 
 static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects)
@@ -1218,7 +1233,7 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
         effects = nvme_passthru_start(ctrl, ns, cmd.opcode);
         status = nvme_submit_user_cmd(ns ? ns->queue : ctrl->admin_q, &c,
                         (void __user *)(uintptr_t)cmd.addr, cmd.data_len,
-                        (void __user *)(uintptr_t)cmd.metadata, cmd.metadata,
+                        (void __user *)(uintptr_t)cmd.metadata, cmd.metadata_len,
                         0, &cmd.result, timeout);
         nvme_passthru_end(ctrl, effects);
 
@@ -3138,7 +3153,7 @@ static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
 
         down_write(&ctrl->namespaces_rwsem);
         list_for_each_entry_safe(ns, next, &ctrl->namespaces, list) {
-                if (ns->head->ns_id > nsid)
+                if (ns->head->ns_id > nsid || test_bit(NVME_NS_DEAD, &ns->flags))
                         list_move_tail(&ns->list, &rm_list);
         }
         up_write(&ctrl->namespaces_rwsem);
@@ -3542,19 +3557,9 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl)
         if (ctrl->admin_q)
                 blk_mq_unquiesce_queue(ctrl->admin_q);
 
-        list_for_each_entry(ns, &ctrl->namespaces, list) {
-                /*
-                 * Revalidating a dead namespace sets capacity to 0. This will
-                 * end buffered writers dirtying pages that can't be synced.
-                 */
-                if (!ns->disk || test_and_set_bit(NVME_NS_DEAD, &ns->flags))
-                        continue;
-                revalidate_disk(ns->disk);
-                blk_set_queue_dying(ns->queue);
+        list_for_each_entry(ns, &ctrl->namespaces, list)
+                nvme_set_queue_dying(ns);
 
-                /* Forcibly unquiesce queues to avoid blocking dispatch */
-                blk_mq_unquiesce_queue(ns->queue);
-        }
         up_read(&ctrl->namespaces_rwsem);
 }
 EXPORT_SYMBOL_GPL(nvme_kill_queues);
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index 903eb4545e26..f7efe5a58cc7 100644
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -539,14 +539,18 @@ static struct nvmf_transport_ops *nvmf_lookup_transport(
 /*
  * For something we're not in a state to send to the device the default action
  * is to busy it and retry it after the controller state is recovered.  However,
- * anything marked for failfast or nvme multipath is immediately failed.
+ * if the controller is deleting or if anything is marked for failfast or
+ * nvme multipath it is immediately failed.
  *
  * Note: commands used to initialize the controller will be marked for failfast.
  * Note: nvme cli/ioctl commands are marked for failfast.
  */
-blk_status_t nvmf_fail_nonready_command(struct request *rq)
+blk_status_t nvmf_fail_nonready_command(struct nvme_ctrl *ctrl,
+                struct request *rq)
 {
-        if (!blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH))
+        if (ctrl->state != NVME_CTRL_DELETING &&
+            ctrl->state != NVME_CTRL_DEAD &&
+            !blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH))
                 return BLK_STS_RESOURCE;
         nvme_req(rq)->status = NVME_SC_ABORT_REQ;
         return BLK_STS_IOERR;
diff --git a/drivers/nvme/host/fabrics.h b/drivers/nvme/host/fabrics.h
index e1818a27aa2d..aa2fdb2a2e8f 100644
--- a/drivers/nvme/host/fabrics.h
+++ b/drivers/nvme/host/fabrics.h
@@ -162,7 +162,8 @@ void nvmf_unregister_transport(struct nvmf_transport_ops *ops);
 void nvmf_free_options(struct nvmf_ctrl_options *opts);
 int nvmf_get_address(struct nvme_ctrl *ctrl, char *buf, int size);
 bool nvmf_should_reconnect(struct nvme_ctrl *ctrl);
-blk_status_t nvmf_fail_nonready_command(struct request *rq);
+blk_status_t nvmf_fail_nonready_command(struct nvme_ctrl *ctrl,
+                struct request *rq);
 bool __nvmf_check_ready(struct nvme_ctrl *ctrl, struct request *rq,
                 bool queue_live);
 
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 41d45a1b5c62..9bac912173ba 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -2272,7 +2272,7 @@ nvme_fc_queue_rq(struct blk_mq_hw_ctx *hctx,
 
         if (ctrl->rport->remoteport.port_state != FC_OBJSTATE_ONLINE ||
             !nvmf_check_ready(&queue->ctrl->ctrl, rq, queue_ready))
-                return nvmf_fail_nonready_command(rq);
+                return nvmf_fail_nonready_command(&queue->ctrl->ctrl, rq);
 
         ret = nvme_setup_cmd(ns, rq, sqe);
         if (ret)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index ba943f211687..ddd441b1516a 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2556,11 +2556,6 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         quirks |= check_vendor_combination_bug(pdev);
 
-        result = nvme_init_ctrl(&dev->ctrl, &pdev->dev, &nvme_pci_ctrl_ops,
-                        quirks);
-        if (result)
-                goto release_pools;
-
         /*
          * Double check that our mempool alloc size will cover the biggest
          * command we support.
@@ -2578,6 +2573,11 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto release_pools;
         }
 
+        result = nvme_init_ctrl(&dev->ctrl, &pdev->dev, &nvme_pci_ctrl_ops,
+                        quirks);
+        if (result)
+                goto release_mempool;
+
         dev_info(dev->ctrl.device, "pci function %s\n", dev_name(&pdev->dev));
 
         nvme_get_ctrl(&dev->ctrl);
@@ -2585,6 +2585,8 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         return 0;
 
+ release_mempool:
+        mempool_destroy(dev->iod_mempool);
  release_pools:
         nvme_release_prp_pools(dev);
  unmap:
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 9544625c0b7d..66ec5985c9f3 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -732,8 +732,11 @@ static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl,
                 blk_cleanup_queue(ctrl->ctrl.admin_q);
                 nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset);
         }
-        nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
-                sizeof(struct nvme_command), DMA_TO_DEVICE);
+        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]);
 }
 
@@ -1636,7 +1639,7 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
         WARN_ON_ONCE(rq->tag < 0);
 
         if (!nvmf_check_ready(&queue->ctrl->ctrl, rq, queue_ready))
-                return nvmf_fail_nonready_command(rq);
+                return nvmf_fail_nonready_command(&queue->ctrl->ctrl, rq);
 
         dev = queue->device->dev;
         ib_dma_sync_single_for_cpu(dev, sqe->dma,
diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c
index d3f3b3ec4d1a..ebea1373d1b7 100644
--- a/drivers/nvme/target/configfs.c
+++ b/drivers/nvme/target/configfs.c
@@ -282,6 +282,7 @@ static ssize_t nvmet_ns_device_path_store(struct config_item *item,
 {
         struct nvmet_ns *ns = to_nvmet_ns(item);
         struct nvmet_subsys *subsys = ns->subsys;
+        size_t len;
         int ret;
 
         mutex_lock(&subsys->lock);
@@ -289,10 +290,14 @@ static ssize_t nvmet_ns_device_path_store(struct config_item *item,
         if (ns->enabled)
                 goto out_unlock;
 
-        kfree(ns->device_path);
+        ret = -EINVAL;
+        len = strcspn(page, "\n");
+        if (!len)
+                goto out_unlock;
 
+        kfree(ns->device_path);
         ret = -ENOMEM;
-        ns->device_path = kstrndup(page, strcspn(page, "\n"), GFP_KERNEL);
+        ns->device_path = kstrndup(page, len, GFP_KERNEL);
         if (!ns->device_path)
                 goto out_unlock;
 
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 74d4b785d2da..9838103f2d62 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -339,7 +339,7 @@ int nvmet_ns_enable(struct nvmet_ns *ns)
                 goto out_unlock;
 
         ret = nvmet_bdev_ns_enable(ns);
-        if (ret)
+        if (ret == -ENOTBLK)
                 ret = nvmet_file_ns_enable(ns);
         if (ret)
                 goto out_unlock;
diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c
index 408279cb6f2c..29b4b236afd8 100644
--- a/drivers/nvme/target/fc.c
+++ b/drivers/nvme/target/fc.c
@@ -58,8 +58,8 @@ struct nvmet_fc_ls_iod {
         struct work_struct              work;
 } __aligned(sizeof(unsigned long long));
 
+/* desired maximum for a single sequence - if sg list allows it */
 #define NVMET_FC_MAX_SEQ_LENGTH         (256 * 1024)
-#define NVMET_FC_MAX_XFR_SGENTS         (NVMET_FC_MAX_SEQ_LENGTH / PAGE_SIZE)
 
 enum nvmet_fcp_datadir {
         NVMET_FCP_NODATA,
@@ -74,6 +74,7 @@ struct nvmet_fc_fcp_iod {
         struct nvme_fc_cmd_iu           cmdiubuf;
         struct nvme_fc_ersp_iu          rspiubuf;
         dma_addr_t                      rspdma;
+        struct scatterlist              *next_sg;
         struct scatterlist              *data_sg;
         int                             data_sg_cnt;
         u32                             offset;
@@ -1025,8 +1026,7 @@ nvmet_fc_register_targetport(struct nvmet_fc_port_info *pinfo,
         INIT_LIST_HEAD(&newrec->assoc_list);
         kref_init(&newrec->ref);
         ida_init(&newrec->assoc_cnt);
-        newrec->max_sg_cnt = min_t(u32, NVMET_FC_MAX_XFR_SGENTS,
-                                        template->max_sgl_segments);
+        newrec->max_sg_cnt = template->max_sgl_segments;
 
         ret = nvmet_fc_alloc_ls_iodlist(newrec);
         if (ret) {
@@ -1722,6 +1722,7 @@ nvmet_fc_alloc_tgt_pgs(struct nvmet_fc_fcp_iod *fod)
                                 ((fod->io_dir == NVMET_FCP_WRITE) ?
                                         DMA_FROM_DEVICE : DMA_TO_DEVICE));
                                 /* note: write from initiator perspective */
+        fod->next_sg = fod->data_sg;
 
         return 0;
 
@@ -1866,24 +1867,49 @@ nvmet_fc_transfer_fcp_data(struct nvmet_fc_tgtport *tgtport,
                                 struct nvmet_fc_fcp_iod *fod, u8 op)
 {
         struct nvmefc_tgt_fcp_req *fcpreq = fod->fcpreq;
+        struct scatterlist *sg = fod->next_sg;
         unsigned long flags;
-        u32 tlen;
+        u32 remaininglen = fod->req.transfer_len - fod->offset;
+        u32 tlen = 0;
         int ret;
 
         fcpreq->op = op;
         fcpreq->offset = fod->offset;
         fcpreq->timeout = NVME_FC_TGTOP_TIMEOUT_SEC;
 
-        tlen = min_t(u32, tgtport->max_sg_cnt * PAGE_SIZE,
-                        (fod->req.transfer_len - fod->offset));
+        /*
+         * for next sequence:
+         *  break at a sg element boundary
+         *  attempt to keep sequence length capped at
+         *    NVMET_FC_MAX_SEQ_LENGTH but allow sequence to
+         *    be longer if a single sg element is larger
+         *    than that amount. This is done to avoid creating
+         *    a new sg list to use for the tgtport api.
+         */
+        fcpreq->sg = sg;
+        fcpreq->sg_cnt = 0;
+        while (tlen < remaininglen &&
+               fcpreq->sg_cnt < tgtport->max_sg_cnt &&
+               tlen + sg_dma_len(sg) < NVMET_FC_MAX_SEQ_LENGTH) {
+                fcpreq->sg_cnt++;
+                tlen += sg_dma_len(sg);
+                sg = sg_next(sg);
+        }
+        if (tlen < remaininglen && fcpreq->sg_cnt == 0) {
+                fcpreq->sg_cnt++;
+                tlen += min_t(u32, sg_dma_len(sg), remaininglen);
+                sg = sg_next(sg);
+        }
+        if (tlen < remaininglen)
+                fod->next_sg = sg;
+        else
+                fod->next_sg = NULL;
+
         fcpreq->transfer_length = tlen;
         fcpreq->transferred_length = 0;
         fcpreq->fcp_error = 0;
         fcpreq->rsplen = 0;
 
-        fcpreq->sg = &fod->data_sg[fod->offset / PAGE_SIZE];
-        fcpreq->sg_cnt = DIV_ROUND_UP(tlen, PAGE_SIZE);
-
         /*
          * If the last READDATA request: check if LLDD supports
          * combined xfr with response.
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
index d8d91f04bd7e..ae7586b8be07 100644
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -162,7 +162,7 @@ static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx,
         blk_status_t ret;
 
         if (!nvmf_check_ready(&queue->ctrl->ctrl, req, queue_ready))
-                return nvmf_fail_nonready_command(req);
+                return nvmf_fail_nonready_command(&queue->ctrl->ctrl, req);
 
         ret = nvme_setup_cmd(ns, req, &iod->cmd);
         if (ret)
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/of/base.c b/drivers/of/base.c
index 848f549164cd..466e3c8582f0 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -102,7 +102,7 @@ static u32 phandle_cache_mask;
  *   - the phandle lookup overhead reduction provided by the cache
  *     will likely be less
  */
-static void of_populate_phandle_cache(void)
+void of_populate_phandle_cache(void)
 {
         unsigned long flags;
         u32 cache_entries;
@@ -134,8 +134,7 @@ out:
         raw_spin_unlock_irqrestore(&devtree_lock, flags);
 }
 
-#ifndef CONFIG_MODULES
-static int __init of_free_phandle_cache(void)
+int of_free_phandle_cache(void)
 {
         unsigned long flags;
 
@@ -148,6 +147,7 @@ static int __init of_free_phandle_cache(void)
 
         return 0;
 }
+#if !defined(CONFIG_MODULES)
 late_initcall_sync(of_free_phandle_cache);
 #endif
 
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
index 891d780c076a..216175d11d3d 100644
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@ -79,6 +79,8 @@ int of_resolve_phandles(struct device_node *tree);
 #if defined(CONFIG_OF_OVERLAY)
 void of_overlay_mutex_lock(void);
 void of_overlay_mutex_unlock(void);
+int of_free_phandle_cache(void);
+void of_populate_phandle_cache(void);
 #else
 static inline void of_overlay_mutex_lock(void) {};
 static inline void of_overlay_mutex_unlock(void) {};
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 7baa53e5b1d7..eda57ef12fd0 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -804,6 +804,8 @@ static int of_overlay_apply(const void *fdt, struct device_node *tree,
                 goto err_free_overlay_changeset;
         }
 
+        of_populate_phandle_cache();
+
         ret = __of_changeset_apply_notify(&ovcs->cset);
         if (ret)
                 pr_err("overlay changeset entry notify error %d\n", ret);
@@ -1046,8 +1048,17 @@ int of_overlay_remove(int *ovcs_id)
 
         list_del(&ovcs->ovcs_list);
 
+        /*
+         * Disable phandle cache.  Avoids race condition that would arise
+         * from removing cache entry when the associated node is deleted.
+         */
+        of_free_phandle_cache();
+
         ret_apply = 0;
         ret = __of_changeset_revert_entries(&ovcs->cset, &ret_apply);
+
+        of_populate_phandle_cache();
+
         if (ret) {
                 if (ret_apply)
                         devicetree_state_flags |= DTSF_REVERT_FAIL;
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/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 781aa03aeede..29a05759a294 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -363,7 +363,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
         resource_list_for_each_entry_safe(win, tmp, &bridge->windows) {
                 switch (resource_type(win->res)) {
                 case IORESOURCE_IO:
-                        ret = pci_remap_iospace(win->res, pp->io_base);
+                        ret = devm_pci_remap_iospace(dev, win->res,
+                                                     pp->io_base);
                         if (ret) {
                                 dev_warn(dev, "Error %d: failed to map resource %pR\n",
                                          ret, win->res);
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index d3172d5d3d35..0fae816fba39 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -849,7 +849,7 @@ static int advk_pcie_parse_request_of_pci_ranges(struct advk_pcie *pcie)
                                              0, 0xF8000000, 0,
                                              lower_32_bits(res->start),
                                              OB_PCIE_IO);
-                        err = pci_remap_iospace(res, iobase);
+                        err = devm_pci_remap_iospace(dev, res, iobase);
                         if (err) {
                                 dev_warn(dev, "error %d: failed to map resource %pR\n",
                                          err, res);
diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c
index a1ebe9ed441f..bf5ece5d9291 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;
@@ -501,7 +503,7 @@ static int faraday_pci_probe(struct platform_device *pdev)
                                 dev_err(dev, "illegal IO mem size\n");
                                 return -EINVAL;
                         }
-                        ret = pci_remap_iospace(io, io_base);
+                        ret = devm_pci_remap_iospace(dev, io, io_base);
                         if (ret) {
                                 dev_warn(dev, "error %d: failed to map resource %pR\n",
                                          ret, io);
diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index 6cc5036ac83c..f6325f1a89e8 100644
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -1073,6 +1073,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
         struct pci_bus *pbus;
         struct pci_dev *pdev;
         struct cpumask *dest;
+        unsigned long flags;
         struct compose_comp_ctxt comp;
         struct tran_int_desc *int_desc;
         struct {
@@ -1164,14 +1165,15 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
                  * the channel callback directly when channel->target_cpu is
                  * the current CPU. When the higher level interrupt code
                  * calls us with interrupt enabled, let's add the
-                 * local_bh_disable()/enable() to avoid race.
+                 * local_irq_save()/restore() to avoid race:
+                 * hv_pci_onchannelcallback() can also run in tasklet.
                  */
-                local_bh_disable();
+                local_irq_save(flags);
 
                 if (hbus->hdev->channel->target_cpu == smp_processor_id())
                         hv_pci_onchannelcallback(hbus);
 
-                local_bh_enable();
+                local_irq_restore(flags);
 
                 if (hpdev->state == hv_pcichild_ejecting) {
                         dev_err_once(&hbus->hdev->device,
diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c
index 68b8bfbdb867..d219404bad92 100644
--- a/drivers/pci/controller/pci-v3-semi.c
+++ b/drivers/pci/controller/pci-v3-semi.c
@@ -537,7 +537,7 @@ static int v3_pci_setup_resource(struct v3_pci *v3,
                 v3->io_bus_addr = io->start - win->offset;
                 dev_dbg(dev, "I/O window %pR, bus addr %pap\n",
                         io, &v3->io_bus_addr);
-                ret = pci_remap_iospace(io, io_base);
+                ret = devm_pci_remap_iospace(dev, io, io_base);
                 if (ret) {
                         dev_warn(dev,
                                  "error %d: failed to map resource %pR\n",
diff --git a/drivers/pci/controller/pci-versatile.c b/drivers/pci/controller/pci-versatile.c
index 994f32061b32..f59ad2728c0b 100644
--- a/drivers/pci/controller/pci-versatile.c
+++ b/drivers/pci/controller/pci-versatile.c
@@ -82,7 +82,7 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev,
 
                 switch (resource_type(res)) {
                 case IORESOURCE_IO:
-                        err = pci_remap_iospace(res, iobase);
+                        err = devm_pci_remap_iospace(dev, res, iobase);
                         if (err) {
                                 dev_warn(dev, "error %d: failed to map resource %pR\n",
                                          err, res);
diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index d854d67e873c..ffda3e8b4742 100644
--- a/drivers/pci/controller/pci-xgene.c
+++ b/drivers/pci/controller/pci-xgene.c
@@ -423,7 +423,7 @@ static int xgene_pcie_map_ranges(struct xgene_pcie_port *port,
                 case IORESOURCE_IO:
                         xgene_pcie_setup_ob_reg(port, res, OMR3BARL, io_base,
                                                 res->start - window->offset);
-                        ret = pci_remap_iospace(res, io_base);
+                        ret = devm_pci_remap_iospace(dev, res, io_base);
                         if (ret < 0)
                                 return ret;
                         break;
diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index 0baabe30858f..861dda69f366 100644
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -1109,7 +1109,7 @@ static int mtk_pcie_request_resources(struct mtk_pcie *pcie)
         if (err < 0)
                 return err;
 
-        pci_remap_iospace(&pcie->pio, pcie->io.start);
+        devm_pci_remap_iospace(dev, &pcie->pio, pcie->io.start);
 
         return 0;
 }
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..825fa24427a3 100644
--- a/drivers/pci/endpoint/pci-epf-core.c
+++ b/drivers/pci/endpoint/pci-epf-core.c
@@ -137,6 +137,20 @@ void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar)
 }
 EXPORT_SYMBOL_GPL(pci_epf_alloc_space);
 
+static void pci_epf_remove_cfs(struct pci_epf_driver *driver)
+{
+        struct config_group *group, *tmp;
+
+        if (!IS_ENABLED(CONFIG_PCI_ENDPOINT_CONFIGFS))
+                return;
+
+        mutex_lock(&pci_epf_mutex);
+        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);
+}
+
 /**
  * pci_epf_unregister_driver() - unregister the PCI EPF driver
  * @driver: the PCI EPF driver that has to be unregistered
@@ -145,17 +159,38 @@ EXPORT_SYMBOL_GPL(pci_epf_alloc_space);
  */
 void pci_epf_unregister_driver(struct pci_epf_driver *driver)
 {
-        struct config_group *group;
-
-        mutex_lock(&pci_epf_mutex);
-        list_for_each_entry(group, &driver->epf_group, group_entry)
-                pci_ep_cfs_remove_epf_group(group);
-        list_del(&driver->epf_group);
-        mutex_unlock(&pci_epf_mutex);
+        pci_epf_remove_cfs(driver);
         driver_unregister(&driver->driver);
 }
 EXPORT_SYMBOL_GPL(pci_epf_unregister_driver);
 
+static int pci_epf_add_cfs(struct pci_epf_driver *driver)
+{
+        struct config_group *group;
+        const struct pci_epf_device_id *id;
+
+        if (!IS_ENABLED(CONFIG_PCI_ENDPOINT_CONFIGFS))
+                return 0;
+
+        INIT_LIST_HEAD(&driver->epf_group);
+
+        id = driver->id_table;
+        while (id->name[0]) {
+                group = pci_ep_cfs_add_epf_group(id->name);
+                if (IS_ERR(group)) {
+                        pci_epf_remove_cfs(driver);
+                        return PTR_ERR(group);
+                }
+
+                mutex_lock(&pci_epf_mutex);
+                list_add_tail(&group->group_entry, &driver->epf_group);
+                mutex_unlock(&pci_epf_mutex);
+                id++;
+        }
+
+        return 0;
+}
+
 /**
  * __pci_epf_register_driver() - register a new PCI EPF driver
  * @driver: structure representing PCI EPF driver
@@ -167,8 +202,6 @@ int __pci_epf_register_driver(struct pci_epf_driver *driver,
                               struct module *owner)
 {
         int ret;
-        struct config_group *group;
-        const struct pci_epf_device_id *id;
 
         if (!driver->ops)
                 return -EINVAL;
@@ -183,16 +216,7 @@ int __pci_epf_register_driver(struct pci_epf_driver *driver,
         if (ret)
                 return ret;
 
-        INIT_LIST_HEAD(&driver->epf_group);
-
-        id = driver->id_table;
-        while (id->name[0]) {
-                group = pci_ep_cfs_add_epf_group(id->name);
-                mutex_lock(&pci_epf_mutex);
-                list_add_tail(&group->group_entry, &driver->epf_group);
-                mutex_unlock(&pci_epf_mutex);
-                id++;
-        }
+        pci_epf_add_cfs(driver);
 
         return 0;
 }
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/of.c b/drivers/pci/of.c
index d088c9147f10..69a60d6ebd73 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -612,7 +612,7 @@ int pci_parse_request_of_pci_ranges(struct device *dev,
 
                 switch (resource_type(res)) {
                 case IORESOURCE_IO:
-                        err = pci_remap_iospace(res, iobase);
+                        err = devm_pci_remap_iospace(dev, res, iobase);
                         if (err) {
                                 dev_warn(dev, "error %d: failed to map resource %pR\n",
                                          err, res);
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.c b/drivers/pci/pci.c
index 97acba712e4e..316496e99da9 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -3579,6 +3579,44 @@ void pci_unmap_iospace(struct resource *res)
 }
 EXPORT_SYMBOL(pci_unmap_iospace);
 
+static void devm_pci_unmap_iospace(struct device *dev, void *ptr)
+{
+        struct resource **res = ptr;
+
+        pci_unmap_iospace(*res);
+}
+
+/**
+ * devm_pci_remap_iospace - Managed pci_remap_iospace()
+ * @dev: Generic device to remap IO address for
+ * @res: Resource describing the I/O space
+ * @phys_addr: physical address of range to be mapped
+ *
+ * Managed pci_remap_iospace().  Map is automatically unmapped on driver
+ * detach.
+ */
+int devm_pci_remap_iospace(struct device *dev, const struct resource *res,
+                           phys_addr_t phys_addr)
+{
+        const struct resource **ptr;
+        int error;
+
+        ptr = devres_alloc(devm_pci_unmap_iospace, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return -ENOMEM;
+
+        error = pci_remap_iospace(res, phys_addr);
+        if (error) {
+                devres_free(ptr);
+        } else  {
+                *ptr = res;
+                devres_add(dev, ptr);
+        }
+
+        return error;
+}
+EXPORT_SYMBOL(devm_pci_remap_iospace);
+
 /**
  * devm_pci_remap_cfgspace - Managed pci_remap_cfgspace()
  * @dev: Generic device to remap IO address for
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/pci/pcie/err.c b/drivers/pci/pcie/err.c
index f7ce0cb0b0b7..f02e334beb45 100644
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -295,6 +295,7 @@ void pcie_do_fatal_recovery(struct pci_dev *dev, u32 service)
 
         parent = udev->subordinate;
         pci_lock_rescan_remove();
+        pci_dev_get(dev);
         list_for_each_entry_safe_reverse(pdev, temp, &parent->devices,
                                          bus_list) {
                 pci_dev_get(pdev);
@@ -328,6 +329,7 @@ void pcie_do_fatal_recovery(struct pci_dev *dev, u32 service)
                 pci_info(dev, "Device recovery from fatal error failed\n");
         }
 
+        pci_dev_put(dev);
         pci_unlock_rescan_remove();
 }
 
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/phy/broadcom/phy-brcm-usb-init.c b/drivers/phy/broadcom/phy-brcm-usb-init.c
index 1b7febc43da9..29d2c3b1913a 100644
--- a/drivers/phy/broadcom/phy-brcm-usb-init.c
+++ b/drivers/phy/broadcom/phy-brcm-usb-init.c
@@ -962,6 +962,10 @@ void brcm_usb_init_xhci(struct brcm_usb_init_params *params)
 {
         void __iomem *ctrl = params->ctrl_regs;
 
+        USB_CTRL_UNSET(ctrl, USB30_PCTL, PHY3_IDDQ_OVERRIDE);
+        /* 1 millisecond - for USB clocks to settle down */
+        usleep_range(1000, 2000);
+
         if (BRCM_ID(params->family_id) == 0x7366) {
                 /*
                  * The PHY3_SOFT_RESETB bits default to the wrong state.
diff --git a/drivers/phy/motorola/phy-mapphone-mdm6600.c b/drivers/phy/motorola/phy-mapphone-mdm6600.c
index 23705e1a0023..0075fb0bef8c 100644
--- a/drivers/phy/motorola/phy-mapphone-mdm6600.c
+++ b/drivers/phy/motorola/phy-mapphone-mdm6600.c
@@ -182,13 +182,13 @@ static void phy_mdm6600_status(struct work_struct *work)
         ddata = container_of(work, struct phy_mdm6600, status_work.work);
         dev = ddata->dev;
 
-        error = gpiod_get_array_value_cansleep(PHY_MDM6600_NR_CMD_LINES,
+        error = gpiod_get_array_value_cansleep(PHY_MDM6600_NR_STATUS_LINES,
                                                ddata->status_gpios->desc,
                                                values);
         if (error)
                 return;
 
-        for (i = 0; i < PHY_MDM6600_NR_CMD_LINES; i++) {
+        for (i = 0; i < PHY_MDM6600_NR_STATUS_LINES; i++) {
                 val |= values[i] << i;
                 dev_dbg(ddata->dev, "XXX %s: i: %i values[i]: %i val: %i\n",
                         __func__, i, values[i], val);
diff --git a/drivers/pinctrl/bcm/pinctrl-nsp-mux.c b/drivers/pinctrl/bcm/pinctrl-nsp-mux.c
index 35c17653c694..87618a4e90e4 100644
--- a/drivers/pinctrl/bcm/pinctrl-nsp-mux.c
+++ b/drivers/pinctrl/bcm/pinctrl-nsp-mux.c
@@ -460,8 +460,8 @@ static int nsp_pinmux_enable(struct pinctrl_dev *pctrl_dev,
         const struct nsp_pin_function *func;
         const struct nsp_pin_group *grp;
 
-        if (grp_select > pinctrl->num_groups ||
-                func_select > pinctrl->num_functions)
+        if (grp_select >= pinctrl->num_groups ||
+            func_select >= pinctrl->num_functions)
                 return -EINVAL;
 
         func = &pinctrl->functions[func_select];
@@ -577,6 +577,8 @@ static int nsp_pinmux_probe(struct platform_device *pdev)
                 return PTR_ERR(pinctrl->base0);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (!res)
+                return -EINVAL;
         pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start,
                                               resource_size(res));
         if (!pinctrl->base1) {
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7622.c b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
index e3f1ab2290fc..4c4740ffeb9c 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
@@ -1424,7 +1424,7 @@ static struct pinctrl_desc mtk_desc = {
 
 static int mtk_gpio_get(struct gpio_chip *chip, unsigned int gpio)
 {
-        struct mtk_pinctrl *hw = dev_get_drvdata(chip->parent);
+        struct mtk_pinctrl *hw = gpiochip_get_data(chip);
         int value, err;
 
         err = mtk_hw_get_value(hw, gpio, PINCTRL_PIN_REG_DI, &value);
@@ -1436,7 +1436,7 @@ static int mtk_gpio_get(struct gpio_chip *chip, unsigned int gpio)
 
 static void mtk_gpio_set(struct gpio_chip *chip, unsigned int gpio, int value)
 {
-        struct mtk_pinctrl *hw = dev_get_drvdata(chip->parent);
+        struct mtk_pinctrl *hw = gpiochip_get_data(chip);
 
         mtk_hw_set_value(hw, gpio, PINCTRL_PIN_REG_DO, !!value);
 }
@@ -1508,11 +1508,20 @@ static int mtk_build_gpiochip(struct mtk_pinctrl *hw, struct device_node *np)
         if (ret < 0)
                 return ret;
 
-        ret = gpiochip_add_pin_range(chip, dev_name(hw->dev), 0, 0,
-                                     chip->ngpio);
-        if (ret < 0) {
-                gpiochip_remove(chip);
-                return ret;
+        /* Just for backward compatible for these old pinctrl nodes without
+         * "gpio-ranges" property. Otherwise, called directly from a
+         * DeviceTree-supported pinctrl driver is DEPRECATED.
+         * Please see Section 2.1 of
+         * Documentation/devicetree/bindings/gpio/gpio.txt on how to
+         * bind pinctrl and gpio drivers via the "gpio-ranges" property.
+         */
+        if (!of_find_property(np, "gpio-ranges", NULL)) {
+                ret = gpiochip_add_pin_range(chip, dev_name(hw->dev), 0, 0,
+                                             chip->ngpio);
+                if (ret < 0) {
+                        gpiochip_remove(chip);
+                        return ret;
+                }
         }
 
         return 0;
@@ -1695,15 +1704,16 @@ static int mtk_pinctrl_probe(struct platform_device *pdev)
         mtk_desc.custom_conf_items = mtk_conf_items;
 #endif
 
-        hw->pctrl = devm_pinctrl_register(&pdev->dev, &mtk_desc, hw);
-        if (IS_ERR(hw->pctrl))
-                return PTR_ERR(hw->pctrl);
+        err = devm_pinctrl_register_and_init(&pdev->dev, &mtk_desc, hw,
+                                             &hw->pctrl);
+        if (err)
+                return err;
 
         /* Setup groups descriptions per SoC types */
         err = mtk_build_groups(hw);
         if (err) {
                 dev_err(&pdev->dev, "Failed to build groups\n");
-                return 0;
+                return err;
         }
 
         /* Setup functions descriptions per SoC types */
@@ -1713,17 +1723,25 @@ static int mtk_pinctrl_probe(struct platform_device *pdev)
                 return err;
         }
 
-        err = mtk_build_gpiochip(hw, pdev->dev.of_node);
-        if (err) {
-                dev_err(&pdev->dev, "Failed to add gpio_chip\n");
+        /* For able to make pinctrl_claim_hogs, we must not enable pinctrl
+         * until all groups and functions are being added one.
+         */
+        err = pinctrl_enable(hw->pctrl);
+        if (err)
                 return err;
-        }
 
         err = mtk_build_eint(hw, pdev);
         if (err)
                 dev_warn(&pdev->dev,
                          "Failed to add EINT, but pinctrl still can work\n");
 
+        /* Build gpiochip should be after pinctrl_enable is done */
+        err = mtk_build_gpiochip(hw, pdev->dev.of_node);
+        if (err) {
+                dev_err(&pdev->dev, "Failed to add gpio_chip\n");
+                return err;
+        }
+
         platform_set_drvdata(pdev, hw);
 
         return 0;
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
index a1d7156d0a43..6a1b6058b991 100644
--- a/drivers/pinctrl/pinctrl-ingenic.c
+++ b/drivers/pinctrl/pinctrl-ingenic.c
@@ -536,7 +536,7 @@ static int ingenic_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev,
                 ingenic_config_pin(jzpc, pin, JZ4770_GPIO_PAT1, input);
         } else {
                 ingenic_config_pin(jzpc, pin, JZ4740_GPIO_SELECT, false);
-                ingenic_config_pin(jzpc, pin, JZ4740_GPIO_DIR, input);
+                ingenic_config_pin(jzpc, pin, JZ4740_GPIO_DIR, !input);
                 ingenic_config_pin(jzpc, pin, JZ4740_GPIO_FUNC, false);
         }
 
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77970.c b/drivers/pinctrl/sh-pfc/pfc-r8a77970.c
index b02caf316711..eeb58b3bbc9a 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77970.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a77970.c
@@ -21,15 +21,13 @@
 #include "core.h"
 #include "sh_pfc.h"
 
-#define CFG_FLAGS SH_PFC_PIN_CFG_DRIVE_STRENGTH
-
 #define CPU_ALL_PORT(fn, sfx)                                           \
-        PORT_GP_CFG_22(0, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
-        PORT_GP_CFG_28(1, fn, sfx, CFG_FLAGS),                          \
-        PORT_GP_CFG_17(2, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
-        PORT_GP_CFG_17(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \
-        PORT_GP_CFG_6(4,  fn, sfx, CFG_FLAGS),                          \
-        PORT_GP_CFG_15(5, fn, sfx, CFG_FLAGS)
+        PORT_GP_CFG_22(0, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE),          \
+        PORT_GP_28(1, fn, sfx),                                         \
+        PORT_GP_CFG_17(2, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE),          \
+        PORT_GP_CFG_17(3, fn, sfx, SH_PFC_PIN_CFG_IO_VOLTAGE),          \
+        PORT_GP_6(4,  fn, sfx),                                         \
+        PORT_GP_15(5, fn, sfx)
 /*
  * F_() : just information
  * FM() : macro for FN_xxx / xxx_MARK
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index f1fa8612db40..06978c14c83b 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -2185,7 +2185,7 @@ static int __init dell_init(void)
                 dell_fill_request(&buffer, token->location, 0, 0, 0);
                 ret = dell_send_request(&buffer,
                                         CLASS_TOKEN_READ, SELECT_TOKEN_AC);
-                if (ret)
+                if (ret == 0)
                         max_intensity = buffer.output[3];
         }
 
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index 547dbdac9d54..01b0e2bb3319 100644
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -89,6 +89,7 @@ int ptp_set_pinfunc(struct ptp_clock *ptp, unsigned int pin,
         case PTP_PF_PHYSYNC:
                 if (chan != 0)
                         return -EINVAL;
+                break;
         default:
                 return -EINVAL;
         }
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 6d4012dd6922..bac1eeb3d312 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -265,8 +265,10 @@ int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
                         return err;
 
                 /* full-function RTCs won't have such missing fields */
-                if (rtc_valid_tm(&alarm->time) == 0)
+                if (rtc_valid_tm(&alarm->time) == 0) {
+                        rtc_add_offset(rtc, &alarm->time);
                         return 0;
+                }
 
                 /* get the "after" timestamp, to detect wrapped fields */
                 err = rtc_read_time(rtc, &now);
@@ -409,7 +411,6 @@ static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
         if (err)
                 return err;
 
-        rtc_subtract_offset(rtc, &alarm->time);
         scheduled = rtc_tm_to_time64(&alarm->time);
 
         /* Make sure we're not setting alarms in the past */
@@ -426,6 +427,8 @@ static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
          * over right here, before we set the alarm.
          */
 
+        rtc_subtract_offset(rtc, &alarm->time);
+
         if (!rtc->ops)
                 err = -ENODEV;
         else if (!rtc->ops->set_alarm)
@@ -467,7 +470,6 @@ int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
 
         mutex_unlock(&rtc->ops_lock);
 
-        rtc_add_offset(rtc, &alarm->time);
         return err;
 }
 EXPORT_SYMBOL_GPL(rtc_set_alarm);
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 097a4d4e2aba..1925aaf09093 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -367,10 +367,8 @@ static int vrtc_mrst_do_probe(struct device *dev, struct resource *iomem,
         }
 
         retval = rtc_register_device(mrst_rtc.rtc);
-        if (retval) {
-                retval = PTR_ERR(mrst_rtc.rtc);
+        if (retval)
                 goto cleanup0;
-        }
 
         dev_dbg(dev, "initialised\n");
         return 0;
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index d3a38c421503..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
  */
@@ -3115,8 +3124,8 @@ static int dasd_alloc_queue(struct dasd_block *block)
 
         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.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);
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 976b6bd4fb05..de6b96036aa4 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -228,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. */
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/cxlflash/main.h b/drivers/scsi/cxlflash/main.h
index 2a3977823812..a39be94d110c 100644
--- a/drivers/scsi/cxlflash/main.h
+++ b/drivers/scsi/cxlflash/main.h
@@ -107,12 +107,12 @@ cxlflash_assign_ops(struct dev_dependent_vals *ddv)
 {
         const struct cxlflash_backend_ops *ops = NULL;
 
-#ifdef CONFIG_OCXL
+#ifdef CONFIG_OCXL_BASE
         if (ddv->flags & CXLFLASH_OCXL_DEV)
                 ops = &cxlflash_ocxl_ops;
 #endif
 
-#ifdef CONFIG_CXL
+#ifdef CONFIG_CXL_BASE
         if (!(ddv->flags & CXLFLASH_OCXL_DEV))
                 ops = &cxlflash_cxl_ops;
 #endif
diff --git a/drivers/scsi/cxlflash/ocxl_hw.c b/drivers/scsi/cxlflash/ocxl_hw.c
index 0a95b5f25380..497a68389461 100644
--- a/drivers/scsi/cxlflash/ocxl_hw.c
+++ b/drivers/scsi/cxlflash/ocxl_hw.c
@@ -134,15 +134,14 @@ static struct file *ocxlflash_getfile(struct device *dev, const char *name,
                 rc = PTR_ERR(file);
                 dev_err(dev, "%s: alloc_file failed rc=%d\n",
                         __func__, rc);
-                goto err5;
+                path_put(&path);
+                goto err3;
         }
 
         file->f_flags = flags & (O_ACCMODE | O_NONBLOCK);
         file->private_data = priv;
 out:
         return file;
-err5:
-        path_put(&path);
 err4:
         iput(inode);
 err3:
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 15c7f3b6f35e..58bb70b886d7 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3440,11 +3440,11 @@ static void hpsa_get_enclosure_info(struct ctlr_info *h,
         struct ext_report_lun_entry *rle = &rlep->LUN[rle_index];
         u16 bmic_device_index = 0;
 
-        bmic_device_index = GET_BMIC_DRIVE_NUMBER(&rle->lunid[0]);
-
-        encl_dev->sas_address =
+        encl_dev->eli =
                 hpsa_get_enclosure_logical_identifier(h, scsi3addr);
 
+        bmic_device_index = GET_BMIC_DRIVE_NUMBER(&rle->lunid[0]);
+
         if (encl_dev->target == -1 || encl_dev->lun == -1) {
                 rc = IO_OK;
                 goto out;
@@ -9697,7 +9697,24 @@ hpsa_sas_get_linkerrors(struct sas_phy *phy)
 static int
 hpsa_sas_get_enclosure_identifier(struct sas_rphy *rphy, u64 *identifier)
 {
-        *identifier = rphy->identify.sas_address;
+        struct Scsi_Host *shost = phy_to_shost(rphy);
+        struct ctlr_info *h;
+        struct hpsa_scsi_dev_t *sd;
+
+        if (!shost)
+                return -ENXIO;
+
+        h = shost_to_hba(shost);
+
+        if (!h)
+                return -ENXIO;
+
+        sd = hpsa_find_device_by_sas_rphy(h, rphy);
+        if (!sd)
+                return -ENXIO;
+
+        *identifier = sd->eli;
+
         return 0;
 }
 
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index fb9f5e7f8209..59e023696fff 100644
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -68,6 +68,7 @@ struct hpsa_scsi_dev_t {
 #define RAID_CTLR_LUNID "\0\0\0\0\0\0\0\0"
         unsigned char device_id[16];    /* from inquiry pg. 0x83 */
         u64 sas_address;
+        u64 eli;                        /* from report diags. */
         unsigned char vendor[8];        /* bytes 8-15 of inquiry data */
         unsigned char model[16];        /* bytes 16-31 of inquiry data */
         unsigned char rev;              /* byte 2 of inquiry data */
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/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index 90394cef0f41..0a5dd5595dd3 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -3295,6 +3295,11 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)
 
         init_completion(&qedf->flogi_compl);
 
+        status = qed_ops->common->update_drv_state(qedf->cdev, true);
+        if (status)
+                QEDF_ERR(&(qedf->dbg_ctx),
+                        "Failed to send drv state to MFW.\n");
+
         memset(&link_params, 0, sizeof(struct qed_link_params));
         link_params.link_up = true;
         status = qed_ops->common->set_link(qedf->cdev, &link_params);
@@ -3343,6 +3348,7 @@ static int qedf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 static void __qedf_remove(struct pci_dev *pdev, int mode)
 {
         struct qedf_ctx *qedf;
+        int rc;
 
         if (!pdev) {
                 QEDF_ERR(NULL, "pdev is NULL.\n");
@@ -3437,6 +3443,12 @@ static void __qedf_remove(struct pci_dev *pdev, int mode)
                 qed_ops->common->set_power_state(qedf->cdev, PCI_D0);
                 pci_set_drvdata(pdev, NULL);
         }
+
+        rc = qed_ops->common->update_drv_state(qedf->cdev, false);
+        if (rc)
+                QEDF_ERR(&(qedf->dbg_ctx),
+                        "Failed to send drv state to MFW.\n");
+
         qed_ops->common->slowpath_stop(qedf->cdev);
         qed_ops->common->remove(qedf->cdev);
 
diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
index cf274a79e77a..091ec1207bea 100644
--- a/drivers/scsi/qedi/qedi_main.c
+++ b/drivers/scsi/qedi/qedi_main.c
@@ -2273,6 +2273,7 @@ kset_free:
 static void __qedi_remove(struct pci_dev *pdev, int mode)
 {
         struct qedi_ctx *qedi = pci_get_drvdata(pdev);
+        int rval;
 
         if (qedi->tmf_thread) {
                 flush_workqueue(qedi->tmf_thread);
@@ -2302,6 +2303,10 @@ static void __qedi_remove(struct pci_dev *pdev, int mode)
         if (mode == QEDI_MODE_NORMAL)
                 qedi_free_iscsi_pf_param(qedi);
 
+        rval = qedi_ops->common->update_drv_state(qedi->cdev, false);
+        if (rval)
+                QEDI_ERR(&qedi->dbg_ctx, "Failed to send drv state to MFW\n");
+
         if (!test_bit(QEDI_IN_OFFLINE, &qedi->flags)) {
                 qedi_ops->common->slowpath_stop(qedi->cdev);
                 qedi_ops->common->remove(qedi->cdev);
@@ -2576,6 +2581,12 @@ static int __qedi_probe(struct pci_dev *pdev, int mode)
                 if (qedi_setup_boot_info(qedi))
                         QEDI_ERR(&qedi->dbg_ctx,
                                  "No iSCSI boot target configured\n");
+
+                rc = qedi_ops->common->update_drv_state(qedi->cdev, true);
+                if (rc)
+                        QEDI_ERR(&qedi->dbg_ctx,
+                                 "Failed to send drv state to MFW\n");
+
         }
 
         return 0;
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 9442e18aef6f..0f94b1d62d3f 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -361,6 +361,8 @@ struct ct_arg {
         dma_addr_t      rsp_dma;
         u32             req_size;
         u32             rsp_size;
+        u32             req_allocated_size;
+        u32             rsp_allocated_size;
         void            *req;
         void            *rsp;
         port_id_t       id;
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 4bc2b66b299f..2c35b0b2baa0 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -556,7 +556,7 @@ err2:
                 /* please ignore kernel warning. otherwise, we have mem leak. */
                 if (sp->u.iocb_cmd.u.ctarg.req) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                            sizeof(struct ct_sns_pkt),
+                            sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                             sp->u.iocb_cmd.u.ctarg.req,
                             sp->u.iocb_cmd.u.ctarg.req_dma);
                         sp->u.iocb_cmd.u.ctarg.req = NULL;
@@ -564,7 +564,7 @@ err2:
 
                 if (sp->u.iocb_cmd.u.ctarg.rsp) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                            sizeof(struct ct_sns_pkt),
+                            sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                             sp->u.iocb_cmd.u.ctarg.rsp,
                             sp->u.iocb_cmd.u.ctarg.rsp_dma);
                         sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -617,6 +617,7 @@ static int qla_async_rftid(scsi_qla_host_t *vha, port_id_t *d_id)
         sp->u.iocb_cmd.u.ctarg.req = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.req_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.req) {
                 ql_log(ql_log_warn, vha, 0xd041,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -627,6 +628,7 @@ static int qla_async_rftid(scsi_qla_host_t *vha, port_id_t *d_id)
         sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.rsp_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                 ql_log(ql_log_warn, vha, 0xd042,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -712,6 +714,7 @@ static int qla_async_rffid(scsi_qla_host_t *vha, port_id_t *d_id,
         sp->u.iocb_cmd.u.ctarg.req = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.req_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.req) {
                 ql_log(ql_log_warn, vha, 0xd041,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -722,6 +725,7 @@ static int qla_async_rffid(scsi_qla_host_t *vha, port_id_t *d_id,
         sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.rsp_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                 ql_log(ql_log_warn, vha, 0xd042,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -802,6 +806,7 @@ static int qla_async_rnnid(scsi_qla_host_t *vha, port_id_t *d_id,
         sp->u.iocb_cmd.u.ctarg.req = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.req_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.req) {
                 ql_log(ql_log_warn, vha, 0xd041,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -812,6 +817,7 @@ static int qla_async_rnnid(scsi_qla_host_t *vha, port_id_t *d_id,
         sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.rsp_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                 ql_log(ql_log_warn, vha, 0xd042,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -909,6 +915,7 @@ static int qla_async_rsnn_nn(scsi_qla_host_t *vha)
         sp->u.iocb_cmd.u.ctarg.req = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.req_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.req) {
                 ql_log(ql_log_warn, vha, 0xd041,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -919,6 +926,7 @@ static int qla_async_rsnn_nn(scsi_qla_host_t *vha)
         sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev,
             sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.rsp_dma,
             GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                 ql_log(ql_log_warn, vha, 0xd042,
                     "%s: Failed to allocate ct_sns request.\n",
@@ -3388,14 +3396,14 @@ void qla24xx_sp_unmap(scsi_qla_host_t *vha, srb_t *sp)
 {
         if (sp->u.iocb_cmd.u.ctarg.req) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                        sizeof(struct ct_sns_pkt),
+                        sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                         sp->u.iocb_cmd.u.ctarg.req,
                         sp->u.iocb_cmd.u.ctarg.req_dma);
                 sp->u.iocb_cmd.u.ctarg.req = NULL;
         }
         if (sp->u.iocb_cmd.u.ctarg.rsp) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                        sizeof(struct ct_sns_pkt),
+                        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                         sp->u.iocb_cmd.u.ctarg.rsp,
                         sp->u.iocb_cmd.u.ctarg.rsp_dma);
                 sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -3596,14 +3604,14 @@ static void qla2x00_async_gpnid_sp_done(void *s, int res)
                 /* please ignore kernel warning. otherwise, we have mem leak. */
                 if (sp->u.iocb_cmd.u.ctarg.req) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                                sizeof(struct ct_sns_pkt),
+                                sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                                 sp->u.iocb_cmd.u.ctarg.req,
                                 sp->u.iocb_cmd.u.ctarg.req_dma);
                         sp->u.iocb_cmd.u.ctarg.req = NULL;
                 }
                 if (sp->u.iocb_cmd.u.ctarg.rsp) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                                sizeof(struct ct_sns_pkt),
+                                sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                                 sp->u.iocb_cmd.u.ctarg.rsp,
                                 sp->u.iocb_cmd.u.ctarg.rsp_dma);
                         sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -3654,6 +3662,7 @@ int qla24xx_async_gpnid(scsi_qla_host_t *vha, port_id_t *id)
         sp->u.iocb_cmd.u.ctarg.req = dma_alloc_coherent(&vha->hw->pdev->dev,
                 sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.req_dma,
                 GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.req) {
                 ql_log(ql_log_warn, vha, 0xd041,
                     "Failed to allocate ct_sns request.\n");
@@ -3663,6 +3672,7 @@ int qla24xx_async_gpnid(scsi_qla_host_t *vha, port_id_t *id)
         sp->u.iocb_cmd.u.ctarg.rsp = dma_alloc_coherent(&vha->hw->pdev->dev,
                 sizeof(struct ct_sns_pkt), &sp->u.iocb_cmd.u.ctarg.rsp_dma,
                 GFP_KERNEL);
+        sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
         if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                 ql_log(ql_log_warn, vha, 0xd042,
                     "Failed to allocate ct_sns request.\n");
@@ -4142,14 +4152,14 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res)
                          */
                         if (sp->u.iocb_cmd.u.ctarg.req) {
                                 dma_free_coherent(&vha->hw->pdev->dev,
-                                    sizeof(struct ct_sns_pkt),
+                                    sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                                     sp->u.iocb_cmd.u.ctarg.req,
                                     sp->u.iocb_cmd.u.ctarg.req_dma);
                                 sp->u.iocb_cmd.u.ctarg.req = NULL;
                         }
                         if (sp->u.iocb_cmd.u.ctarg.rsp) {
                                 dma_free_coherent(&vha->hw->pdev->dev,
-                                    sizeof(struct ct_sns_pkt),
+                                    sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                                     sp->u.iocb_cmd.u.ctarg.rsp,
                                     sp->u.iocb_cmd.u.ctarg.rsp_dma);
                                 sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -4179,14 +4189,14 @@ static void qla2x00_async_gpnft_gnnft_sp_done(void *s, int res)
                 /* please ignore kernel warning. Otherwise, we have mem leak. */
                 if (sp->u.iocb_cmd.u.ctarg.req) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                            sizeof(struct ct_sns_pkt),
+                            sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                             sp->u.iocb_cmd.u.ctarg.req,
                             sp->u.iocb_cmd.u.ctarg.req_dma);
                         sp->u.iocb_cmd.u.ctarg.req = NULL;
                 }
                 if (sp->u.iocb_cmd.u.ctarg.rsp) {
                         dma_free_coherent(&vha->hw->pdev->dev,
-                            sizeof(struct ct_sns_pkt),
+                            sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                             sp->u.iocb_cmd.u.ctarg.rsp,
                             sp->u.iocb_cmd.u.ctarg.rsp_dma);
                         sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -4281,14 +4291,14 @@ static int qla24xx_async_gnnft(scsi_qla_host_t *vha, struct srb *sp,
 done_free_sp:
         if (sp->u.iocb_cmd.u.ctarg.req) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                    sizeof(struct ct_sns_pkt),
+                    sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                     sp->u.iocb_cmd.u.ctarg.req,
                     sp->u.iocb_cmd.u.ctarg.req_dma);
                 sp->u.iocb_cmd.u.ctarg.req = NULL;
         }
         if (sp->u.iocb_cmd.u.ctarg.rsp) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                    sizeof(struct ct_sns_pkt),
+                    sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                     sp->u.iocb_cmd.u.ctarg.rsp,
                     sp->u.iocb_cmd.u.ctarg.rsp_dma);
                 sp->u.iocb_cmd.u.ctarg.rsp = NULL;
@@ -4349,6 +4359,7 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp)
                 sp->u.iocb_cmd.u.ctarg.req = dma_zalloc_coherent(
                         &vha->hw->pdev->dev, sizeof(struct ct_sns_pkt),
                         &sp->u.iocb_cmd.u.ctarg.req_dma, GFP_KERNEL);
+                sp->u.iocb_cmd.u.ctarg.req_allocated_size = sizeof(struct ct_sns_pkt);
                 if (!sp->u.iocb_cmd.u.ctarg.req) {
                         ql_log(ql_log_warn, vha, 0xffff,
                             "Failed to allocate ct_sns request.\n");
@@ -4366,6 +4377,7 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp)
                 sp->u.iocb_cmd.u.ctarg.rsp = dma_zalloc_coherent(
                         &vha->hw->pdev->dev, rspsz,
                         &sp->u.iocb_cmd.u.ctarg.rsp_dma, GFP_KERNEL);
+                sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = sizeof(struct ct_sns_pkt);
                 if (!sp->u.iocb_cmd.u.ctarg.rsp) {
                         ql_log(ql_log_warn, vha, 0xffff,
                             "Failed to allocate ct_sns request.\n");
@@ -4425,14 +4437,14 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp)
 done_free_sp:
         if (sp->u.iocb_cmd.u.ctarg.req) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                    sizeof(struct ct_sns_pkt),
+                    sp->u.iocb_cmd.u.ctarg.req_allocated_size,
                     sp->u.iocb_cmd.u.ctarg.req,
                     sp->u.iocb_cmd.u.ctarg.req_dma);
                 sp->u.iocb_cmd.u.ctarg.req = NULL;
         }
         if (sp->u.iocb_cmd.u.ctarg.rsp) {
                 dma_free_coherent(&vha->hw->pdev->dev,
-                    sizeof(struct ct_sns_pkt),
+                    sp->u.iocb_cmd.u.ctarg.rsp_allocated_size,
                     sp->u.iocb_cmd.u.ctarg.rsp,
                     sp->u.iocb_cmd.u.ctarg.rsp_dma);
                 sp->u.iocb_cmd.u.ctarg.rsp = NULL;
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 7b675243bd16..db0e3279e07a 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -591,12 +591,14 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha,
                                 conflict_fcport =
                                         qla2x00_find_fcport_by_wwpn(vha,
                                             e->port_name, 0);
-                                ql_dbg(ql_dbg_disc, vha, 0x20e6,
-                                    "%s %d %8phC post del sess\n",
-                                    __func__, __LINE__,
-                                    conflict_fcport->port_name);
-                                qlt_schedule_sess_for_deletion
-                                        (conflict_fcport);
+                                if (conflict_fcport) {
+                                        qlt_schedule_sess_for_deletion
+                                                (conflict_fcport);
+                                        ql_dbg(ql_dbg_disc, vha, 0x20e6,
+                                            "%s %d %8phC post del sess\n",
+                                            __func__, __LINE__,
+                                            conflict_fcport->port_name);
+                                }
                         }
 
                         /* FW already picked this loop id for another fcport */
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index e881fce7477a..9f309e572be4 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3180,6 +3180,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
             "req->req_q_in=%p req->req_q_out=%p rsp->rsp_q_in=%p rsp->rsp_q_out=%p.\n",
             req->req_q_in, req->req_q_out, rsp->rsp_q_in, rsp->rsp_q_out);
 
+        ha->wq = alloc_workqueue("qla2xxx_wq", 0, 0);
+
         if (ha->isp_ops->initialize_adapter(base_vha)) {
                 ql_log(ql_log_fatal, base_vha, 0x00d6,
                     "Failed to initialize adapter - Adapter flags %x.\n",
@@ -3216,8 +3218,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
             host->can_queue, base_vha->req,
             base_vha->mgmt_svr_loop_id, host->sg_tablesize);
 
-        ha->wq = alloc_workqueue("qla2xxx_wq", 0, 0);
-
         if (ha->mqenable) {
                 bool mq = false;
                 bool startit = false;
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_error.c b/drivers/scsi/scsi_error.c
index 8932ae81a15a..2715cdaa669c 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -296,6 +296,20 @@ enum blk_eh_timer_return scsi_times_out(struct request *req)
                 rtn = host->hostt->eh_timed_out(scmd);
 
         if (rtn == BLK_EH_DONE) {
+                /*
+                 * For blk-mq, we must set the request state to complete now
+                 * before sending the request to the scsi error handler. This
+                 * will prevent a use-after-free in the event the LLD manages
+                 * to complete the request before the error handler finishes
+                 * processing this timed out request.
+                 *
+                 * If the request was already completed, then the LLD beat the
+                 * time out handler from transferring the request to the scsi
+                 * error handler. In that case we can return immediately as no
+                 * further action is required.
+                 */
+                if (req->q->mq_ops && !blk_mq_mark_complete(req))
+                        return rtn;
                 if (scsi_abort_command(scmd) != SUCCESS) {
                         set_host_byte(scmd, DID_TIME_OUT);
                         scsi_eh_scmd_add(scmd);
diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index a14fef11776e..2bf3bf73886e 100644
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -391,7 +391,8 @@ static int sd_zbc_check_capacity(struct scsi_disk *sdkp, unsigned char *buf)
  * Check that all zones of the device are equal. The last zone can however
  * be smaller. The zone size must also be a power of two number of LBAs.
  *
- * Returns the zone size in bytes upon success or an error code upon failure.
+ * Returns the zone size in number of blocks upon success or an error code
+ * upon failure.
  */
 static s64 sd_zbc_check_zone_size(struct scsi_disk *sdkp)
 {
@@ -401,7 +402,7 @@ static s64 sd_zbc_check_zone_size(struct scsi_disk *sdkp)
         unsigned char *rec;
         unsigned int buf_len;
         unsigned int list_length;
-        int ret;
+        s64 ret;
         u8 same;
 
         /* Get a buffer */
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/soc/imx/gpc.c b/drivers/soc/imx/gpc.c
index 32f0748fd067..0097a939487f 100644
--- a/drivers/soc/imx/gpc.c
+++ b/drivers/soc/imx/gpc.c
@@ -27,9 +27,16 @@
 #define GPC_PGC_SW2ISO_SHIFT    0x8
 #define GPC_PGC_SW_SHIFT        0x0
 
+#define GPC_PGC_PCI_PDN         0x200
+#define GPC_PGC_PCI_SR          0x20c
+
 #define GPC_PGC_GPU_PDN         0x260
 #define GPC_PGC_GPU_PUPSCR      0x264
 #define GPC_PGC_GPU_PDNSCR      0x268
+#define GPC_PGC_GPU_SR          0x26c
+
+#define GPC_PGC_DISP_PDN        0x240
+#define GPC_PGC_DISP_SR         0x24c
 
 #define GPU_VPU_PUP_REQ         BIT(1)
 #define GPU_VPU_PDN_REQ         BIT(0)
@@ -318,10 +325,24 @@ static const struct of_device_id imx_gpc_dt_ids[] = {
         { }
 };
 
+static const struct regmap_range yes_ranges[] = {
+        regmap_reg_range(GPC_CNTR, GPC_CNTR),
+        regmap_reg_range(GPC_PGC_PCI_PDN, GPC_PGC_PCI_SR),
+        regmap_reg_range(GPC_PGC_GPU_PDN, GPC_PGC_GPU_SR),
+        regmap_reg_range(GPC_PGC_DISP_PDN, GPC_PGC_DISP_SR),
+};
+
+static const struct regmap_access_table access_table = {
+        .yes_ranges     = yes_ranges,
+        .n_yes_ranges   = ARRAY_SIZE(yes_ranges),
+};
+
 static const struct regmap_config imx_gpc_regmap_config = {
         .reg_bits = 32,
         .val_bits = 32,
         .reg_stride = 4,
+        .rd_table = &access_table,
+        .wr_table = &access_table,
         .max_register = 0x2ac,
 };
 
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/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
index 0ecffab52ec2..abdaf7cf8162 100644
--- a/drivers/staging/ks7010/ks_hostif.c
+++ b/drivers/staging/ks7010/ks_hostif.c
@@ -1842,15 +1842,15 @@ void hostif_sme_multicast_set(struct ks_wlan_private *priv)
         memset(set_address, 0, NIC_MAX_MCAST_LIST * ETH_ALEN);
 
         if (dev->flags & IFF_PROMISC) {
-                hostif_mib_set_request_bool(priv, LOCAL_MULTICAST_FILTER,
-                                            MCAST_FILTER_PROMISC);
+                hostif_mib_set_request_int(priv, LOCAL_MULTICAST_FILTER,
+                                           MCAST_FILTER_PROMISC);
                 goto spin_unlock;
         }
 
         if ((netdev_mc_count(dev) > NIC_MAX_MCAST_LIST) ||
             (dev->flags & IFF_ALLMULTI)) {
-                hostif_mib_set_request_bool(priv, LOCAL_MULTICAST_FILTER,
-                                            MCAST_FILTER_MCASTALL);
+                hostif_mib_set_request_int(priv, LOCAL_MULTICAST_FILTER,
+                                           MCAST_FILTER_MCASTALL);
                 goto spin_unlock;
         }
 
@@ -1866,8 +1866,8 @@ void hostif_sme_multicast_set(struct ks_wlan_private *priv)
                                                ETH_ALEN * mc_count);
         } else {
                 priv->sme_i.sme_flag |= SME_MULTICAST;
-                hostif_mib_set_request_bool(priv, LOCAL_MULTICAST_FILTER,
-                                            MCAST_FILTER_MCAST);
+                hostif_mib_set_request_int(priv, LOCAL_MULTICAST_FILTER,
+                                           MCAST_FILTER_MCAST);
         }
 
 spin_unlock:
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index a3a83424a926..16478fe9e3f8 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -11,7 +11,6 @@
  * (at your option) any later version.
  */
 
-#include <asm/cacheflush.h>
 #include <linux/clk.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
@@ -24,6 +23,8 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-mc.h>
 
+#include <asm/cacheflush.h>
+
 #include "iss_video.h"
 #include "iss.h"
 
diff --git a/drivers/staging/rtl8188eu/Kconfig b/drivers/staging/rtl8188eu/Kconfig
index 673fdce25530..ff7832798a77 100644
--- a/drivers/staging/rtl8188eu/Kconfig
+++ b/drivers/staging/rtl8188eu/Kconfig
@@ -7,7 +7,6 @@ config R8188EU
         select LIB80211
         select LIB80211_CRYPT_WEP
         select LIB80211_CRYPT_CCMP
-        select LIB80211_CRYPT_TKIP
         ---help---
         This option adds the Realtek RTL8188EU USB device such as TP-Link TL-WN725N.
         If built as a module, it will be called r8188eu.
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index 05936a45eb93..c6857a5be12a 100644
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -23,7 +23,6 @@
 #include <mon.h>
 #include <wifi.h>
 #include <linux/vmalloc.h>
-#include <net/lib80211.h>
 
 #define ETHERNET_HEADER_SIZE    14      /*  Ethernet Header Length */
 #define LLC_HEADER_SIZE                 6       /*  LLC Header Length */
@@ -221,20 +220,31 @@ u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter)
 static int recvframe_chkmic(struct adapter *adapter,
                             struct recv_frame *precvframe)
 {
-        int res = _SUCCESS;
-        struct rx_pkt_attrib *prxattrib = &precvframe->attrib;
-        struct sta_info *stainfo = rtw_get_stainfo(&adapter->stapriv, prxattrib->ta);
+        int     i, res = _SUCCESS;
+        u32     datalen;
+        u8      miccode[8];
+        u8      bmic_err = false, brpt_micerror = true;
+        u8      *pframe, *payload, *pframemic;
+        u8      *mickey;
+        struct  sta_info                *stainfo;
+        struct  rx_pkt_attrib   *prxattrib = &precvframe->attrib;
+        struct  security_priv   *psecuritypriv = &adapter->securitypriv;
+
+        struct mlme_ext_priv    *pmlmeext = &adapter->mlmeextpriv;
+        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
+
+        stainfo = rtw_get_stainfo(&adapter->stapriv, &prxattrib->ta[0]);
 
         if (prxattrib->encrypt == _TKIP_) {
+                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
+                         ("\n %s: prxattrib->encrypt==_TKIP_\n", __func__));
+                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
+                         ("\n %s: da=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+                          __func__, prxattrib->ra[0], prxattrib->ra[1], prxattrib->ra[2],
+                          prxattrib->ra[3], prxattrib->ra[4], prxattrib->ra[5]));
+
+                /* calculate mic code */
                 if (stainfo) {
-                        int key_idx;
-                        const int iv_len = 8, icv_len = 4, key_length = 32;
-                        struct sk_buff *skb = precvframe->pkt;
-                        u8 key[32], iv[8], icv[4], *pframe = skb->data;
-                        void *crypto_private = NULL;
-                        struct lib80211_crypto_ops *crypto_ops = try_then_request_module(lib80211_get_crypto_ops("TKIP"), "lib80211_crypt_tkip");
-                        struct security_priv *psecuritypriv = &adapter->securitypriv;
-
                         if (IS_MCAST(prxattrib->ra)) {
                                 if (!psecuritypriv) {
                                         res = _FAIL;
@@ -243,58 +253,115 @@ static int recvframe_chkmic(struct adapter *adapter,
                                         DBG_88E("\n %s: didn't install group key!!!!!!!!!!\n", __func__);
                                         goto exit;
                                 }
-                                key_idx = prxattrib->key_index;
-                                memcpy(key, psecuritypriv->dot118021XGrpKey[key_idx].skey, 16);
-                                memcpy(key + 16, psecuritypriv->dot118021XGrprxmickey[key_idx].skey, 16);
+                                mickey = &psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0];
+
+                                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
+                                         ("\n %s: bcmc key\n", __func__));
                         } else {
-                                key_idx = 0;
-                                memcpy(key, stainfo->dot118021x_UncstKey.skey, 16);
-                                memcpy(key + 16, stainfo->dot11tkiprxmickey.skey, 16);
+                                mickey = &stainfo->dot11tkiprxmickey.skey[0];
+                                RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
+                                         ("\n %s: unicast key\n", __func__));
                         }
 
-                        if (!crypto_ops) {
-                                res = _FAIL;
-                                goto exit_lib80211_tkip;
-                        }
+                        /* icv_len included the mic code */
+                        datalen = precvframe->pkt->len-prxattrib->hdrlen -
+                                  prxattrib->iv_len-prxattrib->icv_len-8;
+                        pframe = precvframe->pkt->data;
+                        payload = pframe+prxattrib->hdrlen+prxattrib->iv_len;
 
-                        memcpy(iv, pframe + prxattrib->hdrlen, iv_len);
-                        memcpy(icv, pframe + skb->len - icv_len, icv_len);
-                        memmove(pframe + iv_len, pframe, prxattrib->hdrlen);
+                        RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n prxattrib->iv_len=%d prxattrib->icv_len=%d\n", prxattrib->iv_len, prxattrib->icv_len));
+                        rtw_seccalctkipmic(mickey, pframe, payload, datalen, &miccode[0],
+                                           (unsigned char)prxattrib->priority); /* care the length of the data */
 
-                        skb_pull(skb, iv_len);
-                        skb_trim(skb, skb->len - icv_len);
+                        pframemic = payload+datalen;
 
-                        crypto_private = crypto_ops->init(key_idx);
-                        if (!crypto_private) {
-                                res = _FAIL;
-                                goto exit_lib80211_tkip;
-                        }
-                        if (crypto_ops->set_key(key, key_length, NULL, crypto_private) < 0) {
-                                res = _FAIL;
-                                goto exit_lib80211_tkip;
-                        }
-                        if (crypto_ops->decrypt_msdu(skb, key_idx, prxattrib->hdrlen, crypto_private)) {
-                                res = _FAIL;
-                                goto exit_lib80211_tkip;
+                        bmic_err = false;
+
+                        for (i = 0; i < 8; i++) {
+                                if (miccode[i] != *(pframemic+i)) {
+                                        RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
+                                                 ("%s: miccode[%d](%02x)!=*(pframemic+%d)(%02x) ",
+                                                  __func__, i, miccode[i], i, *(pframemic + i)));
+                                        bmic_err = true;
+                                }
                         }
 
-                        memmove(pframe, pframe + iv_len, prxattrib->hdrlen);
-                        skb_push(skb, iv_len);
-                        skb_put(skb, icv_len);
+                        if (bmic_err) {
+                                RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
+                                         ("\n *(pframemic-8)-*(pframemic-1)=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+                                         *(pframemic-8), *(pframemic-7), *(pframemic-6),
+                                         *(pframemic-5), *(pframemic-4), *(pframemic-3),
+                                         *(pframemic-2), *(pframemic-1)));
+                                RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
+                                         ("\n *(pframemic-16)-*(pframemic-9)=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+                                         *(pframemic-16), *(pframemic-15), *(pframemic-14),
+                                         *(pframemic-13), *(pframemic-12), *(pframemic-11),
+                                         *(pframemic-10), *(pframemic-9)));
+                                {
+                                        uint i;
 
-                        memcpy(pframe + prxattrib->hdrlen, iv, iv_len);
-                        memcpy(pframe + skb->len - icv_len, icv, icv_len);
+                                        RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
+                                                 ("\n ======demp packet (len=%d)======\n",
+                                                 precvframe->pkt->len));
+                                        for (i = 0; i < precvframe->pkt->len; i += 8) {
+                                                RT_TRACE(_module_rtl871x_recv_c_,
+                                                         _drv_err_,
+                                                         ("0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x",
+                                                         *(precvframe->pkt->data+i),
+                                                         *(precvframe->pkt->data+i+1),
+                                                         *(precvframe->pkt->data+i+2),
+                                                         *(precvframe->pkt->data+i+3),
+                                                         *(precvframe->pkt->data+i+4),
+                                                         *(precvframe->pkt->data+i+5),
+                                                         *(precvframe->pkt->data+i+6),
+                                                         *(precvframe->pkt->data+i+7)));
+                                        }
+                                        RT_TRACE(_module_rtl871x_recv_c_,
+                                                 _drv_err_,
+                                                 ("\n ====== demp packet end [len=%d]======\n",
+                                                 precvframe->pkt->len));
+                                        RT_TRACE(_module_rtl871x_recv_c_,
+                                                 _drv_err_,
+                                                 ("\n hrdlen=%d,\n",
+                                                 prxattrib->hdrlen));
+                                }
 
-exit_lib80211_tkip:
-                        if (crypto_ops && crypto_private)
-                                crypto_ops->deinit(crypto_private);
+                                RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
+                                         ("ra=0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x psecuritypriv->binstallGrpkey=%d ",
+                                         prxattrib->ra[0], prxattrib->ra[1], prxattrib->ra[2],
+                                         prxattrib->ra[3], prxattrib->ra[4], prxattrib->ra[5], psecuritypriv->binstallGrpkey));
+
+                                /*  double check key_index for some timing issue , */
+                                /*  cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue */
+                                if ((IS_MCAST(prxattrib->ra) == true)  && (prxattrib->key_index != pmlmeinfo->key_index))
+                                        brpt_micerror = false;
+
+                                if ((prxattrib->bdecrypted) && (brpt_micerror)) {
+                                        rtw_handle_tkip_mic_err(adapter, (u8)IS_MCAST(prxattrib->ra));
+                                        RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" mic error :prxattrib->bdecrypted=%d ", prxattrib->bdecrypted));
+                                        DBG_88E(" mic error :prxattrib->bdecrypted=%d\n", prxattrib->bdecrypted);
+                                } else {
+                                        RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" mic error :prxattrib->bdecrypted=%d ", prxattrib->bdecrypted));
+                                        DBG_88E(" mic error :prxattrib->bdecrypted=%d\n", prxattrib->bdecrypted);
+                                }
+                                res = _FAIL;
+                        } else {
+                                /* mic checked ok */
+                                if ((!psecuritypriv->bcheck_grpkey) && (IS_MCAST(prxattrib->ra))) {
+                                        psecuritypriv->bcheck_grpkey = true;
+                                        RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("psecuritypriv->bcheck_grpkey = true"));
+                                }
+                        }
                 } else {
                         RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
                                  ("%s: rtw_get_stainfo==NULL!!!\n", __func__));
                 }
+
+                skb_trim(precvframe->pkt, precvframe->pkt->len - 8);
         }
 
 exit:
+
         return res;
 }
 
diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c
index bfe0b217e679..67a2490f055e 100644
--- a/drivers/staging/rtl8188eu/core/rtw_security.c
+++ b/drivers/staging/rtl8188eu/core/rtw_security.c
@@ -650,71 +650,71 @@ u32	rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
         return res;
 }
 
+/* The hlen isn't include the IV */
 u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
-{
-        struct rx_pkt_attrib *prxattrib = &((struct recv_frame *)precvframe)->attrib;
-        u32 res = _SUCCESS;
+{                                                                                                                                       /*  exclude ICV */
+        u16 pnl;
+        u32 pnh;
+        u8   rc4key[16];
+        u8   ttkey[16];
+        u8      crc[4];
+        struct arc4context mycontext;
+        int                     length;
+
+        u8      *pframe, *payload, *iv, *prwskey;
+        union pn48 dot11txpn;
+        struct  sta_info                *stainfo;
+        struct  rx_pkt_attrib    *prxattrib = &((struct recv_frame *)precvframe)->attrib;
+        struct  security_priv   *psecuritypriv = &padapter->securitypriv;
+        u32             res = _SUCCESS;
+
+
+        pframe = (unsigned char *)((struct recv_frame *)precvframe)->pkt->data;
 
         /* 4 start to decrypt recvframe */
         if (prxattrib->encrypt == _TKIP_) {
-                struct sta_info *stainfo = rtw_get_stainfo(&padapter->stapriv, prxattrib->ta);
-
+                stainfo = rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]);
                 if (stainfo) {
-                        int key_idx;
-                        const int iv_len = 8, icv_len = 4, key_length = 32;
-                        void *crypto_private = NULL;
-                        struct sk_buff *skb = ((struct recv_frame *)precvframe)->pkt;
-                        u8 key[32], iv[8], icv[4], *pframe = skb->data;
-                        struct lib80211_crypto_ops *crypto_ops = try_then_request_module(lib80211_get_crypto_ops("TKIP"), "lib80211_crypt_tkip");
-                        struct security_priv *psecuritypriv = &padapter->securitypriv;
-
                         if (IS_MCAST(prxattrib->ra)) {
                                 if (!psecuritypriv->binstallGrpkey) {
                                         res = _FAIL;
                                         DBG_88E("%s:rx bc/mc packets, but didn't install group key!!!!!!!!!!\n", __func__);
                                         goto exit;
                                 }
-                                key_idx = prxattrib->key_index;
-                                memcpy(key, psecuritypriv->dot118021XGrpKey[key_idx].skey, 16);
-                                memcpy(key + 16, psecuritypriv->dot118021XGrprxmickey[key_idx].skey, 16);
+                                prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
                         } else {
-                                key_idx = 0;
-                                memcpy(key, stainfo->dot118021x_UncstKey.skey, 16);
-                                memcpy(key + 16, stainfo->dot11tkiprxmickey.skey, 16);
+                                RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));
+                                prwskey = &stainfo->dot118021x_UncstKey.skey[0];
                         }
 
-                        if (!crypto_ops) {
-                                res = _FAIL;
-                                goto exit_lib80211_tkip;
-                        }
+                        iv = pframe+prxattrib->hdrlen;
+                        payload = pframe+prxattrib->iv_len+prxattrib->hdrlen;
+                        length = ((struct recv_frame *)precvframe)->pkt->len-prxattrib->hdrlen-prxattrib->iv_len;
 
-                        memcpy(iv, pframe + prxattrib->hdrlen, iv_len);
-                        memcpy(icv, pframe + skb->len - icv_len, icv_len);
+                        GET_TKIP_PN(iv, dot11txpn);
 
-                        crypto_private = crypto_ops->init(key_idx);
-                        if (!crypto_private) {
-                                res = _FAIL;
-                                goto exit_lib80211_tkip;
-                        }
-                        if (crypto_ops->set_key(key, key_length, NULL, crypto_private) < 0) {
-                                res = _FAIL;
-                                goto exit_lib80211_tkip;
-                        }
-                        if (crypto_ops->decrypt_mpdu(skb, prxattrib->hdrlen, crypto_private)) {
-                                res = _FAIL;
-                                goto exit_lib80211_tkip;
-                        }
+                        pnl = (u16)(dot11txpn.val);
+                        pnh = (u32)(dot11txpn.val>>16);
 
-                        memmove(pframe, pframe + iv_len, prxattrib->hdrlen);
-                        skb_push(skb, iv_len);
-                        skb_put(skb, icv_len);
+                        phase1((u16 *)&ttkey[0], prwskey, &prxattrib->ta[0], pnh);
+                        phase2(&rc4key[0], prwskey, (unsigned short *)&ttkey[0], pnl);
 
-                        memcpy(pframe + prxattrib->hdrlen, iv, iv_len);
-                        memcpy(pframe + skb->len - icv_len, icv, icv_len);
+                        /* 4 decrypt payload include icv */
 
-exit_lib80211_tkip:
-                        if (crypto_ops && crypto_private)
-                                crypto_ops->deinit(crypto_private);
+                        arcfour_init(&mycontext, rc4key, 16);
+                        arcfour_encrypt(&mycontext, payload, payload, length);
+
+                        *((__le32 *)crc) = getcrc32(payload, length-4);
+
+                        if (crc[3] != payload[length-1] ||
+                            crc[2] != payload[length-2] ||
+                            crc[1] != payload[length-3] ||
+                            crc[0] != payload[length-4]) {
+                                RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
+                                         ("rtw_wep_decrypt:icv error crc (%4ph)!=payload (%4ph)\n",
+                                         &crc, &payload[length-4]));
+                                res = _FAIL;
+                        }
                 } else {
                         RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_decrypt: stainfo==NULL!!!\n"));
                         res = _FAIL;
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/speakup/speakup_soft.c b/drivers/staging/speakup/speakup_soft.c
index a61bc41b82d7..947c79532e10 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -198,11 +198,15 @@ static ssize_t softsynthx_read(struct file *fp, char __user *buf, size_t count,
         int chars_sent = 0;
         char __user *cp;
         char *init;
+        size_t bytes_per_ch = unicode ? 3 : 1;
         u16 ch;
         int empty;
         unsigned long flags;
         DEFINE_WAIT(wait);
 
+        if (count < bytes_per_ch)
+                return -EINVAL;
+
         spin_lock_irqsave(&speakup_info.spinlock, flags);
         while (1) {
                 prepare_to_wait(&speakup_event, &wait, TASK_INTERRUPTIBLE);
@@ -228,7 +232,7 @@ static ssize_t softsynthx_read(struct file *fp, char __user *buf, size_t count,
         init = get_initstring();
 
         /* Keep 3 bytes available for a 16bit UTF-8-encoded character */
-        while (chars_sent <= count - 3) {
+        while (chars_sent <= count - bytes_per_ch) {
                 if (speakup_info.flushing) {
                         speakup_info.flushing = 0;
                         ch = '\x18';
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/Kconfig b/drivers/usb/chipidea/Kconfig
index 785f0ed037f7..ee34e9046f7e 100644
--- a/drivers/usb/chipidea/Kconfig
+++ b/drivers/usb/chipidea/Kconfig
@@ -3,6 +3,7 @@ config USB_CHIPIDEA
         depends on ((USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD && !USB_GADGET) || (!USB_EHCI_HCD && USB_GADGET)) && HAS_DMA
         select EXTCON
         select RESET_CONTROLLER
+        select USB_ULPI_BUS
         help
           Say Y here if your system has a dual role high speed USB
           controller based on ChipIdea silicon IP. It supports:
@@ -38,12 +39,4 @@ config USB_CHIPIDEA_HOST
         help
           Say Y here to enable host controller functionality of the
           ChipIdea driver.
-
-config USB_CHIPIDEA_ULPI
-        bool "ChipIdea ULPI PHY support"
-        depends on USB_ULPI_BUS=y || USB_ULPI_BUS=USB_CHIPIDEA
-        help
-          Say Y here if you have a ULPI PHY attached to your ChipIdea
-          controller.
-
 endif
diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
index e3d5e728fa53..12df94f78f72 100644
--- a/drivers/usb/chipidea/Makefile
+++ b/drivers/usb/chipidea/Makefile
@@ -1,11 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_CHIPIDEA)              += ci_hdrc.o
 
-ci_hdrc-y                               := core.o otg.o debug.o
+ci_hdrc-y                               := core.o otg.o debug.o ulpi.o
 ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC)      += udc.o
 ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST)     += host.o
 ci_hdrc-$(CONFIG_USB_OTG_FSM)           += otg_fsm.o
-ci_hdrc-$(CONFIG_USB_CHIPIDEA_ULPI)     += ulpi.o
 
 # Glue/Bridge layers go here
 
diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
index 0bf244d50544..6a2cc5cd0281 100644
--- a/drivers/usb/chipidea/ci.h
+++ b/drivers/usb/chipidea/ci.h
@@ -240,10 +240,8 @@ struct ci_hdrc {
 
         struct ci_hdrc_platform_data    *platdata;
         int                             vbus_active;
-#ifdef CONFIG_USB_CHIPIDEA_ULPI
         struct ulpi                     *ulpi;
         struct ulpi_ops                 ulpi_ops;
-#endif
         struct phy                      *phy;
         /* old usb_phy interface */
         struct usb_phy                  *usb_phy;
@@ -426,15 +424,9 @@ static inline bool ci_otg_is_fsm_mode(struct ci_hdrc *ci)
 #endif
 }
 
-#if IS_ENABLED(CONFIG_USB_CHIPIDEA_ULPI)
 int ci_ulpi_init(struct ci_hdrc *ci);
 void ci_ulpi_exit(struct ci_hdrc *ci);
 int ci_ulpi_resume(struct ci_hdrc *ci);
-#else
-static inline int ci_ulpi_init(struct ci_hdrc *ci) { return 0; }
-static inline void ci_ulpi_exit(struct ci_hdrc *ci) { }
-static inline int ci_ulpi_resume(struct ci_hdrc *ci) { return 0; }
-#endif
 
 u32 hw_read_intr_enable(struct ci_hdrc *ci);
 
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/chipidea/ulpi.c b/drivers/usb/chipidea/ulpi.c
index 6da42dcd2888..dfec07e8ae1d 100644
--- a/drivers/usb/chipidea/ulpi.c
+++ b/drivers/usb/chipidea/ulpi.c
@@ -95,6 +95,9 @@ int ci_ulpi_resume(struct ci_hdrc *ci)
 {
         int cnt = 100000;
 
+        if (ci->platdata->phy_mode != USBPHY_INTERFACE_MODE_ULPI)
+                return 0;
+
         while (cnt-- > 0) {
                 if (hw_read(ci, OP_ULPI_VIEWPORT, ULPI_SYNC_STATE))
                         return 0;
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 7b366a6c0b49..75c4623ad779 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 */
         },
@@ -1828,6 +1831,9 @@ static const struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0x09d8, 0x0320), /* Elatec GmbH TWN3 */
         .driver_info = NO_UNION_NORMAL, /* has misplaced union descriptor */
         },
+        { USB_DEVICE(0x0ca6, 0xa050), /* Castles VEGA3000 */
+        .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
+        },
 
         { USB_DEVICE(0x2912, 0x0001), /* ATOL FPrint */
         .driver_info = CLEAR_HALT_CONDITIONS,
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index fcae521df29b..1fb266809966 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1142,10 +1142,14 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
 
                 if (!udev || udev->state == USB_STATE_NOTATTACHED) {
                         /* Tell hub_wq to disconnect the device or
-                         * check for a new connection
+                         * check for a new connection or over current condition.
+                         * Based on USB2.0 Spec Section 11.12.5,
+                         * C_PORT_OVER_CURRENT could be set while
+                         * PORT_OVER_CURRENT is not. So check for any of them.
                          */
                         if (udev || (portstatus & USB_PORT_STAT_CONNECTION) ||
-                            (portstatus & USB_PORT_STAT_OVERCURRENT))
+                            (portstatus & USB_PORT_STAT_OVERCURRENT) ||
+                            (portchange & USB_PORT_STAT_C_OVERCURRENT))
                                 set_bit(port1, hub->change_bits);
 
                 } else if (portstatus & USB_PORT_STAT_ENABLE) {
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..cefc99ae69b2 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);
@@ -3429,7 +3430,7 @@ static void dwc2_gadget_handle_incomplete_isoc_in(struct dwc2_hsotg *hsotg)
         for (idx = 1; idx < hsotg->num_of_eps; idx++) {
                 hs_ep = hsotg->eps_in[idx];
                 /* Proceed only unmasked ISOC EPs */
-                if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))
+                if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)
                         continue;
 
                 epctrl = dwc2_readl(hsotg->regs + DIEPCTL(idx));
@@ -3475,7 +3476,7 @@ static void dwc2_gadget_handle_incomplete_isoc_out(struct dwc2_hsotg *hsotg)
         for (idx = 1; idx < hsotg->num_of_eps; idx++) {
                 hs_ep = hsotg->eps_out[idx];
                 /* Proceed only unmasked ISOC EPs */
-                if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))
+                if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)
                         continue;
 
                 epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx));
@@ -3649,7 +3650,7 @@ irq_retry:
                 for (idx = 1; idx < hsotg->num_of_eps; idx++) {
                         hs_ep = hsotg->eps_out[idx];
                         /* Proceed only unmasked ISOC EPs */
-                        if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))
+                        if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)
                                 continue;
 
                         epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx));
@@ -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..6e2cdd7b93d4 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,36 +2634,66 @@ static void dwc2_hc_init_xfer(struct dwc2_hsotg *hsotg,
         }
 }
 
-#define DWC2_USB_DMA_ALIGN 4
+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;
 
-struct dma_aligned_buffer {
-        void *kmalloc_ptr;
-        void *old_xfer_buffer;
-        u8 data[0];
-};
+        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
 
 static void dwc2_free_dma_aligned_buffer(struct urb *urb)
 {
-        struct dma_aligned_buffer *temp;
+        void *stored_xfer_buffer;
+        size_t length;
 
         if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))
                 return;
 
-        temp = container_of(urb->transfer_buffer,
-                            struct dma_aligned_buffer, data);
+        /* Restore urb->transfer_buffer from the end of the allocated area */
+        memcpy(&stored_xfer_buffer, urb->transfer_buffer +
+               urb->transfer_buffer_length, sizeof(urb->transfer_buffer));
 
-        if (usb_urb_dir_in(urb))
-                memcpy(temp->old_xfer_buffer, temp->data,
-                       urb->transfer_buffer_length);
-        urb->transfer_buffer = temp->old_xfer_buffer;
-        kfree(temp->kmalloc_ptr);
+        if (usb_urb_dir_in(urb)) {
+                if (usb_pipeisoc(urb->pipe))
+                        length = urb->transfer_buffer_length;
+                else
+                        length = urb->actual_length;
+
+                memcpy(stored_xfer_buffer, urb->transfer_buffer, length);
+        }
+        kfree(urb->transfer_buffer);
+        urb->transfer_buffer = stored_xfer_buffer;
 
         urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER;
 }
 
 static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
 {
-        struct dma_aligned_buffer *temp, *kmalloc_ptr;
+        void *kmalloc_ptr;
         size_t kmalloc_size;
 
         if (urb->num_sgs || urb->sg ||
@@ -2662,22 +2701,29 @@ static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
             !((uintptr_t)urb->transfer_buffer & (DWC2_USB_DMA_ALIGN - 1)))
                 return 0;
 
-        /* Allocate a buffer with enough padding for alignment */
+        /*
+         * Allocate a buffer with enough padding for original transfer_buffer
+         * pointer. This allocation is guaranteed to be aligned properly for
+         * DMA
+         */
         kmalloc_size = urb->transfer_buffer_length +
-                sizeof(struct dma_aligned_buffer) + DWC2_USB_DMA_ALIGN - 1;
+                sizeof(urb->transfer_buffer);
 
         kmalloc_ptr = kmalloc(kmalloc_size, mem_flags);
         if (!kmalloc_ptr)
                 return -ENOMEM;
 
-        /* Position our struct dma_aligned_buffer such that data is aligned */
-        temp = PTR_ALIGN(kmalloc_ptr + 1, DWC2_USB_DMA_ALIGN) - 1;
-        temp->kmalloc_ptr = kmalloc_ptr;
-        temp->old_xfer_buffer = urb->transfer_buffer;
+        /*
+         * Position value of original urb->transfer_buffer pointer to the end
+         * of allocation for later referencing
+         */
+        memcpy(kmalloc_ptr + urb->transfer_buffer_length,
+               &urb->transfer_buffer, sizeof(urb->transfer_buffer));
+
         if (usb_urb_dir_out(urb))
-                memcpy(temp->data, urb->transfer_buffer,
+                memcpy(kmalloc_ptr, urb->transfer_buffer,
                        urb->transfer_buffer_length);
-        urb->transfer_buffer = temp->data;
+        urb->transfer_buffer = kmalloc_ptr;
 
         urb->transfer_flags |= URB_ALIGNED_TEMP_BUFFER;
 
@@ -2802,6 +2848,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 +5318,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 +5365,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 +5408,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 +5522,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 +5703,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..8ce10caf3e19 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));
@@ -1224,7 +1231,10 @@ static void dwc2_hc_nak_intr(struct dwc2_hsotg *hsotg,
          * avoid interrupt storms we'll wait before retrying if we've got
          * several NAKs. If we didn't do this we'd retry directly from the
          * interrupt handler and could end up quickly getting another
-         * interrupt (another NAK), which we'd retry.
+         * interrupt (another NAK), which we'd retry. Note that we do not
+         * delay retries for IN parts of control requests, as those are expected
+         * to complete fairly quickly, and if we delay them we risk confusing
+         * the device and cause it issue STALL.
          *
          * Note that in DMA mode software only gets involved to re-send NAKed
          * transfers for split transactions, so we only need to apply this
@@ -1237,7 +1247,9 @@ static void dwc2_hc_nak_intr(struct dwc2_hsotg *hsotg,
                         qtd->error_count = 0;
                 qtd->complete_split = 0;
                 qtd->num_naks++;
-                qtd->qh->want_wait = qtd->num_naks >= DWC2_NAKS_BEFORE_DELAY;
+                qtd->qh->want_wait = qtd->num_naks >= DWC2_NAKS_BEFORE_DELAY &&
+                                !(chan->ep_type == USB_ENDPOINT_XFER_CONTROL &&
+                                  chan->ep_is_in);
                 dwc2_halt_channel(hsotg, chan, qtd, DWC2_HC_XFER_NAK);
                 goto handle_nak_done;
         }
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/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index c77ff50a88a2..8efde178eef4 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -973,15 +973,12 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,
                 ret = dwc3_ep0_start_trans(dep);
         } else if (IS_ALIGNED(req->request.length, dep->endpoint.maxpacket) &&
                    req->request.length && req->request.zero) {
-                u32     maxpacket;
 
                 ret = usb_gadget_map_request_by_dev(dwc->sysdev,
                                 &req->request, dep->number);
                 if (ret)
                         return;
 
-                maxpacket = dep->endpoint.maxpacket;
-
                 /* prepare normal TRB */
                 dwc3_ep0_prepare_one_trb(dep, req->request.dma,
                                          req->request.length,
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index f242c2bcea81..b8a15840b4ff 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))
@@ -1816,7 +1819,6 @@ unknown:
                 if (cdev->use_os_string && cdev->os_desc_config &&
                     (ctrl->bRequestType & USB_TYPE_VENDOR) &&
                     ctrl->bRequest == cdev->b_vendor_code) {
-                        struct usb_request              *req;
                         struct usb_configuration        *os_desc_cfg;
                         u8                              *buf;
                         int                             interface;
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index dce9d12c7981..3ada83d81bda 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;
 }
@@ -3253,7 +3263,7 @@ static int ffs_func_setup(struct usb_function *f,
         __ffs_event_add(ffs, FUNCTIONFS_SETUP);
         spin_unlock_irqrestore(&ffs->ev.waitq.lock, flags);
 
-        return USB_GADGET_DELAYED_STATUS;
+        return creq->wLength == 0 ? USB_GADGET_DELAYED_STATUS : 0;
 }
 
 static bool ffs_func_req_match(struct usb_function *f,
diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c
index d2dc1f00180b..d582921f7257 100644
--- a/drivers/usb/gadget/function/f_uac2.c
+++ b/drivers/usb/gadget/function/f_uac2.c
@@ -438,14 +438,14 @@ static struct usb_descriptor_header *hs_audio_desc[] = {
 };
 
 struct cntrl_cur_lay3 {
-        __u32   dCUR;
+        __le32  dCUR;
 };
 
 struct cntrl_range_lay3 {
-        __u16   wNumSubRanges;
-        __u32   dMIN;
-        __u32   dMAX;
-        __u32   dRES;
+        __le16  wNumSubRanges;
+        __le32  dMIN;
+        __le32  dMAX;
+        __le32  dRES;
 } __packed;
 
 static void set_ep_max_packet_size(const struct f_uac2_opts *uac2_opts,
@@ -559,13 +559,13 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
         agdev->out_ep = usb_ep_autoconfig(gadget, &fs_epout_desc);
         if (!agdev->out_ep) {
                 dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                return ret;
+                return -ENODEV;
         }
 
         agdev->in_ep = usb_ep_autoconfig(gadget, &fs_epin_desc);
         if (!agdev->in_ep) {
                 dev_err(dev, "%s:%d Error!\n", __func__, __LINE__);
-                return ret;
+                return -ENODEV;
         }
 
         agdev->in_ep_maxpsize = max_t(u16,
@@ -703,9 +703,9 @@ in_rq_cur(struct usb_function *fn, const struct usb_ctrlrequest *cr)
                 memset(&c, 0, sizeof(struct cntrl_cur_lay3));
 
                 if (entity_id == USB_IN_CLK_ID)
-                        c.dCUR = p_srate;
+                        c.dCUR = cpu_to_le32(p_srate);
                 else if (entity_id == USB_OUT_CLK_ID)
-                        c.dCUR = c_srate;
+                        c.dCUR = cpu_to_le32(c_srate);
 
                 value = min_t(unsigned, w_length, sizeof c);
                 memcpy(req->buf, &c, value);
@@ -742,15 +742,15 @@ in_rq_range(struct usb_function *fn, const struct usb_ctrlrequest *cr)
 
         if (control_selector == UAC2_CS_CONTROL_SAM_FREQ) {
                 if (entity_id == USB_IN_CLK_ID)
-                        r.dMIN = p_srate;
+                        r.dMIN = cpu_to_le32(p_srate);
                 else if (entity_id == USB_OUT_CLK_ID)
-                        r.dMIN = c_srate;
+                        r.dMIN = cpu_to_le32(c_srate);
                 else
                         return -EOPNOTSUPP;
 
                 r.dMAX = r.dMIN;
                 r.dRES = 0;
-                r.wNumSubRanges = 1;
+                r.wNumSubRanges = cpu_to_le16(1);
 
                 value = min_t(unsigned, w_length, sizeof r);
                 memcpy(req->buf, &r, value);
diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c
index a72295c953bb..fb5ed97572e5 100644
--- a/drivers/usb/gadget/function/u_audio.c
+++ b/drivers/usb/gadget/function/u_audio.c
@@ -32,9 +32,6 @@ struct uac_req {
 struct uac_rtd_params {
         struct snd_uac_chip *uac; /* parent chip */
         bool ep_enabled; /* if the ep is enabled */
-        /* Size of the ring buffer */
-        size_t dma_bytes;
-        unsigned char *dma_area;
 
         struct snd_pcm_substream *ss;
 
@@ -43,8 +40,6 @@ struct uac_rtd_params {
 
         void *rbuf;
 
-        size_t period_size;
-
         unsigned max_psize;     /* MaxPacketSize of endpoint */
         struct uac_req *ureq;
 
@@ -84,12 +79,12 @@ static const struct snd_pcm_hardware uac_pcm_hardware = {
 static void u_audio_iso_complete(struct usb_ep *ep, struct usb_request *req)
 {
         unsigned pending;
-        unsigned long flags;
+        unsigned long flags, flags2;
         unsigned int hw_ptr;
-        bool update_alsa = false;
         int status = req->status;
         struct uac_req *ur = req->context;
         struct snd_pcm_substream *substream;
+        struct snd_pcm_runtime *runtime;
         struct uac_rtd_params *prm = ur->pp;
         struct snd_uac_chip *uac = prm->uac;
 
@@ -111,6 +106,14 @@ static void u_audio_iso_complete(struct usb_ep *ep, struct usb_request *req)
         if (!substream)
                 goto exit;
 
+        snd_pcm_stream_lock_irqsave(substream, flags2);
+
+        runtime = substream->runtime;
+        if (!runtime || !snd_pcm_running(substream)) {
+                snd_pcm_stream_unlock_irqrestore(substream, flags2);
+                goto exit;
+        }
+
         spin_lock_irqsave(&prm->lock, flags);
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
@@ -137,43 +140,46 @@ static void u_audio_iso_complete(struct usb_ep *ep, struct usb_request *req)
                 req->actual = req->length;
         }
 
-        pending = prm->hw_ptr % prm->period_size;
-        pending += req->actual;
-        if (pending >= prm->period_size)
-                update_alsa = true;
-
         hw_ptr = prm->hw_ptr;
-        prm->hw_ptr = (prm->hw_ptr + req->actual) % prm->dma_bytes;
 
         spin_unlock_irqrestore(&prm->lock, flags);
 
         /* Pack USB load in ALSA ring buffer */
-        pending = prm->dma_bytes - hw_ptr;
+        pending = runtime->dma_bytes - hw_ptr;
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 if (unlikely(pending < req->actual)) {
-                        memcpy(req->buf, prm->dma_area + hw_ptr, pending);
-                        memcpy(req->buf + pending, prm->dma_area,
+                        memcpy(req->buf, runtime->dma_area + hw_ptr, pending);
+                        memcpy(req->buf + pending, runtime->dma_area,
                                req->actual - pending);
                 } else {
-                        memcpy(req->buf, prm->dma_area + hw_ptr, req->actual);
+                        memcpy(req->buf, runtime->dma_area + hw_ptr,
+                               req->actual);
                 }
         } else {
                 if (unlikely(pending < req->actual)) {
-                        memcpy(prm->dma_area + hw_ptr, req->buf, pending);
-                        memcpy(prm->dma_area, req->buf + pending,
+                        memcpy(runtime->dma_area + hw_ptr, req->buf, pending);
+                        memcpy(runtime->dma_area, req->buf + pending,
                                req->actual - pending);
                 } else {
-                        memcpy(prm->dma_area + hw_ptr, req->buf, req->actual);
+                        memcpy(runtime->dma_area + hw_ptr, req->buf,
+                               req->actual);
                 }
         }
 
+        spin_lock_irqsave(&prm->lock, flags);
+        /* update hw_ptr after data is copied to memory */
+        prm->hw_ptr = (hw_ptr + req->actual) % runtime->dma_bytes;
+        hw_ptr = prm->hw_ptr;
+        spin_unlock_irqrestore(&prm->lock, flags);
+        snd_pcm_stream_unlock_irqrestore(substream, flags2);
+
+        if ((hw_ptr % snd_pcm_lib_period_bytes(substream)) < req->actual)
+                snd_pcm_period_elapsed(substream);
+
 exit:
         if (usb_ep_queue(ep, req, GFP_ATOMIC))
                 dev_err(uac->card->dev, "%d Error!\n", __LINE__);
-
-        if (update_alsa)
-                snd_pcm_period_elapsed(substream);
 }
 
 static int uac_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
@@ -236,40 +242,12 @@ static snd_pcm_uframes_t uac_pcm_pointer(struct snd_pcm_substream *substream)
 static int uac_pcm_hw_params(struct snd_pcm_substream *substream,
                                struct snd_pcm_hw_params *hw_params)
 {
-        struct snd_uac_chip *uac = snd_pcm_substream_chip(substream);
-        struct uac_rtd_params *prm;
-        int err;
-
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                prm = &uac->p_prm;
-        else
-                prm = &uac->c_prm;
-
-        err = snd_pcm_lib_malloc_pages(substream,
+        return snd_pcm_lib_malloc_pages(substream,
                                         params_buffer_bytes(hw_params));
-        if (err >= 0) {
-                prm->dma_bytes = substream->runtime->dma_bytes;
-                prm->dma_area = substream->runtime->dma_area;
-                prm->period_size = params_period_bytes(hw_params);
-        }
-
-        return err;
 }
 
 static int uac_pcm_hw_free(struct snd_pcm_substream *substream)
 {
-        struct snd_uac_chip *uac = snd_pcm_substream_chip(substream);
-        struct uac_rtd_params *prm;
-
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                prm = &uac->p_prm;
-        else
-                prm = &uac->c_prm;
-
-        prm->dma_area = NULL;
-        prm->dma_bytes = 0;
-        prm->period_size = 0;
-
         return snd_pcm_lib_free_pages(substream);
 }
 
@@ -595,15 +573,15 @@ int g_audio_setup(struct g_audio *g_audio, const char *pcm_name,
         if (err < 0)
                 goto snd_fail;
 
-        strcpy(pcm->name, pcm_name);
+        strlcpy(pcm->name, pcm_name, sizeof(pcm->name));
         pcm->private_data = uac;
         uac->pcm = pcm;
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &uac_pcm_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &uac_pcm_ops);
 
-        strcpy(card->driver, card_name);
-        strcpy(card->shortname, card_name);
+        strlcpy(card->driver, card_name, sizeof(card->driver));
+        strlcpy(card->shortname, card_name, sizeof(card->shortname));
         sprintf(card->longname, "%s %i", card_name, card->dev->id);
 
         snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
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/gadget/udc/aspeed-vhub/ep0.c b/drivers/usb/gadget/udc/aspeed-vhub/ep0.c
index 20ffb03ff6ac..e2927fb083cf 100644
--- a/drivers/usb/gadget/udc/aspeed-vhub/ep0.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/ep0.c
@@ -108,6 +108,13 @@ void ast_vhub_ep0_handle_setup(struct ast_vhub_ep *ep)
         /* Check our state, cancel pending requests if needed */
         if (ep->ep0.state != ep0_state_token) {
                 EPDBG(ep, "wrong state\n");
+                ast_vhub_nuke(ep, -EIO);
+
+                /*
+                 * Accept the packet regardless, this seems to happen
+                 * when stalling a SETUP packet that has an OUT data
+                 * phase.
+                 */
                 ast_vhub_nuke(ep, 0);
                 goto stall;
         }
@@ -212,6 +219,8 @@ static void ast_vhub_ep0_do_send(struct ast_vhub_ep *ep,
         if (chunk && req->req.buf)
                 memcpy(ep->buf, req->req.buf + req->req.actual, chunk);
 
+        vhub_dma_workaround(ep->buf);
+
         /* Remember chunk size and trigger send */
         reg = VHUB_EP0_SET_TX_LEN(chunk);
         writel(reg, ep->ep0.ctlstat);
@@ -224,7 +233,7 @@ static void ast_vhub_ep0_rx_prime(struct ast_vhub_ep *ep)
         EPVDBG(ep, "rx prime\n");
 
         /* Prime endpoint for receiving data */
-        writel(VHUB_EP0_RX_BUFF_RDY, ep->ep0.ctlstat + AST_VHUB_EP0_CTRL);
+        writel(VHUB_EP0_RX_BUFF_RDY, ep->ep0.ctlstat);
 }
 
 static void ast_vhub_ep0_do_receive(struct ast_vhub_ep *ep, struct ast_vhub_req *req,
diff --git a/drivers/usb/gadget/udc/aspeed-vhub/epn.c b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
index 80c9feac5147..5939eb1e97f2 100644
--- a/drivers/usb/gadget/udc/aspeed-vhub/epn.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
@@ -66,11 +66,16 @@ static void ast_vhub_epn_kick(struct ast_vhub_ep *ep, struct ast_vhub_req *req)
         if (!req->req.dma) {
 
                 /* For IN transfers, copy data over first */
-                if (ep->epn.is_in)
+                if (ep->epn.is_in) {
                         memcpy(ep->buf, req->req.buf + act, chunk);
+                        vhub_dma_workaround(ep->buf);
+                }
                 writel(ep->buf_dma, ep->epn.regs + AST_VHUB_EP_DESC_BASE);
-        } else
+        } else {
+                if (ep->epn.is_in)
+                        vhub_dma_workaround(req->req.buf);
                 writel(req->req.dma + act, ep->epn.regs + AST_VHUB_EP_DESC_BASE);
+        }
 
         /* Start DMA */
         req->active = true;
@@ -161,6 +166,7 @@ static inline unsigned int ast_vhub_count_free_descs(struct ast_vhub_ep *ep)
 static void ast_vhub_epn_kick_desc(struct ast_vhub_ep *ep,
                                    struct ast_vhub_req *req)
 {
+        struct ast_vhub_desc *desc = NULL;
         unsigned int act = req->act_count;
         unsigned int len = req->req.length;
         unsigned int chunk;
@@ -177,7 +183,6 @@ static void ast_vhub_epn_kick_desc(struct ast_vhub_ep *ep,
 
         /* While we can create descriptors */
         while (ast_vhub_count_free_descs(ep) && req->last_desc < 0) {
-                struct ast_vhub_desc *desc;
                 unsigned int d_num;
 
                 /* Grab next free descriptor */
@@ -227,6 +232,9 @@ static void ast_vhub_epn_kick_desc(struct ast_vhub_ep *ep,
                 req->act_count = act = act + chunk;
         }
 
+        if (likely(desc))
+                vhub_dma_workaround(desc);
+
         /* Tell HW about new descriptors */
         writel(VHUB_EP_DMA_SET_CPU_WPTR(ep->epn.d_next),
                ep->epn.regs + AST_VHUB_EP_DESC_STATUS);
diff --git a/drivers/usb/gadget/udc/aspeed-vhub/vhub.h b/drivers/usb/gadget/udc/aspeed-vhub/vhub.h
index 2b040257bc1f..4ed03d33a5a9 100644
--- a/drivers/usb/gadget/udc/aspeed-vhub/vhub.h
+++ b/drivers/usb/gadget/udc/aspeed-vhub/vhub.h
@@ -462,6 +462,39 @@ enum std_req_rc {
 #define DDBG(d, fmt, ...)       do { } while(0)
 #endif
 
+static inline void vhub_dma_workaround(void *addr)
+{
+        /*
+         * This works around a confirmed HW issue with the Aspeed chip.
+         *
+         * The core uses a different bus to memory than the AHB going to
+         * the USB device controller. Due to the latter having a higher
+         * priority than the core for arbitration on that bus, it's
+         * possible for an MMIO to the device, followed by a DMA by the
+         * device from memory to all be performed and services before
+         * a previous store to memory gets completed.
+         *
+         * This the following scenario can happen:
+         *
+         *    - Driver writes to a DMA descriptor (Mbus)
+         *    - Driver writes to the MMIO register to start the DMA (AHB)
+         *    - The gadget sees the second write and sends a read of the
+         *      descriptor to the memory controller (Mbus)
+         *    - The gadget hits memory before the descriptor write
+         *      causing it to read an obsolete value.
+         *
+         * Thankfully the problem is limited to the USB gadget device, other
+         * masters in the SoC all have a lower priority than the core, thus
+         * ensuring that the store by the core arrives first.
+         *
+         * The workaround consists of using a dummy read of the memory before
+         * doing the MMIO writes. This will ensure that the previous writes
+         * have been "pushed out".
+         */
+        mb();
+        (void)__raw_readl((void __iomem *)addr);
+}
+
 /* core.c */
 void ast_vhub_done(struct ast_vhub_ep *ep, struct ast_vhub_req *req,
                    int status);
diff --git a/drivers/usb/gadget/udc/r8a66597-udc.c b/drivers/usb/gadget/udc/r8a66597-udc.c
index a3ecce62662b..11e25a3f4f1f 100644
--- a/drivers/usb/gadget/udc/r8a66597-udc.c
+++ b/drivers/usb/gadget/udc/r8a66597-udc.c
@@ -832,11 +832,11 @@ static void init_controller(struct r8a66597 *r8a66597)
 
                 r8a66597_bset(r8a66597, XCKE, SYSCFG0);
 
-                msleep(3);
+                mdelay(3);
 
                 r8a66597_bset(r8a66597, PLLC, SYSCFG0);
 
-                msleep(1);
+                mdelay(1);
 
                 r8a66597_bset(r8a66597, SCKE, SYSCFG0);
 
@@ -1190,7 +1190,7 @@ __acquires(r8a66597->lock)
         r8a66597->ep0_req->length = 2;
         /* AV: what happens if we get called again before that gets through? */
         spin_unlock(&r8a66597->lock);
-        r8a66597_queue(r8a66597->gadget.ep0, r8a66597->ep0_req, GFP_KERNEL);
+        r8a66597_queue(r8a66597->gadget.ep0, r8a66597->ep0_req, GFP_ATOMIC);
         spin_lock(&r8a66597->lock);
 }
 
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..68e6132aa8b2 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);
                 }
@@ -3012,6 +3051,7 @@ static void xhci_endpoint_reset(struct usb_hcd *hcd,
         if (!list_empty(&ep->ring->td_list)) {
                 dev_err(&udev->dev, "EP not empty, refuse reset\n");
                 spin_unlock_irqrestore(&xhci->lock, flags);
+                xhci_free_command(xhci, cfg_cmd);
                 goto cleanup;
         }
         xhci_queue_stop_endpoint(xhci, stop_cmd, udev->slot_id, ep_index, 0);
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/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
index 900875f326d7..f7c96d209eda 100644
--- a/drivers/usb/phy/phy-fsl-usb.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -861,6 +861,7 @@ int usb_otg_start(struct platform_device *pdev)
         if (pdata->init && pdata->init(pdev) != 0)
                 return -EINVAL;
 
+#ifdef CONFIG_PPC32
         if (pdata->big_endian_mmio) {
                 _fsl_readl = _fsl_readl_be;
                 _fsl_writel = _fsl_writel_be;
@@ -868,6 +869,7 @@ int usb_otg_start(struct platform_device *pdev)
                 _fsl_readl = _fsl_readl_le;
                 _fsl_writel = _fsl_writel_le;
         }
+#endif
 
         /* request irq */
         p_otg->irq = platform_get_irq(pdev, 0);
@@ -958,7 +960,7 @@ int usb_otg_start(struct platform_device *pdev)
 /*
  * state file in sysfs
  */
-static int show_fsl_usb2_otg_state(struct device *dev,
+static ssize_t show_fsl_usb2_otg_state(struct device *dev,
                                    struct device_attribute *attr, char *buf)
 {
         struct otg_fsm *fsm = &fsl_otg_dev->fsm;
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..d1d20252bad8 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);
 
@@ -2136,7 +2140,7 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port)
                          * PPS APDO. Again skip the first sink PDO as this will
                          * always be 5V 3A.
                          */
-                        for (j = i; j < port->nr_snk_pdo; j++) {
+                        for (j = 1; j < port->nr_snk_pdo; j++) {
                                 pdo = port->snk_pdo[j];
 
                                 switch (pdo_type(pdo)) {
@@ -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/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index b423a309a6e0..125b58eff936 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -28,6 +28,7 @@
 #include <linux/uaccess.h>
 #include <linux/vfio.h>
 #include <linux/vgaarb.h>
+#include <linux/nospec.h>
 
 #include "vfio_pci_private.h"
 
@@ -727,6 +728,9 @@ static long vfio_pci_ioctl(void *device_data,
                         if (info.index >=
                             VFIO_PCI_NUM_REGIONS + vdev->num_regions)
                                 return -EINVAL;
+                        info.index = array_index_nospec(info.index,
+                                                        VFIO_PCI_NUM_REGIONS +
+                                                        vdev->num_regions);
 
                         i = info.index - VFIO_PCI_NUM_REGIONS;
 
diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c
index 759a5bdd40e1..7cd63b0c1a46 100644
--- a/drivers/vfio/vfio_iommu_spapr_tce.c
+++ b/drivers/vfio/vfio_iommu_spapr_tce.c
@@ -457,17 +457,17 @@ static void tce_iommu_unuse_page(struct tce_container *container,
 }
 
 static int tce_iommu_prereg_ua_to_hpa(struct tce_container *container,
-                unsigned long tce, unsigned long size,
+                unsigned long tce, unsigned long shift,
                 unsigned long *phpa, struct mm_iommu_table_group_mem_t **pmem)
 {
         long ret = 0;
         struct mm_iommu_table_group_mem_t *mem;
 
-        mem = mm_iommu_lookup(container->mm, tce, size);
+        mem = mm_iommu_lookup(container->mm, tce, 1ULL << shift);
         if (!mem)
                 return -EINVAL;
 
-        ret = mm_iommu_ua_to_hpa(mem, tce, phpa);
+        ret = mm_iommu_ua_to_hpa(mem, tce, shift, phpa);
         if (ret)
                 return -EINVAL;
 
@@ -487,7 +487,7 @@ static void tce_iommu_unuse_page_v2(struct tce_container *container,
         if (!pua)
                 return;
 
-        ret = tce_iommu_prereg_ua_to_hpa(container, *pua, IOMMU_PAGE_SIZE(tbl),
+        ret = tce_iommu_prereg_ua_to_hpa(container, *pua, tbl->it_page_shift,
                         &hpa, &mem);
         if (ret)
                 pr_debug("%s: tce %lx at #%lx was not cached, ret=%d\n",
@@ -611,7 +611,7 @@ static long tce_iommu_build_v2(struct tce_container *container,
                                 entry + i);
 
                 ret = tce_iommu_prereg_ua_to_hpa(container,
-                                tce, IOMMU_PAGE_SIZE(tbl), &hpa, &mem);
+                                tce, tbl->it_page_shift, &hpa, &mem);
                 if (ret)
                         break;
 
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: