241 files changed, 2650 insertions, 1533 deletions

diff --git a/drivers/acpi/acpi_dbg.c b/drivers/acpi/acpi_dbg.c
index 1f4128487dd4..dee86925a9a1 100644
--- a/drivers/acpi/acpi_dbg.c
+++ b/drivers/acpi/acpi_dbg.c
@@ -602,7 +602,7 @@ static int acpi_aml_read_user(char __user *buf, int len)
         crc->tail = (crc->tail + n) & (ACPI_AML_BUF_SIZE - 1);
         ret = n;
 out:
-        acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, !ret);
+        acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, ret >= 0);
         return ret;
 }
 
@@ -672,7 +672,7 @@ static int acpi_aml_write_user(const char __user *buf, int len)
         crc->head = (crc->head + n) & (ACPI_AML_BUF_SIZE - 1);
         ret = n;
 out:
-        acpi_aml_unlock_fifo(ACPI_AML_IN_USER, !ret);
+        acpi_aml_unlock_fifo(ACPI_AML_IN_USER, ret >= 0);
         return n;
 }
 
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 21932d640a41..a1d177d58254 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -108,9 +108,7 @@ acpi_ex_add_table(u32 table_index,
 
         /* Add the table to the namespace */
 
-        acpi_ex_exit_interpreter();
         status = acpi_ns_load_table(table_index, parent_node);
-        acpi_ex_enter_interpreter();
         if (ACPI_FAILURE(status)) {
                 acpi_ut_remove_reference(obj_desc);
                 *ddb_handle = NULL;
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index 1783cd7e1446..f631a47724f0 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -47,7 +47,6 @@
 #include "acparser.h"
 #include "acdispat.h"
 #include "actables.h"
-#include "acinterp.h"
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsparse")
@@ -171,8 +170,6 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
 
         ACPI_FUNCTION_TRACE(ns_parse_table);
 
-        acpi_ex_enter_interpreter();
-
         /*
          * AML Parse, pass 1
          *
@@ -188,7 +185,7 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
         status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1,
                                             table_index, start_node);
         if (ACPI_FAILURE(status)) {
-                goto error_exit;
+                return_ACPI_STATUS(status);
         }
 
         /*
@@ -204,10 +201,8 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
         status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2,
                                             table_index, start_node);
         if (ACPI_FAILURE(status)) {
-                goto error_exit;
+                return_ACPI_STATUS(status);
         }
 
-error_exit:
-        acpi_ex_exit_interpreter();
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 73c76d646064..290d6f5be44b 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1331,8 +1331,6 @@ static int ec_install_handlers(struct acpi_ec *ec)
 
 static void ec_remove_handlers(struct acpi_ec *ec)
 {
-        acpi_ec_stop(ec, false);
-
         if (test_bit(EC_FLAGS_EC_HANDLER_INSTALLED, &ec->flags)) {
                 if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
                                         ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
@@ -1340,6 +1338,19 @@ static void ec_remove_handlers(struct acpi_ec *ec)
                 clear_bit(EC_FLAGS_EC_HANDLER_INSTALLED, &ec->flags);
         }
 
+        /*
+         * Stops handling the EC transactions after removing the operation
+         * region handler. This is required because _REG(DISCONNECT)
+         * invoked during the removal can result in new EC transactions.
+         *
+         * Flushes the EC requests and thus disables the GPE before
+         * removing the GPE handler. This is required by the current ACPICA
+         * GPE core. ACPICA GPE core will automatically disable a GPE when
+         * it is indicated but there is no way to handle it. So the drivers
+         * must disable the GPEs prior to removing the GPE handlers.
+         */
+        acpi_ec_stop(ec, false);
+
         if (test_bit(EC_FLAGS_GPE_HANDLER_INSTALLED, &ec->flags)) {
                 if (ACPI_FAILURE(acpi_remove_gpe_handler(NULL, ec->gpe,
                                         &acpi_ec_gpe_handler)))
diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c
index 2215fc847fa9..1f0e06065ae6 100644
--- a/drivers/acpi/nfit.c
+++ b/drivers/acpi/nfit.c
@@ -928,7 +928,7 @@ static ssize_t format_show(struct device *dev,
 {
         struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
 
-        return sprintf(buf, "0x%04x\n", be16_to_cpu(dcr->code));
+        return sprintf(buf, "0x%04x\n", le16_to_cpu(dcr->code));
 }
 static DEVICE_ATTR_RO(format);
 
@@ -961,8 +961,8 @@ static ssize_t format1_show(struct device *dev,
                                 continue;
                         if (nfit_dcr->dcr->code == dcr->code)
                                 continue;
-                        rc = sprintf(buf, "%#x\n",
-                                        be16_to_cpu(nfit_dcr->dcr->code));
+                        rc = sprintf(buf, "0x%04x\n",
+                                        le16_to_cpu(nfit_dcr->dcr->code));
                         break;
                 }
                 if (rc != ENXIO)
@@ -1151,9 +1151,10 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc,
                 if (disable_vendor_specific)
                         dsm_mask &= ~(1 << 8);
         } else {
-                dev_err(dev, "unknown dimm command family\n");
+                dev_dbg(dev, "unknown dimm command family\n");
                 nfit_mem->family = -1;
-                return force_enable_dimms ? 0 : -ENODEV;
+                /* DSMs are optional, continue loading the driver... */
+                return 0;
         }
 
         uuid = to_nfit_uuid(nfit_mem->family);
diff --git a/drivers/acpi/nfit.h b/drivers/acpi/nfit.h
index 11cb38348aef..02b9ea1e8d2e 100644
--- a/drivers/acpi/nfit.h
+++ b/drivers/acpi/nfit.h
@@ -53,12 +53,12 @@ enum nfit_uuids {
 };
 
 /*
- * Region format interface codes are stored as an array of bytes in the
- * NFIT DIMM Control Region structure
+ * Region format interface codes are stored with the interface as the
+ * LSB and the function as the MSB.
  */
-#define NFIT_FIC_BYTE cpu_to_be16(0x101) /* byte-addressable energy backed */
-#define NFIT_FIC_BLK cpu_to_be16(0x201) /* block-addressable non-energy backed */
-#define NFIT_FIC_BYTEN cpu_to_be16(0x301) /* byte-addressable non-energy backed */
+#define NFIT_FIC_BYTE cpu_to_le16(0x101) /* byte-addressable energy backed */
+#define NFIT_FIC_BLK cpu_to_le16(0x201) /* block-addressable non-energy backed */
+#define NFIT_FIC_BYTEN cpu_to_le16(0x301) /* byte-addressable non-energy backed */
 
 enum {
         NFIT_BLK_READ_FLUSH = 1,
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 8fc7323ed3e8..c983bf733ad3 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -470,6 +470,7 @@ static int acpi_irq_pci_sharing_penalty(int irq)
 {
         struct acpi_pci_link *link;
         int penalty = 0;
+        int i;
 
         list_for_each_entry(link, &acpi_link_list, list) {
                 /*
@@ -478,18 +479,14 @@ static int acpi_irq_pci_sharing_penalty(int irq)
                  */
                 if (link->irq.active && link->irq.active == irq)
                         penalty += PIRQ_PENALTY_PCI_USING;
-                else {
-                        int i;
-
-                        /*
-                         * If a link is inactive, penalize the IRQs it
-                         * might use, but not as severely.
-                         */
-                        for (i = 0; i < link->irq.possible_count; i++)
-                                if (link->irq.possible[i] == irq)
-                                        penalty += PIRQ_PENALTY_PCI_POSSIBLE /
-                                                link->irq.possible_count;
-                }
+
+                /*
+                 * penalize the IRQs PCI might use, but not as severely.
+                 */
+                for (i = 0; i < link->irq.possible_count; i++)
+                        if (link->irq.possible[i] == irq)
+                                penalty += PIRQ_PENALTY_PCI_POSSIBLE /
+                                        link->irq.possible_count;
         }
 
         return penalty;
@@ -499,9 +496,6 @@ static int acpi_irq_get_penalty(int irq)
 {
         int penalty = 0;
 
-        if (irq < ACPI_MAX_ISA_IRQS)
-                penalty += acpi_isa_irq_penalty[irq];
-
         /*
         * Penalize IRQ used by ACPI SCI. If ACPI SCI pin attributes conflict
         * with PCI IRQ attributes, mark ACPI SCI as ISA_ALWAYS so it won't be
@@ -516,10 +510,49 @@ static int acpi_irq_get_penalty(int irq)
                         penalty += PIRQ_PENALTY_PCI_USING;
         }
 
+        if (irq < ACPI_MAX_ISA_IRQS)
+                return penalty + acpi_isa_irq_penalty[irq];
+
         penalty += acpi_irq_pci_sharing_penalty(irq);
         return penalty;
 }
 
+int __init acpi_irq_penalty_init(void)
+{
+        struct acpi_pci_link *link;
+        int i;
+
+        /*
+         * Update penalties to facilitate IRQ balancing.
+         */
+        list_for_each_entry(link, &acpi_link_list, list) {
+
+                /*
+                 * reflect the possible and active irqs in the penalty table --
+                 * useful for breaking ties.
+                 */
+                if (link->irq.possible_count) {
+                        int penalty =
+                            PIRQ_PENALTY_PCI_POSSIBLE /
+                            link->irq.possible_count;
+
+                        for (i = 0; i < link->irq.possible_count; i++) {
+                                if (link->irq.possible[i] < ACPI_MAX_ISA_IRQS)
+                                        acpi_isa_irq_penalty[link->irq.
+                                                         possible[i]] +=
+                                            penalty;
+                        }
+
+                } else if (link->irq.active &&
+                                (link->irq.active < ACPI_MAX_ISA_IRQS)) {
+                        acpi_isa_irq_penalty[link->irq.active] +=
+                            PIRQ_PENALTY_PCI_POSSIBLE;
+                }
+        }
+
+        return 0;
+}
+
 static int acpi_irq_balance = -1;       /* 0: static, 1: balance */
 
 static int acpi_pci_link_allocate(struct acpi_pci_link *link)
@@ -839,7 +872,7 @@ void acpi_penalize_isa_irq(int irq, int active)
 {
         if ((irq >= 0) && (irq < ARRAY_SIZE(acpi_isa_irq_penalty)))
                 acpi_isa_irq_penalty[irq] = acpi_irq_get_penalty(irq) +
-                        active ? PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING;
+                  (active ? PIRQ_PENALTY_ISA_USED : PIRQ_PENALTY_PCI_USING);
 }
 
 bool acpi_isa_irq_available(int irq)
diff --git a/drivers/ata/ahci_seattle.c b/drivers/ata/ahci_seattle.c
index 6e702ab57220..1d31c0c0fc20 100644
--- a/drivers/ata/ahci_seattle.c
+++ b/drivers/ata/ahci_seattle.c
@@ -137,7 +137,7 @@ static const struct ata_port_info *ahci_seattle_get_port_info(
         u32 val;
 
         plat_data = devm_kzalloc(dev, sizeof(*plat_data), GFP_KERNEL);
-        if (IS_ERR(plat_data))
+        if (!plat_data)
                 return &ahci_port_info;
 
         plat_data->sgpio_ctrl = devm_ioremap_resource(dev,
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 6be7770f68e9..31c183aed368 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4314,6 +4314,12 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
          */
         { "ST380013AS",         "3.20",         ATA_HORKAGE_MAX_SEC_1024 },
 
+        /*
+         * Device times out with higher max sects.
+         * https://bugzilla.kernel.org/show_bug.cgi?id=121671
+         */
+        { "LITEON CX1-JB256-HP", NULL,          ATA_HORKAGE_MAX_SEC_1024 },
+
         /* Devices we expect to fail diagnostics */
 
         /* Devices where NCQ should be avoided */
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index bd74ee555278..745489a1c86a 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -986,7 +986,7 @@ static inline void mv_write_cached_reg(void __iomem *addr, u32 *old, u32 new)
                  * Looks like a lot of fuss, but it avoids an unnecessary
                  * +1 usec read-after-write delay for unaffected registers.
                  */
-                laddr = (long)addr & 0xffff;
+                laddr = (unsigned long)addr & 0xffff;
                 if (laddr >= 0x300 && laddr <= 0x33c) {
                         laddr &= 0x000f;
                         if (laddr == 0x4 || laddr == 0xc) {
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index eda09090cb52..f642c4264c27 100644
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
@@ -8,8 +8,6 @@
 #include <linux/bcma/bcma.h>
 #include <linux/delay.h>
 
-#define BCMA_CORE_SIZE          0x1000
-
 #define bcma_err(bus, fmt, ...) \
         pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
 #define bcma_warn(bus, fmt, ...) \
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 2e6d1e9c3345..fcc5b4e0aef2 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -207,6 +207,9 @@ struct blkfront_info
         struct blk_mq_tag_set tag_set;
         struct blkfront_ring_info *rinfo;
         unsigned int nr_rings;
+        /* Save uncomplete reqs and bios for migration. */
+        struct list_head requests;
+        struct bio_list bio_list;
 };
 
 static unsigned int nr_minors;
@@ -2002,69 +2005,22 @@ static int blkif_recover(struct blkfront_info *info)
 {
         unsigned int i, r_index;
         struct request *req, *n;
-        struct blk_shadow *copy;
         int rc;
         struct bio *bio, *cloned_bio;
-        struct bio_list bio_list, merge_bio;
         unsigned int segs, offset;
         int pending, size;
         struct split_bio *split_bio;
-        struct list_head requests;
 
         blkfront_gather_backend_features(info);
         segs = info->max_indirect_segments ? : BLKIF_MAX_SEGMENTS_PER_REQUEST;
         blk_queue_max_segments(info->rq, segs);
-        bio_list_init(&bio_list);
-        INIT_LIST_HEAD(&requests);
 
         for (r_index = 0; r_index < info->nr_rings; r_index++) {
-                struct blkfront_ring_info *rinfo;
-
-                rinfo = &info->rinfo[r_index];
-                /* Stage 1: Make a safe copy of the shadow state. */
-                copy = kmemdup(rinfo->shadow, sizeof(rinfo->shadow),
-                               GFP_NOIO | __GFP_REPEAT | __GFP_HIGH);
-                if (!copy)
-                        return -ENOMEM;
-
-                /* Stage 2: Set up free list. */
-                memset(&rinfo->shadow, 0, sizeof(rinfo->shadow));
-                for (i = 0; i < BLK_RING_SIZE(info); i++)
-                        rinfo->shadow[i].req.u.rw.id = i+1;
-                rinfo->shadow_free = rinfo->ring.req_prod_pvt;
-                rinfo->shadow[BLK_RING_SIZE(info)-1].req.u.rw.id = 0x0fffffff;
+                struct blkfront_ring_info *rinfo = &info->rinfo[r_index];
 
                 rc = blkfront_setup_indirect(rinfo);
-                if (rc) {
-                        kfree(copy);
+                if (rc)
                         return rc;
-                }
-
-                for (i = 0; i < BLK_RING_SIZE(info); i++) {
-                        /* Not in use? */
-                        if (!copy[i].request)
-                                continue;
-
-                        /*
-                         * Get the bios in the request so we can re-queue them.
-                         */
-                        if (copy[i].request->cmd_flags &
-                            (REQ_FLUSH | REQ_FUA | REQ_DISCARD | REQ_SECURE)) {
-                                /*
-                                 * Flush operations don't contain bios, so
-                                 * we need to requeue the whole request
-                                 */
-                                list_add(&copy[i].request->queuelist, &requests);
-                                continue;
-                        }
-                        merge_bio.head = copy[i].request->bio;
-                        merge_bio.tail = copy[i].request->biotail;
-                        bio_list_merge(&bio_list, &merge_bio);
-                        copy[i].request->bio = NULL;
-                        blk_end_request_all(copy[i].request, 0);
-                }
-
-                kfree(copy);
         }
         xenbus_switch_state(info->xbdev, XenbusStateConnected);
 
@@ -2079,7 +2035,7 @@ static int blkif_recover(struct blkfront_info *info)
                 kick_pending_request_queues(rinfo);
         }
 
-        list_for_each_entry_safe(req, n, &requests, queuelist) {
+        list_for_each_entry_safe(req, n, &info->requests, queuelist) {
                 /* Requeue pending requests (flush or discard) */
                 list_del_init(&req->queuelist);
                 BUG_ON(req->nr_phys_segments > segs);
@@ -2087,7 +2043,7 @@ static int blkif_recover(struct blkfront_info *info)
         }
         blk_mq_kick_requeue_list(info->rq);
 
-        while ((bio = bio_list_pop(&bio_list)) != NULL) {
+        while ((bio = bio_list_pop(&info->bio_list)) != NULL) {
                 /* Traverse the list of pending bios and re-queue them */
                 if (bio_segments(bio) > segs) {
                         /*
@@ -2133,9 +2089,42 @@ static int blkfront_resume(struct xenbus_device *dev)
 {
         struct blkfront_info *info = dev_get_drvdata(&dev->dev);
         int err = 0;
+        unsigned int i, j;
 
         dev_dbg(&dev->dev, "blkfront_resume: %s\n", dev->nodename);
 
+        bio_list_init(&info->bio_list);
+        INIT_LIST_HEAD(&info->requests);
+        for (i = 0; i < info->nr_rings; i++) {
+                struct blkfront_ring_info *rinfo = &info->rinfo[i];
+                struct bio_list merge_bio;
+                struct blk_shadow *shadow = rinfo->shadow;
+
+                for (j = 0; j < BLK_RING_SIZE(info); j++) {
+                        /* Not in use? */
+                        if (!shadow[j].request)
+                                continue;
+
+                        /*
+                         * Get the bios in the request so we can re-queue them.
+                         */
+                        if (shadow[j].request->cmd_flags &
+                                        (REQ_FLUSH | REQ_FUA | REQ_DISCARD | REQ_SECURE)) {
+                                /*
+                                 * Flush operations don't contain bios, so
+                                 * we need to requeue the whole request
+                                 */
+                                list_add(&shadow[j].request->queuelist, &info->requests);
+                                continue;
+                        }
+                        merge_bio.head = shadow[j].request->bio;
+                        merge_bio.tail = shadow[j].request->biotail;
+                        bio_list_merge(&info->bio_list, &merge_bio);
+                        shadow[j].request->bio = NULL;
+                        blk_mq_end_request(shadow[j].request, 0);
+                }
+        }
+
         blkif_free(info, info->connected == BLKIF_STATE_CONNECTED);
 
         err = negotiate_mq(info);
diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c
index 10f846cc8db1..25d5906640c3 100644
--- a/drivers/clk/at91/clk-programmable.c
+++ b/drivers/clk/at91/clk-programmable.c
@@ -99,7 +99,7 @@ static int clk_programmable_set_parent(struct clk_hw *hw, u8 index)
         struct clk_programmable *prog = to_clk_programmable(hw);
         const struct clk_programmable_layout *layout = prog->layout;
         unsigned int mask = layout->css_mask;
-        unsigned int pckr = 0;
+        unsigned int pckr = index;
 
         if (layout->have_slck_mck)
                 mask |= AT91_PMC_CSSMCK_MCK;
diff --git a/drivers/clk/clk-oxnas.c b/drivers/clk/clk-oxnas.c
index efba7d4dbcfc..79bcb2e42060 100644
--- a/drivers/clk/clk-oxnas.c
+++ b/drivers/clk/clk-oxnas.c
@@ -144,9 +144,9 @@ static int oxnas_stdclk_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         regmap = syscon_node_to_regmap(of_get_parent(np));
-        if (!regmap) {
+        if (IS_ERR(regmap)) {
                 dev_err(&pdev->dev, "failed to have parent regmap\n");
-                return -EINVAL;
+                return PTR_ERR(regmap);
         }
 
         for (i = 0; i < ARRAY_SIZE(clk_oxnas_init); i++) {
diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c
index 4bb130cd0062..05b3d73bfefa 100644
--- a/drivers/clk/rockchip/clk-cpu.c
+++ b/drivers/clk/rockchip/clk-cpu.c
@@ -321,9 +321,9 @@ struct clk *rockchip_clk_register_cpuclk(const char *name,
         }
 
         cclk = clk_register(NULL, &cpuclk->hw);
-        if (IS_ERR(clk)) {
+        if (IS_ERR(cclk)) {
                 pr_err("%s: could not register cpuclk %s\n", __func__,  name);
-                ret = PTR_ERR(clk);
+                ret = PTR_ERR(cclk);
                 goto free_rate_table;
         }
 
diff --git a/drivers/clk/rockchip/clk-mmc-phase.c b/drivers/clk/rockchip/clk-mmc-phase.c
index bc856f21f6b2..077fcdc7908b 100644
--- a/drivers/clk/rockchip/clk-mmc-phase.c
+++ b/drivers/clk/rockchip/clk-mmc-phase.c
@@ -41,8 +41,6 @@ static unsigned long rockchip_mmc_recalc(struct clk_hw *hw,
 #define ROCKCHIP_MMC_DEGREE_MASK 0x3
 #define ROCKCHIP_MMC_DELAYNUM_OFFSET 2
 #define ROCKCHIP_MMC_DELAYNUM_MASK (0xff << ROCKCHIP_MMC_DELAYNUM_OFFSET)
-#define ROCKCHIP_MMC_INIT_STATE_RESET 0x1
-#define ROCKCHIP_MMC_INIT_STATE_SHIFT 1
 
 #define PSECS_PER_SEC 1000000000000LL
 
@@ -154,6 +152,7 @@ struct clk *rockchip_clk_register_mmc(const char *name,
                 return ERR_PTR(-ENOMEM);
 
         init.name = name;
+        init.flags = 0;
         init.num_parents = num_parents;
         init.parent_names = parent_names;
         init.ops = &rockchip_mmc_clk_ops;
@@ -162,15 +161,6 @@ struct clk *rockchip_clk_register_mmc(const char *name,
         mmc_clock->reg = reg;
         mmc_clock->shift = shift;
 
-        /*
-         * Assert init_state to soft reset the CLKGEN
-         * for mmc tuning phase and degree
-         */
-        if (mmc_clock->shift == ROCKCHIP_MMC_INIT_STATE_SHIFT)
-                writel(HIWORD_UPDATE(ROCKCHIP_MMC_INIT_STATE_RESET,
-                                     ROCKCHIP_MMC_INIT_STATE_RESET,
-                                     mmc_clock->shift), mmc_clock->reg);
-
         clk = clk_register(NULL, &mmc_clock->hw);
         if (IS_ERR(clk))
                 kfree(mmc_clock);
diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
index 291543f52caa..8059a8d3ea36 100644
--- a/drivers/clk/rockchip/clk-rk3399.c
+++ b/drivers/clk/rockchip/clk-rk3399.c
@@ -832,9 +832,9 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
                         RK3399_CLKGATE_CON(13), 1, GFLAGS),
 
         /* perihp */
-        GATE(0, "cpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED,
+        GATE(0, "cpll_aclk_perihp_src", "cpll", CLK_IGNORE_UNUSED,
                         RK3399_CLKGATE_CON(5), 0, GFLAGS),
-        GATE(0, "gpll_aclk_perihp_src", "cpll", CLK_IGNORE_UNUSED,
+        GATE(0, "gpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED,
                         RK3399_CLKGATE_CON(5), 1, GFLAGS),
         COMPOSITE(ACLK_PERIHP, "aclk_perihp", mux_aclk_perihp_p, CLK_IGNORE_UNUSED,
                         RK3399_CLKSEL_CON(14), 7, 1, MFLAGS, 0, 5, DFLAGS,
@@ -1466,6 +1466,8 @@ static struct rockchip_clk_branch rk3399_clk_pmu_branches[] __initdata = {
 
 static const char *const rk3399_cru_critical_clocks[] __initconst = {
         "aclk_cci_pre",
+        "aclk_gic",
+        "aclk_gic_noc",
         "pclk_perilp0",
         "pclk_perilp0",
         "hclk_perilp0",
@@ -1508,6 +1510,7 @@ static void __init rk3399_clk_init(struct device_node *np)
         ctx = rockchip_clk_init(np, reg_base, CLK_NR_CLKS);
         if (IS_ERR(ctx)) {
                 pr_err("%s: rockchip clk init failed\n", __func__);
+                iounmap(reg_base);
                 return;
         }
 
@@ -1553,6 +1556,7 @@ static void __init rk3399_pmu_clk_init(struct device_node *np)
         ctx = rockchip_clk_init(np, reg_base, CLKPMU_NR_CLKS);
         if (IS_ERR(ctx)) {
                 pr_err("%s: rockchip pmu clk init failed\n", __func__);
+                iounmap(reg_base);
                 return;
         }
 
diff --git a/drivers/clk/sunxi/clk-sun4i-display.c b/drivers/clk/sunxi/clk-sun4i-display.c
index 445a7498d6df..9780fac6d029 100644
--- a/drivers/clk/sunxi/clk-sun4i-display.c
+++ b/drivers/clk/sunxi/clk-sun4i-display.c
@@ -33,6 +33,8 @@ struct sun4i_a10_display_clk_data {
 
         u8      width_div;
         u8      width_mux;
+
+        u32     flags;
 };
 
 struct reset_data {
@@ -166,7 +168,7 @@ static void __init sun4i_a10_display_init(struct device_node *node,
                                      data->has_div ? &div->hw : NULL,
                                      data->has_div ? &clk_divider_ops : NULL,
                                      &gate->hw, &clk_gate_ops,
-                                     0);
+                                     data->flags);
         if (IS_ERR(clk)) {
                 pr_err("%s: Couldn't register the clock\n", clk_name);
                 goto free_div;
@@ -232,6 +234,7 @@ static const struct sun4i_a10_display_clk_data sun4i_a10_tcon_ch0_data __initcon
         .offset_rst     = 29,
         .offset_mux     = 24,
         .width_mux      = 2,
+        .flags          = CLK_SET_RATE_PARENT,
 };
 
 static void __init sun4i_a10_tcon_ch0_setup(struct device_node *node)
diff --git a/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c b/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c
index 98a4582de56a..b6d29d1bedca 100644
--- a/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c
+++ b/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c
@@ -79,15 +79,11 @@ static int tcon_ch1_is_enabled(struct clk_hw *hw)
 static u8 tcon_ch1_get_parent(struct clk_hw *hw)
 {
         struct tcon_ch1_clk *tclk = hw_to_tclk(hw);
-        int num_parents = clk_hw_get_num_parents(hw);
         u32 reg;
 
         reg = readl(tclk->reg) >> TCON_CH1_SCLK2_MUX_SHIFT;
         reg &= reg >> TCON_CH1_SCLK2_MUX_MASK;
 
-        if (reg >= num_parents)
-                return -EINVAL;
-
         return reg;
 }
 
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 15d06fcf0b50..b02f9c606e0b 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -56,11 +56,21 @@ static struct cb_id cn_proc_event_id = { CN_IDX_PROC, CN_VAL_PROC };
 /* proc_event_counts is used as the sequence number of the netlink message */
 static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
 
-static inline void get_seq(__u32 *ts, int *cpu)
+static inline void send_msg(struct cn_msg *msg)
 {
         preempt_disable();
-        *ts = __this_cpu_inc_return(proc_event_counts) - 1;
-        *cpu = smp_processor_id();
+
+        msg->seq = __this_cpu_inc_return(proc_event_counts) - 1;
+        ((struct proc_event *)msg->data)->cpu = smp_processor_id();
+
+        /*
+         * Preemption remains disabled during send to ensure the messages are
+         * ordered according to their sequence numbers.
+         *
+         * If cn_netlink_send() fails, the data is not sent.
+         */
+        cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_NOWAIT);
+
         preempt_enable();
 }
 
@@ -77,7 +87,6 @@ void proc_fork_connector(struct task_struct *task)
         msg = buffer_to_cn_msg(buffer);
         ev = (struct proc_event *)msg->data;
         memset(&ev->event_data, 0, sizeof(ev->event_data));
-        get_seq(&msg->seq, &ev->cpu);
         ev->timestamp_ns = ktime_get_ns();
         ev->what = PROC_EVENT_FORK;
         rcu_read_lock();
@@ -92,8 +101,7 @@ void proc_fork_connector(struct task_struct *task)
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
         msg->flags = 0; /* not used */
-        /*  If cn_netlink_send() failed, the data is not sent */
-        cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_KERNEL);
+        send_msg(msg);
 }
 
 void proc_exec_connector(struct task_struct *task)
@@ -108,7 +116,6 @@ void proc_exec_connector(struct task_struct *task)
         msg = buffer_to_cn_msg(buffer);
         ev = (struct proc_event *)msg->data;
         memset(&ev->event_data, 0, sizeof(ev->event_data));
-        get_seq(&msg->seq, &ev->cpu);
         ev->timestamp_ns = ktime_get_ns();
         ev->what = PROC_EVENT_EXEC;
         ev->event_data.exec.process_pid = task->pid;
@@ -118,7 +125,7 @@ void proc_exec_connector(struct task_struct *task)
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
         msg->flags = 0; /* not used */
-        cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_KERNEL);
+        send_msg(msg);
 }
 
 void proc_id_connector(struct task_struct *task, int which_id)
@@ -150,14 +157,13 @@ void proc_id_connector(struct task_struct *task, int which_id)
                 return;
         }
         rcu_read_unlock();
-        get_seq(&msg->seq, &ev->cpu);
         ev->timestamp_ns = ktime_get_ns();
 
         memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
         msg->flags = 0; /* not used */
-        cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_KERNEL);
+        send_msg(msg);
 }
 
 void proc_sid_connector(struct task_struct *task)
@@ -172,7 +178,6 @@ void proc_sid_connector(struct task_struct *task)
         msg = buffer_to_cn_msg(buffer);
         ev = (struct proc_event *)msg->data;
         memset(&ev->event_data, 0, sizeof(ev->event_data));
-        get_seq(&msg->seq, &ev->cpu);
         ev->timestamp_ns = ktime_get_ns();
         ev->what = PROC_EVENT_SID;
         ev->event_data.sid.process_pid = task->pid;
@@ -182,7 +187,7 @@ void proc_sid_connector(struct task_struct *task)
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
         msg->flags = 0; /* not used */
-        cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_KERNEL);
+        send_msg(msg);
 }
 
 void proc_ptrace_connector(struct task_struct *task, int ptrace_id)
@@ -197,7 +202,6 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id)
         msg = buffer_to_cn_msg(buffer);
         ev = (struct proc_event *)msg->data;
         memset(&ev->event_data, 0, sizeof(ev->event_data));
-        get_seq(&msg->seq, &ev->cpu);
         ev->timestamp_ns = ktime_get_ns();
         ev->what = PROC_EVENT_PTRACE;
         ev->event_data.ptrace.process_pid  = task->pid;
@@ -215,7 +219,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id)
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
         msg->flags = 0; /* not used */
-        cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_KERNEL);
+        send_msg(msg);
 }
 
 void proc_comm_connector(struct task_struct *task)
@@ -230,7 +234,6 @@ void proc_comm_connector(struct task_struct *task)
         msg = buffer_to_cn_msg(buffer);
         ev = (struct proc_event *)msg->data;
         memset(&ev->event_data, 0, sizeof(ev->event_data));
-        get_seq(&msg->seq, &ev->cpu);
         ev->timestamp_ns = ktime_get_ns();
         ev->what = PROC_EVENT_COMM;
         ev->event_data.comm.process_pid  = task->pid;
@@ -241,7 +244,7 @@ void proc_comm_connector(struct task_struct *task)
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
         msg->flags = 0; /* not used */
-        cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_KERNEL);
+        send_msg(msg);
 }
 
 void proc_coredump_connector(struct task_struct *task)
@@ -256,7 +259,6 @@ void proc_coredump_connector(struct task_struct *task)
         msg = buffer_to_cn_msg(buffer);
         ev = (struct proc_event *)msg->data;
         memset(&ev->event_data, 0, sizeof(ev->event_data));
-        get_seq(&msg->seq, &ev->cpu);
         ev->timestamp_ns = ktime_get_ns();
         ev->what = PROC_EVENT_COREDUMP;
         ev->event_data.coredump.process_pid = task->pid;
@@ -266,7 +268,7 @@ void proc_coredump_connector(struct task_struct *task)
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
         msg->flags = 0; /* not used */
-        cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_KERNEL);
+        send_msg(msg);
 }
 
 void proc_exit_connector(struct task_struct *task)
@@ -281,7 +283,6 @@ void proc_exit_connector(struct task_struct *task)
         msg = buffer_to_cn_msg(buffer);
         ev = (struct proc_event *)msg->data;
         memset(&ev->event_data, 0, sizeof(ev->event_data));
-        get_seq(&msg->seq, &ev->cpu);
         ev->timestamp_ns = ktime_get_ns();
         ev->what = PROC_EVENT_EXIT;
         ev->event_data.exit.process_pid = task->pid;
@@ -293,7 +294,7 @@ void proc_exit_connector(struct task_struct *task)
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
         msg->flags = 0; /* not used */
-        cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_KERNEL);
+        send_msg(msg);
 }
 
 /*
@@ -325,7 +326,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
         msg->ack = rcvd_ack + 1;
         msg->len = sizeof(*ev);
         msg->flags = 0; /* not used */
-        cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_KERNEL);
+        send_msg(msg);
 }
 
 /**
diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
index 3646b143bbf5..0bb44d5b5df4 100644
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
@@ -79,15 +79,16 @@ static const struct of_device_id machines[] __initconst = {
 static int __init cpufreq_dt_platdev_init(void)
 {
         struct device_node *np = of_find_node_by_path("/");
+        const struct of_device_id *match;
 
         if (!np)
                 return -ENODEV;
 
-        if (!of_match_node(machines, np))
+        match = of_match_node(machines, np);
+        of_node_put(np);
+        if (!match)
                 return -ENODEV;
 
-        of_node_put(of_root);
-
         return PTR_ERR_OR_ZERO(platform_device_register_simple("cpufreq-dt", -1,
                                                                NULL, 0));
 }
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 9009295f5134..5617c7087d77 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2261,6 +2261,10 @@ int cpufreq_update_policy(unsigned int cpu)
          * -> ask driver for current freq and notify governors about a change
          */
         if (cpufreq_driver->get && !cpufreq_driver->setpolicy) {
+                if (cpufreq_suspended) {
+                        ret = -EAGAIN;
+                        goto unlock;
+                }
                 new_policy.cur = cpufreq_update_current_freq(policy);
                 if (WARN_ON(!new_policy.cur)) {
                         ret = -EIO;
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index fe9dc17ea873..1fa1a32928d7 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1400,6 +1400,9 @@ static void intel_pstate_set_update_util_hook(unsigned int cpu_num)
 {
         struct cpudata *cpu = all_cpu_data[cpu_num];
 
+        if (cpu->update_util_set)
+                return;
+
         /* Prevent intel_pstate_update_util() from using stale data. */
         cpu->sample.time = 0;
         cpufreq_add_update_util_hook(cpu_num, &cpu->update_util,
@@ -1440,8 +1443,6 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
         if (!policy->cpuinfo.max_freq)
                 return -ENODEV;
 
-        intel_pstate_clear_update_util_hook(policy->cpu);
-
         pr_debug("set_policy cpuinfo.max %u policy->max %u\n",
                  policy->cpuinfo.max_freq, policy->max);
 
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index a4d0059e232c..c73207abb5a4 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -173,7 +173,7 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
 
         struct cpuidle_state *target_state = &drv->states[index];
         bool broadcast = !!(target_state->flags & CPUIDLE_FLAG_TIMER_STOP);
-        u64 time_start, time_end;
+        ktime_t time_start, time_end;
         s64 diff;
 
         /*
@@ -195,13 +195,13 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
         sched_idle_set_state(target_state);
 
         trace_cpu_idle_rcuidle(index, dev->cpu);
-        time_start = local_clock();
+        time_start = ns_to_ktime(local_clock());
 
         stop_critical_timings();
         entered_state = target_state->enter(dev, drv, index);
         start_critical_timings();
 
-        time_end = local_clock();
+        time_end = ns_to_ktime(local_clock());
         trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
 
         /* The cpu is no longer idle or about to enter idle. */
@@ -217,11 +217,7 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
         if (!cpuidle_state_is_coupled(drv, index))
                 local_irq_enable();
 
-        /*
-         * local_clock() returns the time in nanosecond, let's shift
-         * by 10 (divide by 1024) to have microsecond based time.
-         */
-        diff = (time_end - time_start) >> 10;
+        diff = ktime_us_delta(time_end, time_start);
         if (diff > INT_MAX)
                 diff = INT_MAX;
 
diff --git a/drivers/crypto/qat/qat_common/Makefile b/drivers/crypto/qat/qat_common/Makefile
index 6d74b91f2152..5fc3dbb9ada0 100644
--- a/drivers/crypto/qat/qat_common/Makefile
+++ b/drivers/crypto/qat/qat_common/Makefile
@@ -2,6 +2,7 @@ $(obj)/qat_rsapubkey-asn1.o: $(obj)/qat_rsapubkey-asn1.c \
                              $(obj)/qat_rsapubkey-asn1.h
 $(obj)/qat_rsaprivkey-asn1.o: $(obj)/qat_rsaprivkey-asn1.c \
                               $(obj)/qat_rsaprivkey-asn1.h
+$(obj)/qat_asym_algs.o: $(obj)/qat_rsapubkey-asn1.h $(obj)/qat_rsaprivkey-asn1.h
 
 clean-files += qat_rsapubkey-asn1.c qat_rsapubkey-asn1.h
 clean-files += qat_rsaprivkey-asn1.c qat_rsaprivkey-asn1.h
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index 574e87c7f2b8..9acccad26928 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -781,7 +781,7 @@ static int hash_process_data(struct hash_device_data *device_data,
                                                 &device_data->state);
                                 memmove(req_ctx->state.buffer,
                                         device_data->state.buffer,
-                                        HASH_BLOCK_SIZE / sizeof(u32));
+                                        HASH_BLOCK_SIZE);
                                 if (ret) {
                                         dev_err(device_data->dev,
                                                 "%s: hash_resume_state() failed!\n",
@@ -832,7 +832,7 @@ static int hash_process_data(struct hash_device_data *device_data,
 
                         memmove(device_data->state.buffer,
                                 req_ctx->state.buffer,
-                                HASH_BLOCK_SIZE / sizeof(u32));
+                                HASH_BLOCK_SIZE);
                         if (ret) {
                                 dev_err(device_data->dev, "%s: hash_save_state() failed!\n",
                                         __func__);
diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c
index 495577b6d31b..94ad5c0adbcb 100644
--- a/drivers/crypto/vmx/aes_cbc.c
+++ b/drivers/crypto/vmx/aes_cbc.c
@@ -182,7 +182,7 @@ struct crypto_alg p8_aes_cbc_alg = {
         .cra_name = "cbc(aes)",
         .cra_driver_name = "p8_aes_cbc",
         .cra_module = THIS_MODULE,
-        .cra_priority = 1000,
+        .cra_priority = 2000,
         .cra_type = &crypto_blkcipher_type,
         .cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK,
         .cra_alignmask = 0,
diff --git a/drivers/crypto/vmx/aes_ctr.c b/drivers/crypto/vmx/aes_ctr.c
index 0a3c1b04cf3c..38ed10d761d0 100644
--- a/drivers/crypto/vmx/aes_ctr.c
+++ b/drivers/crypto/vmx/aes_ctr.c
@@ -166,7 +166,7 @@ struct crypto_alg p8_aes_ctr_alg = {
         .cra_name = "ctr(aes)",
         .cra_driver_name = "p8_aes_ctr",
         .cra_module = THIS_MODULE,
-        .cra_priority = 1000,
+        .cra_priority = 2000,
         .cra_type = &crypto_blkcipher_type,
         .cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK,
         .cra_alignmask = 0,
diff --git a/drivers/crypto/vmx/ppc-xlate.pl b/drivers/crypto/vmx/ppc-xlate.pl
index 9f4994cabcc7..b18e67d0e065 100644
--- a/drivers/crypto/vmx/ppc-xlate.pl
+++ b/drivers/crypto/vmx/ppc-xlate.pl
@@ -141,7 +141,7 @@ my $vmr = sub {
 
 # Some ABIs specify vrsave, special-purpose register #256, as reserved
 # for system use.
-my $no_vrsave = ($flavour =~ /aix|linux64le/);
+my $no_vrsave = ($flavour =~ /linux-ppc64le/);
 my $mtspr = sub {
     my ($f,$idx,$ra) = @_;
     if ($idx == 256 && $no_vrsave) {
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 6744d88bdea8..4fb2eb7c800d 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -2378,22 +2378,19 @@ static int sbridge_get_onedevice(struct pci_dev **prev,
  * @num_mc: pointer to the memory controllers count, to be incremented in case
  *          of success.
  * @table: model specific table
- * @allow_dups: allow for multiple devices to exist with the same device id
- *              (as implemented, this isn't expected to work correctly in the
- *              multi-socket case).
- * @multi_bus: don't assume devices on different buses belong to different
- *             memory controllers.
  *
  * returns 0 in case of success or error code
  */
-static int sbridge_get_all_devices_full(u8 *num_mc,
-                                        const struct pci_id_table *table,
-                                        int allow_dups,
-                                        int multi_bus)
+static int sbridge_get_all_devices(u8 *num_mc,
+                                        const struct pci_id_table *table)
 {
         int i, rc;
         struct pci_dev *pdev = NULL;
+        int allow_dups = 0;
+        int multi_bus = 0;
 
+        if (table->type == KNIGHTS_LANDING)
+                allow_dups = multi_bus = 1;
         while (table && table->descr) {
                 for (i = 0; i < table->n_devs; i++) {
                         if (!allow_dups || i == 0 ||
@@ -2420,11 +2417,6 @@ static int sbridge_get_all_devices_full(u8 *num_mc,
         return 0;
 }
 
-#define sbridge_get_all_devices(num_mc, table) \
-                sbridge_get_all_devices_full(num_mc, table, 0, 0)
-#define sbridge_get_all_devices_knl(num_mc, table) \
-                sbridge_get_all_devices_full(num_mc, table, 1, 1)
-
 static int sbridge_mci_bind_devs(struct mem_ctl_info *mci,
                                  struct sbridge_dev *sbridge_dev)
 {
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index cebcb405812e..d7860614f87f 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -49,7 +49,7 @@ config GPIO_DEVRES
 
 config OF_GPIO
         def_bool y
-        depends on OF || COMPILE_TEST
+        depends on OF
 
 config GPIO_ACPI
         def_bool y
@@ -402,9 +402,12 @@ config GPIO_TB10X
         select OF_GPIO
 
 config GPIO_TEGRA
-        bool
-        default y
+        bool "NVIDIA Tegra GPIO support"
+        default ARCH_TEGRA
         depends on ARCH_TEGRA || COMPILE_TEST
+        depends on OF
+        help
+          Say yes here to support GPIO pins on NVIDIA Tegra SoCs.
 
 config GPIO_TS4800
         tristate "TS-4800 DIO blocks and compatibles"
diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c
index e85e7539cf5d..eb43ae4835c1 100644
--- a/drivers/gpio/gpio-sch.c
+++ b/drivers/gpio/gpio-sch.c
@@ -61,9 +61,8 @@ static unsigned sch_gpio_bit(struct sch_gpio *sch, unsigned gpio)
         return gpio % 8;
 }
 
-static int sch_gpio_reg_get(struct gpio_chip *gc, unsigned gpio, unsigned reg)
+static int sch_gpio_reg_get(struct sch_gpio *sch, unsigned gpio, unsigned reg)
 {
-        struct sch_gpio *sch = gpiochip_get_data(gc);
         unsigned short offset, bit;
         u8 reg_val;
 
@@ -75,10 +74,9 @@ static int sch_gpio_reg_get(struct gpio_chip *gc, unsigned gpio, unsigned reg)
         return reg_val;
 }
 
-static void sch_gpio_reg_set(struct gpio_chip *gc, unsigned gpio, unsigned reg,
+static void sch_gpio_reg_set(struct sch_gpio *sch, unsigned gpio, unsigned reg,
                              int val)
 {
-        struct sch_gpio *sch = gpiochip_get_data(gc);
         unsigned short offset, bit;
         u8 reg_val;
 
@@ -98,14 +96,15 @@ static int sch_gpio_direction_in(struct gpio_chip *gc, unsigned gpio_num)
         struct sch_gpio *sch = gpiochip_get_data(gc);
 
         spin_lock(&sch->lock);
-        sch_gpio_reg_set(gc, gpio_num, GIO, 1);
+        sch_gpio_reg_set(sch, gpio_num, GIO, 1);
         spin_unlock(&sch->lock);
         return 0;
 }
 
 static int sch_gpio_get(struct gpio_chip *gc, unsigned gpio_num)
 {
-        return sch_gpio_reg_get(gc, gpio_num, GLV);
+        struct sch_gpio *sch = gpiochip_get_data(gc);
+        return sch_gpio_reg_get(sch, gpio_num, GLV);
 }
 
 static void sch_gpio_set(struct gpio_chip *gc, unsigned gpio_num, int val)
@@ -113,7 +112,7 @@ static void sch_gpio_set(struct gpio_chip *gc, unsigned gpio_num, int val)
         struct sch_gpio *sch = gpiochip_get_data(gc);
 
         spin_lock(&sch->lock);
-        sch_gpio_reg_set(gc, gpio_num, GLV, val);
+        sch_gpio_reg_set(sch, gpio_num, GLV, val);
         spin_unlock(&sch->lock);
 }
 
@@ -123,7 +122,7 @@ static int sch_gpio_direction_out(struct gpio_chip *gc, unsigned gpio_num,
         struct sch_gpio *sch = gpiochip_get_data(gc);
 
         spin_lock(&sch->lock);
-        sch_gpio_reg_set(gc, gpio_num, GIO, 0);
+        sch_gpio_reg_set(sch, gpio_num, GIO, 0);
         spin_unlock(&sch->lock);
 
         /*
@@ -182,13 +181,13 @@ static int sch_gpio_probe(struct platform_device *pdev)
                  * GPIO7 is configured by the CMC as SLPIOVR
                  * Enable GPIO[9:8] core powered gpios explicitly
                  */
-                sch_gpio_reg_set(&sch->chip, 8, GEN, 1);
-                sch_gpio_reg_set(&sch->chip, 9, GEN, 1);
+                sch_gpio_reg_set(sch, 8, GEN, 1);
+                sch_gpio_reg_set(sch, 9, GEN, 1);
                 /*
                  * SUS_GPIO[2:0] enabled by default
                  * Enable SUS_GPIO3 resume powered gpio explicitly
                  */
-                sch_gpio_reg_set(&sch->chip, 13, GEN, 1);
+                sch_gpio_reg_set(sch, 13, GEN, 1);
                 break;
 
         case PCI_DEVICE_ID_INTEL_ITC_LPC:
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index ec891a27952f..661b0e34e067 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -98,7 +98,6 @@ struct tegra_gpio_info {
         const struct tegra_gpio_soc_config      *soc;
         struct gpio_chip                        gc;
         struct irq_chip                         ic;
-        struct lock_class_key                   lock_class;
         u32                                     bank_count;
 };
 
@@ -547,6 +546,12 @@ static const struct dev_pm_ops tegra_gpio_pm_ops = {
         SET_SYSTEM_SLEEP_PM_OPS(tegra_gpio_suspend, tegra_gpio_resume)
 };
 
+/*
+ * This lock class tells lockdep that GPIO irqs are in a different category
+ * than their parents, so it won't report false recursion.
+ */
+static struct lock_class_key gpio_lock_class;
+
 static int tegra_gpio_probe(struct platform_device *pdev)
 {
         const struct tegra_gpio_soc_config *config;
@@ -660,7 +665,7 @@ static int tegra_gpio_probe(struct platform_device *pdev)
 
                 bank = &tgi->bank_info[GPIO_BANK(gpio)];
 
-                irq_set_lockdep_class(irq, &tgi->lock_class);
+                irq_set_lockdep_class(irq, &gpio_lock_class);
                 irq_set_chip_data(irq, bank);
                 irq_set_chip_and_handler(irq, &tgi->ic, handle_simple_irq);
         }
diff --git a/drivers/gpio/gpiolib-legacy.c b/drivers/gpio/gpiolib-legacy.c
index 3a5c7011ad3b..8b830996fe02 100644
--- a/drivers/gpio/gpiolib-legacy.c
+++ b/drivers/gpio/gpiolib-legacy.c
@@ -28,6 +28,10 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
         if (!desc && gpio_is_valid(gpio))
                 return -EPROBE_DEFER;
 
+        err = gpiod_request(desc, label);
+        if (err)
+                return err;
+
         if (flags & GPIOF_OPEN_DRAIN)
                 set_bit(FLAG_OPEN_DRAIN, &desc->flags);
 
@@ -37,10 +41,6 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
         if (flags & GPIOF_ACTIVE_LOW)
                 set_bit(FLAG_ACTIVE_LOW, &desc->flags);
 
-        err = gpiod_request(desc, label);
-        if (err)
-                return err;
-
         if (flags & GPIOF_DIR_IN)
                 err = gpiod_direction_input(desc);
         else
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 570771ed19e6..be74bd370f1f 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1352,14 +1352,6 @@ static int __gpiod_request(struct gpio_desc *desc, const char *label)
                 spin_lock_irqsave(&gpio_lock, flags);
         }
 done:
-        if (status < 0) {
-                /* Clear flags that might have been set by the caller before
-                 * requesting the GPIO.
-                 */
-                clear_bit(FLAG_ACTIVE_LOW, &desc->flags);
-                clear_bit(FLAG_OPEN_DRAIN, &desc->flags);
-                clear_bit(FLAG_OPEN_SOURCE, &desc->flags);
-        }
         spin_unlock_irqrestore(&gpio_lock, flags);
         return status;
 }
@@ -2587,28 +2579,13 @@ struct gpio_desc *__must_check gpiod_get_optional(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(gpiod_get_optional);
 
-/**
- * gpiod_parse_flags - helper function to parse GPIO lookup flags
- * @desc:       gpio to be setup
- * @lflags:     gpio_lookup_flags - returned from of_find_gpio() or
- *              of_get_gpio_hog()
- *
- * Set the GPIO descriptor flags based on the given GPIO lookup flags.
- */
-static void gpiod_parse_flags(struct gpio_desc *desc, unsigned long lflags)
-{
-        if (lflags & GPIO_ACTIVE_LOW)
-                set_bit(FLAG_ACTIVE_LOW, &desc->flags);
-        if (lflags & GPIO_OPEN_DRAIN)
-                set_bit(FLAG_OPEN_DRAIN, &desc->flags);
-        if (lflags & GPIO_OPEN_SOURCE)
-                set_bit(FLAG_OPEN_SOURCE, &desc->flags);
-}
 
 /**
  * gpiod_configure_flags - helper function to configure a given GPIO
  * @desc:       gpio whose value will be assigned
  * @con_id:     function within the GPIO consumer
+ * @lflags:     gpio_lookup_flags - returned from of_find_gpio() or
+ *              of_get_gpio_hog()
  * @dflags:     gpiod_flags - optional GPIO initialization flags
  *
  * Return 0 on success, -ENOENT if no GPIO has been assigned to the
@@ -2616,10 +2593,17 @@ static void gpiod_parse_flags(struct gpio_desc *desc, unsigned long lflags)
  * occurred while trying to acquire the GPIO.
  */
 static int gpiod_configure_flags(struct gpio_desc *desc, const char *con_id,
-                                 enum gpiod_flags dflags)
+                unsigned long lflags, enum gpiod_flags dflags)
 {
         int status;
 
+        if (lflags & GPIO_ACTIVE_LOW)
+                set_bit(FLAG_ACTIVE_LOW, &desc->flags);
+        if (lflags & GPIO_OPEN_DRAIN)
+                set_bit(FLAG_OPEN_DRAIN, &desc->flags);
+        if (lflags & GPIO_OPEN_SOURCE)
+                set_bit(FLAG_OPEN_SOURCE, &desc->flags);
+
         /* No particular flag request, return here... */
         if (!(dflags & GPIOD_FLAGS_BIT_DIR_SET)) {
                 pr_debug("no flags found for %s\n", con_id);
@@ -2686,13 +2670,11 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,
                 return desc;
         }
 
-        gpiod_parse_flags(desc, lookupflags);
-
         status = gpiod_request(desc, con_id);
         if (status < 0)
                 return ERR_PTR(status);
 
-        status = gpiod_configure_flags(desc, con_id, flags);
+        status = gpiod_configure_flags(desc, con_id, lookupflags, flags);
         if (status < 0) {
                 dev_dbg(dev, "setup of GPIO %s failed\n", con_id);
                 gpiod_put(desc);
@@ -2748,6 +2730,10 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
         if (IS_ERR(desc))
                 return desc;
 
+        ret = gpiod_request(desc, NULL);
+        if (ret)
+                return ERR_PTR(ret);
+
         if (active_low)
                 set_bit(FLAG_ACTIVE_LOW, &desc->flags);
 
@@ -2758,10 +2744,6 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,
                         set_bit(FLAG_OPEN_SOURCE, &desc->flags);
         }
 
-        ret = gpiod_request(desc, NULL);
-        if (ret)
-                return ERR_PTR(ret);
-
         return desc;
 }
 EXPORT_SYMBOL_GPL(fwnode_get_named_gpiod);
@@ -2814,8 +2796,6 @@ int gpiod_hog(struct gpio_desc *desc, const char *name,
         chip = gpiod_to_chip(desc);
         hwnum = gpio_chip_hwgpio(desc);
 
-        gpiod_parse_flags(desc, lflags);
-
         local_desc = gpiochip_request_own_desc(chip, hwnum, name);
         if (IS_ERR(local_desc)) {
                 status = PTR_ERR(local_desc);
@@ -2824,7 +2804,7 @@ int gpiod_hog(struct gpio_desc *desc, const char *name,
                 return status;
         }
 
-        status = gpiod_configure_flags(desc, name, dflags);
+        status = gpiod_configure_flags(desc, name, lflags, dflags);
         if (status < 0) {
                 pr_err("setup of hog GPIO %s (chip %s, offset %d) failed, %d\n",
                        name, chip->label, hwnum, status);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index e19520c4b4b6..d9c88d13f8db 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -1106,6 +1106,10 @@ static void amdgpu_uvd_idle_work_handler(struct work_struct *work)
         if (fences == 0 && handles == 0) {
                 if (adev->pm.dpm_enabled) {
                         amdgpu_dpm_enable_uvd(adev, false);
+                        /* just work around for uvd clock remain high even
+                         * when uvd dpm disabled on Polaris10 */
+                        if (adev->asic_type == CHIP_POLARIS10)
+                                amdgpu_asic_set_uvd_clocks(adev, 0, 0);
                 } else {
                         amdgpu_asic_set_uvd_clocks(adev, 0, 0);
                 }
diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_i2c.c b/drivers/gpu/drm/amd/amdgpu/atombios_i2c.c
index 13cdb01e9b45..bc56c8a181e6 100644
--- a/drivers/gpu/drm/amd/amdgpu/atombios_i2c.c
+++ b/drivers/gpu/drm/amd/amdgpu/atombios_i2c.c
@@ -156,3 +156,18 @@ u32 amdgpu_atombios_i2c_func(struct i2c_adapter *adap)
         return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
 }
 
+void amdgpu_atombios_i2c_channel_trans(struct amdgpu_device* adev, u8 slave_addr, u8 line_number, u8 offset, u8 data)
+{
+        PROCESS_I2C_CHANNEL_TRANSACTION_PS_ALLOCATION args;
+        int index = GetIndexIntoMasterTable(COMMAND, ProcessI2cChannelTransaction);
+
+        args.ucRegIndex = offset;
+        args.lpI2CDataOut = data;
+        args.ucFlag = 1;
+        args.ucI2CSpeed = TARGET_HW_I2C_CLOCK;
+        args.ucTransBytes = 1;
+        args.ucSlaveAddr = slave_addr;
+        args.ucLineNumber = line_number;
+
+        amdgpu_atom_execute_table(adev->mode_info.atom_context, index, (uint32_t *)&args);
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_i2c.h b/drivers/gpu/drm/amd/amdgpu/atombios_i2c.h
index d6128d9de56e..251aaf41f65d 100644
--- a/drivers/gpu/drm/amd/amdgpu/atombios_i2c.h
+++ b/drivers/gpu/drm/amd/amdgpu/atombios_i2c.h
@@ -27,5 +27,7 @@
 int amdgpu_atombios_i2c_xfer(struct i2c_adapter *i2c_adap,
                       struct i2c_msg *msgs, int num);
 u32 amdgpu_atombios_i2c_func(struct i2c_adapter *adap);
+void amdgpu_atombios_i2c_channel_trans(struct amdgpu_device* adev,
+                u8 slave_addr, u8 line_number, u8 offset, u8 data);
 
 #endif
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index c30b6ac25d89..aabaf2f92575 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -28,6 +28,7 @@
 #include "vid.h"
 #include "amdgpu_ucode.h"
 #include "amdgpu_atombios.h"
+#include "atombios_i2c.h"
 #include "clearstate_vi.h"
 
 #include "gmc/gmc_8_2_d.h"
@@ -47,6 +48,8 @@
 #include "dce/dce_10_0_d.h"
 #include "dce/dce_10_0_sh_mask.h"
 
+#include "smu/smu_7_1_3_d.h"
+
 #define GFX8_NUM_GFX_RINGS     1
 #define GFX8_NUM_COMPUTE_RINGS 8
 
@@ -282,6 +285,7 @@ static const u32 golden_settings_polaris11_a11[] =
         mmTCP_ADDR_CONFIG, 0x000003ff, 0x000000f3,
         mmTCP_CHAN_STEER_HI, 0xffffffff, 0x00000000,
         mmTCP_CHAN_STEER_LO, 0xffffffff, 0x00003210,
+        mmVGT_RESET_DEBUG, 0x00000004, 0x00000004,
 };
 
 static const u32 polaris11_golden_common_all[] =
@@ -312,6 +316,7 @@ static const u32 golden_settings_polaris10_a11[] =
         mmTCC_CTRL, 0x00100000, 0xf31fff7f,
         mmTCP_ADDR_CONFIG, 0x000003ff, 0x000000f7,
         mmTCP_CHAN_STEER_HI, 0xffffffff, 0x00000000,
+        mmVGT_RESET_DEBUG, 0x00000004, 0x00000004,
 };
 
 static const u32 polaris10_golden_common_all[] =
@@ -693,6 +698,11 @@ static void gfx_v8_0_init_golden_registers(struct amdgpu_device *adev)
                 amdgpu_program_register_sequence(adev,
                                                  polaris10_golden_common_all,
                                                  (const u32)ARRAY_SIZE(polaris10_golden_common_all));
+                WREG32_SMC(ixCG_ACLK_CNTL, 0x0000001C);
+                if (adev->pdev->revision == 0xc7) {
+                        amdgpu_atombios_i2c_channel_trans(adev, 0x10, 0x96, 0x1E, 0xDD);
+                        amdgpu_atombios_i2c_channel_trans(adev, 0x10, 0x96, 0x1F, 0xD0);
+                }
                 break;
         case CHIP_CARRIZO:
                 amdgpu_program_register_sequence(adev,
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
index 9d764c4d253e..a6c9b4201e25 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
@@ -780,7 +780,7 @@ static int polaris10_populate_smc_mvdd_table(struct pp_hwmgr *hwmgr,
                         table->Smio[level] |=
                                 data->mvdd_voltage_table.entries[level].smio_low;
                 }
-                table->SmioMask2 = data->vddci_voltage_table.mask_low;
+                table->SmioMask2 = data->mvdd_voltage_table.mask_low;
 
                 table->MvddLevelCount = (uint32_t) PP_HOST_TO_SMC_UL(count);
         }
@@ -1470,22 +1470,19 @@ static int polaris10_populate_smc_acpi_level(struct pp_hwmgr *hwmgr,
 
         table->ACPILevel.Flags &= ~PPSMC_SWSTATE_FLAG_DC;
 
-        if (!data->sclk_dpm_key_disabled) {
-                /* Get MinVoltage and Frequency from DPM0,
-                 * already converted to SMC_UL */
-                sclk_frequency = data->dpm_table.sclk_table.dpm_levels[0].value;
-                result = polaris10_get_dependency_volt_by_clk(hwmgr,
-                                table_info->vdd_dep_on_sclk,
-                                table->ACPILevel.SclkFrequency,
-                                &table->ACPILevel.MinVoltage, &mvdd);
-                PP_ASSERT_WITH_CODE((0 == result),
-                                "Cannot find ACPI VDDC voltage value "
-                                "in Clock Dependency Table", );
-        } else {
-                sclk_frequency = data->vbios_boot_state.sclk_bootup_value;
-                table->ACPILevel.MinVoltage =
-                                data->vbios_boot_state.vddc_bootup_value * VOLTAGE_SCALE;
-        }
+
+        /* Get MinVoltage and Frequency from DPM0,
+         * already converted to SMC_UL */
+        sclk_frequency = data->dpm_table.sclk_table.dpm_levels[0].value;
+        result = polaris10_get_dependency_volt_by_clk(hwmgr,
+                        table_info->vdd_dep_on_sclk,
+                        sclk_frequency,
+                        &table->ACPILevel.MinVoltage, &mvdd);
+        PP_ASSERT_WITH_CODE((0 == result),
+                        "Cannot find ACPI VDDC voltage value "
+                        "in Clock Dependency Table",
+                        );
+
 
         result = polaris10_calculate_sclk_params(hwmgr, sclk_frequency,  &(table->ACPILevel.SclkSetting));
         PP_ASSERT_WITH_CODE(result == 0, "Error retrieving Engine Clock dividers from VBIOS.", return result);
@@ -1510,24 +1507,18 @@ static int polaris10_populate_smc_acpi_level(struct pp_hwmgr *hwmgr,
         CONVERT_FROM_HOST_TO_SMC_US(table->ACPILevel.SclkSetting.Fcw1_frac);
         CONVERT_FROM_HOST_TO_SMC_US(table->ACPILevel.SclkSetting.Sclk_ss_slew_rate);
 
-        if (!data->mclk_dpm_key_disabled) {
-                /* Get MinVoltage and Frequency from DPM0, already converted to SMC_UL */
-                table->MemoryACPILevel.MclkFrequency =
-                                data->dpm_table.mclk_table.dpm_levels[0].value;
-                result = polaris10_get_dependency_volt_by_clk(hwmgr,
-                                table_info->vdd_dep_on_mclk,
-                                table->MemoryACPILevel.MclkFrequency,
-                                &table->MemoryACPILevel.MinVoltage, &mvdd);
-                PP_ASSERT_WITH_CODE((0 == result),
-                                "Cannot find ACPI VDDCI voltage value "
-                                "in Clock Dependency Table",
-                                );
-        } else {
-                table->MemoryACPILevel.MclkFrequency =
-                                data->vbios_boot_state.mclk_bootup_value;
-                table->MemoryACPILevel.MinVoltage =
-                                data->vbios_boot_state.vddci_bootup_value * VOLTAGE_SCALE;
-        }
+
+        /* Get MinVoltage and Frequency from DPM0, already converted to SMC_UL */
+        table->MemoryACPILevel.MclkFrequency =
+                        data->dpm_table.mclk_table.dpm_levels[0].value;
+        result = polaris10_get_dependency_volt_by_clk(hwmgr,
+                        table_info->vdd_dep_on_mclk,
+                        table->MemoryACPILevel.MclkFrequency,
+                        &table->MemoryACPILevel.MinVoltage, &mvdd);
+        PP_ASSERT_WITH_CODE((0 == result),
+                        "Cannot find ACPI VDDCI voltage value "
+                        "in Clock Dependency Table",
+                        );
 
         us_mvdd = 0;
         if ((POLARIS10_VOLTAGE_CONTROL_NONE == data->mvdd_control) ||
@@ -1572,6 +1563,7 @@ static int polaris10_populate_smc_vce_level(struct pp_hwmgr *hwmgr,
         struct phm_ppt_v1_mm_clock_voltage_dependency_table *mm_table =
                         table_info->mm_dep_table;
         struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
+        uint32_t vddci;
 
         table->VceLevelCount = (uint8_t)(mm_table->count);
         table->VceBootLevel = 0;
@@ -1581,9 +1573,18 @@ static int polaris10_populate_smc_vce_level(struct pp_hwmgr *hwmgr,
                 table->VceLevel[count].MinVoltage = 0;
                 table->VceLevel[count].MinVoltage |=
                                 (mm_table->entries[count].vddc * VOLTAGE_SCALE) << VDDC_SHIFT;
+
+                if (POLARIS10_VOLTAGE_CONTROL_BY_GPIO == data->vddci_control)
+                        vddci = (uint32_t)phm_find_closest_vddci(&(data->vddci_voltage_table),
+                                                mm_table->entries[count].vddc - VDDC_VDDCI_DELTA);
+                else if (POLARIS10_VOLTAGE_CONTROL_BY_SVID2 == data->vddci_control)
+                        vddci = mm_table->entries[count].vddc - VDDC_VDDCI_DELTA;
+                else
+                        vddci = (data->vbios_boot_state.vddci_bootup_value * VOLTAGE_SCALE) << VDDCI_SHIFT;
+
+
                 table->VceLevel[count].MinVoltage |=
-                                ((mm_table->entries[count].vddc - data->vddc_vddci_delta) *
-                                                VOLTAGE_SCALE) << VDDCI_SHIFT;
+                                (vddci * VOLTAGE_SCALE) << VDDCI_SHIFT;
                 table->VceLevel[count].MinVoltage |= 1 << PHASES_SHIFT;
 
                 /*retrieve divider value for VBIOS */
@@ -1612,6 +1613,7 @@ static int polaris10_populate_smc_samu_level(struct pp_hwmgr *hwmgr,
         struct phm_ppt_v1_mm_clock_voltage_dependency_table *mm_table =
                         table_info->mm_dep_table;
         struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
+        uint32_t vddci;
 
         table->SamuBootLevel = 0;
         table->SamuLevelCount = (uint8_t)(mm_table->count);
@@ -1622,8 +1624,16 @@ static int polaris10_populate_smc_samu_level(struct pp_hwmgr *hwmgr,
                 table->SamuLevel[count].Frequency = mm_table->entries[count].samclock;
                 table->SamuLevel[count].MinVoltage |= (mm_table->entries[count].vddc *
                                 VOLTAGE_SCALE) << VDDC_SHIFT;
-                table->SamuLevel[count].MinVoltage |= ((mm_table->entries[count].vddc -
-                                data->vddc_vddci_delta) * VOLTAGE_SCALE) << VDDCI_SHIFT;
+
+                if (POLARIS10_VOLTAGE_CONTROL_BY_GPIO == data->vddci_control)
+                        vddci = (uint32_t)phm_find_closest_vddci(&(data->vddci_voltage_table),
+                                                mm_table->entries[count].vddc - VDDC_VDDCI_DELTA);
+                else if (POLARIS10_VOLTAGE_CONTROL_BY_SVID2 == data->vddci_control)
+                        vddci = mm_table->entries[count].vddc - VDDC_VDDCI_DELTA;
+                else
+                        vddci = (data->vbios_boot_state.vddci_bootup_value * VOLTAGE_SCALE) << VDDCI_SHIFT;
+
+                table->SamuLevel[count].MinVoltage |= (vddci * VOLTAGE_SCALE) << VDDCI_SHIFT;
                 table->SamuLevel[count].MinVoltage |= 1 << PHASES_SHIFT;
 
                 /* retrieve divider value for VBIOS */
@@ -1706,6 +1716,7 @@ static int polaris10_populate_smc_uvd_level(struct pp_hwmgr *hwmgr,
         struct phm_ppt_v1_mm_clock_voltage_dependency_table *mm_table =
                         table_info->mm_dep_table;
         struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
+        uint32_t vddci;
 
         table->UvdLevelCount = (uint8_t)(mm_table->count);
         table->UvdBootLevel = 0;
@@ -1716,8 +1727,16 @@ static int polaris10_populate_smc_uvd_level(struct pp_hwmgr *hwmgr,
                 table->UvdLevel[count].DclkFrequency = mm_table->entries[count].dclk;
                 table->UvdLevel[count].MinVoltage |= (mm_table->entries[count].vddc *
                                 VOLTAGE_SCALE) << VDDC_SHIFT;
-                table->UvdLevel[count].MinVoltage |= ((mm_table->entries[count].vddc -
-                                data->vddc_vddci_delta) * VOLTAGE_SCALE) << VDDCI_SHIFT;
+
+                if (POLARIS10_VOLTAGE_CONTROL_BY_GPIO == data->vddci_control)
+                        vddci = (uint32_t)phm_find_closest_vddci(&(data->vddci_voltage_table),
+                                                mm_table->entries[count].vddc - VDDC_VDDCI_DELTA);
+                else if (POLARIS10_VOLTAGE_CONTROL_BY_SVID2 == data->vddci_control)
+                        vddci = mm_table->entries[count].vddc - VDDC_VDDCI_DELTA;
+                else
+                        vddci = (data->vbios_boot_state.vddci_bootup_value * VOLTAGE_SCALE) << VDDCI_SHIFT;
+
+                table->UvdLevel[count].MinVoltage |= (vddci * VOLTAGE_SCALE) << VDDCI_SHIFT;
                 table->UvdLevel[count].MinVoltage |= 1 << PHASES_SHIFT;
 
                 /* retrieve divider value for VBIOS */
@@ -1738,8 +1757,8 @@ static int polaris10_populate_smc_uvd_level(struct pp_hwmgr *hwmgr,
                 CONVERT_FROM_HOST_TO_SMC_UL(table->UvdLevel[count].VclkFrequency);
                 CONVERT_FROM_HOST_TO_SMC_UL(table->UvdLevel[count].DclkFrequency);
                 CONVERT_FROM_HOST_TO_SMC_UL(table->UvdLevel[count].MinVoltage);
-
         }
+
         return result;
 }
 
@@ -1839,20 +1858,26 @@ static int polaris10_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr)
         for (i = 0; i < sclk_table->count; i++) {
                 data->smc_state_table.Sclk_CKS_masterEn0_7 |=
                                 sclk_table->entries[i].cks_enable << i;
-
-                volt_without_cks =  (uint32_t)(((ro - 40) * 1000 - 2753594 - sclk_table->entries[i].clk/100 * 136418 /1000) / \
-                                        (sclk_table->entries[i].clk/100 * 1132925 /10000 - 242418)/100);
-
-                volt_with_cks = (uint32_t)((ro * 1000 -2396351 - sclk_table->entries[i].clk/100 * 329021/1000) / \
-                                (sclk_table->entries[i].clk/10000 * 649434 /1000  - 18005)/10);
+                if (hwmgr->chip_id == CHIP_POLARIS10) {
+                        volt_without_cks = (uint32_t)((2753594000U + (sclk_table->entries[i].clk/100) * 136418 -(ro - 70) * 1000000) / \
+                                                (2424180 - (sclk_table->entries[i].clk/100) * 1132925/1000));
+                        volt_with_cks = (uint32_t)((2797202000U + sclk_table->entries[i].clk/100 * 3232 - (ro - 65) * 1000000) / \
+                                        (2522480 - sclk_table->entries[i].clk/100 * 115764/100));
+                } else {
+                        volt_without_cks = (uint32_t)((2416794800U + (sclk_table->entries[i].clk/100) * 1476925/10 -(ro - 50) * 1000000) / \
+                                                (2625416 - (sclk_table->entries[i].clk/100) * (12586807/10000)));
+                        volt_with_cks = (uint32_t)((2999656000U - sclk_table->entries[i].clk/100 * 392803 - (ro - 44) * 1000000) / \
+                                        (3422454 - sclk_table->entries[i].clk/100 * (18886376/10000)));
+                }
 
                 if (volt_without_cks >= volt_with_cks)
                         volt_offset = (uint8_t)(((volt_without_cks - volt_with_cks +
-                                        sclk_table->entries[i].cks_voffset) * 100 / 625) + 1);
+                                        sclk_table->entries[i].cks_voffset) * 100 + 624) / 625);
 
                 data->smc_state_table.Sclk_voltageOffset[i] = volt_offset;
         }
 
+        data->smc_state_table.LdoRefSel = (table_info->cac_dtp_table->ucCKS_LDO_REFSEL != 0) ? table_info->cac_dtp_table->ucCKS_LDO_REFSEL : 6;
         /* Populate CKS Lookup Table */
         if (stretch_amount == 1 || stretch_amount == 2 || stretch_amount == 5)
                 stretch_amount2 = 0;
@@ -2629,6 +2654,8 @@ int polaris10_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
         PP_ASSERT_WITH_CODE((0 == tmp_result),
                         "Failed to enable VR hot GPIO interrupt!", result = tmp_result);
 
+        smum_send_msg_to_smc(hwmgr->smumgr, (PPSMC_Msg)PPSMC_HasDisplay);
+
         tmp_result = polaris10_enable_sclk_control(hwmgr);
         PP_ASSERT_WITH_CODE((0 == tmp_result),
                         "Failed to enable SCLK control!", result = tmp_result);
@@ -2847,7 +2874,7 @@ static int polaris10_get_evv_voltages(struct pp_hwmgr *hwmgr)
 {
         struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
         uint16_t vv_id;
-        uint16_t vddc = 0;
+        uint32_t vddc = 0;
         uint16_t i, j;
         uint32_t sclk = 0;
         struct phm_ppt_v1_information *table_info =
@@ -2878,8 +2905,9 @@ static int polaris10_get_evv_voltages(struct pp_hwmgr *hwmgr)
                                 continue;
                         }
 
-                        /* need to make sure vddc is less than 2v or else, it could burn the ASIC. */
-                        PP_ASSERT_WITH_CODE((vddc < 2000 && vddc != 0),
+                        /* need to make sure vddc is less than 2v or else, it could burn the ASIC.
+                         * real voltage level in unit of 0.01mv */
+                        PP_ASSERT_WITH_CODE((vddc < 200000 && vddc != 0),
                                         "Invalid VDDC value", result = -EINVAL;);
 
                         /* the voltage should not be zero nor equal to leakage ID */
@@ -3105,6 +3133,31 @@ static int polaris10_set_private_data_based_on_pptable(struct pp_hwmgr *hwmgr)
         return 0;
 }
 
+int polaris10_patch_voltage_workaround(struct pp_hwmgr *hwmgr)
+{
+        struct phm_ppt_v1_information *table_info =
+                       (struct phm_ppt_v1_information *)(hwmgr->pptable);
+        struct phm_ppt_v1_clock_voltage_dependency_table *dep_mclk_table =
+                        table_info->vdd_dep_on_mclk;
+        struct phm_ppt_v1_voltage_lookup_table *lookup_table =
+                        table_info->vddc_lookup_table;
+        uint32_t i;
+
+        if (hwmgr->chip_id == CHIP_POLARIS10 && hwmgr->hw_revision == 0xC7) {
+                if (lookup_table->entries[dep_mclk_table->entries[dep_mclk_table->count-1].vddInd].us_vdd >= 1000)
+                        return 0;
+
+                for (i = 0; i < lookup_table->count; i++) {
+                        if (lookup_table->entries[i].us_vdd < 0xff01 && lookup_table->entries[i].us_vdd >= 1000) {
+                                dep_mclk_table->entries[dep_mclk_table->count-1].vddInd = (uint8_t) i;
+                                return 0;
+                        }
+                }
+        }
+        return 0;
+}
+
+
 int polaris10_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
 {
         struct polaris10_hwmgr *data;
@@ -3188,6 +3241,7 @@ int polaris10_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
 
         polaris10_set_features_platform_caps(hwmgr);
 
+        polaris10_patch_voltage_workaround(hwmgr);
         polaris10_init_dpm_defaults(hwmgr);
 
         /* Get leakage voltage based on leakage ID. */
@@ -4557,6 +4611,15 @@ static int polaris10_notify_link_speed_change_after_state_change(
         return 0;
 }
 
+static int polaris10_notify_smc_display(struct pp_hwmgr *hwmgr)
+{
+        struct polaris10_hwmgr *data = (struct polaris10_hwmgr *)(hwmgr->backend);
+
+        smum_send_msg_to_smc_with_parameter(hwmgr->smumgr,
+                (PPSMC_Msg)PPSMC_MSG_SetVBITimeout, data->frame_time_x2);
+        return (smum_send_msg_to_smc(hwmgr->smumgr, (PPSMC_Msg)PPSMC_HasDisplay) == 0) ?  0 : -EINVAL;
+}
+
 static int polaris10_set_power_state_tasks(struct pp_hwmgr *hwmgr, const void *input)
 {
         int tmp_result, result = 0;
@@ -4605,6 +4668,11 @@ static int polaris10_set_power_state_tasks(struct pp_hwmgr *hwmgr, const void *i
                         "Failed to program memory timing parameters!",
                         result = tmp_result);
 
+        tmp_result = polaris10_notify_smc_display(hwmgr);
+        PP_ASSERT_WITH_CODE((0 == tmp_result),
+                        "Failed to notify smc display settings!",
+                        result = tmp_result);
+
         tmp_result = polaris10_unfreeze_sclk_mclk_dpm(hwmgr);
         PP_ASSERT_WITH_CODE((0 == tmp_result),
                         "Failed to unfreeze SCLK MCLK DPM!",
@@ -4639,6 +4707,7 @@ static int polaris10_set_max_fan_pwm_output(struct pp_hwmgr *hwmgr, uint16_t us_
                         PPSMC_MSG_SetFanPwmMax, us_max_fan_pwm);
 }
 
+
 int polaris10_notify_smc_display_change(struct pp_hwmgr *hwmgr, bool has_display)
 {
         PPSMC_Msg msg = has_display ? (PPSMC_Msg)PPSMC_HasDisplay : (PPSMC_Msg)PPSMC_NoDisplay;
@@ -4658,8 +4727,6 @@ int polaris10_notify_smc_display_config_after_ps_adjustment(struct pp_hwmgr *hwm
 
         if (num_active_displays > 1)  /* to do && (pHwMgr->pPECI->displayConfiguration.bMultiMonitorInSync != TRUE)) */
                 polaris10_notify_smc_display_change(hwmgr, false);
-        else
-                polaris10_notify_smc_display_change(hwmgr, true);
 
         return 0;
 }
@@ -4700,6 +4767,8 @@ int polaris10_program_display_gap(struct pp_hwmgr *hwmgr)
         frame_time_in_us = 1000000 / refresh_rate;
 
         pre_vbi_time_in_us = frame_time_in_us - 200 - mode_info.vblank_time_us;
+        data->frame_time_x2 = frame_time_in_us * 2 / 100;
+
         display_gap2 = pre_vbi_time_in_us * (ref_clock / 100);
 
         cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC, ixCG_DISPLAY_GAP_CNTL2, display_gap2);
@@ -4708,8 +4777,6 @@ int polaris10_program_display_gap(struct pp_hwmgr *hwmgr)
 
         cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC, data->soft_regs_start + offsetof(SMU74_SoftRegisters, VBlankTimeout), (frame_time_in_us - pre_vbi_time_in_us));
 
-        polaris10_notify_smc_display_change(hwmgr, num_active_displays != 0);
-
         return 0;
 }
 
@@ -4821,7 +4888,7 @@ int polaris10_upload_mc_firmware(struct pp_hwmgr *hwmgr)
                 return 0;
         }
 
-        data->need_long_memory_training = true;
+        data->need_long_memory_training = false;
 
 /*
  *      PPMCME_FirmwareDescriptorEntry *pfd = NULL;
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h
index fd38b0d7a3c2..dbc6d9bfd5af 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h
@@ -311,6 +311,7 @@ struct polaris10_hwmgr {
         bool apply_optimized_settings;
         uint32_t                              avfs_vdroop_override_setting;
         bool                                  apply_avfs_cks_off_voltage;
+        uint32_t                              frame_time_x2;
 };
 
 /* To convert to Q8.8 format for firmware */
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
index 5d70e2c47faf..a64db7ba4e0b 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
@@ -1256,7 +1256,7 @@ int atomctrl_set_ac_timing_ai(struct pp_hwmgr *hwmgr, uint32_t memory_clock,
 }
 
 int atomctrl_get_voltage_evv_on_sclk_ai(struct pp_hwmgr *hwmgr, uint8_t voltage_type,
-                                uint32_t sclk, uint16_t virtual_voltage_Id, uint16_t *voltage)
+                                uint32_t sclk, uint16_t virtual_voltage_Id, uint32_t *voltage)
 {
 
         int result;
@@ -1274,7 +1274,7 @@ int atomctrl_get_voltage_evv_on_sclk_ai(struct pp_hwmgr *hwmgr, uint8_t voltage_
         if (0 != result)
                 return result;
 
-        *voltage = get_voltage_info_param_space.usVoltageLevel;
+        *voltage = ((GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_3 *)(&get_voltage_info_param_space))->ulVoltageLevel;
 
         return result;
 }
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h
index 248c5db5f380..1e35a9625baf 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h
@@ -305,7 +305,7 @@ extern int atomctrl_get_engine_pll_dividers_ai(struct pp_hwmgr *hwmgr, uint32_t
 extern int atomctrl_set_ac_timing_ai(struct pp_hwmgr *hwmgr, uint32_t memory_clock,
                                                                 uint8_t level);
 extern int atomctrl_get_voltage_evv_on_sclk_ai(struct pp_hwmgr *hwmgr, uint8_t voltage_type,
-                                uint32_t sclk, uint16_t virtual_voltage_Id, uint16_t *voltage);
+                                uint32_t sclk, uint16_t virtual_voltage_Id, uint32_t *voltage);
 extern int atomctrl_get_smc_sclk_range_table(struct pp_hwmgr *hwmgr, struct pp_atom_ctrl_sclk_range_table *table);
 
 extern int atomctrl_get_avfs_information(struct pp_hwmgr *hwmgr, struct pp_atom_ctrl__avfs_parameters *param);
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c
index 6c4553cf8023..072b3b682637 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c
@@ -1302,7 +1302,7 @@ static int tonga_populate_smc_mvdd_table(struct pp_hwmgr *hwmgr,
                         table->Smio[count] |=
                                 data->mvdd_voltage_table.entries[count].smio_low;
                 }
-                table->SmioMask2 = data->vddci_voltage_table.mask_low;
+                table->SmioMask2 = data->mvdd_voltage_table.mask_low;
 
                 CONVERT_FROM_HOST_TO_SMC_UL(table->MvddLevelCount);
         }
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
index 94d6b472e1fe..4662d3d0b7b1 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
@@ -302,7 +302,7 @@ static int init_dpm_2_parameters(
                         (((unsigned long)powerplay_table) + le16_to_cpu(powerplay_table->usPPMTableOffset));
 
                 if (0 != powerplay_table->usPPMTableOffset) {
-                        if (1 == get_platform_power_management_table(hwmgr, atom_ppm_table)) {
+                        if (get_platform_power_management_table(hwmgr, atom_ppm_table) == 0) {
                                 phm_cap_set(hwmgr->platform_descriptor.platformCaps,
                                         PHM_PlatformCaps_EnablePlatformPowerManagement);
                         }
diff --git a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
index 0bbc42a224e5..bf0d2accf7bf 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
@@ -415,6 +415,8 @@ struct phm_cac_tdp_table {
         uint8_t  ucVr_I2C_Line;
         uint8_t  ucPlx_I2C_address;
         uint8_t  ucPlx_I2C_Line;
+        uint32_t usBoostPowerLimit;
+        uint8_t  ucCKS_LDO_REFSEL;
 };
 
 struct phm_ppm_table {
diff --git a/drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h b/drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h
index d41d37ab5b7c..b8f4b73c322e 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h
@@ -392,6 +392,8 @@ typedef uint16_t PPSMC_Result;
 #define PPSMC_MSG_SetGpuPllDfsForSclk         ((uint16_t) 0x300)
 #define PPSMC_MSG_Didt_Block_Function             ((uint16_t) 0x301)
 
+#define PPSMC_MSG_SetVBITimeout               ((uint16_t) 0x306)
+
 #define PPSMC_MSG_SecureSRBMWrite             ((uint16_t) 0x600)
 #define PPSMC_MSG_SecureSRBMRead              ((uint16_t) 0x601)
 #define PPSMC_MSG_SetAddress                  ((uint16_t) 0x800)
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h b/drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h
index b85ff5400e57..899d6d8108c2 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h
@@ -270,7 +270,8 @@ struct SMU74_Discrete_DpmTable {
         uint8_t                             BootPhases;
 
         uint8_t                             VRHotLevel;
-        uint8_t                             Reserved1[3];
+        uint8_t                             LdoRefSel;
+        uint8_t                             Reserved1[2];
         uint16_t                            FanStartTemperature;
         uint16_t                            FanStopTemperature;
         uint16_t                            MaxVoltage;
diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
index 067632ad2f29..6f10b421487b 100644
--- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
@@ -40,7 +40,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
         if (!mutex_is_locked(mutex))
                 return false;
 
-#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)
+#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)
         return mutex->owner == task;
 #else
         /* Since UP may be pre-empted, we cannot assume that we own the lock */
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index c3b33a10c15c..3edb9580928e 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -41,15 +41,15 @@
  * be moved to FW_FAILED.
  */
 
-#define I915_CSR_KBL "i915/kbl_dmc_ver1_01.bin"
+#define I915_CSR_KBL "i915/kbl_dmc_ver1.bin"
 MODULE_FIRMWARE(I915_CSR_KBL);
 #define KBL_CSR_VERSION_REQUIRED        CSR_VERSION(1, 1)
 
-#define I915_CSR_SKL "i915/skl_dmc_ver1_26.bin"
+#define I915_CSR_SKL "i915/skl_dmc_ver1.bin"
 MODULE_FIRMWARE(I915_CSR_SKL);
-#define SKL_CSR_VERSION_REQUIRED        CSR_VERSION(1, 26)
+#define SKL_CSR_VERSION_REQUIRED        CSR_VERSION(1, 23)
 
-#define I915_CSR_BXT "i915/bxt_dmc_ver1_07.bin"
+#define I915_CSR_BXT "i915/bxt_dmc_ver1.bin"
 MODULE_FIRMWARE(I915_CSR_BXT);
 #define BXT_CSR_VERSION_REQUIRED        CSR_VERSION(1, 7)
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index be3b2cab2640..70555c526f6c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12016,6 +12016,12 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
                 ret = intel_color_check(crtc, crtc_state);
                 if (ret)
                         return ret;
+
+                /*
+                 * Changing color management on Intel hardware is
+                 * handled as part of planes update.
+                 */
+                crtc_state->planes_changed = true;
         }
 
         ret = 0;
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 0c5ba3410a1e..21b04c3eda41 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4336,7 +4336,7 @@ intel_dp_detect(struct drm_connector *connector, bool force)
 
         intel_dp->detect_done = false;
 
-        if (intel_connector->detect_edid)
+        if (is_edp(intel_dp) || intel_connector->detect_edid)
                 return connector_status_connected;
         else
                 return connector_status_disconnected;
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 70c699043d0e..414ddda43922 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1097,6 +1097,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *engine,
                                                 uint32_t *const batch,
                                                 uint32_t index)
 {
+        struct drm_i915_private *dev_priv = engine->i915;
         uint32_t l3sqc4_flush = (0x40400000 | GEN8_LQSC_FLUSH_COHERENT_LINES);
 
         /*
@@ -1105,8 +1106,8 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *engine,
          * this batch updates GEN8_L3SQCREG4 with default value we need to
          * set this bit here to retain the WA during flush.
          */
-        if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_E0) ||
-            IS_KBL_REVID(engine->i915, 0, KBL_REVID_E0))
+        if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_E0) ||
+            IS_KBL_REVID(dev_priv, 0, KBL_REVID_E0))
                 l3sqc4_flush |= GEN8_LQSC_RO_PERF_DIS;
 
         wa_ctx_emit(batch, index, (MI_STORE_REGISTER_MEM_GEN8 |
@@ -1267,11 +1268,12 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine,
                                     uint32_t *offset)
 {
         int ret;
+        struct drm_i915_private *dev_priv = engine->i915;
         uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
 
         /* WaDisableCtxRestoreArbitration:skl,bxt */
-        if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_D0) ||
-            IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1))
+        if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_D0) ||
+            IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
                 wa_ctx_emit(batch, index, MI_ARB_ON_OFF | MI_ARB_DISABLE);
 
         /* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt */
@@ -1282,7 +1284,7 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine,
 
         /* WaClearSlmSpaceAtContextSwitch:kbl */
         /* Actual scratch location is at 128 bytes offset */
-        if (IS_KBL_REVID(engine->i915, 0, KBL_REVID_A0)) {
+        if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_A0)) {
                 uint32_t scratch_addr
                         = engine->scratch.gtt_offset + 2*CACHELINE_BYTES;
 
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index c27d5eb063d0..adca262d591a 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -1072,5 +1072,16 @@ intel_opregion_get_panel_type(struct drm_i915_private *dev_priv)
                 return -ENODEV;
         }
 
+        /*
+         * FIXME On Dell XPS 13 9350 the OpRegion panel type (0) gives us
+         * low vswing for eDP, whereas the VBT panel type (2) gives us normal
+         * vswing instead. Low vswing results in some display flickers, so
+         * let's simply ignore the OpRegion panel type on SKL for now.
+         */
+        if (IS_SKYLAKE(dev_priv)) {
+                DRM_DEBUG_KMS("Ignoring OpRegion panel type (%d)\n", ret - 1);
+                return -ENODEV;
+        }
+
         return ret - 1;
 }
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 5a8ee0c76593..f4f3fcc8b3be 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -57,7 +57,7 @@
 
 static void gen9_init_clock_gating(struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
+        struct drm_i915_private *dev_priv = dev->dev_private;
 
         /* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl */
         I915_WRITE(CHICKEN_PAR1_1,
@@ -7046,7 +7046,7 @@ static void gen8_set_l3sqc_credits(struct drm_i915_private *dev_priv,
 
 static void kabylake_init_clock_gating(struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
+        struct drm_i915_private *dev_priv = dev->dev_private;
 
         gen9_init_clock_gating(dev);
 
@@ -7067,7 +7067,7 @@ static void kabylake_init_clock_gating(struct drm_device *dev)
 
 static void skylake_init_clock_gating(struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = to_i915(dev);
+        struct drm_i915_private *dev_priv = dev->dev_private;
 
         gen9_init_clock_gating(dev);
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
index 22706c0a54b5..49bd5da194e1 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
@@ -40,7 +40,8 @@ static int
 gf119_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
 {
         struct nvkm_device *device = outp->base.disp->engine.subdev.device;
-        nvkm_mask(device, 0x61c110, 0x0f0f0f0f, 0x01010101 * pattern);
+        const u32 soff = gf119_sor_soff(outp);
+        nvkm_mask(device, 0x61c110 + soff, 0x0f0f0f0f, 0x01010101 * pattern);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c
index f628b6d8f23f..4a192210574f 100644
--- a/drivers/gpu/drm/sun4i/sun4i_crtc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c
@@ -77,6 +77,14 @@ static void sun4i_crtc_disable(struct drm_crtc *crtc)
         DRM_DEBUG_DRIVER("Disabling the CRTC\n");
 
         sun4i_tcon_disable(drv->tcon);
+
+        if (crtc->state->event && !crtc->state->active) {
+                spin_lock_irq(&crtc->dev->event_lock);
+                drm_crtc_send_vblank_event(crtc, crtc->state->event);
+                spin_unlock_irq(&crtc->dev->event_lock);
+
+                crtc->state->event = NULL;
+        }
 }
 
 static void sun4i_crtc_enable(struct drm_crtc *crtc)
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 5b89940edcb1..4dc543e1db10 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -92,7 +92,7 @@ static struct drm_driver sun4i_drv_driver = {
         /* Frame Buffer Operations */
 
         /* VBlank Operations */
-        .get_vblank_counter     = drm_vblank_count,
+        .get_vblank_counter     = drm_vblank_no_hw_counter,
         .enable_vblank          = sun4i_drv_enable_vblank,
         .disable_vblank         = sun4i_drv_disable_vblank,
 };
@@ -300,6 +300,7 @@ static int sun4i_drv_probe(struct platform_device *pdev)
 
                 count += sun4i_drv_add_endpoints(&pdev->dev, &match,
                                                 pipeline);
+                of_node_put(pipeline);
 
                 DRM_DEBUG_DRIVER("Queued %d outputs on pipeline %d\n",
                                  count, i);
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index e340d0d66429..3452748dc43c 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1044,9 +1044,9 @@ out_unlock:
         return ret;
 }
 
-static bool ttm_bo_mem_compat(struct ttm_placement *placement,
-                              struct ttm_mem_reg *mem,
-                              uint32_t *new_flags)
+bool ttm_bo_mem_compat(struct ttm_placement *placement,
+                       struct ttm_mem_reg *mem,
+                       uint32_t *new_flags)
 {
         int i;
 
@@ -1078,6 +1078,7 @@ static bool ttm_bo_mem_compat(struct ttm_placement *placement,
 
         return false;
 }
+EXPORT_SYMBOL(ttm_bo_mem_compat);
 
 int ttm_bo_validate(struct ttm_buffer_object *bo,
                         struct ttm_placement *placement,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
index 9b078a493996..0cd889015dc5 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
@@ -49,6 +49,7 @@ int vmw_dmabuf_pin_in_placement(struct vmw_private *dev_priv,
 {
         struct ttm_buffer_object *bo = &buf->base;
         int ret;
+        uint32_t new_flags;
 
         ret = ttm_write_lock(&dev_priv->reservation_sem, interruptible);
         if (unlikely(ret != 0))
@@ -60,7 +61,12 @@ int vmw_dmabuf_pin_in_placement(struct vmw_private *dev_priv,
         if (unlikely(ret != 0))
                 goto err;
 
-        ret = ttm_bo_validate(bo, placement, interruptible, false);
+        if (buf->pin_count > 0)
+                ret = ttm_bo_mem_compat(placement, &bo->mem,
+                                        &new_flags) == true ? 0 : -EINVAL;
+        else
+                ret = ttm_bo_validate(bo, placement, interruptible, false);
+
         if (!ret)
                 vmw_bo_pin_reserved(buf, true);
 
@@ -91,6 +97,7 @@ int vmw_dmabuf_pin_in_vram_or_gmr(struct vmw_private *dev_priv,
 {
         struct ttm_buffer_object *bo = &buf->base;
         int ret;
+        uint32_t new_flags;
 
         ret = ttm_write_lock(&dev_priv->reservation_sem, interruptible);
         if (unlikely(ret != 0))
@@ -102,6 +109,12 @@ int vmw_dmabuf_pin_in_vram_or_gmr(struct vmw_private *dev_priv,
         if (unlikely(ret != 0))
                 goto err;
 
+        if (buf->pin_count > 0) {
+                ret = ttm_bo_mem_compat(&vmw_vram_gmr_placement, &bo->mem,
+                                        &new_flags) == true ? 0 : -EINVAL;
+                goto out_unreserve;
+        }
+
         ret = ttm_bo_validate(bo, &vmw_vram_gmr_placement, interruptible,
                               false);
         if (likely(ret == 0) || ret == -ERESTARTSYS)
@@ -161,6 +174,7 @@ int vmw_dmabuf_pin_in_start_of_vram(struct vmw_private *dev_priv,
         struct ttm_placement placement;
         struct ttm_place place;
         int ret = 0;
+        uint32_t new_flags;
 
         place = vmw_vram_placement.placement[0];
         place.lpfn = bo->num_pages;
@@ -185,10 +199,15 @@ int vmw_dmabuf_pin_in_start_of_vram(struct vmw_private *dev_priv,
          */
         if (bo->mem.mem_type == TTM_PL_VRAM &&
             bo->mem.start < bo->num_pages &&
-            bo->mem.start > 0)
+            bo->mem.start > 0 &&
+            buf->pin_count == 0)
                 (void) ttm_bo_validate(bo, &vmw_sys_placement, false, false);
 
-        ret = ttm_bo_validate(bo, &placement, interruptible, false);
+        if (buf->pin_count > 0)
+                ret = ttm_bo_mem_compat(&placement, &bo->mem,
+                                        &new_flags) == true ? 0 : -EINVAL;
+        else
+                ret = ttm_bo_validate(bo, &placement, interruptible, false);
 
         /* For some reason we didn't end up at the start of vram */
         WARN_ON(ret == 0 && bo->offset != 0);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 5d5c9515618d..e8ae3dc476d1 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -233,6 +233,7 @@ static int vmw_force_iommu;
 static int vmw_restrict_iommu;
 static int vmw_force_coherent;
 static int vmw_restrict_dma_mask;
+static int vmw_assume_16bpp;
 
 static int vmw_probe(struct pci_dev *, const struct pci_device_id *);
 static void vmw_master_init(struct vmw_master *);
@@ -249,6 +250,8 @@ MODULE_PARM_DESC(force_coherent, "Force coherent TTM pages");
 module_param_named(force_coherent, vmw_force_coherent, int, 0600);
 MODULE_PARM_DESC(restrict_dma_mask, "Restrict DMA mask to 44 bits with IOMMU");
 module_param_named(restrict_dma_mask, vmw_restrict_dma_mask, int, 0600);
+MODULE_PARM_DESC(assume_16bpp, "Assume 16-bpp when filtering modes");
+module_param_named(assume_16bpp, vmw_assume_16bpp, int, 0600);
 
 
 static void vmw_print_capabilities(uint32_t capabilities)
@@ -660,6 +663,8 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
         dev_priv->vram_start = pci_resource_start(dev->pdev, 1);
         dev_priv->mmio_start = pci_resource_start(dev->pdev, 2);
 
+        dev_priv->assume_16bpp = !!vmw_assume_16bpp;
+
         dev_priv->enable_fb = enable_fbdev;
 
         vmw_write(dev_priv, SVGA_REG_ID, SVGA_ID_2);
@@ -706,6 +711,13 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
                         vmw_read(dev_priv,
                                  SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB);
 
+                /*
+                 * Workaround for low memory 2D VMs to compensate for the
+                 * allocation taken by fbdev
+                 */
+                if (!(dev_priv->capabilities & SVGA_CAP_3D))
+                        mem_size *= 2;
+
                 dev_priv->max_mob_pages = mem_size * 1024 / PAGE_SIZE;
                 dev_priv->prim_bb_mem =
                         vmw_read(dev_priv,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 9a90f824814e..74304b03f9d4 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -387,6 +387,7 @@ struct vmw_private {
         spinlock_t hw_lock;
         spinlock_t cap_lock;
         bool has_dx;
+        bool assume_16bpp;
 
         /*
          * VGA registers.
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index 679a4cb98ee3..d2d93959b119 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -517,28 +517,6 @@ static int vmw_fb_kms_framebuffer(struct fb_info *info)
 
         par->set_fb = &vfb->base;
 
-        if (!par->bo_ptr) {
-                /*
-                 * Pin before mapping. Since we don't know in what placement
-                 * to pin, call into KMS to do it for us.
-                 */
-                ret = vfb->pin(vfb);
-                if (ret) {
-                        DRM_ERROR("Could not pin the fbdev framebuffer.\n");
-                        return ret;
-                }
-
-                ret = ttm_bo_kmap(&par->vmw_bo->base, 0,
-                                  par->vmw_bo->base.num_pages, &par->map);
-                if (ret) {
-                        vfb->unpin(vfb);
-                        DRM_ERROR("Could not map the fbdev framebuffer.\n");
-                        return ret;
-                }
-
-                par->bo_ptr = ttm_kmap_obj_virtual(&par->map, &par->bo_iowrite);
-        }
-
         return 0;
 }
 
@@ -601,6 +579,31 @@ static int vmw_fb_set_par(struct fb_info *info)
         if (ret)
                 goto out_unlock;
 
+        if (!par->bo_ptr) {
+                struct vmw_framebuffer *vfb = vmw_framebuffer_to_vfb(set.fb);
+
+                /*
+                 * Pin before mapping. Since we don't know in what placement
+                 * to pin, call into KMS to do it for us.
+                 */
+                ret = vfb->pin(vfb);
+                if (ret) {
+                        DRM_ERROR("Could not pin the fbdev framebuffer.\n");
+                        goto out_unlock;
+                }
+
+                ret = ttm_bo_kmap(&par->vmw_bo->base, 0,
+                                  par->vmw_bo->base.num_pages, &par->map);
+                if (ret) {
+                        vfb->unpin(vfb);
+                        DRM_ERROR("Could not map the fbdev framebuffer.\n");
+                        goto out_unlock;
+                }
+
+                par->bo_ptr = ttm_kmap_obj_virtual(&par->map, &par->bo_iowrite);
+        }
+
+
         vmw_fb_dirty_mark(par, par->fb_x, par->fb_y,
                           par->set_fb->width, par->set_fb->height);
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 8a69d4da40b5..bf28ccc150df 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -1555,14 +1555,10 @@ int vmw_du_connector_fill_modes(struct drm_connector *connector,
                 DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC)
         };
         int i;
-        u32 assumed_bpp = 2;
+        u32 assumed_bpp = 4;
 
-        /*
-         * If using screen objects, then assume 32-bpp because that's what the
-         * SVGA device is assuming
-         */
-        if (dev_priv->active_display_unit == vmw_du_screen_object)
-                assumed_bpp = 4;
+        if (dev_priv->assume_16bpp)
+                assumed_bpp = 2;
 
         if (dev_priv->active_display_unit == vmw_du_screen_target) {
                 max_width  = min(max_width,  dev_priv->stdu_max_width);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
index f0374f9b56ca..e57a0bad7a62 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
@@ -300,6 +300,9 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,
                 break;
         }
 
+        if (retries == RETRIES)
+                return -EINVAL;
+
         *msg_len = reply_len;
         *msg     = reply;
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index 9ca818fb034c..41932a7c4f79 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@ -399,8 +399,10 @@ static int vmw_stdu_bind_fb(struct vmw_private *dev_priv,
 
         WARN_ON_ONCE(!stdu->defined);
 
-        if (!vfb->dmabuf && new_fb->width == mode->hdisplay &&
-            new_fb->height == mode->vdisplay)
+        new_vfbs = (vfb->dmabuf) ? NULL : vmw_framebuffer_to_vfbs(new_fb);
+
+        if (new_vfbs && new_vfbs->surface->base_size.width == mode->hdisplay &&
+            new_vfbs->surface->base_size.height == mode->vdisplay)
                 new_content_type = SAME_AS_DISPLAY;
         else if (vfb->dmabuf)
                 new_content_type = SEPARATE_DMA;
@@ -444,7 +446,6 @@ static int vmw_stdu_bind_fb(struct vmw_private *dev_priv,
                         content_srf.mip_levels[0]     = 1;
                         content_srf.multisample_count = 0;
                 } else {
-                        new_vfbs = vmw_framebuffer_to_vfbs(new_fb);
                         content_srf = *new_vfbs->surface;
                 }
 
@@ -464,7 +465,6 @@ static int vmw_stdu_bind_fb(struct vmw_private *dev_priv,
                         return ret;
                 }
         } else if (new_content_type == SAME_AS_DISPLAY) {
-                new_vfbs = vmw_framebuffer_to_vfbs(new_fb);
                 new_display_srf = vmw_surface_reference(new_vfbs->surface);
         }
 
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 95b7d61d9910..fb6f1f447279 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -61,6 +61,7 @@ MODULE_LICENSE("GPL");
 #define MT_QUIRK_ALWAYS_VALID           (1 << 4)
 #define MT_QUIRK_VALID_IS_INRANGE       (1 << 5)
 #define MT_QUIRK_VALID_IS_CONFIDENCE    (1 << 6)
+#define MT_QUIRK_CONFIDENCE             (1 << 7)
 #define MT_QUIRK_SLOT_IS_CONTACTID_MINUS_ONE    (1 << 8)
 #define MT_QUIRK_NO_AREA                (1 << 9)
 #define MT_QUIRK_IGNORE_DUPLICATES      (1 << 10)
@@ -78,6 +79,7 @@ struct mt_slot {
         __s32 contactid;        /* the device ContactID assigned to this slot */
         bool touch_state;       /* is the touch valid? */
         bool inrange_state;     /* is the finger in proximity of the sensor? */
+        bool confidence_state;  /* is the touch made by a finger? */
 };
 
 struct mt_class {
@@ -503,10 +505,8 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                         return 1;
                 case HID_DG_CONFIDENCE:
                         if (cls->name == MT_CLS_WIN_8 &&
-                                field->application == HID_DG_TOUCHPAD) {
-                                cls->quirks &= ~MT_QUIRK_ALWAYS_VALID;
-                                cls->quirks |= MT_QUIRK_VALID_IS_CONFIDENCE;
-                        }
+                                field->application == HID_DG_TOUCHPAD)
+                                cls->quirks |= MT_QUIRK_CONFIDENCE;
                         mt_store_field(usage, td, hi);
                         return 1;
                 case HID_DG_TIPSWITCH:
@@ -619,6 +619,7 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input)
                 return;
 
         if (td->curvalid || (td->mtclass.quirks & MT_QUIRK_ALWAYS_VALID)) {
+                int active;
                 int slotnum = mt_compute_slot(td, input);
                 struct mt_slot *s = &td->curdata;
                 struct input_mt *mt = input->mt;
@@ -633,10 +634,14 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input)
                                 return;
                 }
 
+                if (!(td->mtclass.quirks & MT_QUIRK_CONFIDENCE))
+                        s->confidence_state = 1;
+                active = (s->touch_state || s->inrange_state) &&
+                                                        s->confidence_state;
+
                 input_mt_slot(input, slotnum);
-                input_mt_report_slot_state(input, MT_TOOL_FINGER,
-                        s->touch_state || s->inrange_state);
-                if (s->touch_state || s->inrange_state) {
+                input_mt_report_slot_state(input, MT_TOOL_FINGER, active);
+                if (active) {
                         /* this finger is in proximity of the sensor */
                         int wide = (s->w > s->h);
                         /* divided by two to match visual scale of touch */
@@ -701,6 +706,8 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
                         td->curdata.touch_state = value;
                         break;
                 case HID_DG_CONFIDENCE:
+                        if (quirks & MT_QUIRK_CONFIDENCE)
+                                td->curdata.confidence_state = value;
                         if (quirks & MT_QUIRK_VALID_IS_CONFIDENCE)
                                 td->curvalid = value;
                         break;
diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
index cc6439ab3f71..041050edd809 100644
--- a/drivers/i2c/busses/i2c-qup.c
+++ b/drivers/i2c/busses/i2c-qup.c
@@ -1268,6 +1268,8 @@ static int qup_i2c_xfer_v2(struct i2c_adapter *adap,
                 }
         }
 
+        idx = 0;
+
         do {
                 if (msgs[idx].len == 0) {
                         ret = -EINVAL;
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 445398c314a3..b126dbaa47e3 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -912,7 +912,7 @@ static int tegra_i2c_probe(struct platform_device *pdev)
         ret = tegra_i2c_init(i2c_dev);
         if (ret) {
                 dev_err(&pdev->dev, "Failed to initialize i2c controller");
-                goto unprepare_div_clk;
+                goto disable_div_clk;
         }
 
         ret = devm_request_irq(&pdev->dev, i2c_dev->irq,
diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c
index e33022e2d459..6e5fac6a5262 100644
--- a/drivers/i2c/i2c-boardinfo.c
+++ b/drivers/i2c/i2c-boardinfo.c
@@ -56,9 +56,7 @@ EXPORT_SYMBOL_GPL(__i2c_first_dynamic_bus_num);
  * The board info passed can safely be __initdata, but be careful of embedded
  * pointers (for platform_data, functions, etc) since that won't be copied.
  */
-int __init
-i2c_register_board_info(int busnum,
-        struct i2c_board_info const *info, unsigned len)
+int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned len)
 {
         int status;
 
diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c
index 26e7c5187a58..c6a90b4a9c62 100644
--- a/drivers/i2c/muxes/i2c-mux-reg.c
+++ b/drivers/i2c/muxes/i2c-mux-reg.c
@@ -145,7 +145,7 @@ static int i2c_mux_reg_probe_dt(struct regmux *mux,
                 mux->data.idle_in_use = true;
 
         /* map address from "reg" if exists */
-        if (of_address_to_resource(np, 0, &res)) {
+        if (of_address_to_resource(np, 0, &res) == 0) {
                 mux->data.reg_size = resource_size(&res);
                 mux->data.reg = devm_ioremap_resource(&pdev->dev, &res);
                 if (IS_ERR(mux->data.reg))
diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
index 923f56598d4b..3a9f106787d2 100644
--- a/drivers/iio/accel/kxsd9.c
+++ b/drivers/iio/accel/kxsd9.c
@@ -81,7 +81,7 @@ static int kxsd9_write_scale(struct iio_dev *indio_dev, int micro)
 
         mutex_lock(&st->buf_lock);
         ret = spi_w8r8(st->us, KXSD9_READ(KXSD9_REG_CTRL_C));
-        if (ret)
+        if (ret < 0)
                 goto error_ret;
         st->tx[0] = KXSD9_WRITE(KXSD9_REG_CTRL_C);
         st->tx[1] = (ret & ~KXSD9_FS_MASK) | i;
@@ -163,7 +163,7 @@ static int kxsd9_read_raw(struct iio_dev *indio_dev,
                 break;
         case IIO_CHAN_INFO_SCALE:
                 ret = spi_w8r8(st->us, KXSD9_READ(KXSD9_REG_CTRL_C));
-                if (ret)
+                if (ret < 0)
                         goto error_ret;
                 *val2 = kxsd9_micro_scales[ret & KXSD9_FS_MASK];
                 ret = IIO_VAL_INT_PLUS_MICRO;
diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index 21e19b60e2b9..2123f0ac2e2a 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -396,8 +396,8 @@ static int ad7266_probe(struct spi_device *spi)
 
         st = iio_priv(indio_dev);
 
-        st->reg = devm_regulator_get(&spi->dev, "vref");
-        if (!IS_ERR_OR_NULL(st->reg)) {
+        st->reg = devm_regulator_get_optional(&spi->dev, "vref");
+        if (!IS_ERR(st->reg)) {
                 ret = regulator_enable(st->reg);
                 if (ret)
                         return ret;
@@ -408,6 +408,9 @@ static int ad7266_probe(struct spi_device *spi)
 
                 st->vref_mv = ret / 1000;
         } else {
+                /* Any other error indicates that the regulator does exist */
+                if (PTR_ERR(st->reg) != -ENODEV)
+                        return PTR_ERR(st->reg);
                 /* Use internal reference */
                 st->vref_mv = 2500;
         }
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
index f62b8bd9ad7e..dd6fc6d21f9d 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c
@@ -56,6 +56,7 @@ static int asus_acpi_get_sensor_info(struct acpi_device *adev,
         int i;
         acpi_status status;
         union acpi_object *cpm;
+        int ret;
 
         status = acpi_evaluate_object(adev->handle, "CNF0", NULL, &buffer);
         if (ACPI_FAILURE(status))
@@ -82,10 +83,10 @@ static int asus_acpi_get_sensor_info(struct acpi_device *adev,
                         }
                 }
         }
-
+        ret = cpm->package.count;
         kfree(buffer.pointer);
 
-        return cpm->package.count;
+        return ret;
 }
 
 static int acpi_i2c_check_resource(struct acpi_resource *ares, void *data)
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index a5793c8f1590..60df4f8e81be 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -530,6 +530,7 @@ static PORT_PMA_ATTR(port_xmit_data		    , 12, 32, 192);
 static PORT_PMA_ATTR(port_rcv_data                  , 13, 32, 224);
 static PORT_PMA_ATTR(port_xmit_packets              , 14, 32, 256);
 static PORT_PMA_ATTR(port_rcv_packets               , 15, 32, 288);
+static PORT_PMA_ATTR(port_xmit_wait                 ,  0, 32, 320);
 
 /*
  * Counters added by extended set
@@ -560,6 +561,7 @@ static struct attribute *pma_attrs[] = {
         &port_pma_attr_port_rcv_data.attr.attr,
         &port_pma_attr_port_xmit_packets.attr.attr,
         &port_pma_attr_port_rcv_packets.attr.attr,
+        &port_pma_attr_port_xmit_wait.attr.attr,
         NULL
 };
 
@@ -579,6 +581,7 @@ static struct attribute *pma_attrs_ext[] = {
         &port_pma_attr_ext_port_xmit_data.attr.attr,
         &port_pma_attr_ext_port_rcv_data.attr.attr,
         &port_pma_attr_ext_port_xmit_packets.attr.attr,
+        &port_pma_attr_port_xmit_wait.attr.attr,
         &port_pma_attr_ext_port_rcv_packets.attr.attr,
         &port_pma_attr_ext_unicast_rcv_packets.attr.attr,
         &port_pma_attr_ext_unicast_xmit_packets.attr.attr,
@@ -604,6 +607,7 @@ static struct attribute *pma_attrs_noietf[] = {
         &port_pma_attr_ext_port_rcv_data.attr.attr,
         &port_pma_attr_ext_port_xmit_packets.attr.attr,
         &port_pma_attr_ext_port_rcv_packets.attr.attr,
+        &port_pma_attr_port_xmit_wait.attr.attr,
         NULL
 };
 
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index f5de85178055..dad4d0ebbdff 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -14113,8 +14113,14 @@ static int init_asic_data(struct hfi1_devdata *dd)
 {
         unsigned long flags;
         struct hfi1_devdata *tmp, *peer = NULL;
+        struct hfi1_asic_data *asic_data;
         int ret = 0;
 
+        /* pre-allocate the asic structure in case we are the first device */
+        asic_data = kzalloc(sizeof(*dd->asic_data), GFP_KERNEL);
+        if (!asic_data)
+                return -ENOMEM;
+
         spin_lock_irqsave(&hfi1_devs_lock, flags);
         /* Find our peer device */
         list_for_each_entry(tmp, &hfi1_dev_list, list) {
@@ -14126,18 +14132,14 @@ static int init_asic_data(struct hfi1_devdata *dd)
         }
 
         if (peer) {
+                /* use already allocated structure */
                 dd->asic_data = peer->asic_data;
+                kfree(asic_data);
         } else {
-                dd->asic_data = kzalloc(sizeof(*dd->asic_data), GFP_KERNEL);
-                if (!dd->asic_data) {
-                        ret = -ENOMEM;
-                        goto done;
-                }
+                dd->asic_data = asic_data;
                 mutex_init(&dd->asic_data->asic_resource_mutex);
         }
         dd->asic_data->dds[dd->hfi1_id] = dd; /* self back-pointer */
-
-done:
         spin_unlock_irqrestore(&hfi1_devs_lock, flags);
         return ret;
 }
diff --git a/drivers/infiniband/hw/hfi1/ud.c b/drivers/infiniband/hw/hfi1/ud.c
index 1e503ad0bebb..be91f6fa1c87 100644
--- a/drivers/infiniband/hw/hfi1/ud.c
+++ b/drivers/infiniband/hw/hfi1/ud.c
@@ -678,8 +678,7 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
         u32 tlen = packet->tlen;
         struct rvt_qp *qp = packet->qp;
         bool has_grh = rcv_flags & HFI1_HAS_GRH;
-        bool sc4_bit = has_sc4_bit(packet);
-        u8 sc;
+        u8 sc5 = hdr2sc((struct hfi1_message_header *)hdr, packet->rhf);
         u32 bth1;
         int is_mcast;
         struct ib_grh *grh = NULL;
@@ -697,10 +696,8 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
                  */
                 struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);
                 u32 lqpn =  be32_to_cpu(ohdr->bth[1]) & RVT_QPN_MASK;
-                u8 sl, sc5;
+                u8 sl;
 
-                sc5 = (be16_to_cpu(hdr->lrh[0]) >> 12) & 0xf;
-                sc5 |= sc4_bit;
                 sl = ibp->sc_to_sl[sc5];
 
                 process_becn(ppd, sl, 0, lqpn, 0, IB_CC_SVCTYPE_UD);
@@ -717,10 +714,6 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
 
         if (!is_mcast && (opcode != IB_OPCODE_CNP) && bth1 & HFI1_FECN_SMASK) {
                 u16 slid = be16_to_cpu(hdr->lrh[3]);
-                u8 sc5;
-
-                sc5 = (be16_to_cpu(hdr->lrh[0]) >> 12) & 0xf;
-                sc5 |= sc4_bit;
 
                 return_cnp(ibp, qp, src_qp, pkey, dlid, slid, sc5, grh);
         }
@@ -745,10 +738,6 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
                 if (qp->ibqp.qp_num > 1) {
                         struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);
                         u16 slid;
-                        u8 sc5;
-
-                        sc5 = (be16_to_cpu(hdr->lrh[0]) >> 12) & 0xf;
-                        sc5 |= sc4_bit;
 
                         slid = be16_to_cpu(hdr->lrh[3]);
                         if (unlikely(rcv_pkey_check(ppd, pkey, sc5, slid))) {
@@ -790,10 +779,6 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
                 /* Received on QP0, and so by definition, this is an SMP */
                 struct opa_smp *smp = (struct opa_smp *)data;
                 u16 slid = be16_to_cpu(hdr->lrh[3]);
-                u8 sc5;
-
-                sc5 = (be16_to_cpu(hdr->lrh[0]) >> 12) & 0xf;
-                sc5 |= sc4_bit;
 
                 if (opa_smp_check(ibp, pkey, sc5, qp, slid, smp))
                         goto drop;
@@ -890,9 +875,7 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
         }
 
         wc.slid = be16_to_cpu(hdr->lrh[3]);
-        sc = (be16_to_cpu(hdr->lrh[0]) >> 12) & 0xf;
-        sc |= sc4_bit;
-        wc.sl = ibp->sc_to_sl[sc];
+        wc.sl = ibp->sc_to_sl[sc5];
 
         /*
          * Save the LMC lower bits if the destination LID is a unicast LID.
diff --git a/drivers/infiniband/hw/i40iw/i40iw_main.c b/drivers/infiniband/hw/i40iw/i40iw_main.c
index c963cad92f5a..6e9081380a27 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_main.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_main.c
@@ -600,8 +600,7 @@ static enum i40iw_status_code i40iw_create_cqp(struct i40iw_device *iwdev)
         cqp_init_info.scratch_array = cqp->scratch_array;
         status = dev->cqp_ops->cqp_init(dev->cqp, &cqp_init_info);
         if (status) {
-                i40iw_pr_err("cqp init status %d maj_err %d min_err %d\n",
-                             status, maj_err, min_err);
+                i40iw_pr_err("cqp init status %d\n", status);
                 goto exit;
         }
         status = dev->cqp_ops->cqp_create(dev->cqp, true, &maj_err, &min_err);
diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
index 33959ed14563..283b64c942ee 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
@@ -1474,6 +1474,7 @@ static int i40iw_hw_alloc_stag(struct i40iw_device *iwdev, struct i40iw_mr *iwmr
         info->stag_idx = iwmr->stag >> I40IW_CQPSQ_STAG_IDX_SHIFT;
         info->pd_id = iwpd->sc_pd.pd_id;
         info->total_len = iwmr->length;
+        info->remote_access = true;
         cqp_info->cqp_cmd = OP_ALLOC_STAG;
         cqp_info->post_sq = 1;
         cqp_info->in.u.alloc_stag.dev = &iwdev->sc_dev;
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 804dbcc37d3f..a529a4535457 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -1031,17 +1031,17 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect
 
         case XTYPE_XBOXONE:
                 packet->data[0] = 0x09; /* activate rumble */
-                packet->data[1] = 0x08;
+                packet->data[1] = 0x00;
                 packet->data[2] = xpad->odata_serial++;
-                packet->data[3] = 0x08; /* continuous effect */
-                packet->data[4] = 0x00; /* simple rumble mode */
-                packet->data[5] = 0x03; /* L and R actuator only */
-                packet->data[6] = 0x00; /* TODO: LT actuator */
-                packet->data[7] = 0x00; /* TODO: RT actuator */
+                packet->data[3] = 0x09;
+                packet->data[4] = 0x00;
+                packet->data[5] = 0x0F;
+                packet->data[6] = 0x00;
+                packet->data[7] = 0x00;
                 packet->data[8] = strong / 512; /* left actuator */
                 packet->data[9] = weak / 512;   /* right actuator */
-                packet->data[10] = 0x80;        /* length of pulse */
-                packet->data[11] = 0x00;        /* stop period of pulse */
+                packet->data[10] = 0xFF;
+                packet->data[11] = 0x00;
                 packet->data[12] = 0x00;
                 packet->len = 13;
                 packet->pending = true;
@@ -1431,22 +1431,15 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
         int ep_irq_in_idx;
         int i, error;
 
+        if (intf->cur_altsetting->desc.bNumEndpoints != 2)
+                return -ENODEV;
+
         for (i = 0; xpad_device[i].idVendor; i++) {
                 if ((le16_to_cpu(udev->descriptor.idVendor) == xpad_device[i].idVendor) &&
                     (le16_to_cpu(udev->descriptor.idProduct) == xpad_device[i].idProduct))
                         break;
         }
 
-        if (xpad_device[i].xtype == XTYPE_XBOXONE &&
-            intf->cur_altsetting->desc.bInterfaceNumber != 0) {
-                /*
-                 * The Xbox One controller lists three interfaces all with the
-                 * same interface class, subclass and protocol. Differentiate by
-                 * interface number.
-                 */
-                return -ENODEV;
-        }
-
         xpad = kzalloc(sizeof(struct usb_xpad), GFP_KERNEL);
         if (!xpad)
                 return -ENOMEM;
@@ -1478,6 +1471,8 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
                 if (intf->cur_altsetting->desc.bInterfaceClass == USB_CLASS_VENDOR_SPEC) {
                         if (intf->cur_altsetting->desc.bInterfaceProtocol == 129)
                                 xpad->xtype = XTYPE_XBOX360W;
+                        else if (intf->cur_altsetting->desc.bInterfaceProtocol == 208)
+                                xpad->xtype = XTYPE_XBOXONE;
                         else
                                 xpad->xtype = XTYPE_XBOX360;
                 } else {
@@ -1492,6 +1487,17 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
                         xpad->mapping |= MAP_STICKS_TO_NULL;
         }
 
+        if (xpad->xtype == XTYPE_XBOXONE &&
+            intf->cur_altsetting->desc.bInterfaceNumber != 0) {
+                /*
+                 * The Xbox One controller lists three interfaces all with the
+                 * same interface class, subclass and protocol. Differentiate by
+                 * interface number.
+                 */
+                error = -ENODEV;
+                goto err_free_in_urb;
+        }
+
         error = xpad_init_output(intf, xpad);
         if (error)
                 goto err_free_in_urb;
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 78f93cf68840..be5b399da5d3 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1568,13 +1568,7 @@ static int elantech_set_properties(struct elantech_data *etd)
                 case 5:
                         etd->hw_version = 3;
                         break;
-                case 6:
-                case 7:
-                case 8:
-                case 9:
-                case 10:
-                case 13:
-                case 14:
+                case 6 ... 14:
                         etd->hw_version = 4;
                         break;
                 default:
diff --git a/drivers/input/mouse/vmmouse.c b/drivers/input/mouse/vmmouse.c
index a3f0f5a47490..0f586780ceb4 100644
--- a/drivers/input/mouse/vmmouse.c
+++ b/drivers/input/mouse/vmmouse.c
@@ -355,18 +355,11 @@ int vmmouse_detect(struct psmouse *psmouse, bool set_properties)
                 return -ENXIO;
         }
 
-        if (!request_region(VMMOUSE_PROTO_PORT, 4, "vmmouse")) {
-                psmouse_dbg(psmouse, "VMMouse port in use.\n");
-                return -EBUSY;
-        }
-
         /* Check if the device is present */
         response = ~VMMOUSE_PROTO_MAGIC;
         VMMOUSE_CMD(GETVERSION, 0, version, response, dummy1, dummy2);
-        if (response != VMMOUSE_PROTO_MAGIC || version == 0xffffffffU) {
-                release_region(VMMOUSE_PROTO_PORT, 4);
+        if (response != VMMOUSE_PROTO_MAGIC || version == 0xffffffffU)
                 return -ENXIO;
-        }
 
         if (set_properties) {
                 psmouse->vendor = VMMOUSE_VENDOR;
@@ -374,8 +367,6 @@ int vmmouse_detect(struct psmouse *psmouse, bool set_properties)
                 psmouse->model = version;
         }
 
-        release_region(VMMOUSE_PROTO_PORT, 4);
-
         return 0;
 }
 
@@ -394,7 +385,6 @@ static void vmmouse_disconnect(struct psmouse *psmouse)
         psmouse_reset(psmouse);
         input_unregister_device(priv->abs_dev);
         kfree(priv);
-        release_region(VMMOUSE_PROTO_PORT, 4);
 }
 
 /**
@@ -438,15 +428,10 @@ int vmmouse_init(struct psmouse *psmouse)
         struct input_dev *rel_dev = psmouse->dev, *abs_dev;
         int error;
 
-        if (!request_region(VMMOUSE_PROTO_PORT, 4, "vmmouse")) {
-                psmouse_dbg(psmouse, "VMMouse port in use.\n");
-                return -EBUSY;
-        }
-
         psmouse_reset(psmouse);
         error = vmmouse_enable(psmouse);
         if (error)
-                goto release_region;
+                return error;
 
         priv = kzalloc(sizeof(*priv), GFP_KERNEL);
         abs_dev = input_allocate_device();
@@ -502,8 +487,5 @@ init_fail:
         kfree(priv);
         psmouse->private = NULL;
 
-release_region:
-        release_region(VMMOUSE_PROTO_PORT, 4);
-
         return error;
 }
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
index b368b0515c5a..253df96be427 100644
--- a/drivers/input/rmi4/rmi_bus.c
+++ b/drivers/input/rmi4/rmi_bus.c
@@ -157,11 +157,11 @@ static int rmi_function_match(struct device *dev, struct device_driver *drv)
 static void rmi_function_of_probe(struct rmi_function *fn)
 {
         char of_name[9];
+        struct device_node *node = fn->rmi_dev->xport->dev->of_node;
 
         snprintf(of_name, sizeof(of_name), "rmi4-f%02x",
                 fn->fd.function_number);
-        fn->dev.of_node = of_find_node_by_name(
-                                fn->rmi_dev->xport->dev->of_node, of_name);
+        fn->dev.of_node = of_get_child_by_name(node, of_name);
 }
 #else
 static inline void rmi_function_of_probe(struct rmi_function *fn)
diff --git a/drivers/input/rmi4/rmi_f12.c b/drivers/input/rmi4/rmi_f12.c
index 8dd3fb5e1f94..88e91559c84e 100644
--- a/drivers/input/rmi4/rmi_f12.c
+++ b/drivers/input/rmi4/rmi_f12.c
@@ -66,7 +66,7 @@ static int rmi_f12_read_sensor_tuning(struct f12_data *f12)
         struct rmi_device *rmi_dev = fn->rmi_dev;
         int ret;
         int offset;
-        u8 buf[14];
+        u8 buf[15];
         int pitch_x = 0;
         int pitch_y = 0;
         int clip_x_low = 0;
@@ -86,9 +86,10 @@ static int rmi_f12_read_sensor_tuning(struct f12_data *f12)
 
         offset = rmi_register_desc_calc_reg_offset(&f12->control_reg_desc, 8);
 
-        if (item->reg_size > 14) {
-                dev_err(&fn->dev, "F12 control8 should be 14 bytes, not: %ld\n",
-                        item->reg_size);
+        if (item->reg_size > sizeof(buf)) {
+                dev_err(&fn->dev,
+                        "F12 control8 should be no bigger than %zd bytes, not: %ld\n",
+                        sizeof(buf), item->reg_size);
                 return -ENODEV;
         }
 
diff --git a/drivers/input/touchscreen/ts4800-ts.c b/drivers/input/touchscreen/ts4800-ts.c
index 3c3dd78303be..fed73eeb47b3 100644
--- a/drivers/input/touchscreen/ts4800-ts.c
+++ b/drivers/input/touchscreen/ts4800-ts.c
@@ -118,6 +118,13 @@ static int ts4800_parse_dt(struct platform_device *pdev,
                 return -ENODEV;
         }
 
+        ts->regmap = syscon_node_to_regmap(syscon_np);
+        of_node_put(syscon_np);
+        if (IS_ERR(ts->regmap)) {
+                dev_err(dev, "cannot get parent's regmap\n");
+                return PTR_ERR(ts->regmap);
+        }
+
         error = of_property_read_u32_index(np, "syscon", 1, &reg);
         if (error < 0) {
                 dev_err(dev, "no offset in syscon\n");
@@ -134,12 +141,6 @@ static int ts4800_parse_dt(struct platform_device *pdev,
 
         ts->bit = BIT(bit);
 
-        ts->regmap = syscon_node_to_regmap(syscon_np);
-        if (IS_ERR(ts->regmap)) {
-                dev_err(dev, "cannot get parent's regmap\n");
-                return PTR_ERR(ts->regmap);
-        }
-
         return 0;
 }
 
diff --git a/drivers/input/touchscreen/tsc2004.c b/drivers/input/touchscreen/tsc2004.c
index 7295c198aa08..6fe55d598fac 100644
--- a/drivers/input/touchscreen/tsc2004.c
+++ b/drivers/input/touchscreen/tsc2004.c
@@ -22,6 +22,11 @@
 #include <linux/regmap.h>
 #include "tsc200x-core.h"
 
+static const struct input_id tsc2004_input_id = {
+        .bustype = BUS_I2C,
+        .product = 2004,
+};
+
 static int tsc2004_cmd(struct device *dev, u8 cmd)
 {
         u8 tx = TSC200X_CMD | TSC200X_CMD_12BIT | cmd;
@@ -42,7 +47,7 @@ static int tsc2004_probe(struct i2c_client *i2c,
                          const struct i2c_device_id *id)
 
 {
-        return tsc200x_probe(&i2c->dev, i2c->irq, BUS_I2C,
+        return tsc200x_probe(&i2c->dev, i2c->irq, &tsc2004_input_id,
                              devm_regmap_init_i2c(i2c, &tsc200x_regmap_config),
                              tsc2004_cmd);
 }
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index b9f593dfd2ef..f2c5f0e47f77 100644
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -24,6 +24,11 @@
 #include <linux/regmap.h>
 #include "tsc200x-core.h"
 
+static const struct input_id tsc2005_input_id = {
+        .bustype = BUS_SPI,
+        .product = 2005,
+};
+
 static int tsc2005_cmd(struct device *dev, u8 cmd)
 {
         u8 tx = TSC200X_CMD | TSC200X_CMD_12BIT | cmd;
@@ -62,7 +67,7 @@ static int tsc2005_probe(struct spi_device *spi)
         if (error)
                 return error;
 
-        return tsc200x_probe(&spi->dev, spi->irq, BUS_SPI,
+        return tsc200x_probe(&spi->dev, spi->irq, &tsc2005_input_id,
                              devm_regmap_init_spi(spi, &tsc200x_regmap_config),
                              tsc2005_cmd);
 }
diff --git a/drivers/input/touchscreen/tsc200x-core.c b/drivers/input/touchscreen/tsc200x-core.c
index 15240c1ee850..dfa7f1c4f545 100644
--- a/drivers/input/touchscreen/tsc200x-core.c
+++ b/drivers/input/touchscreen/tsc200x-core.c
@@ -450,7 +450,7 @@ static void tsc200x_close(struct input_dev *input)
         mutex_unlock(&ts->mutex);
 }
 
-int tsc200x_probe(struct device *dev, int irq, __u16 bustype,
+int tsc200x_probe(struct device *dev, int irq, const struct input_id *tsc_id,
                   struct regmap *regmap,
                   int (*tsc200x_cmd)(struct device *dev, u8 cmd))
 {
@@ -547,9 +547,18 @@ int tsc200x_probe(struct device *dev, int irq, __u16 bustype,
         snprintf(ts->phys, sizeof(ts->phys),
                  "%s/input-ts", dev_name(dev));
 
-        input_dev->name = "TSC200X touchscreen";
+        if (tsc_id->product == 2004) {
+                input_dev->name = "TSC200X touchscreen";
+        } else {
+                input_dev->name = devm_kasprintf(dev, GFP_KERNEL,
+                                                 "TSC%04d touchscreen",
+                                                 tsc_id->product);
+                if (!input_dev->name)
+                        return -ENOMEM;
+        }
+
         input_dev->phys = ts->phys;
-        input_dev->id.bustype = bustype;
+        input_dev->id = *tsc_id;
         input_dev->dev.parent = dev;
         input_dev->evbit[0] = BIT(EV_ABS) | BIT(EV_KEY);
         input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
diff --git a/drivers/input/touchscreen/tsc200x-core.h b/drivers/input/touchscreen/tsc200x-core.h
index 7a482d102614..49a63a3c6840 100644
--- a/drivers/input/touchscreen/tsc200x-core.h
+++ b/drivers/input/touchscreen/tsc200x-core.h
@@ -70,7 +70,7 @@
 extern const struct regmap_config tsc200x_regmap_config;
 extern const struct dev_pm_ops tsc200x_pm_ops;
 
-int tsc200x_probe(struct device *dev, int irq, __u16 bustype,
+int tsc200x_probe(struct device *dev, int irq, const struct input_id *tsc_id,
                   struct regmap *regmap,
                   int (*tsc200x_cmd)(struct device *dev, u8 cmd));
 int tsc200x_remove(struct device *dev);
diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index bab3c6acf6a2..b6fc4bde79de 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -27,7 +27,7 @@ MODULE_AUTHOR("Jaya Kumar <jayakumar.lkml@gmail.com>");
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
-#define W8001_MAX_LENGTH        11
+#define W8001_MAX_LENGTH        13
 #define W8001_LEAD_MASK         0x80
 #define W8001_LEAD_BYTE         0x80
 #define W8001_TAB_MASK          0x40
@@ -155,6 +155,7 @@ static void parse_multi_touch(struct w8001 *w8001)
                 bool touch = data[0] & (1 << i);
 
                 input_mt_slot(dev, i);
+                input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
                 if (touch) {
                         x = (data[6 * i + 1] << 7) | data[6 * i + 2];
                         y = (data[6 * i + 3] << 7) | data[6 * i + 4];
@@ -339,6 +340,15 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
                 w8001->idx = 0;
                 parse_multi_touch(w8001);
                 break;
+
+        default:
+                /*
+                 * ThinkPad X60 Tablet PC (pen only device) sometimes
+                 * sends invalid data packets that are larger than
+                 * W8001_PKTLEN_TPCPEN. Let's start over again.
+                 */
+                if (!w8001->touch_dev && w8001->idx > W8001_PKTLEN_TPCPEN - 1)
+                        w8001->idx = 0;
         }
 
         return IRQ_HANDLED;
@@ -513,6 +523,8 @@ static int w8001_setup_touch(struct w8001 *w8001, char *basename,
                                         0, touch.x, 0, 0);
                 input_set_abs_params(dev, ABS_MT_POSITION_Y,
                                         0, touch.y, 0, 0);
+                input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
+                                        0, MT_TOOL_MAX, 0, 0);
 
                 strlcat(basename, " 2FG", basename_sz);
                 if (w8001->max_pen_x && w8001->max_pen_y)
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 9e0034196e10..59741ead7e15 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1107,13 +1107,13 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
                                 break;
                         }
 
+                        devid = e->devid;
                         DUMP_printk("  DEV_ACPI_HID(%s[%s])\t\tdevid: %02x:%02x.%x\n",
                                     hid, uid,
                                     PCI_BUS_NUM(devid),
                                     PCI_SLOT(devid),
                                     PCI_FUNC(devid));
 
-                        devid  = e->devid;
                         flags = e->flags;
 
                         ret = add_acpi_hid_device(hid, uid, &devid, false);
@@ -1568,13 +1568,23 @@ static int __init amd_iommu_init_pci(void)
                         break;
         }
 
+        /*
+         * Order is important here to make sure any unity map requirements are
+         * fulfilled. The unity mappings are created and written to the device
+         * table during the amd_iommu_init_api() call.
+         *
+         * After that we call init_device_table_dma() to make sure any
+         * uninitialized DTE will block DMA, and in the end we flush the caches
+         * of all IOMMUs to make sure the changes to the device table are
+         * active.
+         */
+        ret = amd_iommu_init_api();
+
         init_device_table_dma();
 
         for_each_iommu(iommu)
                 iommu_flush_all_caches(iommu);
 
-        ret = amd_iommu_init_api();
-
         if (!ret)
                 print_iommu_info();
 
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 10700945994e..323dac9900ba 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -4602,13 +4602,13 @@ static void free_all_cpu_cached_iovas(unsigned int cpu)
         for (i = 0; i < g_num_of_iommus; i++) {
                 struct intel_iommu *iommu = g_iommus[i];
                 struct dmar_domain *domain;
-                u16 did;
+                int did;
 
                 if (!iommu)
                         continue;
 
-                for (did = 0; did < 0xffff; did++) {
-                        domain = get_iommu_domain(iommu, did);
+                for (did = 0; did < cap_ndoms(iommu->cap); did++) {
+                        domain = get_iommu_domain(iommu, (u16)did);
 
                         if (!domain)
                                 continue;
diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c
index ba764a0835d3..e23001bfcfee 100644
--- a/drivers/iommu/iova.c
+++ b/drivers/iommu/iova.c
@@ -420,8 +420,10 @@ retry:
 
                 /* Try replenishing IOVAs by flushing rcache. */
                 flushed_rcache = true;
+                preempt_disable();
                 for_each_online_cpu(cpu)
                         free_cpu_cached_iovas(cpu, iovad);
+                preempt_enable();
                 goto retry;
         }
 
@@ -749,7 +751,7 @@ static bool __iova_rcache_insert(struct iova_domain *iovad,
         bool can_insert = false;
         unsigned long flags;
 
-        cpu_rcache = this_cpu_ptr(rcache->cpu_rcaches);
+        cpu_rcache = get_cpu_ptr(rcache->cpu_rcaches);
         spin_lock_irqsave(&cpu_rcache->lock, flags);
 
         if (!iova_magazine_full(cpu_rcache->loaded)) {
@@ -779,6 +781,7 @@ static bool __iova_rcache_insert(struct iova_domain *iovad,
                 iova_magazine_push(cpu_rcache->loaded, iova_pfn);
 
         spin_unlock_irqrestore(&cpu_rcache->lock, flags);
+        put_cpu_ptr(rcache->cpu_rcaches);
 
         if (mag_to_free) {
                 iova_magazine_free_pfns(mag_to_free, iovad);
@@ -812,7 +815,7 @@ static unsigned long __iova_rcache_get(struct iova_rcache *rcache,
         bool has_pfn = false;
         unsigned long flags;
 
-        cpu_rcache = this_cpu_ptr(rcache->cpu_rcaches);
+        cpu_rcache = get_cpu_ptr(rcache->cpu_rcaches);
         spin_lock_irqsave(&cpu_rcache->lock, flags);
 
         if (!iova_magazine_empty(cpu_rcache->loaded)) {
@@ -834,6 +837,7 @@ static unsigned long __iova_rcache_get(struct iova_rcache *rcache,
                 iova_pfn = iova_magazine_pop(cpu_rcache->loaded, limit_pfn);
 
         spin_unlock_irqrestore(&cpu_rcache->lock, flags);
+        put_cpu_ptr(rcache->cpu_rcaches);
 
         return iova_pfn;
 }
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 8a4adbeb2b8c..70ed1d0151b8 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -718,7 +718,7 @@ static int gic_shared_irq_domain_map(struct irq_domain *d, unsigned int virq,
 
         spin_lock_irqsave(&gic_lock, flags);
         gic_map_to_pin(intr, gic_cpu_pin);
-        gic_map_to_vpe(intr, vpe);
+        gic_map_to_vpe(intr, mips_cm_vp_id(vpe));
         for (i = 0; i < min(gic_vpes, NR_CPUS); i++)
                 clear_bit(intr, pcpu_masks[i].pcpu_mask);
         set_bit(intr, pcpu_masks[vpe].pcpu_mask);
@@ -959,7 +959,7 @@ int gic_ipi_domain_match(struct irq_domain *d, struct device_node *node,
         switch (bus_token) {
         case DOMAIN_BUS_IPI:
                 is_ipi = d->bus_token == bus_token;
-                return to_of_node(d->fwnode) == node && is_ipi;
+                return (!node || to_of_node(d->fwnode) == node) && is_ipi;
                 break;
         default:
                 return 0;
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index beb2841ceae5..3f1ab4986cfc 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -779,11 +779,31 @@ static const struct v4l2_dv_timings_cap adv76xx_timings_cap_digital = {
                         V4L2_DV_BT_CAP_CUSTOM)
 };
 
-static inline const struct v4l2_dv_timings_cap *
-adv76xx_get_dv_timings_cap(struct v4l2_subdev *sd)
+/*
+ * Return the DV timings capabilities for the requested sink pad. As a special
+ * case, pad value -1 returns the capabilities for the currently selected input.
+ */
+static const struct v4l2_dv_timings_cap *
+adv76xx_get_dv_timings_cap(struct v4l2_subdev *sd, int pad)
 {
-        return is_digital_input(sd) ? &adv76xx_timings_cap_digital :
-                                      &adv7604_timings_cap_analog;
+        if (pad == -1) {
+                struct adv76xx_state *state = to_state(sd);
+
+                pad = state->selected_input;
+        }
+
+        switch (pad) {
+        case ADV76XX_PAD_HDMI_PORT_A:
+        case ADV7604_PAD_HDMI_PORT_B:
+        case ADV7604_PAD_HDMI_PORT_C:
+        case ADV7604_PAD_HDMI_PORT_D:
+                return &adv76xx_timings_cap_digital;
+
+        case ADV7604_PAD_VGA_RGB:
+        case ADV7604_PAD_VGA_COMP:
+        default:
+                return &adv7604_timings_cap_analog;
+        }
 }
 
 
@@ -1329,7 +1349,7 @@ static int stdi2dv_timings(struct v4l2_subdev *sd,
                 const struct v4l2_bt_timings *bt = &v4l2_dv_timings_presets[i].bt;
 
                 if (!v4l2_valid_dv_timings(&v4l2_dv_timings_presets[i],
-                                           adv76xx_get_dv_timings_cap(sd),
+                                           adv76xx_get_dv_timings_cap(sd, -1),
                                            adv76xx_check_dv_timings, NULL))
                         continue;
                 if (vtotal(bt) != stdi->lcf + 1)
@@ -1430,18 +1450,22 @@ static int adv76xx_enum_dv_timings(struct v4l2_subdev *sd,
                 return -EINVAL;
 
         return v4l2_enum_dv_timings_cap(timings,
-                adv76xx_get_dv_timings_cap(sd), adv76xx_check_dv_timings, NULL);
+                adv76xx_get_dv_timings_cap(sd, timings->pad),
+                adv76xx_check_dv_timings, NULL);
 }
 
 static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd,
                         struct v4l2_dv_timings_cap *cap)
 {
         struct adv76xx_state *state = to_state(sd);
+        unsigned int pad = cap->pad;
 
         if (cap->pad >= state->source_pad)
                 return -EINVAL;
 
-        *cap = *adv76xx_get_dv_timings_cap(sd);
+        *cap = *adv76xx_get_dv_timings_cap(sd, pad);
+        cap->pad = pad;
+
         return 0;
 }
 
@@ -1450,9 +1474,9 @@ static int adv76xx_dv_timings_cap(struct v4l2_subdev *sd,
 static void adv76xx_fill_optional_dv_timings_fields(struct v4l2_subdev *sd,
                 struct v4l2_dv_timings *timings)
 {
-        v4l2_find_dv_timings_cap(timings, adv76xx_get_dv_timings_cap(sd),
-                        is_digital_input(sd) ? 250000 : 1000000,
-                        adv76xx_check_dv_timings, NULL);
+        v4l2_find_dv_timings_cap(timings, adv76xx_get_dv_timings_cap(sd, -1),
+                                 is_digital_input(sd) ? 250000 : 1000000,
+                                 adv76xx_check_dv_timings, NULL);
 }
 
 static unsigned int adv7604_read_hdmi_pixelclock(struct v4l2_subdev *sd)
@@ -1620,7 +1644,7 @@ static int adv76xx_s_dv_timings(struct v4l2_subdev *sd,
 
         bt = &timings->bt;
 
-        if (!v4l2_valid_dv_timings(timings, adv76xx_get_dv_timings_cap(sd),
+        if (!v4l2_valid_dv_timings(timings, adv76xx_get_dv_timings_cap(sd, -1),
                                    adv76xx_check_dv_timings, NULL))
                 return -ERANGE;
 
diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c
index 87c12930416f..92d9d4214c3a 100644
--- a/drivers/media/usb/airspy/airspy.c
+++ b/drivers/media/usb/airspy/airspy.c
@@ -1072,7 +1072,7 @@ static int airspy_probe(struct usb_interface *intf,
         if (ret) {
                 dev_err(s->dev, "Failed to register as video device (%d)\n",
                                 ret);
-                goto err_unregister_v4l2_dev;
+                goto err_free_controls;
         }
         dev_info(s->dev, "Registered as %s\n",
                         video_device_node_name(&s->vdev));
@@ -1081,7 +1081,6 @@ static int airspy_probe(struct usb_interface *intf,
 
 err_free_controls:
         v4l2_ctrl_handler_free(&s->hdl);
-err_unregister_v4l2_dev:
         v4l2_device_unregister(&s->v4l2_dev);
 err_free_mem:
         kfree(s);
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 28e5be2c2eef..528390f33b53 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -2171,7 +2171,7 @@ static int v4l_cropcap(const struct v4l2_ioctl_ops *ops,
          * The determine_valid_ioctls() call already should ensure
          * that this can never happen, but just in case...
          */
-        if (WARN_ON(!ops->vidioc_cropcap && !ops->vidioc_cropcap))
+        if (WARN_ON(!ops->vidioc_cropcap && !ops->vidioc_g_selection))
                 return -ENOTTY;
 
         if (ops->vidioc_cropcap)
diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c
index 199d261990be..f32fbb8e8129 100644
--- a/drivers/mfd/max77620.c
+++ b/drivers/mfd/max77620.c
@@ -203,6 +203,7 @@ static int max77620_get_fps_period_reg_value(struct max77620_chip *chip,
                 break;
         case MAX77620:
                 fps_min_period = MAX77620_FPS_PERIOD_MIN_US;
+                break;
         default:
                 return -EINVAL;
         }
@@ -236,6 +237,7 @@ static int max77620_config_fps(struct max77620_chip *chip,
                 break;
         case MAX77620:
                 fps_max_period = MAX77620_FPS_PERIOD_MAX_US;
+                break;
         default:
                 return -EINVAL;
         }
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index e62fde3ac431..c5472e3c9231 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -355,8 +355,10 @@ static struct mmc_blk_ioc_data *mmc_blk_ioctl_copy_from_user(
                 goto idata_err;
         }
 
-        if (!idata->buf_bytes)
+        if (!idata->buf_bytes) {
+                idata->buf = NULL;
                 return idata;
+        }
 
         idata->buf = kmalloc(idata->buf_bytes, GFP_KERNEL);
         if (!idata->buf) {
@@ -1786,8 +1788,8 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq,
 
         packed_cmd_hdr = packed->cmd_hdr;
         memset(packed_cmd_hdr, 0, sizeof(packed->cmd_hdr));
-        packed_cmd_hdr[0] = (packed->nr_entries << 16) |
-                (PACKED_CMD_WR << 8) | PACKED_CMD_VER;
+        packed_cmd_hdr[0] = cpu_to_le32((packed->nr_entries << 16) |
+                (PACKED_CMD_WR << 8) | PACKED_CMD_VER);
         hdr_blocks = mmc_large_sector(card) ? 8 : 1;
 
         /*
@@ -1801,14 +1803,14 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq,
                         ((brq->data.blocks * brq->data.blksz) >=
                          card->ext_csd.data_tag_unit_size);
                 /* Argument of CMD23 */
-                packed_cmd_hdr[(i * 2)] =
+                packed_cmd_hdr[(i * 2)] = cpu_to_le32(
                         (do_rel_wr ? MMC_CMD23_ARG_REL_WR : 0) |
                         (do_data_tag ? MMC_CMD23_ARG_TAG_REQ : 0) |
-                        blk_rq_sectors(prq);
+                        blk_rq_sectors(prq));
                 /* Argument of CMD18 or CMD25 */
-                packed_cmd_hdr[((i * 2)) + 1] =
+                packed_cmd_hdr[((i * 2)) + 1] = cpu_to_le32(
                         mmc_card_blockaddr(card) ?
-                        blk_rq_pos(prq) : blk_rq_pos(prq) << 9;
+                        blk_rq_pos(prq) : blk_rq_pos(prq) << 9);
                 packed->blocks += blk_rq_sectors(prq);
                 i++;
         }
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 86fac3e86833..c763b404510f 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -789,14 +789,16 @@ static int pxamci_probe(struct platform_device *pdev)
                 gpio_direction_output(gpio_power,
                                       host->pdata->gpio_power_invert);
         }
-        if (gpio_is_valid(gpio_ro))
+        if (gpio_is_valid(gpio_ro)) {
                 ret = mmc_gpio_request_ro(mmc, gpio_ro);
-        if (ret) {
-                dev_err(&pdev->dev, "Failed requesting gpio_ro %d\n", gpio_ro);
-                goto out;
-        } else {
-                mmc->caps2 |= host->pdata->gpio_card_ro_invert ?
-                        0 : MMC_CAP2_RO_ACTIVE_HIGH;
+                if (ret) {
+                        dev_err(&pdev->dev, "Failed requesting gpio_ro %d\n",
+                                gpio_ro);
+                        goto out;
+                } else {
+                        mmc->caps2 |= host->pdata->gpio_card_ro_invert ?
+                                0 : MMC_CAP2_RO_ACTIVE_HIGH;
+                }
         }
 
         if (gpio_is_valid(gpio_cd))
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 08e158895635..a136da8df6fe 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1657,8 +1657,11 @@ static int omap_get_dt_info(struct device *dev, struct omap_nand_info *info)
 
         /* detect availability of ELM module. Won't be present pre-OMAP4 */
         info->elm_of_node = of_parse_phandle(child, "ti,elm-id", 0);
-        if (!info->elm_of_node)
-                dev_dbg(dev, "ti,elm-id not in DT\n");
+        if (!info->elm_of_node) {
+                info->elm_of_node = of_parse_phandle(child, "elm_id", 0);
+                if (!info->elm_of_node)
+                        dev_dbg(dev, "ti,elm-id not in DT\n");
+        }
 
         /* select ecc-scheme for NAND */
         if (of_property_read_string(child, "ti,nand-ecc-opt", &s)) {
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index b9304a295f86..edc70ffad660 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -101,11 +101,14 @@ enum ad_link_speed_type {
 #define MAC_ADDRESS_EQUAL(A, B) \
         ether_addr_equal_64bits((const u8 *)A, (const u8 *)B)
 
-static struct mac_addr null_mac_addr = { { 0, 0, 0, 0, 0, 0 } };
+static const u8 null_mac_addr[ETH_ALEN + 2] __long_aligned = {
+        0, 0, 0, 0, 0, 0
+};
 static u16 ad_ticks_per_sec;
 static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000;
 
-static const u8 lacpdu_mcast_addr[ETH_ALEN] = MULTICAST_LACPDU_ADDR;
+static const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned =
+        MULTICAST_LACPDU_ADDR;
 
 /* ================= main 802.3ad protocol functions ================== */
 static int ad_lacpdu_send(struct port *port);
@@ -657,6 +660,20 @@ static void __set_agg_ports_ready(struct aggregator *aggregator, int val)
         }
 }
 
+static int __agg_active_ports(struct aggregator *agg)
+{
+        struct port *port;
+        int active = 0;
+
+        for (port = agg->lag_ports; port;
+             port = port->next_port_in_aggregator) {
+                if (port->is_enabled)
+                        active++;
+        }
+
+        return active;
+}
+
 /**
  * __get_agg_bandwidth - get the total bandwidth of an aggregator
  * @aggregator: the aggregator we're looking at
@@ -664,39 +681,40 @@ static void __set_agg_ports_ready(struct aggregator *aggregator, int val)
  */
 static u32 __get_agg_bandwidth(struct aggregator *aggregator)
 {
+        int nports = __agg_active_ports(aggregator);
         u32 bandwidth = 0;
 
-        if (aggregator->num_of_ports) {
+        if (nports) {
                 switch (__get_link_speed(aggregator->lag_ports)) {
                 case AD_LINK_SPEED_1MBPS:
-                        bandwidth = aggregator->num_of_ports;
+                        bandwidth = nports;
                         break;
                 case AD_LINK_SPEED_10MBPS:
-                        bandwidth = aggregator->num_of_ports * 10;
+                        bandwidth = nports * 10;
                         break;
                 case AD_LINK_SPEED_100MBPS:
-                        bandwidth = aggregator->num_of_ports * 100;
+                        bandwidth = nports * 100;
                         break;
                 case AD_LINK_SPEED_1000MBPS:
-                        bandwidth = aggregator->num_of_ports * 1000;
+                        bandwidth = nports * 1000;
                         break;
                 case AD_LINK_SPEED_2500MBPS:
-                        bandwidth = aggregator->num_of_ports * 2500;
+                        bandwidth = nports * 2500;
                         break;
                 case AD_LINK_SPEED_10000MBPS:
-                        bandwidth = aggregator->num_of_ports * 10000;
+                        bandwidth = nports * 10000;
                         break;
                 case AD_LINK_SPEED_20000MBPS:
-                        bandwidth = aggregator->num_of_ports * 20000;
+                        bandwidth = nports * 20000;
                         break;
                 case AD_LINK_SPEED_40000MBPS:
-                        bandwidth = aggregator->num_of_ports * 40000;
+                        bandwidth = nports * 40000;
                         break;
                 case AD_LINK_SPEED_56000MBPS:
-                        bandwidth = aggregator->num_of_ports * 56000;
+                        bandwidth = nports * 56000;
                         break;
                 case AD_LINK_SPEED_100000MBPS:
-                        bandwidth = aggregator->num_of_ports * 100000;
+                        bandwidth = nports * 100000;
                         break;
                 default:
                         bandwidth = 0; /* to silence the compiler */
@@ -1530,10 +1548,10 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,
 
         switch (__get_agg_selection_mode(curr->lag_ports)) {
         case BOND_AD_COUNT:
-                if (curr->num_of_ports > best->num_of_ports)
+                if (__agg_active_ports(curr) > __agg_active_ports(best))
                         return curr;
 
-                if (curr->num_of_ports < best->num_of_ports)
+                if (__agg_active_ports(curr) < __agg_active_ports(best))
                         return best;
 
                 /*FALLTHROUGH*/
@@ -1561,8 +1579,14 @@ static int agg_device_up(const struct aggregator *agg)
         if (!port)
                 return 0;
 
-        return netif_running(port->slave->dev) &&
-               netif_carrier_ok(port->slave->dev);
+        for (port = agg->lag_ports; port;
+             port = port->next_port_in_aggregator) {
+                if (netif_running(port->slave->dev) &&
+                    netif_carrier_ok(port->slave->dev))
+                        return 1;
+        }
+
+        return 0;
 }
 
 /**
@@ -1610,7 +1634,7 @@ static void ad_agg_selection_logic(struct aggregator *agg,
 
                 agg->is_active = 0;
 
-                if (agg->num_of_ports && agg_device_up(agg))
+                if (__agg_active_ports(agg) && agg_device_up(agg))
                         best = ad_agg_selection_test(best, agg);
         }
 
@@ -1622,7 +1646,7 @@ static void ad_agg_selection_logic(struct aggregator *agg,
                  * answering partner.
                  */
                 if (active && active->lag_ports &&
-                    active->lag_ports->is_enabled &&
+                    __agg_active_ports(active) &&
                     (__agg_has_partner(active) ||
                      (!__agg_has_partner(active) &&
                      !__agg_has_partner(best)))) {
@@ -1718,7 +1742,7 @@ static void ad_clear_agg(struct aggregator *aggregator)
                 aggregator->is_individual = false;
                 aggregator->actor_admin_aggregator_key = 0;
                 aggregator->actor_oper_aggregator_key = 0;
-                aggregator->partner_system = null_mac_addr;
+                eth_zero_addr(aggregator->partner_system.mac_addr_value);
                 aggregator->partner_system_priority = 0;
                 aggregator->partner_oper_aggregator_key = 0;
                 aggregator->receive_state = 0;
@@ -1740,7 +1764,7 @@ static void ad_initialize_agg(struct aggregator *aggregator)
         if (aggregator) {
                 ad_clear_agg(aggregator);
 
-                aggregator->aggregator_mac_address = null_mac_addr;
+                eth_zero_addr(aggregator->aggregator_mac_address.mac_addr_value);
                 aggregator->aggregator_identifier = 0;
                 aggregator->slave = NULL;
         }
@@ -2133,7 +2157,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                 else
                                         temp_aggregator->lag_ports = temp_port->next_port_in_aggregator;
                                 temp_aggregator->num_of_ports--;
-                                if (temp_aggregator->num_of_ports == 0) {
+                                if (__agg_active_ports(temp_aggregator) == 0) {
                                         select_new_active_agg = temp_aggregator->is_active;
                                         ad_clear_agg(temp_aggregator);
                                         if (select_new_active_agg) {
@@ -2432,7 +2456,9 @@ void bond_3ad_adapter_speed_duplex_changed(struct slave *slave)
  */
 void bond_3ad_handle_link_change(struct slave *slave, char link)
 {
+        struct aggregator *agg;
         struct port *port;
+        bool dummy;
 
         port = &(SLAVE_AD_INFO(slave)->port);
 
@@ -2459,6 +2485,9 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
                 port->is_enabled = false;
                 ad_update_actor_keys(port, true);
         }
+        agg = __get_first_agg(port);
+        ad_agg_selection_logic(agg, &dummy);
+
         netdev_dbg(slave->bond->dev, "Port %d changed link status to %s\n",
                    port->actor_port_number,
                    link == BOND_LINK_UP ? "UP" : "DOWN");
@@ -2499,7 +2528,7 @@ int bond_3ad_set_carrier(struct bonding *bond)
         active = __get_active_agg(&(SLAVE_AD_INFO(first_slave)->aggregator));
         if (active) {
                 /* are enough slaves available to consider link up? */
-                if (active->num_of_ports < bond->params.min_links) {
+                if (__agg_active_ports(active) < bond->params.min_links) {
                         if (netif_carrier_ok(bond->dev)) {
                                 netif_carrier_off(bond->dev);
                                 goto out;
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index c5ac160a8ae9..551f0f8dead3 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -42,13 +42,10 @@
 
 
 
-#ifndef __long_aligned
-#define __long_aligned __attribute__((aligned((sizeof(long)))))
-#endif
-static const u8 mac_bcast[ETH_ALEN] __long_aligned = {
+static const u8 mac_bcast[ETH_ALEN + 2] __long_aligned = {
         0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 };
-static const u8 mac_v6_allmcast[ETH_ALEN] __long_aligned = {
+static const u8 mac_v6_allmcast[ETH_ALEN + 2] __long_aligned = {
         0x33, 0x33, 0x00, 0x00, 0x00, 0x01
 };
 static const int alb_delta_in_ticks = HZ / ALB_TIMER_TICKS_PER_SEC;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 941ec99cd3b6..a2afa3be17a4 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1584,6 +1584,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         }
 
         /* check for initial state */
+        new_slave->link = BOND_LINK_NOCHANGE;
         if (bond->params.miimon) {
                 if (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS) {
                         if (bond->params.updelay) {
diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
index db760e84119f..b8df0f5e8c25 100644
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -446,7 +446,11 @@ static int bond_newlink(struct net *src_net, struct net_device *bond_dev,
         if (err < 0)
                 return err;
 
-        return register_netdevice(bond_dev);
+        err = register_netdevice(bond_dev);
+
+        netif_carrier_off(bond_dev);
+
+        return err;
 }
 
 static size_t bond_get_size(const struct net_device *bond_dev)
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 8b3275d7792a..8f5e93cb7975 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -712,9 +712,10 @@ static int at91_poll_rx(struct net_device *dev, int quota)
 
         /* upper group completed, look again in lower */
         if (priv->rx_next > get_mb_rx_low_last(priv) &&
-            quota > 0 && mb > get_mb_rx_last(priv)) {
+            mb > get_mb_rx_last(priv)) {
                 priv->rx_next = get_mb_rx_first(priv);
-                goto again;
+                if (quota > 0)
+                        goto again;
         }
 
         return received;
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index f91b094288da..e3dccd3200d5 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -332,9 +332,23 @@ static void c_can_setup_tx_object(struct net_device *dev, int iface,
 
         priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface), ctrl);
 
-        for (i = 0; i < frame->can_dlc; i += 2) {
-                priv->write_reg(priv, C_CAN_IFACE(DATA1_REG, iface) + i / 2,
-                                frame->data[i] | (frame->data[i + 1] << 8));
+        if (priv->type == BOSCH_D_CAN) {
+                u32 data = 0, dreg = C_CAN_IFACE(DATA1_REG, iface);
+
+                for (i = 0; i < frame->can_dlc; i += 4, dreg += 2) {
+                        data = (u32)frame->data[i];
+                        data |= (u32)frame->data[i + 1] << 8;
+                        data |= (u32)frame->data[i + 2] << 16;
+                        data |= (u32)frame->data[i + 3] << 24;
+                        priv->write_reg32(priv, dreg, data);
+                }
+        } else {
+                for (i = 0; i < frame->can_dlc; i += 2) {
+                        priv->write_reg(priv,
+                                        C_CAN_IFACE(DATA1_REG, iface) + i / 2,
+                                        frame->data[i] |
+                                        (frame->data[i + 1] << 8));
+                }
         }
 }
 
@@ -402,10 +416,20 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, u32 ctrl)
         } else {
                 int i, dreg = C_CAN_IFACE(DATA1_REG, iface);
 
-                for (i = 0; i < frame->can_dlc; i += 2, dreg ++) {
-                        data = priv->read_reg(priv, dreg);
-                        frame->data[i] = data;
-                        frame->data[i + 1] = data >> 8;
+                if (priv->type == BOSCH_D_CAN) {
+                        for (i = 0; i < frame->can_dlc; i += 4, dreg += 2) {
+                                data = priv->read_reg32(priv, dreg);
+                                frame->data[i] = data;
+                                frame->data[i + 1] = data >> 8;
+                                frame->data[i + 2] = data >> 16;
+                                frame->data[i + 3] = data >> 24;
+                        }
+                } else {
+                        for (i = 0; i < frame->can_dlc; i += 2, dreg++) {
+                                data = priv->read_reg(priv, dreg);
+                                frame->data[i] = data;
+                                frame->data[i + 1] = data >> 8;
+                        }
                 }
         }
 
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 910c12e2638e..ad535a854e5c 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -798,6 +798,9 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[])
          * - control mode with CAN_CTRLMODE_FD set
          */
 
+        if (!data)
+                return 0;
+
         if (data[IFLA_CAN_CTRLMODE]) {
                 struct can_ctrlmode *cm = nla_data(data[IFLA_CAN_CTRLMODE]);
 
@@ -1008,6 +1011,11 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
         return -EOPNOTSUPP;
 }
 
+static void can_dellink(struct net_device *dev, struct list_head *head)
+{
+        return;
+}
+
 static struct rtnl_link_ops can_link_ops __read_mostly = {
         .kind           = "can",
         .maxtype        = IFLA_CAN_MAX,
@@ -1016,6 +1024,7 @@ static struct rtnl_link_ops can_link_ops __read_mostly = {
         .validate       = can_validate,
         .newlink        = can_newlink,
         .changelink     = can_changelink,
+        .dellink        = can_dellink,
         .get_size       = can_get_size,
         .fill_info      = can_fill_info,
         .get_xstats_size = can_get_xstats_size,
diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig
index bcb272f6c68a..8483a40e7e9e 100644
--- a/drivers/net/can/usb/Kconfig
+++ b/drivers/net/can/usb/Kconfig
@@ -16,7 +16,8 @@ config CAN_ESD_USB2
 config CAN_GS_USB
         tristate "Geschwister Schneider UG interfaces"
         ---help---
-          This driver supports the Geschwister Schneider USB/CAN devices.
+          This driver supports the Geschwister Schneider and bytewerk.org
+          candleLight USB CAN interfaces USB/CAN devices
           If unsure choose N,
           choose Y for built in support,
           M to compile as module (module will be named: gs_usb).
@@ -46,6 +47,8 @@ config CAN_KVASER_USB
             - Kvaser USBcan R
             - Kvaser Leaf Light v2
             - Kvaser Mini PCI Express HS
+            - Kvaser Mini PCI Express 2xHS
+            - Kvaser USBcan Light 2xHS
             - Kvaser USBcan II HS/HS
             - Kvaser USBcan II HS/LS
             - Kvaser USBcan Rugged ("USBcan Rev B")
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index 1556d4286235..acb0c8490673 100644
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -1,7 +1,9 @@
-/* CAN driver for Geschwister Schneider USB/CAN devices.
+/* CAN driver for Geschwister Schneider USB/CAN devices
+ * and bytewerk.org candleLight USB CAN interfaces.
  *
- * Copyright (C) 2013 Geschwister Schneider Technologie-,
+ * Copyright (C) 2013-2016 Geschwister Schneider Technologie-,
  * Entwicklungs- und Vertriebs UG (Haftungsbeschränkt).
+ * Copyright (C) 2016 Hubert Denkmair
  *
  * Many thanks to all socketcan devs!
  *
@@ -29,6 +31,9 @@
 #define USB_GSUSB_1_VENDOR_ID      0x1d50
 #define USB_GSUSB_1_PRODUCT_ID     0x606f
 
+#define USB_CANDLELIGHT_VENDOR_ID  0x1209
+#define USB_CANDLELIGHT_PRODUCT_ID 0x2323
+
 #define GSUSB_ENDPOINT_IN          1
 #define GSUSB_ENDPOINT_OUT         2
 
@@ -952,6 +957,8 @@ static void gs_usb_disconnect(struct usb_interface *intf)
 static const struct usb_device_id gs_usb_table[] = {
         { USB_DEVICE_INTERFACE_NUMBER(USB_GSUSB_1_VENDOR_ID,
                                       USB_GSUSB_1_PRODUCT_ID, 0) },
+        { USB_DEVICE_INTERFACE_NUMBER(USB_CANDLELIGHT_VENDOR_ID,
+                                      USB_CANDLELIGHT_PRODUCT_ID, 0) },
         {} /* Terminating entry */
 };
 
@@ -969,5 +976,6 @@ module_usb_driver(gs_usb_driver);
 MODULE_AUTHOR("Maximilian Schneider <mws@schneidersoft.net>");
 MODULE_DESCRIPTION(
 "Socket CAN device driver for Geschwister Schneider Technologie-, "
-"Entwicklungs- und Vertriebs UG. USB2.0 to CAN interfaces.");
+"Entwicklungs- und Vertriebs UG. USB2.0 to CAN interfaces\n"
+"and bytewerk.org candleLight USB CAN interfaces.");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
index 022bfa13ebfa..6f1f3b675ff5 100644
--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -59,11 +59,14 @@
 #define USB_CAN_R_PRODUCT_ID            39
 #define USB_LEAF_LITE_V2_PRODUCT_ID     288
 #define USB_MINI_PCIE_HS_PRODUCT_ID     289
+#define USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID 290
+#define USB_USBCAN_LIGHT_2HS_PRODUCT_ID 291
+#define USB_MINI_PCIE_2HS_PRODUCT_ID    292
 
 static inline bool kvaser_is_leaf(const struct usb_device_id *id)
 {
         return id->idProduct >= USB_LEAF_DEVEL_PRODUCT_ID &&
-               id->idProduct <= USB_MINI_PCIE_HS_PRODUCT_ID;
+               id->idProduct <= USB_MINI_PCIE_2HS_PRODUCT_ID;
 }
 
 /* Kvaser USBCan-II devices */
@@ -537,6 +540,9 @@ static const struct usb_device_id kvaser_usb_table[] = {
                 .driver_info = KVASER_HAS_TXRX_ERRORS },
         { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID) },
         { USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID) },
+        { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID) },
+        { USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_2HS_PRODUCT_ID) },
+        { USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_2HS_PRODUCT_ID) },
 
         /* USBCANII family IDs */
         { USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN2_PRODUCT_ID),
diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c
index 30defe6c81f2..821d86c38ab2 100644
--- a/drivers/net/ethernet/agere/et131x.c
+++ b/drivers/net/ethernet/agere/et131x.c
@@ -3851,7 +3851,7 @@ static void et131x_tx_timeout(struct net_device *netdev)
         unsigned long flags;
 
         /* If the device is closed, ignore the timeout */
-        if (~(adapter->flags & FMP_ADAPTER_INTERRUPT_IN_USE))
+        if (!(adapter->flags & FMP_ADAPTER_INTERRUPT_IN_USE))
                 return;
 
         /* Any nonrecoverable hardware error?
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index e0fb0f1122db..20760e10211a 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -509,8 +509,8 @@ static int au1000_mii_probe(struct net_device *dev)
          * on the current MAC's MII bus
          */
         for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++)
-                if (mdiobus_get_phy(aup->mii_bus, aup->phy_addr)) {
-                        phydev = mdiobus_get_phy(aup->mii_bus, aup->phy_addr);
+                if (mdiobus_get_phy(aup->mii_bus, phy_addr)) {
+                        phydev = mdiobus_get_phy(aup->mii_bus, phy_addr);
                         if (!aup->phy_search_highest_addr)
                                 /* break out with first one found */
                                 break;
diff --git a/drivers/net/ethernet/atheros/alx/alx.h b/drivers/net/ethernet/atheros/alx/alx.h
index d02c4240b7df..8fc93c5f6abc 100644
--- a/drivers/net/ethernet/atheros/alx/alx.h
+++ b/drivers/net/ethernet/atheros/alx/alx.h
@@ -96,10 +96,6 @@ struct alx_priv {
         unsigned int rx_ringsz;
         unsigned int rxbuf_size;
 
-        struct page  *rx_page;
-        unsigned int rx_page_offset;
-        unsigned int rx_frag_size;
-
         struct napi_struct napi;
         struct alx_tx_queue txq;
         struct alx_rx_queue rxq;
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index c98acdc0d14f..e708e360a9e3 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -70,35 +70,6 @@ static void alx_free_txbuf(struct alx_priv *alx, int entry)
         }
 }
 
-static struct sk_buff *alx_alloc_skb(struct alx_priv *alx, gfp_t gfp)
-{
-        struct sk_buff *skb;
-        struct page *page;
-
-        if (alx->rx_frag_size > PAGE_SIZE)
-                return __netdev_alloc_skb(alx->dev, alx->rxbuf_size, gfp);
-
-        page = alx->rx_page;
-        if (!page) {
-                alx->rx_page = page = alloc_page(gfp);
-                if (unlikely(!page))
-                        return NULL;
-                alx->rx_page_offset = 0;
-        }
-
-        skb = build_skb(page_address(page) + alx->rx_page_offset,
-                        alx->rx_frag_size);
-        if (likely(skb)) {
-                alx->rx_page_offset += alx->rx_frag_size;
-                if (alx->rx_page_offset >= PAGE_SIZE)
-                        alx->rx_page = NULL;
-                else
-                        get_page(page);
-        }
-        return skb;
-}
-
-
 static int alx_refill_rx_ring(struct alx_priv *alx, gfp_t gfp)
 {
         struct alx_rx_queue *rxq = &alx->rxq;
@@ -115,9 +86,22 @@ static int alx_refill_rx_ring(struct alx_priv *alx, gfp_t gfp)
         while (!cur_buf->skb && next != rxq->read_idx) {
                 struct alx_rfd *rfd = &rxq->rfd[cur];
 
-                skb = alx_alloc_skb(alx, gfp);
+                /*
+                 * When DMA RX address is set to something like
+                 * 0x....fc0, it will be very likely to cause DMA
+                 * RFD overflow issue.
+                 *
+                 * To work around it, we apply rx skb with 64 bytes
+                 * longer space, and offset the address whenever
+                 * 0x....fc0 is detected.
+                 */
+                skb = __netdev_alloc_skb(alx->dev, alx->rxbuf_size + 64, gfp);
                 if (!skb)
                         break;
+
+                if (((unsigned long)skb->data & 0xfff) == 0xfc0)
+                        skb_reserve(skb, 64);
+
                 dma = dma_map_single(&alx->hw.pdev->dev,
                                      skb->data, alx->rxbuf_size,
                                      DMA_FROM_DEVICE);
@@ -153,7 +137,6 @@ static int alx_refill_rx_ring(struct alx_priv *alx, gfp_t gfp)
                 alx_write_mem16(&alx->hw, ALX_RFD_PIDX, cur);
         }
 
-
         return count;
 }
 
@@ -622,11 +605,6 @@ static void alx_free_rings(struct alx_priv *alx)
         kfree(alx->txq.bufs);
         kfree(alx->rxq.bufs);
 
-        if (alx->rx_page) {
-                put_page(alx->rx_page);
-                alx->rx_page = NULL;
-        }
-
         dma_free_coherent(&alx->hw.pdev->dev,
                           alx->descmem.size,
                           alx->descmem.virt,
@@ -681,7 +659,6 @@ static int alx_request_irq(struct alx_priv *alx)
                                   alx->dev->name, alx);
                 if (!err)
                         goto out;
-
                 /* fall back to legacy interrupt */
                 pci_disable_msi(alx->hw.pdev);
         }
@@ -725,7 +702,6 @@ static int alx_init_sw(struct alx_priv *alx)
         struct pci_dev *pdev = alx->hw.pdev;
         struct alx_hw *hw = &alx->hw;
         int err;
-        unsigned int head_size;
 
         err = alx_identify_hw(alx);
         if (err) {
@@ -741,12 +717,7 @@ static int alx_init_sw(struct alx_priv *alx)
 
         hw->smb_timer = 400;
         hw->mtu = alx->dev->mtu;
-
         alx->rxbuf_size = ALX_MAX_FRAME_LEN(hw->mtu);
-        head_size = SKB_DATA_ALIGN(alx->rxbuf_size + NET_SKB_PAD) +
-                    SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
-        alx->rx_frag_size = roundup_pow_of_two(head_size);
-
         alx->tx_ringsz = 256;
         alx->rx_ringsz = 512;
         hw->imt = 200;
@@ -848,7 +819,6 @@ static int alx_change_mtu(struct net_device *netdev, int mtu)
 {
         struct alx_priv *alx = netdev_priv(netdev);
         int max_frame = ALX_MAX_FRAME_LEN(mtu);
-        unsigned int head_size;
 
         if ((max_frame < ALX_MIN_FRAME_SIZE) ||
             (max_frame > ALX_MAX_FRAME_SIZE))
@@ -860,9 +830,6 @@ static int alx_change_mtu(struct net_device *netdev, int mtu)
         netdev->mtu = mtu;
         alx->hw.mtu = mtu;
         alx->rxbuf_size = max(max_frame, ALX_DEF_RXBUF_SIZE);
-        head_size = SKB_DATA_ALIGN(alx->rxbuf_size + NET_SKB_PAD) +
-                    SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
-        alx->rx_frag_size = roundup_pow_of_two(head_size);
         netdev_update_features(netdev);
         if (netif_running(netdev))
                 alx_reinit(alx);
diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
index 08a23e6b60e9..1a3555d03a96 100644
--- a/drivers/net/ethernet/aurora/nb8800.c
+++ b/drivers/net/ethernet/aurora/nb8800.c
@@ -259,6 +259,7 @@ static void nb8800_receive(struct net_device *dev, unsigned int i,
                 if (err) {
                         netdev_err(dev, "rx buffer allocation failed\n");
                         dev->stats.rx_dropped++;
+                        dev_kfree_skb(skb);
                         return;
                 }
 
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 543bf38105c9..bfa26a2590c9 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -392,7 +392,7 @@ static void bcm_sysport_get_stats(struct net_device *dev,
                 else
                         p = (char *)priv;
                 p += s->stat_offset;
-                data[i] = *(u32 *)p;
+                data[i] = *(unsigned long *)p;
         }
 }
 
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index ee5f431ab32a..25bbae5928d4 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -231,7 +231,7 @@ err_dma:
         dma_unmap_single(dma_dev, slot->dma_addr, skb_headlen(skb),
                          DMA_TO_DEVICE);
 
-        while (i > 0) {
+        while (i-- > 0) {
                 int index = (ring->end + i) % BGMAC_TX_RING_SLOTS;
                 struct bgmac_slot_info *slot = &ring->slots[index];
                 u32 ctl1 = le32_to_cpu(ring->cpu_base[index].ctl1);
@@ -267,15 +267,16 @@ static void bgmac_dma_tx_free(struct bgmac *bgmac, struct bgmac_dma_ring *ring)
         while (ring->start != ring->end) {
                 int slot_idx = ring->start % BGMAC_TX_RING_SLOTS;
                 struct bgmac_slot_info *slot = &ring->slots[slot_idx];
-                u32 ctl1;
+                u32 ctl0, ctl1;
                 int len;
 
                 if (slot_idx == empty_slot)
                         break;
 
+                ctl0 = le32_to_cpu(ring->cpu_base[slot_idx].ctl0);
                 ctl1 = le32_to_cpu(ring->cpu_base[slot_idx].ctl1);
                 len = ctl1 & BGMAC_DESC_CTL1_LEN;
-                if (ctl1 & BGMAC_DESC_CTL0_SOF)
+                if (ctl0 & BGMAC_DESC_CTL0_SOF)
                         /* Unmap no longer used buffer */
                         dma_unmap_single(dma_dev, slot->dma_addr, len,
                                          DMA_TO_DEVICE);
@@ -1312,7 +1313,8 @@ static int bgmac_open(struct net_device *net_dev)
 
         phy_start(bgmac->phy_dev);
 
-        netif_carrier_on(net_dev);
+        netif_start_queue(net_dev);
+
         return 0;
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index a38cb047b540..1b0ae4a72e9e 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -1591,7 +1591,7 @@ static int bnxt_get_module_eeprom(struct net_device *dev,
 {
         struct bnxt *bp = netdev_priv(dev);
         u16  start = eeprom->offset, length = eeprom->len;
-        int rc;
+        int rc = 0;
 
         memset(data, 0, eeprom->len);
 
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 8de79ae63231..0e7e7da8d201 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -2821,7 +2821,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
                 if (!g) {
                         netif_info(lio, tx_err, lio->netdev,
                                    "Transmit scatter gather: glist null!\n");
-                        goto lio_xmit_failed;
+                        goto lio_xmit_dma_failed;
                 }
 
                 cmdsetup.s.gather = 1;
@@ -2892,7 +2892,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
         else
                 status = octnet_send_nic_data_pkt(oct, &ndata, xmit_more);
         if (status == IQ_SEND_FAILED)
-                goto lio_xmit_failed;
+                goto lio_xmit_dma_failed;
 
         netif_info(lio, tx_queued, lio->netdev, "Transmit queued successfully\n");
 
@@ -2906,12 +2906,13 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)
 
         return NETDEV_TX_OK;
 
+lio_xmit_dma_failed:
+        dma_unmap_single(&oct->pci_dev->dev, ndata.cmd.dptr,
+                         ndata.datasize, DMA_TO_DEVICE);
 lio_xmit_failed:
         stats->tx_dropped++;
         netif_info(lio, tx_err, lio->netdev, "IQ%d Transmit dropped:%llu\n",
                    iq_no, stats->tx_dropped);
-        dma_unmap_single(&oct->pci_dev->dev, ndata.cmd.dptr,
-                         ndata.datasize, DMA_TO_DEVICE);
         recv_buffer_free(skb);
         return NETDEV_TX_OK;
 }
diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c
index 95f17f8cadac..16ed20357c5c 100644
--- a/drivers/net/ethernet/cavium/thunder/nic_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nic_main.c
@@ -499,6 +499,7 @@ static void nic_tx_channel_cfg(struct nicpf *nic, u8 vnic,
         u32 rr_quantum;
         u8 sq_idx = sq->sq_num;
         u8 pqs_vnic;
+        int svf;
 
         if (sq->sqs_mode)
                 pqs_vnic = nic->pqs_vf[vnic];
@@ -511,10 +512,19 @@ static void nic_tx_channel_cfg(struct nicpf *nic, u8 vnic,
         /* 24 bytes for FCS, IPG and preamble */
         rr_quantum = ((NIC_HW_MAX_FRS + 24) / 4);
 
-        tl4 = (lmac * NIC_TL4_PER_LMAC) + (bgx * NIC_TL4_PER_BGX);
+        if (!sq->sqs_mode) {
+                tl4 = (lmac * NIC_TL4_PER_LMAC) + (bgx * NIC_TL4_PER_BGX);
+        } else {
+                for (svf = 0; svf < MAX_SQS_PER_VF; svf++) {
+                        if (nic->vf_sqs[pqs_vnic][svf] == vnic)
+                                break;
+                }
+                tl4 = (MAX_LMAC_PER_BGX * NIC_TL4_PER_LMAC);
+                tl4 += (lmac * NIC_TL4_PER_LMAC * MAX_SQS_PER_VF);
+                tl4 += (svf * NIC_TL4_PER_LMAC);
+                tl4 += (bgx * NIC_TL4_PER_BGX);
+        }
         tl4 += sq_idx;
-        if (sq->sqs_mode)
-                tl4 += vnic * 8;
 
         tl3 = tl4 / (NIC_MAX_TL4 / NIC_MAX_TL3);
         nic_reg_write(nic, NIC_PF_QSET_0_127_SQ_0_7_CFG2 |
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index 3ed21988626b..63a39ac97d53 100644
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -551,7 +551,9 @@ static int bgx_xaui_check_link(struct lmac *lmac)
         }
 
         /* Clear rcvflt bit (latching high) and read it back */
-        bgx_reg_modify(bgx, lmacid, BGX_SPUX_STATUS2, SPU_STATUS2_RCVFLT);
+        if (bgx_reg_read(bgx, lmacid, BGX_SPUX_STATUS2) & SPU_STATUS2_RCVFLT)
+                bgx_reg_modify(bgx, lmacid,
+                               BGX_SPUX_STATUS2, SPU_STATUS2_RCVFLT);
         if (bgx_reg_read(bgx, lmacid, BGX_SPUX_STATUS2) & SPU_STATUS2_RCVFLT) {
                 dev_err(&bgx->pdev->dev, "Receive fault, retry training\n");
                 if (bgx->use_training) {
@@ -570,13 +572,6 @@ static int bgx_xaui_check_link(struct lmac *lmac)
                 return -1;
         }
 
-        /* Wait for MAC RX to be ready */
-        if (bgx_poll_reg(bgx, lmacid, BGX_SMUX_RX_CTL,
-                         SMU_RX_CTL_STATUS, true)) {
-                dev_err(&bgx->pdev->dev, "SMU RX link not okay\n");
-                return -1;
-        }
-
         /* Wait for BGX RX to be idle */
         if (bgx_poll_reg(bgx, lmacid, BGX_SMUX_CTL, SMU_CTL_RX_IDLE, false)) {
                 dev_err(&bgx->pdev->dev, "SMU RX not idle\n");
@@ -589,29 +584,30 @@ static int bgx_xaui_check_link(struct lmac *lmac)
                 return -1;
         }
 
-        if (bgx_reg_read(bgx, lmacid, BGX_SPUX_STATUS2) & SPU_STATUS2_RCVFLT) {
-                dev_err(&bgx->pdev->dev, "Receive fault\n");
-                return -1;
-        }
-
-        /* Receive link is latching low. Force it high and verify it */
-        bgx_reg_modify(bgx, lmacid, BGX_SPUX_STATUS1, SPU_STATUS1_RCV_LNK);
-        if (bgx_poll_reg(bgx, lmacid, BGX_SPUX_STATUS1,
-                         SPU_STATUS1_RCV_LNK, false)) {
-                dev_err(&bgx->pdev->dev, "SPU receive link down\n");
-                return -1;
-        }
-
+        /* Clear receive packet disable */
         cfg = bgx_reg_read(bgx, lmacid, BGX_SPUX_MISC_CONTROL);
         cfg &= ~SPU_MISC_CTL_RX_DIS;
         bgx_reg_write(bgx, lmacid, BGX_SPUX_MISC_CONTROL, cfg);
-        return 0;
+
+        /* Check for MAC RX faults */
+        cfg = bgx_reg_read(bgx, lmacid, BGX_SMUX_RX_CTL);
+        /* 0 - Link is okay, 1 - Local fault, 2 - Remote fault */
+        cfg &= SMU_RX_CTL_STATUS;
+        if (!cfg)
+                return 0;
+
+        /* Rx local/remote fault seen.
+         * Do lmac reinit to see if condition recovers
+         */
+        bgx_lmac_xaui_init(bgx, lmacid, bgx->lmac_type);
+
+        return -1;
 }
 
 static void bgx_poll_for_link(struct work_struct *work)
 {
         struct lmac *lmac;
-        u64 link;
+        u64 spu_link, smu_link;
 
         lmac = container_of(work, struct lmac, dwork.work);
 
@@ -621,8 +617,11 @@ static void bgx_poll_for_link(struct work_struct *work)
         bgx_poll_reg(lmac->bgx, lmac->lmacid, BGX_SPUX_STATUS1,
                      SPU_STATUS1_RCV_LNK, false);
 
-        link = bgx_reg_read(lmac->bgx, lmac->lmacid, BGX_SPUX_STATUS1);
-        if (link & SPU_STATUS1_RCV_LNK) {
+        spu_link = bgx_reg_read(lmac->bgx, lmac->lmacid, BGX_SPUX_STATUS1);
+        smu_link = bgx_reg_read(lmac->bgx, lmac->lmacid, BGX_SMUX_RX_CTL);
+
+        if ((spu_link & SPU_STATUS1_RCV_LNK) &&
+            !(smu_link & SMU_RX_CTL_STATUS)) {
                 lmac->link_up = 1;
                 if (lmac->bgx->lmac_type == BGX_MODE_XLAUI)
                         lmac->last_speed = 40000;
@@ -636,9 +635,15 @@ static void bgx_poll_for_link(struct work_struct *work)
         }
 
         if (lmac->last_link != lmac->link_up) {
+                if (lmac->link_up) {
+                        if (bgx_xaui_check_link(lmac)) {
+                                /* Errors, clear link_up state */
+                                lmac->link_up = 0;
+                                lmac->last_speed = SPEED_UNKNOWN;
+                                lmac->last_duplex = DUPLEX_UNKNOWN;
+                        }
+                }
                 lmac->last_link = lmac->link_up;
-                if (lmac->link_up)
-                        bgx_xaui_check_link(lmac);
         }
 
         queue_delayed_work(lmac->check_link, &lmac->dwork, HZ * 2);
@@ -710,7 +715,7 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid)
 static void bgx_lmac_disable(struct bgx *bgx, u8 lmacid)
 {
         struct lmac *lmac;
-        u64 cmrx_cfg;
+        u64 cfg;
 
         lmac = &bgx->lmac[lmacid];
         if (lmac->check_link) {
@@ -719,9 +724,33 @@ static void bgx_lmac_disable(struct bgx *bgx, u8 lmacid)
                 destroy_workqueue(lmac->check_link);
         }
 
-        cmrx_cfg = bgx_reg_read(bgx, lmacid, BGX_CMRX_CFG);
-        cmrx_cfg &= ~(1 << 15);
-        bgx_reg_write(bgx, lmacid, BGX_CMRX_CFG, cmrx_cfg);
+        /* Disable packet reception */
+        cfg = bgx_reg_read(bgx, lmacid, BGX_CMRX_CFG);
+        cfg &= ~CMR_PKT_RX_EN;
+        bgx_reg_write(bgx, lmacid, BGX_CMRX_CFG, cfg);
+
+        /* Give chance for Rx/Tx FIFO to get drained */
+        bgx_poll_reg(bgx, lmacid, BGX_CMRX_RX_FIFO_LEN, (u64)0x1FFF, true);
+        bgx_poll_reg(bgx, lmacid, BGX_CMRX_TX_FIFO_LEN, (u64)0x3FFF, true);
+
+        /* Disable packet transmission */
+        cfg = bgx_reg_read(bgx, lmacid, BGX_CMRX_CFG);
+        cfg &= ~CMR_PKT_TX_EN;
+        bgx_reg_write(bgx, lmacid, BGX_CMRX_CFG, cfg);
+
+        /* Disable serdes lanes */
+        if (!lmac->is_sgmii)
+                bgx_reg_modify(bgx, lmacid,
+                               BGX_SPUX_CONTROL1, SPU_CTL_LOW_POWER);
+        else
+                bgx_reg_modify(bgx, lmacid,
+                               BGX_GMP_PCS_MRX_CTL, PCS_MRX_CTL_PWR_DN);
+
+        /* Disable LMAC */
+        cfg = bgx_reg_read(bgx, lmacid, BGX_CMRX_CFG);
+        cfg &= ~CMR_EN;
+        bgx_reg_write(bgx, lmacid, BGX_CMRX_CFG, cfg);
+
         bgx_flush_dmac_addrs(bgx, lmacid);
 
         if ((bgx->lmac_type != BGX_MODE_XFI) &&
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
index 149e179363a1..42010d2e5ddf 100644
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
@@ -41,6 +41,7 @@
 #define BGX_CMRX_RX_STAT10              0xC0
 #define BGX_CMRX_RX_BP_DROP             0xC8
 #define BGX_CMRX_RX_DMAC_CTL            0x0E8
+#define BGX_CMRX_RX_FIFO_LEN            0x108
 #define BGX_CMR_RX_DMACX_CAM            0x200
 #define  RX_DMACX_CAM_EN                        BIT_ULL(48)
 #define  RX_DMACX_CAM_LMACID(x)                 (x << 49)
@@ -50,6 +51,7 @@
 #define BGX_CMR_CHAN_MSK_AND            0x450
 #define BGX_CMR_BIST_STATUS             0x460
 #define BGX_CMR_RX_LMACS                0x468
+#define BGX_CMRX_TX_FIFO_LEN            0x518
 #define BGX_CMRX_TX_STAT0               0x600
 #define BGX_CMRX_TX_STAT1               0x608
 #define BGX_CMRX_TX_STAT2               0x610
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h
index c4b262ca7d43..2accab386323 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h
@@ -36,8 +36,8 @@
 #define __T4FW_VERSION_H__
 
 #define T4FW_VERSION_MAJOR 0x01
-#define T4FW_VERSION_MINOR 0x0E
-#define T4FW_VERSION_MICRO 0x04
+#define T4FW_VERSION_MINOR 0x0F
+#define T4FW_VERSION_MICRO 0x25
 #define T4FW_VERSION_BUILD 0x00
 
 #define T4FW_MIN_VERSION_MAJOR 0x01
@@ -45,8 +45,8 @@
 #define T4FW_MIN_VERSION_MICRO 0x00
 
 #define T5FW_VERSION_MAJOR 0x01
-#define T5FW_VERSION_MINOR 0x0E
-#define T5FW_VERSION_MICRO 0x04
+#define T5FW_VERSION_MINOR 0x0F
+#define T5FW_VERSION_MICRO 0x25
 #define T5FW_VERSION_BUILD 0x00
 
 #define T5FW_MIN_VERSION_MAJOR 0x00
@@ -54,8 +54,8 @@
 #define T5FW_MIN_VERSION_MICRO 0x00
 
 #define T6FW_VERSION_MAJOR 0x01
-#define T6FW_VERSION_MINOR 0x0E
-#define T6FW_VERSION_MICRO 0x04
+#define T6FW_VERSION_MINOR 0x0F
+#define T6FW_VERSION_MICRO 0x25
 #define T6FW_VERSION_BUILD 0x00
 
 #define T6FW_MIN_VERSION_MAJOR 0x00
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index 4edb98c3c6c7..4466a1187110 100644
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -860,6 +860,11 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
         unsigned int entry;
         void *dest;
 
+        if (skb_put_padto(skb, ETHOC_ZLEN)) {
+                dev->stats.tx_errors++;
+                goto out_no_free;
+        }
+
         if (unlikely(skb->len > ETHOC_BUFSIZ)) {
                 dev->stats.tx_errors++;
                 goto out;
@@ -894,6 +899,7 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
         skb_tx_timestamp(skb);
 out:
         dev_kfree_skb(skb);
+out_no_free:
         return NETDEV_TX_OK;
 }
 
@@ -1086,7 +1092,7 @@ static int ethoc_probe(struct platform_device *pdev)
         if (!priv->iobase) {
                 dev_err(&pdev->dev, "cannot remap I/O memory space\n");
                 ret = -ENXIO;
-                goto error;
+                goto free;
         }
 
         if (netdev->mem_end) {
@@ -1095,7 +1101,7 @@ static int ethoc_probe(struct platform_device *pdev)
                 if (!priv->membase) {
                         dev_err(&pdev->dev, "cannot remap memory space\n");
                         ret = -ENXIO;
-                        goto error;
+                        goto free;
                 }
         } else {
                 /* Allocate buffer memory */
@@ -1106,7 +1112,7 @@ static int ethoc_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev, "cannot allocate %dB buffer\n",
                                 buffer_size);
                         ret = -ENOMEM;
-                        goto error;
+                        goto free;
                 }
                 netdev->mem_end = netdev->mem_start + buffer_size;
                 priv->dma_alloc = buffer_size;
@@ -1120,7 +1126,7 @@ static int ethoc_probe(struct platform_device *pdev)
                 128, (netdev->mem_end - netdev->mem_start + 1) / ETHOC_BUFSIZ);
         if (num_bd < 4) {
                 ret = -ENODEV;
-                goto error;
+                goto free;
         }
         priv->num_bd = num_bd;
         /* num_tx must be a power of two */
@@ -1133,7 +1139,7 @@ static int ethoc_probe(struct platform_device *pdev)
         priv->vma = devm_kzalloc(&pdev->dev, num_bd*sizeof(void *), GFP_KERNEL);
         if (!priv->vma) {
                 ret = -ENOMEM;
-                goto error;
+                goto free;
         }
 
         /* Allow the platform setup code to pass in a MAC address. */
diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c
index 06f031715b57..9b7a3f5a2818 100644
--- a/drivers/net/ethernet/ezchip/nps_enet.c
+++ b/drivers/net/ethernet/ezchip/nps_enet.c
@@ -285,6 +285,7 @@ static void nps_enet_hw_reset(struct net_device *ndev)
         ge_rst_value |= NPS_ENET_ENABLE << RST_GMAC_0_SHIFT;
         nps_enet_reg_set(priv, NPS_ENET_REG_GE_RST, ge_rst_value);
         usleep_range(10, 20);
+        ge_rst_value = 0;
         nps_enet_reg_set(priv, NPS_ENET_REG_GE_RST, ge_rst_value);
 
         /* Tx fifo reset sequence */
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 864cb21351a4..88f3c85fb04a 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -75,6 +75,7 @@
 #include <linux/uaccess.h>
 #include <asm/firmware.h>
 #include <linux/seq_file.h>
+#include <linux/workqueue.h>
 
 #include "ibmvnic.h"
 
@@ -89,6 +90,7 @@ MODULE_VERSION(IBMVNIC_DRIVER_VERSION);
 static int ibmvnic_version = IBMVNIC_INITIAL_VERSION;
 static int ibmvnic_remove(struct vio_dev *);
 static void release_sub_crqs(struct ibmvnic_adapter *);
+static void release_sub_crqs_no_irqs(struct ibmvnic_adapter *);
 static int ibmvnic_reset_crq(struct ibmvnic_adapter *);
 static int ibmvnic_send_crq_init(struct ibmvnic_adapter *);
 static int ibmvnic_reenable_crq_queue(struct ibmvnic_adapter *);
@@ -469,7 +471,8 @@ static int ibmvnic_open(struct net_device *netdev)
         crq.logical_link_state.link_state = IBMVNIC_LOGICAL_LNK_UP;
         ibmvnic_send_crq(adapter, &crq);
 
-        netif_start_queue(netdev);
+        netif_tx_start_all_queues(netdev);
+
         return 0;
 
 bounce_map_failed:
@@ -519,7 +522,7 @@ static int ibmvnic_close(struct net_device *netdev)
         for (i = 0; i < adapter->req_rx_queues; i++)
                 napi_disable(&adapter->napi[i]);
 
-        netif_stop_queue(netdev);
+        netif_tx_stop_all_queues(netdev);
 
         if (adapter->bounce_buffer) {
                 if (!dma_mapping_error(dev, adapter->bounce_buffer_dma)) {
@@ -1212,12 +1215,6 @@ static struct ibmvnic_sub_crq_queue *init_sub_crq_queue(struct ibmvnic_adapter
                 goto reg_failed;
         }
 
-        scrq->irq = irq_create_mapping(NULL, scrq->hw_irq);
-        if (scrq->irq == NO_IRQ) {
-                dev_err(dev, "Error mapping irq\n");
-                goto map_irq_failed;
-        }
-
         scrq->adapter = adapter;
         scrq->size = 4 * PAGE_SIZE / sizeof(*scrq->msgs);
         scrq->cur = 0;
@@ -1230,12 +1227,6 @@ static struct ibmvnic_sub_crq_queue *init_sub_crq_queue(struct ibmvnic_adapter
 
         return scrq;
 
-map_irq_failed:
-        do {
-                rc = plpar_hcall_norets(H_FREE_SUB_CRQ,
-                                        adapter->vdev->unit_address,
-                                        scrq->crq_num);
-        } while (rc == H_BUSY || H_IS_LONG_BUSY(rc));
 reg_failed:
         dma_unmap_single(dev, scrq->msg_token, 4 * PAGE_SIZE,
                          DMA_BIDIRECTIONAL);
@@ -1256,6 +1247,7 @@ static void release_sub_crqs(struct ibmvnic_adapter *adapter)
                         if (adapter->tx_scrq[i]) {
                                 free_irq(adapter->tx_scrq[i]->irq,
                                          adapter->tx_scrq[i]);
+                                irq_dispose_mapping(adapter->tx_scrq[i]->irq);
                                 release_sub_crq_queue(adapter,
                                                       adapter->tx_scrq[i]);
                         }
@@ -1267,6 +1259,7 @@ static void release_sub_crqs(struct ibmvnic_adapter *adapter)
                         if (adapter->rx_scrq[i]) {
                                 free_irq(adapter->rx_scrq[i]->irq,
                                          adapter->rx_scrq[i]);
+                                irq_dispose_mapping(adapter->rx_scrq[i]->irq);
                                 release_sub_crq_queue(adapter,
                                                       adapter->rx_scrq[i]);
                         }
@@ -1276,6 +1269,29 @@ static void release_sub_crqs(struct ibmvnic_adapter *adapter)
         adapter->requested_caps = 0;
 }
 
+static void release_sub_crqs_no_irqs(struct ibmvnic_adapter *adapter)
+{
+        int i;
+
+        if (adapter->tx_scrq) {
+                for (i = 0; i < adapter->req_tx_queues; i++)
+                        if (adapter->tx_scrq[i])
+                                release_sub_crq_queue(adapter,
+                                                      adapter->tx_scrq[i]);
+                adapter->tx_scrq = NULL;
+        }
+
+        if (adapter->rx_scrq) {
+                for (i = 0; i < adapter->req_rx_queues; i++)
+                        if (adapter->rx_scrq[i])
+                                release_sub_crq_queue(adapter,
+                                                      adapter->rx_scrq[i]);
+                adapter->rx_scrq = NULL;
+        }
+
+        adapter->requested_caps = 0;
+}
+
 static int disable_scrq_irq(struct ibmvnic_adapter *adapter,
                             struct ibmvnic_sub_crq_queue *scrq)
 {
@@ -1395,6 +1411,66 @@ static irqreturn_t ibmvnic_interrupt_rx(int irq, void *instance)
         return IRQ_HANDLED;
 }
 
+static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter)
+{
+        struct device *dev = &adapter->vdev->dev;
+        struct ibmvnic_sub_crq_queue *scrq;
+        int i = 0, j = 0;
+        int rc = 0;
+
+        for (i = 0; i < adapter->req_tx_queues; i++) {
+                scrq = adapter->tx_scrq[i];
+                scrq->irq = irq_create_mapping(NULL, scrq->hw_irq);
+
+                if (scrq->irq == NO_IRQ) {
+                        rc = -EINVAL;
+                        dev_err(dev, "Error mapping irq\n");
+                        goto req_tx_irq_failed;
+                }
+
+                rc = request_irq(scrq->irq, ibmvnic_interrupt_tx,
+                                 0, "ibmvnic_tx", scrq);
+
+                if (rc) {
+                        dev_err(dev, "Couldn't register tx irq 0x%x. rc=%d\n",
+                                scrq->irq, rc);
+                        irq_dispose_mapping(scrq->irq);
+                        goto req_rx_irq_failed;
+                }
+        }
+
+        for (i = 0; i < adapter->req_rx_queues; i++) {
+                scrq = adapter->rx_scrq[i];
+                scrq->irq = irq_create_mapping(NULL, scrq->hw_irq);
+                if (scrq->irq == NO_IRQ) {
+                        rc = -EINVAL;
+                        dev_err(dev, "Error mapping irq\n");
+                        goto req_rx_irq_failed;
+                }
+                rc = request_irq(scrq->irq, ibmvnic_interrupt_rx,
+                                 0, "ibmvnic_rx", scrq);
+                if (rc) {
+                        dev_err(dev, "Couldn't register rx irq 0x%x. rc=%d\n",
+                                scrq->irq, rc);
+                        irq_dispose_mapping(scrq->irq);
+                        goto req_rx_irq_failed;
+                }
+        }
+        return rc;
+
+req_rx_irq_failed:
+        for (j = 0; j < i; j++)
+                free_irq(adapter->rx_scrq[j]->irq, adapter->rx_scrq[j]);
+                irq_dispose_mapping(adapter->rx_scrq[j]->irq);
+        i = adapter->req_tx_queues;
+req_tx_irq_failed:
+        for (j = 0; j < i; j++)
+                free_irq(adapter->tx_scrq[j]->irq, adapter->tx_scrq[j]);
+                irq_dispose_mapping(adapter->rx_scrq[j]->irq);
+        release_sub_crqs_no_irqs(adapter);
+        return rc;
+}
+
 static void init_sub_crqs(struct ibmvnic_adapter *adapter, int retry)
 {
         struct device *dev = &adapter->vdev->dev;
@@ -1403,8 +1479,7 @@ static void init_sub_crqs(struct ibmvnic_adapter *adapter, int retry)
         union ibmvnic_crq crq;
         int total_queues;
         int more = 0;
-        int i, j;
-        int rc;
+        int i;
 
         if (!retry) {
                 /* Sub-CRQ entries are 32 byte long */
@@ -1483,13 +1558,6 @@ static void init_sub_crqs(struct ibmvnic_adapter *adapter, int retry)
         for (i = 0; i < adapter->req_tx_queues; i++) {
                 adapter->tx_scrq[i] = allqueues[i];
                 adapter->tx_scrq[i]->pool_index = i;
-                rc = request_irq(adapter->tx_scrq[i]->irq, ibmvnic_interrupt_tx,
-                                 0, "ibmvnic_tx", adapter->tx_scrq[i]);
-                if (rc) {
-                        dev_err(dev, "Couldn't register tx irq 0x%x. rc=%d\n",
-                                adapter->tx_scrq[i]->irq, rc);
-                        goto req_tx_irq_failed;
-                }
         }
 
         adapter->rx_scrq = kcalloc(adapter->req_rx_queues,
@@ -1500,13 +1568,6 @@ static void init_sub_crqs(struct ibmvnic_adapter *adapter, int retry)
         for (i = 0; i < adapter->req_rx_queues; i++) {
                 adapter->rx_scrq[i] = allqueues[i + adapter->req_tx_queues];
                 adapter->rx_scrq[i]->scrq_num = i;
-                rc = request_irq(adapter->rx_scrq[i]->irq, ibmvnic_interrupt_rx,
-                                 0, "ibmvnic_rx", adapter->rx_scrq[i]);
-                if (rc) {
-                        dev_err(dev, "Couldn't register rx irq 0x%x. rc=%d\n",
-                                adapter->rx_scrq[i]->irq, rc);
-                        goto req_rx_irq_failed;
-                }
         }
 
         memset(&crq, 0, sizeof(crq));
@@ -1559,15 +1620,6 @@ static void init_sub_crqs(struct ibmvnic_adapter *adapter, int retry)
 
         return;
 
-req_rx_irq_failed:
-        for (j = 0; j < i; j++)
-                free_irq(adapter->rx_scrq[j]->irq, adapter->rx_scrq[j]);
-        i = adapter->req_tx_queues;
-req_tx_irq_failed:
-        for (j = 0; j < i; j++)
-                free_irq(adapter->tx_scrq[j]->irq, adapter->tx_scrq[j]);
-        kfree(adapter->rx_scrq);
-        adapter->rx_scrq = NULL;
 rx_failed:
         kfree(adapter->tx_scrq);
         adapter->tx_scrq = NULL;
@@ -2121,7 +2173,7 @@ static void handle_error_info_rsp(union ibmvnic_crq *crq,
                                   struct ibmvnic_adapter *adapter)
 {
         struct device *dev = &adapter->vdev->dev;
-        struct ibmvnic_error_buff *error_buff;
+        struct ibmvnic_error_buff *error_buff, *tmp;
         unsigned long flags;
         bool found = false;
         int i;
@@ -2133,7 +2185,7 @@ static void handle_error_info_rsp(union ibmvnic_crq *crq,
         }
 
         spin_lock_irqsave(&adapter->error_list_lock, flags);
-        list_for_each_entry(error_buff, &adapter->errors, list)
+        list_for_each_entry_safe(error_buff, tmp, &adapter->errors, list)
                 if (error_buff->error_id == crq->request_error_rsp.error_id) {
                         found = true;
                         list_del(&error_buff->list);
@@ -2348,9 +2400,9 @@ static void handle_request_cap_rsp(union ibmvnic_crq *crq,
                          *req_value,
                          (long int)be32_to_cpu(crq->request_capability_rsp.
                                                number), name);
-                release_sub_crqs(adapter);
+                release_sub_crqs_no_irqs(adapter);
                 *req_value = be32_to_cpu(crq->request_capability_rsp.number);
-                complete(&adapter->init_done);
+                init_sub_crqs(adapter, 1);
                 return;
         default:
                 dev_err(dev, "Error %d in request cap rsp\n",
@@ -2659,7 +2711,7 @@ static void handle_query_cap_rsp(union ibmvnic_crq *crq,
 
 out:
         if (atomic_read(&adapter->running_cap_queries) == 0)
-                complete(&adapter->init_done);
+                init_sub_crqs(adapter, 0);
                 /* We're done querying the capabilities, initialize sub-crqs */
 }
 
@@ -3141,14 +3193,14 @@ static void handle_request_ras_comp_num_rsp(union ibmvnic_crq *crq,
 
 static void ibmvnic_free_inflight(struct ibmvnic_adapter *adapter)
 {
-        struct ibmvnic_inflight_cmd *inflight_cmd;
+        struct ibmvnic_inflight_cmd *inflight_cmd, *tmp1;
         struct device *dev = &adapter->vdev->dev;
-        struct ibmvnic_error_buff *error_buff;
+        struct ibmvnic_error_buff *error_buff, *tmp2;
         unsigned long flags;
         unsigned long flags2;
 
         spin_lock_irqsave(&adapter->inflight_lock, flags);
-        list_for_each_entry(inflight_cmd, &adapter->inflight, list) {
+        list_for_each_entry_safe(inflight_cmd, tmp1, &adapter->inflight, list) {
                 switch (inflight_cmd->crq.generic.cmd) {
                 case LOGIN:
                         dma_unmap_single(dev, adapter->login_buf_token,
@@ -3165,8 +3217,8 @@ static void ibmvnic_free_inflight(struct ibmvnic_adapter *adapter)
                         break;
                 case REQUEST_ERROR_INFO:
                         spin_lock_irqsave(&adapter->error_list_lock, flags2);
-                        list_for_each_entry(error_buff, &adapter->errors,
-                                            list) {
+                        list_for_each_entry_safe(error_buff, tmp2,
+                                                 &adapter->errors, list) {
                                 dma_unmap_single(dev, error_buff->dma,
                                                  error_buff->len,
                                                  DMA_FROM_DEVICE);
@@ -3202,8 +3254,8 @@ static void ibmvnic_handle_crq(union ibmvnic_crq *crq,
                         dev_info(dev, "Partner initialized\n");
                         /* Send back a response */
                         rc = ibmvnic_send_crq_init_complete(adapter);
-                        if (rc == 0)
-                                send_version_xchg(adapter);
+                        if (!rc)
+                                schedule_work(&adapter->vnic_crq_init);
                         else
                                 dev_err(dev, "Can't send initrsp rc=%ld\n", rc);
                         break;
@@ -3555,8 +3607,63 @@ static const struct file_operations ibmvnic_dump_ops = {
         .release        = single_release,
 };
 
+static void handle_crq_init_rsp(struct work_struct *work)
+{
+        struct ibmvnic_adapter *adapter = container_of(work,
+                                                       struct ibmvnic_adapter,
+                                                       vnic_crq_init);
+        struct device *dev = &adapter->vdev->dev;
+        struct net_device *netdev = adapter->netdev;
+        unsigned long timeout = msecs_to_jiffies(30000);
+        int rc;
+
+        send_version_xchg(adapter);
+        reinit_completion(&adapter->init_done);
+        if (!wait_for_completion_timeout(&adapter->init_done, timeout)) {
+                dev_err(dev, "Passive init timeout\n");
+                goto task_failed;
+        }
+
+        do {
+                if (adapter->renegotiate) {
+                        adapter->renegotiate = false;
+                        release_sub_crqs_no_irqs(adapter);
+                        send_cap_queries(adapter);
+
+                        reinit_completion(&adapter->init_done);
+                        if (!wait_for_completion_timeout(&adapter->init_done,
+                                                         timeout)) {
+                                dev_err(dev, "Passive init timeout\n");
+                                goto task_failed;
+                        }
+                }
+        } while (adapter->renegotiate);
+        rc = init_sub_crq_irqs(adapter);
+
+        if (rc)
+                goto task_failed;
+
+        netdev->real_num_tx_queues = adapter->req_tx_queues;
+
+        rc = register_netdev(netdev);
+        if (rc) {
+                dev_err(dev,
+                        "failed to register netdev rc=%d\n", rc);
+                goto register_failed;
+        }
+        dev_info(dev, "ibmvnic registered\n");
+
+        return;
+
+register_failed:
+        release_sub_crqs(adapter);
+task_failed:
+        dev_err(dev, "Passive initialization was not successful\n");
+}
+
 static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
 {
+        unsigned long timeout = msecs_to_jiffies(30000);
         struct ibmvnic_adapter *adapter;
         struct net_device *netdev;
         unsigned char *mac_addr_p;
@@ -3593,6 +3700,8 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
         netdev->ethtool_ops = &ibmvnic_ethtool_ops;
         SET_NETDEV_DEV(netdev, &dev->dev);
 
+        INIT_WORK(&adapter->vnic_crq_init, handle_crq_init_rsp);
+
         spin_lock_init(&adapter->stats_lock);
 
         rc = ibmvnic_init_crq_queue(adapter);
@@ -3635,30 +3744,26 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
         ibmvnic_send_crq_init(adapter);
 
         init_completion(&adapter->init_done);
-        wait_for_completion(&adapter->init_done);
+        if (!wait_for_completion_timeout(&adapter->init_done, timeout))
+                return 0;
 
         do {
-                adapter->renegotiate = false;
-
-                init_sub_crqs(adapter, 0);
-                reinit_completion(&adapter->init_done);
-                wait_for_completion(&adapter->init_done);
-
                 if (adapter->renegotiate) {
-                        release_sub_crqs(adapter);
+                        adapter->renegotiate = false;
+                        release_sub_crqs_no_irqs(adapter);
                         send_cap_queries(adapter);
 
                         reinit_completion(&adapter->init_done);
-                        wait_for_completion(&adapter->init_done);
+                        if (!wait_for_completion_timeout(&adapter->init_done,
+                                                         timeout))
+                                return 0;
                 }
         } while (adapter->renegotiate);
 
-        /* if init_sub_crqs is partially successful, retry */
-        while (!adapter->tx_scrq || !adapter->rx_scrq) {
-                init_sub_crqs(adapter, 1);
-
-                reinit_completion(&adapter->init_done);
-                wait_for_completion(&adapter->init_done);
+        rc = init_sub_crq_irqs(adapter);
+        if (rc) {
+                dev_err(&dev->dev, "failed to initialize sub crq irqs\n");
+                goto free_debugfs;
         }
 
         netdev->real_num_tx_queues = adapter->req_tx_queues;
@@ -3666,12 +3771,14 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
         rc = register_netdev(netdev);
         if (rc) {
                 dev_err(&dev->dev, "failed to register netdev rc=%d\n", rc);
-                goto free_debugfs;
+                goto free_sub_crqs;
         }
         dev_info(&dev->dev, "ibmvnic registered\n");
 
         return 0;
 
+free_sub_crqs:
+        release_sub_crqs(adapter);
 free_debugfs:
         if (adapter->debugfs_dir && !IS_ERR(adapter->debugfs_dir))
                 debugfs_remove_recursive(adapter->debugfs_dir);
diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h
index 0b66a506a4e4..e82898fd518e 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.h
+++ b/drivers/net/ethernet/ibm/ibmvnic.h
@@ -1045,4 +1045,6 @@ struct ibmvnic_adapter {
         u64 opt_rxba_entries_per_subcrq;
         __be64 tx_rx_desc_req;
         u8 map_id;
+
+        struct work_struct vnic_crq_init;
 };
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 75e60897b7e7..2b2e2f8c6369 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2789,7 +2789,7 @@ static void e1000e_vlan_filter_enable(struct e1000_adapter *adapter)
 }
 
 /**
- * e1000e_vlan_strip_enable - helper to disable HW VLAN stripping
+ * e1000e_vlan_strip_disable - helper to disable HW VLAN stripping
  * @adapter: board private structure to initialize
  **/
 static void e1000e_vlan_strip_disable(struct e1000_adapter *adapter)
@@ -6915,6 +6915,14 @@ static netdev_features_t e1000_fix_features(struct net_device *netdev,
         if ((hw->mac.type >= e1000_pch2lan) && (netdev->mtu > ETH_DATA_LEN))
                 features &= ~NETIF_F_RXFCS;
 
+        /* Since there is no support for separate Rx/Tx vlan accel
+         * enable/disable make sure Tx flag is always in same state as Rx.
+         */
+        if (features & NETIF_F_HW_VLAN_CTAG_RX)
+                features |= NETIF_F_HW_VLAN_CTAG_TX;
+        else
+                features &= ~NETIF_F_HW_VLAN_CTAG_TX;
+
         return features;
 }
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 5ea22008d721..501f15d9f4d6 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -1344,6 +1344,13 @@ struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,
         if (!vsi || !macaddr)
                 return NULL;
 
+        /* Do not allow broadcast filter to be added since broadcast filter
+         * is added as part of add VSI for any newly created VSI except
+         * FDIR VSI
+         */
+        if (is_broadcast_ether_addr(macaddr))
+                return NULL;
+
         f = i40e_find_filter(vsi, macaddr, vlan, is_vf, is_netdev);
         if (!f) {
                 f = kzalloc(sizeof(*f), GFP_ATOMIC);
@@ -2151,18 +2158,6 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi)
                                          aq_ret, pf->hw.aq.asq_last_status);
                         }
                 }
-                aq_ret = i40e_aq_set_vsi_broadcast(&vsi->back->hw,
-                                                   vsi->seid,
-                                                   cur_promisc, NULL);
-                if (aq_ret) {
-                        retval = i40e_aq_rc_to_posix(aq_ret,
-                                                     pf->hw.aq.asq_last_status);
-                        dev_info(&pf->pdev->dev,
-                                 "set brdcast promisc failed, err %s, aq_err %s\n",
-                                 i40e_stat_str(&pf->hw, aq_ret),
-                                 i40e_aq_str(&pf->hw,
-                                             pf->hw.aq.asq_last_status));
-                }
         }
 out:
         /* if something went wrong then set the changed flag so we try again */
@@ -7726,10 +7721,11 @@ static int i40e_init_msix(struct i40e_pf *pf)
  * i40e_vsi_alloc_q_vector - Allocate memory for a single interrupt vector
  * @vsi: the VSI being configured
  * @v_idx: index of the vector in the vsi struct
+ * @cpu: cpu to be used on affinity_mask
  *
  * We allocate one q_vector.  If allocation fails we return -ENOMEM.
  **/
-static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx)
+static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx, int cpu)
 {
         struct i40e_q_vector *q_vector;
 
@@ -7740,7 +7736,8 @@ static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx)
 
         q_vector->vsi = vsi;
         q_vector->v_idx = v_idx;
-        cpumask_set_cpu(v_idx, &q_vector->affinity_mask);
+        cpumask_set_cpu(cpu, &q_vector->affinity_mask);
+
         if (vsi->netdev)
                 netif_napi_add(vsi->netdev, &q_vector->napi,
                                i40e_napi_poll, NAPI_POLL_WEIGHT);
@@ -7764,8 +7761,7 @@ static int i40e_vsi_alloc_q_vector(struct i40e_vsi *vsi, int v_idx)
 static int i40e_vsi_alloc_q_vectors(struct i40e_vsi *vsi)
 {
         struct i40e_pf *pf = vsi->back;
-        int v_idx, num_q_vectors;
-        int err;
+        int err, v_idx, num_q_vectors, current_cpu;
 
         /* if not MSIX, give the one vector only to the LAN VSI */
         if (pf->flags & I40E_FLAG_MSIX_ENABLED)
@@ -7775,10 +7771,15 @@ static int i40e_vsi_alloc_q_vectors(struct i40e_vsi *vsi)
         else
                 return -EINVAL;
 
+        current_cpu = cpumask_first(cpu_online_mask);
+
         for (v_idx = 0; v_idx < num_q_vectors; v_idx++) {
-                err = i40e_vsi_alloc_q_vector(vsi, v_idx);
+                err = i40e_vsi_alloc_q_vector(vsi, v_idx, current_cpu);
                 if (err)
                         goto err_out;
+                current_cpu = cpumask_next(current_cpu, cpu_online_mask);
+                if (unlikely(current_cpu >= nr_cpu_ids))
+                        current_cpu = cpumask_first(cpu_online_mask);
         }
 
         return 0;
@@ -9224,6 +9225,7 @@ int i40e_is_vsi_uplink_mode_veb(struct i40e_vsi *vsi)
 static int i40e_add_vsi(struct i40e_vsi *vsi)
 {
         int ret = -ENODEV;
+        i40e_status aq_ret = 0;
         u8 laa_macaddr[ETH_ALEN];
         bool found_laa_mac_filter = false;
         struct i40e_pf *pf = vsi->back;
@@ -9413,6 +9415,18 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
                 vsi->seid = ctxt.seid;
                 vsi->id = ctxt.vsi_number;
         }
+        /* Except FDIR VSI, for all othet VSI set the broadcast filter */
+        if (vsi->type != I40E_VSI_FDIR) {
+                aq_ret = i40e_aq_set_vsi_broadcast(hw, vsi->seid, true, NULL);
+                if (aq_ret) {
+                        ret = i40e_aq_rc_to_posix(aq_ret,
+                                                  hw->aq.asq_last_status);
+                        dev_info(&pf->pdev->dev,
+                                 "set brdcast promisc failed, err %s, aq_err %s\n",
+                                 i40e_stat_str(hw, aq_ret),
+                                 i40e_aq_str(hw, hw->aq.asq_last_status));
+                }
+        }
 
         spin_lock_bh(&vsi->mac_filter_list_lock);
         /* If macvlan filters already exist, force them to get loaded */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 55f151fca1dc..a8868e1bf832 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1280,8 +1280,8 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi,
                                     union i40e_rx_desc *rx_desc)
 {
         struct i40e_rx_ptype_decoded decoded;
-        bool ipv4, ipv6, tunnel = false;
         u32 rx_error, rx_status;
+        bool ipv4, ipv6;
         u8 ptype;
         u64 qword;
 
@@ -1336,19 +1336,23 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi,
         if (rx_error & BIT(I40E_RX_DESC_ERROR_PPRS_SHIFT))
                 return;
 
-        /* The hardware supported by this driver does not validate outer
-         * checksums for tunneled VXLAN or GENEVE frames.  I don't agree
-         * with it but the specification states that you "MAY validate", it
-         * doesn't make it a hard requirement so if we have validated the
-         * inner checksum report CHECKSUM_UNNECESSARY.
+        /* If there is an outer header present that might contain a checksum
+         * we need to bump the checksum level by 1 to reflect the fact that
+         * we are indicating we validated the inner checksum.
          */
-        if (decoded.inner_prot & (I40E_RX_PTYPE_INNER_PROT_TCP |
-                                  I40E_RX_PTYPE_INNER_PROT_UDP |
-                                  I40E_RX_PTYPE_INNER_PROT_SCTP))
-                tunnel = true;
-
-        skb->ip_summed = CHECKSUM_UNNECESSARY;
-        skb->csum_level = tunnel ? 1 : 0;
+        if (decoded.tunnel_type >= I40E_RX_PTYPE_TUNNEL_IP_GRENAT)
+                skb->csum_level = 1;
+
+        /* Only report checksum unnecessary for TCP, UDP, or SCTP */
+        switch (decoded.inner_prot) {
+        case I40E_RX_PTYPE_INNER_PROT_TCP:
+        case I40E_RX_PTYPE_INNER_PROT_UDP:
+        case I40E_RX_PTYPE_INNER_PROT_SCTP:
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+                /* fall though */
+        default:
+                break;
+        }
 
         return;
 
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index be99189da925..79d99cd91b24 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -752,8 +752,8 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi,
                                     union i40e_rx_desc *rx_desc)
 {
         struct i40e_rx_ptype_decoded decoded;
-        bool ipv4, ipv6, tunnel = false;
         u32 rx_error, rx_status;
+        bool ipv4, ipv6;
         u8 ptype;
         u64 qword;
 
@@ -808,19 +808,23 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi,
         if (rx_error & BIT(I40E_RX_DESC_ERROR_PPRS_SHIFT))
                 return;
 
-        /* The hardware supported by this driver does not validate outer
-         * checksums for tunneled VXLAN or GENEVE frames.  I don't agree
-         * with it but the specification states that you "MAY validate", it
-         * doesn't make it a hard requirement so if we have validated the
-         * inner checksum report CHECKSUM_UNNECESSARY.
+        /* If there is an outer header present that might contain a checksum
+         * we need to bump the checksum level by 1 to reflect the fact that
+         * we are indicating we validated the inner checksum.
          */
-        if (decoded.inner_prot & (I40E_RX_PTYPE_INNER_PROT_TCP |
-                                  I40E_RX_PTYPE_INNER_PROT_UDP |
-                                  I40E_RX_PTYPE_INNER_PROT_SCTP))
-                tunnel = true;
-
-        skb->ip_summed = CHECKSUM_UNNECESSARY;
-        skb->csum_level = tunnel ? 1 : 0;
+        if (decoded.tunnel_type >= I40E_RX_PTYPE_TUNNEL_IP_GRENAT)
+                skb->csum_level = 1;
+
+        /* Only report checksum unnecessary for TCP, UDP, or SCTP */
+        switch (decoded.inner_prot) {
+        case I40E_RX_PTYPE_INNER_PROT_TCP:
+        case I40E_RX_PTYPE_INNER_PROT_UDP:
+        case I40E_RX_PTYPE_INNER_PROT_SCTP:
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+                /* fall though */
+        default:
+                break;
+        }
 
         return;
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 088c47cf27d9..8bebd862a54c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -2887,7 +2887,7 @@ int ixgbe_poll(struct napi_struct *napi, int budget)
         if (!test_bit(__IXGBE_DOWN, &adapter->state))
                 ixgbe_irq_enable_queues(adapter, BIT_ULL(q_vector->v_idx));
 
-        return 0;
+        return min(work_done, budget - 1);
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.c b/drivers/net/ethernet/intel/ixgbevf/mbx.c
index 61a80da8b6f0..2819abc454c7 100644
--- a/drivers/net/ethernet/intel/ixgbevf/mbx.c
+++ b/drivers/net/ethernet/intel/ixgbevf/mbx.c
@@ -85,7 +85,7 @@ static s32 ixgbevf_poll_for_ack(struct ixgbe_hw *hw)
 static s32 ixgbevf_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size)
 {
         struct ixgbe_mbx_info *mbx = &hw->mbx;
-        s32 ret_val = -IXGBE_ERR_MBX;
+        s32 ret_val = IXGBE_ERR_MBX;
 
         if (!mbx->ops.read)
                 goto out;
@@ -111,7 +111,7 @@ out:
 static s32 ixgbevf_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size)
 {
         struct ixgbe_mbx_info *mbx = &hw->mbx;
-        s32 ret_val = -IXGBE_ERR_MBX;
+        s32 ret_val = IXGBE_ERR_MBX;
 
         /* exit if either we can't write or there isn't a defined timeout */
         if (!mbx->ops.write || !mbx->timeout)
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index a6d26d351dfc..f92018b13d28 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -244,7 +244,7 @@
 /* Various constants */
 
 /* Coalescing */
-#define MVNETA_TXDONE_COAL_PKTS         1
+#define MVNETA_TXDONE_COAL_PKTS         0       /* interrupt per packet */
 #define MVNETA_RX_COAL_PKTS             32
 #define MVNETA_RX_COAL_USEC             100
 
@@ -3458,6 +3458,8 @@ static int mvneta_open(struct net_device *dev)
         return 0;
 
 err_free_irq:
+        unregister_cpu_notifier(&pp->cpu_notifier);
+        on_each_cpu(mvneta_percpu_disable, pp, true);
         free_percpu_irq(pp->dev->irq, pp->ports);
 err_cleanup_txqs:
         mvneta_cleanup_txqs(pp);
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 4763252bbf85..d1cdc2d76151 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -481,20 +481,23 @@ static inline void mtk_rx_get_desc(struct mtk_rx_dma *rxd,
 /* the qdma core needs scratch memory to be setup */
 static int mtk_init_fq_dma(struct mtk_eth *eth)
 {
-        dma_addr_t phy_ring_head, phy_ring_tail;
+        dma_addr_t phy_ring_tail;
         int cnt = MTK_DMA_SIZE;
         dma_addr_t dma_addr;
         int i;
 
         eth->scratch_ring = dma_alloc_coherent(eth->dev,
                                                cnt * sizeof(struct mtk_tx_dma),
-                                               &phy_ring_head,
+                                               &eth->phy_scratch_ring,
                                                GFP_ATOMIC | __GFP_ZERO);
         if (unlikely(!eth->scratch_ring))
                 return -ENOMEM;
 
         eth->scratch_head = kcalloc(cnt, MTK_QDMA_PAGE_SIZE,
                                     GFP_KERNEL);
+        if (unlikely(!eth->scratch_head))
+                return -ENOMEM;
+
         dma_addr = dma_map_single(eth->dev,
                                   eth->scratch_head, cnt * MTK_QDMA_PAGE_SIZE,
                                   DMA_FROM_DEVICE);
@@ -502,19 +505,19 @@ static int mtk_init_fq_dma(struct mtk_eth *eth)
                 return -ENOMEM;
 
         memset(eth->scratch_ring, 0x0, sizeof(struct mtk_tx_dma) * cnt);
-        phy_ring_tail = phy_ring_head +
+        phy_ring_tail = eth->phy_scratch_ring +
                         (sizeof(struct mtk_tx_dma) * (cnt - 1));
 
         for (i = 0; i < cnt; i++) {
                 eth->scratch_ring[i].txd1 =
                                         (dma_addr + (i * MTK_QDMA_PAGE_SIZE));
                 if (i < cnt - 1)
-                        eth->scratch_ring[i].txd2 = (phy_ring_head +
+                        eth->scratch_ring[i].txd2 = (eth->phy_scratch_ring +
                                 ((i + 1) * sizeof(struct mtk_tx_dma)));
                 eth->scratch_ring[i].txd3 = TX_DMA_SDL(MTK_QDMA_PAGE_SIZE);
         }
 
-        mtk_w32(eth, phy_ring_head, MTK_QDMA_FQ_HEAD);
+        mtk_w32(eth, eth->phy_scratch_ring, MTK_QDMA_FQ_HEAD);
         mtk_w32(eth, phy_ring_tail, MTK_QDMA_FQ_TAIL);
         mtk_w32(eth, (cnt << 16) | cnt, MTK_QDMA_FQ_CNT);
         mtk_w32(eth, MTK_QDMA_PAGE_SIZE << 16, MTK_QDMA_FQ_BLEN);
@@ -671,7 +674,7 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev,
 
 err_dma:
         do {
-                tx_buf = mtk_desc_to_tx_buf(ring, txd);
+                tx_buf = mtk_desc_to_tx_buf(ring, itxd);
 
                 /* unmap dma */
                 mtk_tx_unmap(&dev->dev, tx_buf);
@@ -701,6 +704,20 @@ static inline int mtk_cal_txd_req(struct sk_buff *skb)
         return nfrags;
 }
 
+static int mtk_queue_stopped(struct mtk_eth *eth)
+{
+        int i;
+
+        for (i = 0; i < MTK_MAC_COUNT; i++) {
+                if (!eth->netdev[i])
+                        continue;
+                if (netif_queue_stopped(eth->netdev[i]))
+                        return 1;
+        }
+
+        return 0;
+}
+
 static void mtk_wake_queue(struct mtk_eth *eth)
 {
         int i;
@@ -766,12 +783,9 @@ static int mtk_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (mtk_tx_map(skb, dev, tx_num, ring, gso) < 0)
                 goto drop;
 
-        if (unlikely(atomic_read(&ring->free_count) <= ring->thresh)) {
+        if (unlikely(atomic_read(&ring->free_count) <= ring->thresh))
                 mtk_stop_queue(eth);
-                if (unlikely(atomic_read(&ring->free_count) >
-                             ring->thresh))
-                        mtk_wake_queue(eth);
-        }
+
         spin_unlock_irqrestore(&eth->page_lock, flags);
 
         return NETDEV_TX_OK;
@@ -826,6 +840,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget,
                                           DMA_FROM_DEVICE);
                 if (unlikely(dma_mapping_error(&netdev->dev, dma_addr))) {
                         skb_free_frag(new_data);
+                        netdev->stats.rx_dropped++;
                         goto release_desc;
                 }
 
@@ -833,6 +848,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget,
                 skb = build_skb(data, ring->frag_size);
                 if (unlikely(!skb)) {
                         put_page(virt_to_head_page(new_data));
+                        netdev->stats.rx_dropped++;
                         goto release_desc;
                 }
                 skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN);
@@ -921,7 +937,6 @@ static int mtk_poll_tx(struct mtk_eth *eth, int budget, bool *tx_again)
                 }
                 mtk_tx_unmap(eth->dev, tx_buf);
 
-                ring->last_free->txd2 = next_cpu;
                 ring->last_free = desc;
                 atomic_inc(&ring->free_count);
 
@@ -946,7 +961,8 @@ static int mtk_poll_tx(struct mtk_eth *eth, int budget, bool *tx_again)
         if (!total)
                 return 0;
 
-        if (atomic_read(&ring->free_count) > ring->thresh)
+        if (mtk_queue_stopped(eth) &&
+            (atomic_read(&ring->free_count) > ring->thresh))
                 mtk_wake_queue(eth);
 
         return total;
@@ -1027,9 +1043,8 @@ static int mtk_tx_alloc(struct mtk_eth *eth)
 
         atomic_set(&ring->free_count, MTK_DMA_SIZE - 2);
         ring->next_free = &ring->dma[0];
-        ring->last_free = &ring->dma[MTK_DMA_SIZE - 2];
-        ring->thresh = max((unsigned long)MTK_DMA_SIZE >> 2,
-                              MAX_SKB_FRAGS);
+        ring->last_free = &ring->dma[MTK_DMA_SIZE - 1];
+        ring->thresh = MAX_SKB_FRAGS;
 
         /* make sure that all changes to the dma ring are flushed before we
          * continue
@@ -1207,6 +1222,14 @@ static void mtk_dma_free(struct mtk_eth *eth)
         for (i = 0; i < MTK_MAC_COUNT; i++)
                 if (eth->netdev[i])
                         netdev_reset_queue(eth->netdev[i]);
+        if (eth->scratch_ring) {
+                dma_free_coherent(eth->dev,
+                                  MTK_DMA_SIZE * sizeof(struct mtk_tx_dma),
+                                  eth->scratch_ring,
+                                  eth->phy_scratch_ring);
+                eth->scratch_ring = NULL;
+                eth->phy_scratch_ring = 0;
+        }
         mtk_tx_clean(eth);
         mtk_rx_clean(eth);
         kfree(eth->scratch_head);
@@ -1269,7 +1292,7 @@ static int mtk_start_dma(struct mtk_eth *eth)
         mtk_w32(eth,
                 MTK_TX_WB_DDONE | MTK_RX_DMA_EN | MTK_TX_DMA_EN |
                 MTK_RX_2B_OFFSET | MTK_DMA_SIZE_16DWORDS |
-                MTK_RX_BT_32DWORDS,
+                MTK_RX_BT_32DWORDS | MTK_NDP_CO_PRO,
                 MTK_QDMA_GLO_CFG);
 
         return 0;
@@ -1383,7 +1406,7 @@ static int __init mtk_hw_init(struct mtk_eth *eth)
 
         /* disable delay and normal interrupt */
         mtk_w32(eth, 0, MTK_QDMA_DELAY_INT);
-        mtk_irq_disable(eth, MTK_TX_DONE_INT | MTK_RX_DONE_INT);
+        mtk_irq_disable(eth, ~0);
         mtk_w32(eth, RST_GL_PSE, MTK_RST_GL);
         mtk_w32(eth, 0, MTK_RST_GL);
 
@@ -1697,7 +1720,7 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
         mac->hw_stats->reg_offset = id * MTK_STAT_OFFSET;
 
         SET_NETDEV_DEV(eth->netdev[id], eth->dev);
-        eth->netdev[id]->watchdog_timeo = HZ;
+        eth->netdev[id]->watchdog_timeo = 5 * HZ;
         eth->netdev[id]->netdev_ops = &mtk_netdev_ops;
         eth->netdev[id]->base_addr = (unsigned long)eth->base;
         eth->netdev[id]->vlan_features = MTK_HW_FEATURES &
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index eed626d56ea4..a5eb7c62306b 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -91,6 +91,7 @@
 #define MTK_QDMA_GLO_CFG        0x1A04
 #define MTK_RX_2B_OFFSET        BIT(31)
 #define MTK_RX_BT_32DWORDS      (3 << 11)
+#define MTK_NDP_CO_PRO          BIT(10)
 #define MTK_TX_WB_DDONE         BIT(6)
 #define MTK_DMA_SIZE_16DWORDS   (2 << 4)
 #define MTK_RX_DMA_BUSY         BIT(3)
@@ -357,6 +358,7 @@ struct mtk_rx_ring {
  * @rx_ring:            Pointer to the memore holding info about the RX ring
  * @rx_napi:            The NAPI struct
  * @scratch_ring:       Newer SoCs need memory for a second HW managed TX ring
+ * @phy_scratch_ring:   physical address of scratch_ring
  * @scratch_head:       The scratch memory that scratch_ring points to.
  * @clk_ethif:          The ethif clock
  * @clk_esw:            The switch clock
@@ -384,6 +386,7 @@ struct mtk_eth {
         struct mtk_rx_ring              rx_ring;
         struct napi_struct              rx_napi;
         struct mtk_tx_dma               *scratch_ring;
+        dma_addr_t                      phy_scratch_ring;
         void                            *scratch_head;
         struct clk                      *clk_ethif;
         struct clk                      *clk_esw;
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index e94ca1c3fc7c..f04a423ff79d 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -2597,7 +2597,6 @@ int mlx4_cmd_use_events(struct mlx4_dev *dev)
         priv->cmd.free_head = 0;
 
         sema_init(&priv->cmd.event_sem, priv->cmd.max_cmds);
-        spin_lock_init(&priv->cmd.context_lock);
 
         for (priv->cmd.token_mask = 1;
              priv->cmd.token_mask < priv->cmd.max_cmds;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index fc95affaf76b..44cf16d01f42 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -1042,6 +1042,8 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
+        struct mlx4_en_port_profile new_prof;
+        struct mlx4_en_priv *tmp;
         u32 rx_size, tx_size;
         int port_up = 0;
         int err = 0;
@@ -1061,22 +1063,25 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
             tx_size == priv->tx_ring[0]->size)
                 return 0;
 
+        tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
+        if (!tmp)
+                return -ENOMEM;
+
         mutex_lock(&mdev->state_lock);
+        memcpy(&new_prof, priv->prof, sizeof(struct mlx4_en_port_profile));
+        new_prof.tx_ring_size = tx_size;
+        new_prof.rx_ring_size = rx_size;
+        err = mlx4_en_try_alloc_resources(priv, tmp, &new_prof);
+        if (err)
+                goto out;
+
         if (priv->port_up) {
                 port_up = 1;
                 mlx4_en_stop_port(dev, 1);
         }
 
-        mlx4_en_free_resources(priv);
-
-        priv->prof->tx_ring_size = tx_size;
-        priv->prof->rx_ring_size = rx_size;
+        mlx4_en_safe_replace_resources(priv, tmp);
 
-        err = mlx4_en_alloc_resources(priv);
-        if (err) {
-                en_err(priv, "Failed reallocating port resources\n");
-                goto out;
-        }
         if (port_up) {
                 err = mlx4_en_start_port(dev);
                 if (err)
@@ -1084,8 +1089,8 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
         }
 
         err = mlx4_en_moderation_update(priv);
-
 out:
+        kfree(tmp);
         mutex_unlock(&mdev->state_lock);
         return err;
 }
@@ -1714,6 +1719,8 @@ static int mlx4_en_set_channels(struct net_device *dev,
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
+        struct mlx4_en_port_profile new_prof;
+        struct mlx4_en_priv *tmp;
         int port_up = 0;
         int err = 0;
 
@@ -1723,23 +1730,26 @@ static int mlx4_en_set_channels(struct net_device *dev,
             !channel->tx_count || !channel->rx_count)
                 return -EINVAL;
 
+        tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
+        if (!tmp)
+                return -ENOMEM;
+
         mutex_lock(&mdev->state_lock);
+        memcpy(&new_prof, priv->prof, sizeof(struct mlx4_en_port_profile));
+        new_prof.num_tx_rings_p_up = channel->tx_count;
+        new_prof.tx_ring_num = channel->tx_count * MLX4_EN_NUM_UP;
+        new_prof.rx_ring_num = channel->rx_count;
+
+        err = mlx4_en_try_alloc_resources(priv, tmp, &new_prof);
+        if (err)
+                goto out;
+
         if (priv->port_up) {
                 port_up = 1;
                 mlx4_en_stop_port(dev, 1);
         }
 
-        mlx4_en_free_resources(priv);
-
-        priv->num_tx_rings_p_up = channel->tx_count;
-        priv->tx_ring_num = channel->tx_count * MLX4_EN_NUM_UP;
-        priv->rx_ring_num = channel->rx_count;
-
-        err = mlx4_en_alloc_resources(priv);
-        if (err) {
-                en_err(priv, "Failed reallocating port resources\n");
-                goto out;
-        }
+        mlx4_en_safe_replace_resources(priv, tmp);
 
         netif_set_real_num_tx_queues(dev, priv->tx_ring_num);
         netif_set_real_num_rx_queues(dev, priv->rx_ring_num);
@@ -1757,8 +1767,8 @@ static int mlx4_en_set_channels(struct net_device *dev,
         }
 
         err = mlx4_en_moderation_update(priv);
-
 out:
+        kfree(tmp);
         mutex_unlock(&mdev->state_lock);
         return err;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 19ceced6736c..8359e9e51b3b 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -406,14 +406,18 @@ static int mlx4_en_vlan_rx_add_vid(struct net_device *dev,
         mutex_lock(&mdev->state_lock);
         if (mdev->device_up && priv->port_up) {
                 err = mlx4_SET_VLAN_FLTR(mdev->dev, priv);
-                if (err)
+                if (err) {
                         en_err(priv, "Failed configuring VLAN filter\n");
+                        goto out;
+                }
         }
-        if (mlx4_register_vlan(mdev->dev, priv->port, vid, &idx))
-                en_dbg(HW, priv, "failed adding vlan %d\n", vid);
-        mutex_unlock(&mdev->state_lock);
+        err = mlx4_register_vlan(mdev->dev, priv->port, vid, &idx);
+        if (err)
+                en_dbg(HW, priv, "Failed adding vlan %d\n", vid);
 
-        return 0;
+out:
+        mutex_unlock(&mdev->state_lock);
+        return err;
 }
 
 static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev,
@@ -421,7 +425,7 @@ static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev,
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
-        int err;
+        int err = 0;
 
         en_dbg(HW, priv, "Killing VID:%d\n", vid);
 
@@ -438,7 +442,7 @@ static int mlx4_en_vlan_rx_kill_vid(struct net_device *dev,
         }
         mutex_unlock(&mdev->state_lock);
 
-        return 0;
+        return err;
 }
 
 static void mlx4_en_u64_to_mac(unsigned char dst_mac[ETH_ALEN + 2], u64 src_mac)
@@ -1950,7 +1954,7 @@ static int mlx4_en_close(struct net_device *dev)
         return 0;
 }
 
-void mlx4_en_free_resources(struct mlx4_en_priv *priv)
+static void mlx4_en_free_resources(struct mlx4_en_priv *priv)
 {
         int i;
 
@@ -1975,7 +1979,7 @@ void mlx4_en_free_resources(struct mlx4_en_priv *priv)
 
 }
 
-int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
+static int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
 {
         struct mlx4_en_port_profile *prof = priv->prof;
         int i;
@@ -2032,11 +2036,91 @@ err:
         return -ENOMEM;
 }
 
+static void mlx4_en_shutdown(struct net_device *dev)
+{
+        rtnl_lock();
+        netif_device_detach(dev);
+        mlx4_en_close(dev);
+        rtnl_unlock();
+}
+
+static int mlx4_en_copy_priv(struct mlx4_en_priv *dst,
+                             struct mlx4_en_priv *src,
+                             struct mlx4_en_port_profile *prof)
+{
+        memcpy(&dst->hwtstamp_config, &prof->hwtstamp_config,
+               sizeof(dst->hwtstamp_config));
+        dst->num_tx_rings_p_up = src->mdev->profile.num_tx_rings_p_up;
+        dst->tx_ring_num = prof->tx_ring_num;
+        dst->rx_ring_num = prof->rx_ring_num;
+        dst->flags = prof->flags;
+        dst->mdev = src->mdev;
+        dst->port = src->port;
+        dst->dev = src->dev;
+        dst->prof = prof;
+        dst->stride = roundup_pow_of_two(sizeof(struct mlx4_en_rx_desc) +
+                                         DS_SIZE * MLX4_EN_MAX_RX_FRAGS);
+
+        dst->tx_ring = kzalloc(sizeof(struct mlx4_en_tx_ring *) * MAX_TX_RINGS,
+                                GFP_KERNEL);
+        if (!dst->tx_ring)
+                return -ENOMEM;
+
+        dst->tx_cq = kzalloc(sizeof(struct mlx4_en_cq *) * MAX_TX_RINGS,
+                              GFP_KERNEL);
+        if (!dst->tx_cq) {
+                kfree(dst->tx_ring);
+                return -ENOMEM;
+        }
+        return 0;
+}
+
+static void mlx4_en_update_priv(struct mlx4_en_priv *dst,
+                                struct mlx4_en_priv *src)
+{
+        memcpy(dst->rx_ring, src->rx_ring,
+               sizeof(struct mlx4_en_rx_ring *) * src->rx_ring_num);
+        memcpy(dst->rx_cq, src->rx_cq,
+               sizeof(struct mlx4_en_cq *) * src->rx_ring_num);
+        memcpy(&dst->hwtstamp_config, &src->hwtstamp_config,
+               sizeof(dst->hwtstamp_config));
+        dst->tx_ring_num = src->tx_ring_num;
+        dst->rx_ring_num = src->rx_ring_num;
+        dst->tx_ring = src->tx_ring;
+        dst->tx_cq = src->tx_cq;
+        memcpy(dst->prof, src->prof, sizeof(struct mlx4_en_port_profile));
+}
+
+int mlx4_en_try_alloc_resources(struct mlx4_en_priv *priv,
+                                struct mlx4_en_priv *tmp,
+                                struct mlx4_en_port_profile *prof)
+{
+        mlx4_en_copy_priv(tmp, priv, prof);
+
+        if (mlx4_en_alloc_resources(tmp)) {
+                en_warn(priv,
+                        "%s: Resource allocation failed, using previous configuration\n",
+                        __func__);
+                kfree(tmp->tx_ring);
+                kfree(tmp->tx_cq);
+                return -ENOMEM;
+        }
+        return 0;
+}
+
+void mlx4_en_safe_replace_resources(struct mlx4_en_priv *priv,
+                                    struct mlx4_en_priv *tmp)
+{
+        mlx4_en_free_resources(priv);
+        mlx4_en_update_priv(priv, tmp);
+}
 
 void mlx4_en_destroy_netdev(struct net_device *dev)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
+        bool shutdown = mdev->dev->persist->interface_state &
+                                            MLX4_INTERFACE_STATE_SHUTDOWN;
 
         en_dbg(DRV, priv, "Destroying netdev on port:%d\n", priv->port);
 
@@ -2044,7 +2128,10 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
         if (priv->registered) {
                 devlink_port_type_clear(mlx4_get_devlink_port(mdev->dev,
                                                               priv->port));
-                unregister_netdev(dev);
+                if (shutdown)
+                        mlx4_en_shutdown(dev);
+                else
+                        unregister_netdev(dev);
         }
 
         if (priv->allocated)
@@ -2064,12 +2151,17 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
         mdev->upper[priv->port] = NULL;
         mutex_unlock(&mdev->state_lock);
 
+#ifdef CONFIG_RFS_ACCEL
+        mlx4_en_cleanup_filters(priv);
+#endif
+
         mlx4_en_free_resources(priv);
 
         kfree(priv->tx_ring);
         kfree(priv->tx_cq);
 
-        free_netdev(dev);
+        if (!shutdown)
+                free_netdev(dev);
 }
 
 static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu)
@@ -2447,9 +2539,14 @@ static netdev_features_t mlx4_en_features_check(struct sk_buff *skb,
          * strip that feature if this is an IPv6 encapsulated frame.
          */
         if (skb->encapsulation &&
-            (skb->ip_summed == CHECKSUM_PARTIAL) &&
-            (ip_hdr(skb)->version != 4))
-                features &= ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK);
+            (skb->ip_summed == CHECKSUM_PARTIAL)) {
+                struct mlx4_en_priv *priv = netdev_priv(dev);
+
+                if (!priv->vxlan_port ||
+                    (ip_hdr(skb)->version != 4) ||
+                    (udp_hdr(skb)->dest != priv->vxlan_port))
+                        features &= ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK);
+        }
 
         return features;
 }
@@ -3102,6 +3199,8 @@ int mlx4_en_reset_config(struct net_device *dev,
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
+        struct mlx4_en_port_profile new_prof;
+        struct mlx4_en_priv *tmp;
         int port_up = 0;
         int err = 0;
 
@@ -3118,19 +3217,29 @@ int mlx4_en_reset_config(struct net_device *dev,
                 return -EINVAL;
         }
 
+        tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
+        if (!tmp)
+                return -ENOMEM;
+
         mutex_lock(&mdev->state_lock);
+
+        memcpy(&new_prof, priv->prof, sizeof(struct mlx4_en_port_profile));
+        memcpy(&new_prof.hwtstamp_config, &ts_config, sizeof(ts_config));
+
+        err = mlx4_en_try_alloc_resources(priv, tmp, &new_prof);
+        if (err)
+                goto out;
+
         if (priv->port_up) {
                 port_up = 1;
                 mlx4_en_stop_port(dev, 1);
         }
 
-        mlx4_en_free_resources(priv);
-
         en_warn(priv, "Changing device configuration rx filter(%x) rx vlan(%x)\n",
-                ts_config.rx_filter, !!(features & NETIF_F_HW_VLAN_CTAG_RX));
+                ts_config.rx_filter,
+                !!(features & NETIF_F_HW_VLAN_CTAG_RX));
 
-        priv->hwtstamp_config.tx_type = ts_config.tx_type;
-        priv->hwtstamp_config.rx_filter = ts_config.rx_filter;
+        mlx4_en_safe_replace_resources(priv, tmp);
 
         if (DEV_FEATURE_CHANGED(dev, features, NETIF_F_HW_VLAN_CTAG_RX)) {
                 if (features & NETIF_F_HW_VLAN_CTAG_RX)
@@ -3164,11 +3273,6 @@ int mlx4_en_reset_config(struct net_device *dev,
                 dev->features &= ~NETIF_F_HW_VLAN_CTAG_RX;
         }
 
-        err = mlx4_en_alloc_resources(priv);
-        if (err) {
-                en_err(priv, "Failed reallocating port resources\n");
-                goto out;
-        }
         if (port_up) {
                 err = mlx4_en_start_port(dev);
                 if (err)
@@ -3177,6 +3281,8 @@ int mlx4_en_reset_config(struct net_device *dev,
 
 out:
         mutex_unlock(&mdev->state_lock);
-        netdev_features_change(dev);
+        kfree(tmp);
+        if (!err)
+                netdev_features_change(dev);
         return err;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index c1b3a9c8cf3b..99b5407f2278 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -514,9 +514,6 @@ void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
         ring->rx_info = NULL;
         kfree(ring);
         *pring = NULL;
-#ifdef CONFIG_RFS_ACCEL
-        mlx4_en_cleanup_filters(priv);
-#endif
 }
 
 void mlx4_en_deactivate_rx_ring(struct mlx4_en_priv *priv,
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 12c77a70abdb..546fab0ecc3b 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -3222,6 +3222,7 @@ static int mlx4_load_one(struct pci_dev *pdev, int pci_dev_data,
 
         INIT_LIST_HEAD(&priv->pgdir_list);
         mutex_init(&priv->pgdir_mutex);
+        spin_lock_init(&priv->cmd.context_lock);
 
         INIT_LIST_HEAD(&priv->bf_list);
         mutex_init(&priv->bf_mutex);
@@ -4134,8 +4135,11 @@ static void mlx4_shutdown(struct pci_dev *pdev)
 
         mlx4_info(persist->dev, "mlx4_shutdown was called\n");
         mutex_lock(&persist->interface_state_mutex);
-        if (persist->interface_state & MLX4_INTERFACE_STATE_UP)
+        if (persist->interface_state & MLX4_INTERFACE_STATE_UP) {
+                /* Notify mlx4 clients that the kernel is being shut down */
+                persist->interface_state |= MLX4_INTERFACE_STATE_SHUTDOWN;
                 mlx4_unload_one(pdev);
+        }
         mutex_unlock(&persist->interface_state_mutex);
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 467d47ed2c39..13d297ee34bb 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -353,12 +353,14 @@ struct mlx4_en_port_profile {
         u32 rx_ring_num;
         u32 tx_ring_size;
         u32 rx_ring_size;
+        u8 num_tx_rings_p_up;
         u8 rx_pause;
         u8 rx_ppp;
         u8 tx_pause;
         u8 tx_ppp;
         int rss_rings;
         int inline_thold;
+        struct hwtstamp_config hwtstamp_config;
 };
 
 struct mlx4_en_profile {
@@ -623,8 +625,11 @@ void mlx4_en_set_stats_bitmap(struct mlx4_dev *dev,
                               u8 rx_ppp, u8 rx_pause,
                               u8 tx_ppp, u8 tx_pause);
 
-void mlx4_en_free_resources(struct mlx4_en_priv *priv);
-int mlx4_en_alloc_resources(struct mlx4_en_priv *priv);
+int mlx4_en_try_alloc_resources(struct mlx4_en_priv *priv,
+                                struct mlx4_en_priv *tmp,
+                                struct mlx4_en_port_profile *prof);
+void mlx4_en_safe_replace_resources(struct mlx4_en_priv *priv,
+                                    struct mlx4_en_priv *tmp);
 
 int mlx4_en_create_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq **pcq,
                       int entries, int ring, enum cq_type mode, int node);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index dcd2df6518de..d6e2a1cae19a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -295,6 +295,12 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op,
         case MLX5_CMD_OP_DESTROY_FLOW_GROUP:
         case MLX5_CMD_OP_DELETE_FLOW_TABLE_ENTRY:
         case MLX5_CMD_OP_DEALLOC_FLOW_COUNTER:
+        case MLX5_CMD_OP_2ERR_QP:
+        case MLX5_CMD_OP_2RST_QP:
+        case MLX5_CMD_OP_MODIFY_NIC_VPORT_CONTEXT:
+        case MLX5_CMD_OP_MODIFY_FLOW_TABLE:
+        case MLX5_CMD_OP_SET_FLOW_TABLE_ENTRY:
+        case MLX5_CMD_OP_SET_FLOW_TABLE_ROOT:
                 return MLX5_CMD_STAT_OK;
 
         case MLX5_CMD_OP_QUERY_HCA_CAP:
@@ -321,8 +327,6 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op,
         case MLX5_CMD_OP_RTR2RTS_QP:
         case MLX5_CMD_OP_RTS2RTS_QP:
         case MLX5_CMD_OP_SQERR2RTS_QP:
-        case MLX5_CMD_OP_2ERR_QP:
-        case MLX5_CMD_OP_2RST_QP:
         case MLX5_CMD_OP_QUERY_QP:
         case MLX5_CMD_OP_SQD_RTS_QP:
         case MLX5_CMD_OP_INIT2INIT_QP:
@@ -342,7 +346,6 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op,
         case MLX5_CMD_OP_QUERY_ESW_VPORT_CONTEXT:
         case MLX5_CMD_OP_MODIFY_ESW_VPORT_CONTEXT:
         case MLX5_CMD_OP_QUERY_NIC_VPORT_CONTEXT:
-        case MLX5_CMD_OP_MODIFY_NIC_VPORT_CONTEXT:
         case MLX5_CMD_OP_QUERY_ROCE_ADDRESS:
         case MLX5_CMD_OP_SET_ROCE_ADDRESS:
         case MLX5_CMD_OP_QUERY_HCA_VPORT_CONTEXT:
@@ -390,11 +393,12 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op,
         case MLX5_CMD_OP_CREATE_RQT:
         case MLX5_CMD_OP_MODIFY_RQT:
         case MLX5_CMD_OP_QUERY_RQT:
+
         case MLX5_CMD_OP_CREATE_FLOW_TABLE:
         case MLX5_CMD_OP_QUERY_FLOW_TABLE:
         case MLX5_CMD_OP_CREATE_FLOW_GROUP:
         case MLX5_CMD_OP_QUERY_FLOW_GROUP:
-        case MLX5_CMD_OP_SET_FLOW_TABLE_ENTRY:
+
         case MLX5_CMD_OP_QUERY_FLOW_TABLE_ENTRY:
         case MLX5_CMD_OP_ALLOC_FLOW_COUNTER:
         case MLX5_CMD_OP_QUERY_FLOW_COUNTER:
@@ -545,6 +549,7 @@ const char *mlx5_command_str(int command)
         MLX5_COMMAND_STR_CASE(ALLOC_FLOW_COUNTER);
         MLX5_COMMAND_STR_CASE(DEALLOC_FLOW_COUNTER);
         MLX5_COMMAND_STR_CASE(QUERY_FLOW_COUNTER);
+        MLX5_COMMAND_STR_CASE(MODIFY_FLOW_TABLE);
         default: return "unknown command opcode";
         }
 }
@@ -601,11 +606,36 @@ static void dump_command(struct mlx5_core_dev *dev,
                 pr_debug("\n");
 }
 
+static u16 msg_to_opcode(struct mlx5_cmd_msg *in)
+{
+        struct mlx5_inbox_hdr *hdr = (struct mlx5_inbox_hdr *)(in->first.data);
+
+        return be16_to_cpu(hdr->opcode);
+}
+
+static void cb_timeout_handler(struct work_struct *work)
+{
+        struct delayed_work *dwork = container_of(work, struct delayed_work,
+                                                  work);
+        struct mlx5_cmd_work_ent *ent = container_of(dwork,
+                                                     struct mlx5_cmd_work_ent,
+                                                     cb_timeout_work);
+        struct mlx5_core_dev *dev = container_of(ent->cmd, struct mlx5_core_dev,
+                                                 cmd);
+
+        ent->ret = -ETIMEDOUT;
+        mlx5_core_warn(dev, "%s(0x%x) timeout. Will cause a leak of a command resource\n",
+                       mlx5_command_str(msg_to_opcode(ent->in)),
+                       msg_to_opcode(ent->in));
+        mlx5_cmd_comp_handler(dev, 1UL << ent->idx);
+}
+
 static void cmd_work_handler(struct work_struct *work)
 {
         struct mlx5_cmd_work_ent *ent = container_of(work, struct mlx5_cmd_work_ent, work);
         struct mlx5_cmd *cmd = ent->cmd;
         struct mlx5_core_dev *dev = container_of(cmd, struct mlx5_core_dev, cmd);
+        unsigned long cb_timeout = msecs_to_jiffies(MLX5_CMD_TIMEOUT_MSEC);
         struct mlx5_cmd_layout *lay;
         struct semaphore *sem;
         unsigned long flags;
@@ -646,6 +676,9 @@ static void cmd_work_handler(struct work_struct *work)
         dump_command(dev, ent, 1);
         ent->ts1 = ktime_get_ns();
 
+        if (ent->callback)
+                schedule_delayed_work(&ent->cb_timeout_work, cb_timeout);
+
         /* ring doorbell after the descriptor is valid */
         mlx5_core_dbg(dev, "writing 0x%x to command doorbell\n", 1 << ent->idx);
         wmb();
@@ -690,13 +723,6 @@ static const char *deliv_status_to_str(u8 status)
         }
 }
 
-static u16 msg_to_opcode(struct mlx5_cmd_msg *in)
-{
-        struct mlx5_inbox_hdr *hdr = (struct mlx5_inbox_hdr *)(in->first.data);
-
-        return be16_to_cpu(hdr->opcode);
-}
-
 static int wait_func(struct mlx5_core_dev *dev, struct mlx5_cmd_work_ent *ent)
 {
         unsigned long timeout = msecs_to_jiffies(MLX5_CMD_TIMEOUT_MSEC);
@@ -705,13 +731,13 @@ static int wait_func(struct mlx5_core_dev *dev, struct mlx5_cmd_work_ent *ent)
 
         if (cmd->mode == CMD_MODE_POLLING) {
                 wait_for_completion(&ent->done);
-                err = ent->ret;
-        } else {
-                if (!wait_for_completion_timeout(&ent->done, timeout))
-                        err = -ETIMEDOUT;
-                else
-                        err = 0;
+        } else if (!wait_for_completion_timeout(&ent->done, timeout)) {
+                ent->ret = -ETIMEDOUT;
+                mlx5_cmd_comp_handler(dev, 1UL << ent->idx);
         }
+
+        err = ent->ret;
+
         if (err == -ETIMEDOUT) {
                 mlx5_core_warn(dev, "%s(0x%x) timeout. Will cause a leak of a command resource\n",
                                mlx5_command_str(msg_to_opcode(ent->in)),
@@ -760,6 +786,7 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in,
         if (!callback)
                 init_completion(&ent->done);
 
+        INIT_DELAYED_WORK(&ent->cb_timeout_work, cb_timeout_handler);
         INIT_WORK(&ent->work, cmd_work_handler);
         if (page_queue) {
                 cmd_work_handler(&ent->work);
@@ -769,28 +796,26 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in,
                 goto out_free;
         }
 
-        if (!callback) {
-                err = wait_func(dev, ent);
-                if (err == -ETIMEDOUT)
-                        goto out;
-
-                ds = ent->ts2 - ent->ts1;
-                op = be16_to_cpu(((struct mlx5_inbox_hdr *)in->first.data)->opcode);
-                if (op < ARRAY_SIZE(cmd->stats)) {
-                        stats = &cmd->stats[op];
-                        spin_lock_irq(&stats->lock);
-                        stats->sum += ds;
-                        ++stats->n;
-                        spin_unlock_irq(&stats->lock);
-                }
-                mlx5_core_dbg_mask(dev, 1 << MLX5_CMD_TIME,
-                                   "fw exec time for %s is %lld nsec\n",
-                                   mlx5_command_str(op), ds);
-                *status = ent->status;
-                free_cmd(ent);
-        }
+        if (callback)
+                goto out;
 
-        return err;
+        err = wait_func(dev, ent);
+        if (err == -ETIMEDOUT)
+                goto out_free;
+
+        ds = ent->ts2 - ent->ts1;
+        op = be16_to_cpu(((struct mlx5_inbox_hdr *)in->first.data)->opcode);
+        if (op < ARRAY_SIZE(cmd->stats)) {
+                stats = &cmd->stats[op];
+                spin_lock_irq(&stats->lock);
+                stats->sum += ds;
+                ++stats->n;
+                spin_unlock_irq(&stats->lock);
+        }
+        mlx5_core_dbg_mask(dev, 1 << MLX5_CMD_TIME,
+                           "fw exec time for %s is %lld nsec\n",
+                           mlx5_command_str(op), ds);
+        *status = ent->status;
 
 out_free:
         free_cmd(ent);
@@ -1180,41 +1205,30 @@ err_dbg:
         return err;
 }
 
-void mlx5_cmd_use_events(struct mlx5_core_dev *dev)
+static void mlx5_cmd_change_mod(struct mlx5_core_dev *dev, int mode)
 {
         struct mlx5_cmd *cmd = &dev->cmd;
         int i;
 
         for (i = 0; i < cmd->max_reg_cmds; i++)
                 down(&cmd->sem);
-
         down(&cmd->pages_sem);
 
-        flush_workqueue(cmd->wq);
-
-        cmd->mode = CMD_MODE_EVENTS;
+        cmd->mode = mode;
 
         up(&cmd->pages_sem);
         for (i = 0; i < cmd->max_reg_cmds; i++)
                 up(&cmd->sem);
 }
 
-void mlx5_cmd_use_polling(struct mlx5_core_dev *dev)
+void mlx5_cmd_use_events(struct mlx5_core_dev *dev)
 {
-        struct mlx5_cmd *cmd = &dev->cmd;
-        int i;
-
-        for (i = 0; i < cmd->max_reg_cmds; i++)
-                down(&cmd->sem);
-
-        down(&cmd->pages_sem);
-
-        flush_workqueue(cmd->wq);
-        cmd->mode = CMD_MODE_POLLING;
+        mlx5_cmd_change_mod(dev, CMD_MODE_EVENTS);
+}
 
-        up(&cmd->pages_sem);
-        for (i = 0; i < cmd->max_reg_cmds; i++)
-                up(&cmd->sem);
+void mlx5_cmd_use_polling(struct mlx5_core_dev *dev)
+{
+        mlx5_cmd_change_mod(dev, CMD_MODE_POLLING);
 }
 
 static void free_msg(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *msg)
@@ -1250,6 +1264,8 @@ void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, u64 vec)
                         struct semaphore *sem;
 
                         ent = cmd->ent_arr[i];
+                        if (ent->callback)
+                                cancel_delayed_work(&ent->cb_timeout_work);
                         if (ent->page_queue)
                                 sem = &cmd->pages_sem;
                         else
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index e8a6c3325b39..943b1bd434bf 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -145,7 +145,6 @@ struct mlx5e_umr_wqe {
 
 #ifdef CONFIG_MLX5_CORE_EN_DCB
 #define MLX5E_MAX_BW_ALLOC 100 /* Max percentage of BW allocation */
-#define MLX5E_MIN_BW_ALLOC 1   /* Min percentage of BW allocation */
 #endif
 
 struct mlx5e_params {
@@ -191,6 +190,7 @@ struct mlx5e_tstamp {
 enum {
         MLX5E_RQ_STATE_POST_WQES_ENABLE,
         MLX5E_RQ_STATE_UMR_WQE_IN_PROGRESS,
+        MLX5E_RQ_STATE_FLUSH_TIMEOUT,
 };
 
 struct mlx5e_cq {
@@ -220,6 +220,8 @@ typedef void (*mlx5e_fp_handle_rx_cqe)(struct mlx5e_rq *rq,
 typedef int (*mlx5e_fp_alloc_wqe)(struct mlx5e_rq *rq, struct mlx5e_rx_wqe *wqe,
                                   u16 ix);
 
+typedef void (*mlx5e_fp_dealloc_wqe)(struct mlx5e_rq *rq, u16 ix);
+
 struct mlx5e_dma_info {
         struct page     *page;
         dma_addr_t      addr;
@@ -241,6 +243,7 @@ struct mlx5e_rq {
         struct mlx5e_cq        cq;
         mlx5e_fp_handle_rx_cqe handle_rx_cqe;
         mlx5e_fp_alloc_wqe     alloc_wqe;
+        mlx5e_fp_dealloc_wqe   dealloc_wqe;
 
         unsigned long          state;
         int                    ix;
@@ -305,6 +308,7 @@ struct mlx5e_sq_dma {
 enum {
         MLX5E_SQ_STATE_WAKE_TXQ_ENABLE,
         MLX5E_SQ_STATE_BF_ENABLE,
+        MLX5E_SQ_STATE_TX_TIMEOUT,
 };
 
 struct mlx5e_ico_wqe_info {
@@ -401,7 +405,7 @@ enum mlx5e_traffic_types {
 };
 
 enum {
-        MLX5E_STATE_ASYNC_EVENTS_ENABLE,
+        MLX5E_STATE_ASYNC_EVENTS_ENABLED,
         MLX5E_STATE_OPENED,
         MLX5E_STATE_DESTROYING,
 };
@@ -538,6 +542,7 @@ struct mlx5e_priv {
         struct workqueue_struct    *wq;
         struct work_struct         update_carrier_work;
         struct work_struct         set_rx_mode_work;
+        struct work_struct         tx_timeout_work;
         struct delayed_work        update_stats_work;
 
         struct mlx5_core_dev      *mdev;
@@ -589,12 +594,16 @@ void mlx5e_cq_error_event(struct mlx5_core_cq *mcq, enum mlx5_event event);
 int mlx5e_napi_poll(struct napi_struct *napi, int budget);
 bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget);
 int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget);
+void mlx5e_free_tx_descs(struct mlx5e_sq *sq);
+void mlx5e_free_rx_descs(struct mlx5e_rq *rq);
 
 void mlx5e_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe);
 void mlx5e_handle_rx_cqe_mpwrq(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe);
 bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq);
 int mlx5e_alloc_rx_wqe(struct mlx5e_rq *rq, struct mlx5e_rx_wqe *wqe, u16 ix);
 int mlx5e_alloc_rx_mpwqe(struct mlx5e_rq *rq, struct mlx5e_rx_wqe *wqe, u16 ix);
+void mlx5e_dealloc_rx_wqe(struct mlx5e_rq *rq, u16 ix);
+void mlx5e_dealloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix);
 void mlx5e_post_rx_fragmented_mpwqe(struct mlx5e_rq *rq);
 void mlx5e_complete_rx_linear_mpwqe(struct mlx5e_rq *rq,
                                     struct mlx5_cqe64 *cqe,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
index b2db180ae2a5..c585349e05c3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
@@ -96,7 +96,7 @@ static void mlx5e_build_tc_tx_bw(struct ieee_ets *ets, u8 *tc_tx_bw,
                         tc_tx_bw[i] = MLX5E_MAX_BW_ALLOC;
                         break;
                 case IEEE_8021QAZ_TSA_ETS:
-                        tc_tx_bw[i] = ets->tc_tx_bw[i] ?: MLX5E_MIN_BW_ALLOC;
+                        tc_tx_bw[i] = ets->tc_tx_bw[i];
                         break;
                 }
         }
@@ -140,8 +140,12 @@ static int mlx5e_dbcnl_validate_ets(struct ieee_ets *ets)
 
         /* Validate Bandwidth Sum */
         for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
-                if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS)
+                if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_ETS) {
+                        if (!ets->tc_tx_bw[i])
+                                return -EINVAL;
+
                         bw_sum += ets->tc_tx_bw[i];
+                }
         }
 
         if (bw_sum != 0 && bw_sum != 100)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index fc7dcc03b1de..e667a870e0c2 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -184,7 +184,9 @@ static unsigned long mlx5e_query_pfc_combined(struct mlx5e_priv *priv)
 #define MLX5E_NUM_SQ_STATS(priv) \
         (NUM_SQ_STATS * priv->params.num_channels * priv->params.num_tc * \
          test_bit(MLX5E_STATE_OPENED, &priv->state))
-#define MLX5E_NUM_PFC_COUNTERS(priv) hweight8(mlx5e_query_pfc_combined(priv))
+#define MLX5E_NUM_PFC_COUNTERS(priv) \
+        (hweight8(mlx5e_query_pfc_combined(priv)) * \
+         NUM_PPORT_PER_PRIO_PFC_COUNTERS)
 
 static int mlx5e_get_sset_count(struct net_device *dev, int sset)
 {
@@ -211,42 +213,41 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, uint8_t *data)
 
         /* SW counters */
         for (i = 0; i < NUM_SW_COUNTERS; i++)
-                strcpy(data + (idx++) * ETH_GSTRING_LEN, sw_stats_desc[i].name);
+                strcpy(data + (idx++) * ETH_GSTRING_LEN, sw_stats_desc[i].format);
 
         /* Q counters */
         for (i = 0; i < MLX5E_NUM_Q_CNTRS(priv); i++)
-                strcpy(data + (idx++) * ETH_GSTRING_LEN, q_stats_desc[i].name);
+                strcpy(data + (idx++) * ETH_GSTRING_LEN, q_stats_desc[i].format);
 
         /* VPORT counters */
         for (i = 0; i < NUM_VPORT_COUNTERS; i++)
                 strcpy(data + (idx++) * ETH_GSTRING_LEN,
-                       vport_stats_desc[i].name);
+                       vport_stats_desc[i].format);
 
         /* PPORT counters */
         for (i = 0; i < NUM_PPORT_802_3_COUNTERS; i++)
                 strcpy(data + (idx++) * ETH_GSTRING_LEN,
-                       pport_802_3_stats_desc[i].name);
+                       pport_802_3_stats_desc[i].format);
 
         for (i = 0; i < NUM_PPORT_2863_COUNTERS; i++)
                 strcpy(data + (idx++) * ETH_GSTRING_LEN,
-                       pport_2863_stats_desc[i].name);
+                       pport_2863_stats_desc[i].format);
 
         for (i = 0; i < NUM_PPORT_2819_COUNTERS; i++)
                 strcpy(data + (idx++) * ETH_GSTRING_LEN,
-                       pport_2819_stats_desc[i].name);
+                       pport_2819_stats_desc[i].format);
 
         for (prio = 0; prio < NUM_PPORT_PRIO; prio++) {
                 for (i = 0; i < NUM_PPORT_PER_PRIO_TRAFFIC_COUNTERS; i++)
-                        sprintf(data + (idx++) * ETH_GSTRING_LEN, "prio%d_%s",
-                                prio,
-                                pport_per_prio_traffic_stats_desc[i].name);
+                        sprintf(data + (idx++) * ETH_GSTRING_LEN,
+                                pport_per_prio_traffic_stats_desc[i].format, prio);
         }
 
         pfc_combined = mlx5e_query_pfc_combined(priv);
         for_each_set_bit(prio, &pfc_combined, NUM_PPORT_PRIO) {
                 for (i = 0; i < NUM_PPORT_PER_PRIO_PFC_COUNTERS; i++) {
-                        sprintf(data + (idx++) * ETH_GSTRING_LEN, "prio%d_%s",
-                                prio, pport_per_prio_pfc_stats_desc[i].name);
+                        sprintf(data + (idx++) * ETH_GSTRING_LEN,
+                                pport_per_prio_pfc_stats_desc[i].format, prio);
                 }
         }
 
@@ -256,16 +257,15 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, uint8_t *data)
         /* per channel counters */
         for (i = 0; i < priv->params.num_channels; i++)
                 for (j = 0; j < NUM_RQ_STATS; j++)
-                        sprintf(data + (idx++) * ETH_GSTRING_LEN, "rx%d_%s", i,
-                                rq_stats_desc[j].name);
+                        sprintf(data + (idx++) * ETH_GSTRING_LEN,
+                                rq_stats_desc[j].format, i);
 
         for (tc = 0; tc < priv->params.num_tc; tc++)
                 for (i = 0; i < priv->params.num_channels; i++)
                         for (j = 0; j < NUM_SQ_STATS; j++)
                                 sprintf(data + (idx++) * ETH_GSTRING_LEN,
-                                        "tx%d_%s",
-                                        priv->channeltc_to_txq_map[i][tc],
-                                        sq_stats_desc[j].name);
+                                        sq_stats_desc[j].format,
+                                        priv->channeltc_to_txq_map[i][tc]);
 }
 
 static void mlx5e_get_strings(struct net_device *dev,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index f5c8d5db25a8..5a4d88c2cdb2 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -39,6 +39,13 @@
 #include "eswitch.h"
 #include "vxlan.h"
 
+enum {
+        MLX5_EN_QP_FLUSH_TIMEOUT_MS     = 5000,
+        MLX5_EN_QP_FLUSH_MSLEEP_QUANT   = 20,
+        MLX5_EN_QP_FLUSH_MAX_ITER       = MLX5_EN_QP_FLUSH_TIMEOUT_MS /
+                                          MLX5_EN_QP_FLUSH_MSLEEP_QUANT,
+};
+
 struct mlx5e_rq_param {
         u32                        rqc[MLX5_ST_SZ_DW(rqc)];
         struct mlx5_wq_param       wq;
@@ -74,10 +81,13 @@ static void mlx5e_update_carrier(struct mlx5e_priv *priv)
         port_state = mlx5_query_vport_state(mdev,
                 MLX5_QUERY_VPORT_STATE_IN_OP_MOD_VNIC_VPORT, 0);
 
-        if (port_state == VPORT_STATE_UP)
+        if (port_state == VPORT_STATE_UP) {
+                netdev_info(priv->netdev, "Link up\n");
                 netif_carrier_on(priv->netdev);
-        else
+        } else {
+                netdev_info(priv->netdev, "Link down\n");
                 netif_carrier_off(priv->netdev);
+        }
 }
 
 static void mlx5e_update_carrier_work(struct work_struct *work)
@@ -91,6 +101,26 @@ static void mlx5e_update_carrier_work(struct work_struct *work)
         mutex_unlock(&priv->state_lock);
 }
 
+static void mlx5e_tx_timeout_work(struct work_struct *work)
+{
+        struct mlx5e_priv *priv = container_of(work, struct mlx5e_priv,
+                                               tx_timeout_work);
+        int err;
+
+        rtnl_lock();
+        mutex_lock(&priv->state_lock);
+        if (!test_bit(MLX5E_STATE_OPENED, &priv->state))
+                goto unlock;
+        mlx5e_close_locked(priv->netdev);
+        err = mlx5e_open_locked(priv->netdev);
+        if (err)
+                netdev_err(priv->netdev, "mlx5e_open_locked failed recovering from a tx_timeout, err(%d).\n",
+                           err);
+unlock:
+        mutex_unlock(&priv->state_lock);
+        rtnl_unlock();
+}
+
 static void mlx5e_update_sw_counters(struct mlx5e_priv *priv)
 {
         struct mlx5e_sw_stats *s = &priv->stats.sw;
@@ -105,11 +135,11 @@ static void mlx5e_update_sw_counters(struct mlx5e_priv *priv)
 
                 s->rx_packets   += rq_stats->packets;
                 s->rx_bytes     += rq_stats->bytes;
-                s->lro_packets  += rq_stats->lro_packets;
-                s->lro_bytes    += rq_stats->lro_bytes;
+                s->rx_lro_packets += rq_stats->lro_packets;
+                s->rx_lro_bytes += rq_stats->lro_bytes;
                 s->rx_csum_none += rq_stats->csum_none;
-                s->rx_csum_sw   += rq_stats->csum_sw;
-                s->rx_csum_inner += rq_stats->csum_inner;
+                s->rx_csum_complete += rq_stats->csum_complete;
+                s->rx_csum_unnecessary_inner += rq_stats->csum_unnecessary_inner;
                 s->rx_wqe_err   += rq_stats->wqe_err;
                 s->rx_mpwqe_filler += rq_stats->mpwqe_filler;
                 s->rx_mpwqe_frag   += rq_stats->mpwqe_frag;
@@ -122,24 +152,23 @@ static void mlx5e_update_sw_counters(struct mlx5e_priv *priv)
 
                         s->tx_packets           += sq_stats->packets;
                         s->tx_bytes             += sq_stats->bytes;
-                        s->tso_packets          += sq_stats->tso_packets;
-                        s->tso_bytes            += sq_stats->tso_bytes;
-                        s->tso_inner_packets    += sq_stats->tso_inner_packets;
-                        s->tso_inner_bytes      += sq_stats->tso_inner_bytes;
+                        s->tx_tso_packets       += sq_stats->tso_packets;
+                        s->tx_tso_bytes         += sq_stats->tso_bytes;
+                        s->tx_tso_inner_packets += sq_stats->tso_inner_packets;
+                        s->tx_tso_inner_bytes   += sq_stats->tso_inner_bytes;
                         s->tx_queue_stopped     += sq_stats->stopped;
                         s->tx_queue_wake        += sq_stats->wake;
                         s->tx_queue_dropped     += sq_stats->dropped;
-                        s->tx_csum_inner        += sq_stats->csum_offload_inner;
-                        tx_offload_none         += sq_stats->csum_offload_none;
+                        s->tx_csum_partial_inner += sq_stats->csum_partial_inner;
+                        tx_offload_none         += sq_stats->csum_none;
                 }
         }
 
         /* Update calculated offload counters */
-        s->tx_csum_offload = s->tx_packets - tx_offload_none - s->tx_csum_inner;
-        s->rx_csum_good    = s->rx_packets - s->rx_csum_none -
-                             s->rx_csum_sw;
+        s->tx_csum_partial = s->tx_packets - tx_offload_none - s->tx_csum_partial_inner;
+        s->rx_csum_unnecessary = s->rx_packets - s->rx_csum_none - s->rx_csum_complete;
 
-        s->link_down_events = MLX5_GET(ppcnt_reg,
+        s->link_down_events_phy = MLX5_GET(ppcnt_reg,
                                 priv->stats.pport.phy_counters,
                                 counter_set.phys_layer_cntrs.link_down_events);
 }
@@ -244,7 +273,7 @@ static void mlx5e_async_event(struct mlx5_core_dev *mdev, void *vpriv,
 {
         struct mlx5e_priv *priv = vpriv;
 
-        if (!test_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLE, &priv->state))
+        if (!test_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLED, &priv->state))
                 return;
 
         switch (event) {
@@ -260,12 +289,12 @@ static void mlx5e_async_event(struct mlx5_core_dev *mdev, void *vpriv,
 
 static void mlx5e_enable_async_events(struct mlx5e_priv *priv)
 {
-        set_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLE, &priv->state);
+        set_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLED, &priv->state);
 }
 
 static void mlx5e_disable_async_events(struct mlx5e_priv *priv)
 {
-        clear_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLE, &priv->state);
+        clear_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLED, &priv->state);
         synchronize_irq(mlx5_get_msix_vec(priv->mdev, MLX5_EQ_VEC_ASYNC));
 }
 
@@ -306,6 +335,7 @@ static int mlx5e_create_rq(struct mlx5e_channel *c,
                 }
                 rq->handle_rx_cqe = mlx5e_handle_rx_cqe_mpwrq;
                 rq->alloc_wqe = mlx5e_alloc_rx_mpwqe;
+                rq->dealloc_wqe = mlx5e_dealloc_rx_mpwqe;
 
                 rq->mpwqe_stride_sz = BIT(priv->params.mpwqe_log_stride_sz);
                 rq->mpwqe_num_strides = BIT(priv->params.mpwqe_log_num_strides);
@@ -321,6 +351,7 @@ static int mlx5e_create_rq(struct mlx5e_channel *c,
                 }
                 rq->handle_rx_cqe = mlx5e_handle_rx_cqe;
                 rq->alloc_wqe = mlx5e_alloc_rx_wqe;
+                rq->dealloc_wqe = mlx5e_dealloc_rx_wqe;
 
                 rq->wqe_sz = (priv->params.lro_en) ?
                                 priv->params.lro_wqe_sz :
@@ -526,17 +557,25 @@ err_destroy_rq:
 
 static void mlx5e_close_rq(struct mlx5e_rq *rq)
 {
+        int tout = 0;
+        int err;
+
         clear_bit(MLX5E_RQ_STATE_POST_WQES_ENABLE, &rq->state);
         napi_synchronize(&rq->channel->napi); /* prevent mlx5e_post_rx_wqes */
 
-        mlx5e_modify_rq_state(rq, MLX5_RQC_STATE_RDY, MLX5_RQC_STATE_ERR);
-        while (!mlx5_wq_ll_is_empty(&rq->wq))
-                msleep(20);
+        err = mlx5e_modify_rq_state(rq, MLX5_RQC_STATE_RDY, MLX5_RQC_STATE_ERR);
+        while (!mlx5_wq_ll_is_empty(&rq->wq) && !err &&
+               tout++ < MLX5_EN_QP_FLUSH_MAX_ITER)
+                msleep(MLX5_EN_QP_FLUSH_MSLEEP_QUANT);
+
+        if (err || tout == MLX5_EN_QP_FLUSH_MAX_ITER)
+                set_bit(MLX5E_RQ_STATE_FLUSH_TIMEOUT, &rq->state);
 
         /* avoid destroying rq before mlx5e_poll_rx_cq() is done with it */
         napi_synchronize(&rq->channel->napi);
 
         mlx5e_disable_rq(rq);
+        mlx5e_free_rx_descs(rq);
         mlx5e_destroy_rq(rq);
 }
 
@@ -580,7 +619,7 @@ static int mlx5e_create_sq(struct mlx5e_channel *c,
         void *sqc_wq = MLX5_ADDR_OF(sqc, sqc, wq);
         int err;
 
-        err = mlx5_alloc_map_uar(mdev, &sq->uar, true);
+        err = mlx5_alloc_map_uar(mdev, &sq->uar, !!MLX5_CAP_GEN(mdev, bf));
         if (err)
                 return err;
 
@@ -783,6 +822,9 @@ static inline void netif_tx_disable_queue(struct netdev_queue *txq)
 
 static void mlx5e_close_sq(struct mlx5e_sq *sq)
 {
+        int tout = 0;
+        int err;
+
         if (sq->txq) {
                 clear_bit(MLX5E_SQ_STATE_WAKE_TXQ_ENABLE, &sq->state);
                 /* prevent netif_tx_wake_queue */
@@ -793,15 +835,24 @@ static void mlx5e_close_sq(struct mlx5e_sq *sq)
                 if (mlx5e_sq_has_room_for(sq, 1))
                         mlx5e_send_nop(sq, true);
 
-                mlx5e_modify_sq(sq, MLX5_SQC_STATE_RDY, MLX5_SQC_STATE_ERR);
+                err = mlx5e_modify_sq(sq, MLX5_SQC_STATE_RDY,
+                                      MLX5_SQC_STATE_ERR);
+                if (err)
+                        set_bit(MLX5E_SQ_STATE_TX_TIMEOUT, &sq->state);
         }
 
-        while (sq->cc != sq->pc) /* wait till sq is empty */
-                msleep(20);
+        /* wait till sq is empty, unless a TX timeout occurred on this SQ */
+        while (sq->cc != sq->pc &&
+               !test_bit(MLX5E_SQ_STATE_TX_TIMEOUT, &sq->state)) {
+                msleep(MLX5_EN_QP_FLUSH_MSLEEP_QUANT);
+                if (tout++ > MLX5_EN_QP_FLUSH_MAX_ITER)
+                        set_bit(MLX5E_SQ_STATE_TX_TIMEOUT, &sq->state);
+        }
 
         /* avoid destroying sq before mlx5e_poll_tx_cq() is done with it */
         napi_synchronize(&sq->channel->napi);
 
+        mlx5e_free_tx_descs(sq);
         mlx5e_disable_sq(sq);
         mlx5e_destroy_sq(sq);
 }
@@ -1297,6 +1348,11 @@ static int mlx5e_open_channels(struct mlx5e_priv *priv)
                         goto err_close_channels;
         }
 
+        /* FIXME: This is a W/A for tx timeout watch dog false alarm when
+         * polling for inactive tx queues.
+         */
+        netif_tx_start_all_queues(priv->netdev);
+
         kfree(cparam);
         return 0;
 
@@ -1316,6 +1372,12 @@ static void mlx5e_close_channels(struct mlx5e_priv *priv)
 {
         int i;
 
+        /* FIXME: This is a W/A only for tx timeout watch dog false alarm when
+         * polling for inactive tx queues.
+         */
+        netif_tx_stop_all_queues(priv->netdev);
+        netif_tx_disable(priv->netdev);
+
         for (i = 0; i < priv->params.num_channels; i++)
                 mlx5e_close_channel(priv->channel[i]);
 
@@ -1659,8 +1721,11 @@ static void mlx5e_netdev_set_tcs(struct net_device *netdev)
 
         netdev_set_num_tc(netdev, ntc);
 
+        /* Map netdev TCs to offset 0
+         * We have our own UP to TXQ mapping for QoS
+         */
         for (tc = 0; tc < ntc; tc++)
-                netdev_set_tc_queue(netdev, tc, nch, tc * nch);
+                netdev_set_tc_queue(netdev, tc, nch, 0);
 }
 
 int mlx5e_open_locked(struct net_device *netdev)
@@ -2591,6 +2656,29 @@ static netdev_features_t mlx5e_features_check(struct sk_buff *skb,
         return features;
 }
 
+static void mlx5e_tx_timeout(struct net_device *dev)
+{
+        struct mlx5e_priv *priv = netdev_priv(dev);
+        bool sched_work = false;
+        int i;
+
+        netdev_err(dev, "TX timeout detected\n");
+
+        for (i = 0; i < priv->params.num_channels * priv->params.num_tc; i++) {
+                struct mlx5e_sq *sq = priv->txq_to_sq_map[i];
+
+                if (!netif_xmit_stopped(netdev_get_tx_queue(dev, i)))
+                        continue;
+                sched_work = true;
+                set_bit(MLX5E_SQ_STATE_TX_TIMEOUT, &sq->state);
+                netdev_err(dev, "TX timeout on queue: %d, SQ: 0x%x, CQ: 0x%x, SQ Cons: 0x%x SQ Prod: 0x%x\n",
+                           i, sq->sqn, sq->cq.mcq.cqn, sq->cc, sq->pc);
+        }
+
+        if (sched_work && test_bit(MLX5E_STATE_OPENED, &priv->state))
+                schedule_work(&priv->tx_timeout_work);
+}
+
 static const struct net_device_ops mlx5e_netdev_ops_basic = {
         .ndo_open                = mlx5e_open,
         .ndo_stop                = mlx5e_close,
@@ -2608,6 +2696,7 @@ static const struct net_device_ops mlx5e_netdev_ops_basic = {
 #ifdef CONFIG_RFS_ACCEL
         .ndo_rx_flow_steer       = mlx5e_rx_flow_steer,
 #endif
+        .ndo_tx_timeout          = mlx5e_tx_timeout,
 };
 
 static const struct net_device_ops mlx5e_netdev_ops_sriov = {
@@ -2637,6 +2726,7 @@ static const struct net_device_ops mlx5e_netdev_ops_sriov = {
         .ndo_get_vf_config       = mlx5e_get_vf_config,
         .ndo_set_vf_link_state   = mlx5e_set_vf_link_state,
         .ndo_get_vf_stats        = mlx5e_get_vf_stats,
+        .ndo_tx_timeout          = mlx5e_tx_timeout,
 };
 
 static int mlx5e_check_required_hca_cap(struct mlx5_core_dev *mdev)
@@ -2839,6 +2929,7 @@ static void mlx5e_build_netdev_priv(struct mlx5_core_dev *mdev,
 
         INIT_WORK(&priv->update_carrier_work, mlx5e_update_carrier_work);
         INIT_WORK(&priv->set_rx_mode_work, mlx5e_set_rx_mode_work);
+        INIT_WORK(&priv->tx_timeout_work, mlx5e_tx_timeout_work);
         INIT_DELAYED_WORK(&priv->update_stats_work, mlx5e_update_stats_work);
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index bd947704b59c..9f2a16a507e0 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -212,6 +212,20 @@ err_free_skb:
         return -ENOMEM;
 }
 
+void mlx5e_dealloc_rx_wqe(struct mlx5e_rq *rq, u16 ix)
+{
+        struct sk_buff *skb = rq->skb[ix];
+
+        if (skb) {
+                rq->skb[ix] = NULL;
+                dma_unmap_single(rq->pdev,
+                                 *((dma_addr_t *)skb->cb),
+                                 rq->wqe_sz,
+                                 DMA_FROM_DEVICE);
+                dev_kfree_skb(skb);
+        }
+}
+
 static inline int mlx5e_mpwqe_strides_per_page(struct mlx5e_rq *rq)
 {
         return rq->mpwqe_num_strides >> MLX5_MPWRQ_WQE_PAGE_ORDER;
@@ -574,6 +588,30 @@ int mlx5e_alloc_rx_mpwqe(struct mlx5e_rq *rq, struct mlx5e_rx_wqe *wqe, u16 ix)
         return 0;
 }
 
+void mlx5e_dealloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix)
+{
+        struct mlx5e_mpw_info *wi = &rq->wqe_info[ix];
+
+        wi->free_wqe(rq, wi);
+}
+
+void mlx5e_free_rx_descs(struct mlx5e_rq *rq)
+{
+        struct mlx5_wq_ll *wq = &rq->wq;
+        struct mlx5e_rx_wqe *wqe;
+        __be16 wqe_ix_be;
+        u16 wqe_ix;
+
+        while (!mlx5_wq_ll_is_empty(wq)) {
+                wqe_ix_be = *wq->tail_next;
+                wqe_ix    = be16_to_cpu(wqe_ix_be);
+                wqe       = mlx5_wq_ll_get_wqe(&rq->wq, wqe_ix);
+                rq->dealloc_wqe(rq, wqe_ix);
+                mlx5_wq_ll_pop(&rq->wq, wqe_ix_be,
+                               &wqe->next.next_wqe_index);
+        }
+}
+
 #define RQ_CANNOT_POST(rq) \
                 (!test_bit(MLX5E_RQ_STATE_POST_WQES_ENABLE, &rq->state) || \
                  test_bit(MLX5E_RQ_STATE_UMR_WQE_IN_PROGRESS, &rq->state))
@@ -689,7 +727,7 @@ static inline void mlx5e_handle_csum(struct net_device *netdev,
         if (is_first_ethertype_ip(skb)) {
                 skb->ip_summed = CHECKSUM_COMPLETE;
                 skb->csum = csum_unfold((__force __sum16)cqe->check_sum);
-                rq->stats.csum_sw++;
+                rq->stats.csum_complete++;
                 return;
         }
 
@@ -699,7 +737,7 @@ static inline void mlx5e_handle_csum(struct net_device *netdev,
                 if (cqe_is_tunneled(cqe)) {
                         skb->csum_level = 1;
                         skb->encapsulation = 1;
-                        rq->stats.csum_inner++;
+                        rq->stats.csum_unnecessary_inner++;
                 }
                 return;
         }
@@ -878,6 +916,9 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget)
         struct mlx5e_rq *rq = container_of(cq, struct mlx5e_rq, cq);
         int work_done = 0;
 
+        if (unlikely(test_bit(MLX5E_RQ_STATE_FLUSH_TIMEOUT, &rq->state)))
+                return 0;
+
         if (cq->decmprs_left)
                 work_done += mlx5e_decompress_cqes_cont(rq, cq, 0, budget);
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
index 83bc32b25849..fcd490cc5610 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
@@ -42,9 +42,11 @@
         be64_to_cpu(*(__be32 *)((char *)ptr + dsc[i].offset))
 
 #define MLX5E_DECLARE_STAT(type, fld) #fld, offsetof(type, fld)
+#define MLX5E_DECLARE_RX_STAT(type, fld) "rx%d_"#fld, offsetof(type, fld)
+#define MLX5E_DECLARE_TX_STAT(type, fld) "tx%d_"#fld, offsetof(type, fld)
 
 struct counter_desc {
-        char            name[ETH_GSTRING_LEN];
+        char            format[ETH_GSTRING_LEN];
         int             offset; /* Byte offset */
 };
 
@@ -53,18 +55,18 @@ struct mlx5e_sw_stats {
         u64 rx_bytes;
         u64 tx_packets;
         u64 tx_bytes;
-        u64 tso_packets;
-        u64 tso_bytes;
-        u64 tso_inner_packets;
-        u64 tso_inner_bytes;
-        u64 lro_packets;
-        u64 lro_bytes;
-        u64 rx_csum_good;
+        u64 tx_tso_packets;
+        u64 tx_tso_bytes;
+        u64 tx_tso_inner_packets;
+        u64 tx_tso_inner_bytes;
+        u64 rx_lro_packets;
+        u64 rx_lro_bytes;
+        u64 rx_csum_unnecessary;
         u64 rx_csum_none;
-        u64 rx_csum_sw;
-        u64 rx_csum_inner;
-        u64 tx_csum_offload;
-        u64 tx_csum_inner;
+        u64 rx_csum_complete;
+        u64 rx_csum_unnecessary_inner;
+        u64 tx_csum_partial;
+        u64 tx_csum_partial_inner;
         u64 tx_queue_stopped;
         u64 tx_queue_wake;
         u64 tx_queue_dropped;
@@ -76,7 +78,7 @@ struct mlx5e_sw_stats {
         u64 rx_cqe_compress_pkts;
 
         /* Special handling counters */
-        u64 link_down_events;
+        u64 link_down_events_phy;
 };
 
 static const struct counter_desc sw_stats_desc[] = {
@@ -84,18 +86,18 @@ static const struct counter_desc sw_stats_desc[] = {
         { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_bytes) },
         { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_packets) },
         { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_bytes) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tso_packets) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tso_bytes) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tso_inner_packets) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tso_inner_bytes) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, lro_packets) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, lro_bytes) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_good) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_tso_packets) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_tso_bytes) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_tso_inner_packets) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_tso_inner_bytes) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_lro_packets) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_lro_bytes) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_unnecessary) },
         { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_none) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_sw) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_inner) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_csum_offload) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_csum_inner) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_complete) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_csum_unnecessary_inner) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_csum_partial) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_csum_partial_inner) },
         { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_queue_stopped) },
         { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_queue_wake) },
         { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, tx_queue_dropped) },
@@ -105,7 +107,7 @@ static const struct counter_desc sw_stats_desc[] = {
         { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_buff_alloc_err) },
         { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_cqe_compress_blks) },
         { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_cqe_compress_pkts) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, link_down_events) },
+        { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, link_down_events_phy) },
 };
 
 struct mlx5e_qcounter_stats {
@@ -125,12 +127,6 @@ struct mlx5e_vport_stats {
 };
 
 static const struct counter_desc vport_stats_desc[] = {
-        { "rx_vport_error_packets",
-                VPORT_COUNTER_OFF(received_errors.packets) },
-        { "rx_vport_error_bytes", VPORT_COUNTER_OFF(received_errors.octets) },
-        { "tx_vport_error_packets",
-                VPORT_COUNTER_OFF(transmit_errors.packets) },
-        { "tx_vport_error_bytes", VPORT_COUNTER_OFF(transmit_errors.octets) },
         { "rx_vport_unicast_packets",
                 VPORT_COUNTER_OFF(received_eth_unicast.packets) },
         { "rx_vport_unicast_bytes",
@@ -192,94 +188,68 @@ struct mlx5e_pport_stats {
 };
 
 static const struct counter_desc pport_802_3_stats_desc[] = {
-        { "frames_tx", PPORT_802_3_OFF(a_frames_transmitted_ok) },
-        { "frames_rx", PPORT_802_3_OFF(a_frames_received_ok) },
-        { "check_seq_err", PPORT_802_3_OFF(a_frame_check_sequence_errors) },
-        { "alignment_err", PPORT_802_3_OFF(a_alignment_errors) },
-        { "octets_tx", PPORT_802_3_OFF(a_octets_transmitted_ok) },
-        { "octets_received", PPORT_802_3_OFF(a_octets_received_ok) },
-        { "multicast_xmitted", PPORT_802_3_OFF(a_multicast_frames_xmitted_ok) },
-        { "broadcast_xmitted", PPORT_802_3_OFF(a_broadcast_frames_xmitted_ok) },
-        { "multicast_rx", PPORT_802_3_OFF(a_multicast_frames_received_ok) },
-        { "broadcast_rx", PPORT_802_3_OFF(a_broadcast_frames_received_ok) },
-        { "in_range_len_errors", PPORT_802_3_OFF(a_in_range_length_errors) },
-        { "out_of_range_len", PPORT_802_3_OFF(a_out_of_range_length_field) },
-        { "too_long_errors", PPORT_802_3_OFF(a_frame_too_long_errors) },
-        { "symbol_err", PPORT_802_3_OFF(a_symbol_error_during_carrier) },
-        { "mac_control_tx", PPORT_802_3_OFF(a_mac_control_frames_transmitted) },
-        { "mac_control_rx", PPORT_802_3_OFF(a_mac_control_frames_received) },
-        { "unsupported_op_rx",
-                PPORT_802_3_OFF(a_unsupported_opcodes_received) },
-        { "pause_ctrl_rx", PPORT_802_3_OFF(a_pause_mac_ctrl_frames_received) },
-        { "pause_ctrl_tx",
-                PPORT_802_3_OFF(a_pause_mac_ctrl_frames_transmitted) },
+        { "tx_packets_phy", PPORT_802_3_OFF(a_frames_transmitted_ok) },
+        { "rx_packets_phy", PPORT_802_3_OFF(a_frames_received_ok) },
+        { "rx_crc_errors_phy", PPORT_802_3_OFF(a_frame_check_sequence_errors) },
+        { "tx_bytes_phy", PPORT_802_3_OFF(a_octets_transmitted_ok) },
+        { "rx_bytes_phy", PPORT_802_3_OFF(a_octets_received_ok) },
+        { "tx_multicast_phy", PPORT_802_3_OFF(a_multicast_frames_xmitted_ok) },
+        { "tx_broadcast_phy", PPORT_802_3_OFF(a_broadcast_frames_xmitted_ok) },
+        { "rx_multicast_phy", PPORT_802_3_OFF(a_multicast_frames_received_ok) },
+        { "rx_broadcast_phy", PPORT_802_3_OFF(a_broadcast_frames_received_ok) },
+        { "rx_in_range_len_errors_phy", PPORT_802_3_OFF(a_in_range_length_errors) },
+        { "rx_out_of_range_len_phy", PPORT_802_3_OFF(a_out_of_range_length_field) },
+        { "rx_oversize_pkts_phy", PPORT_802_3_OFF(a_frame_too_long_errors) },
+        { "rx_symbol_err_phy", PPORT_802_3_OFF(a_symbol_error_during_carrier) },
+        { "tx_mac_control_phy", PPORT_802_3_OFF(a_mac_control_frames_transmitted) },
+        { "rx_mac_control_phy", PPORT_802_3_OFF(a_mac_control_frames_received) },
+        { "rx_unsupported_op_phy", PPORT_802_3_OFF(a_unsupported_opcodes_received) },
+        { "rx_pause_ctrl_phy", PPORT_802_3_OFF(a_pause_mac_ctrl_frames_received) },
+        { "tx_pause_ctrl_phy", PPORT_802_3_OFF(a_pause_mac_ctrl_frames_transmitted) },
 };
 
 static const struct counter_desc pport_2863_stats_desc[] = {
-        { "in_octets", PPORT_2863_OFF(if_in_octets) },
-        { "in_ucast_pkts", PPORT_2863_OFF(if_in_ucast_pkts) },
-        { "in_discards", PPORT_2863_OFF(if_in_discards) },
-        { "in_errors", PPORT_2863_OFF(if_in_errors) },
-        { "in_unknown_protos", PPORT_2863_OFF(if_in_unknown_protos) },
-        { "out_octets", PPORT_2863_OFF(if_out_octets) },
-        { "out_ucast_pkts", PPORT_2863_OFF(if_out_ucast_pkts) },
-        { "out_discards", PPORT_2863_OFF(if_out_discards) },
-        { "out_errors", PPORT_2863_OFF(if_out_errors) },
-        { "in_multicast_pkts", PPORT_2863_OFF(if_in_multicast_pkts) },
-        { "in_broadcast_pkts", PPORT_2863_OFF(if_in_broadcast_pkts) },
-        { "out_multicast_pkts", PPORT_2863_OFF(if_out_multicast_pkts) },
-        { "out_broadcast_pkts", PPORT_2863_OFF(if_out_broadcast_pkts) },
+        { "rx_discards_phy", PPORT_2863_OFF(if_in_discards) },
+        { "tx_discards_phy", PPORT_2863_OFF(if_out_discards) },
+        { "tx_errors_phy", PPORT_2863_OFF(if_out_errors) },
 };
 
 static const struct counter_desc pport_2819_stats_desc[] = {
-        { "drop_events", PPORT_2819_OFF(ether_stats_drop_events) },
-        { "octets", PPORT_2819_OFF(ether_stats_octets) },
-        { "pkts", PPORT_2819_OFF(ether_stats_pkts) },
-        { "broadcast_pkts", PPORT_2819_OFF(ether_stats_broadcast_pkts) },
-        { "multicast_pkts", PPORT_2819_OFF(ether_stats_multicast_pkts) },
-        { "crc_align_errors", PPORT_2819_OFF(ether_stats_crc_align_errors) },
-        { "undersize_pkts", PPORT_2819_OFF(ether_stats_undersize_pkts) },
-        { "oversize_pkts", PPORT_2819_OFF(ether_stats_oversize_pkts) },
-        { "fragments", PPORT_2819_OFF(ether_stats_fragments) },
-        { "jabbers", PPORT_2819_OFF(ether_stats_jabbers) },
-        { "collisions", PPORT_2819_OFF(ether_stats_collisions) },
-        { "p64octets", PPORT_2819_OFF(ether_stats_pkts64octets) },
-        { "p65to127octets", PPORT_2819_OFF(ether_stats_pkts65to127octets) },
-        { "p128to255octets", PPORT_2819_OFF(ether_stats_pkts128to255octets) },
-        { "p256to511octets", PPORT_2819_OFF(ether_stats_pkts256to511octets) },
-        { "p512to1023octets", PPORT_2819_OFF(ether_stats_pkts512to1023octets) },
-        { "p1024to1518octets",
-                PPORT_2819_OFF(ether_stats_pkts1024to1518octets) },
-        { "p1519to2047octets",
-                PPORT_2819_OFF(ether_stats_pkts1519to2047octets) },
-        { "p2048to4095octets",
-                PPORT_2819_OFF(ether_stats_pkts2048to4095octets) },
-        { "p4096to8191octets",
-                PPORT_2819_OFF(ether_stats_pkts4096to8191octets) },
-        { "p8192to10239octets",
-                PPORT_2819_OFF(ether_stats_pkts8192to10239octets) },
+        { "rx_undersize_pkts_phy", PPORT_2819_OFF(ether_stats_undersize_pkts) },
+        { "rx_fragments_phy", PPORT_2819_OFF(ether_stats_fragments) },
+        { "rx_jabbers_phy", PPORT_2819_OFF(ether_stats_jabbers) },
+        { "rx_64_bytes_phy", PPORT_2819_OFF(ether_stats_pkts64octets) },
+        { "rx_65_to_127_bytes_phy", PPORT_2819_OFF(ether_stats_pkts65to127octets) },
+        { "rx_128_to_255_bytes_phy", PPORT_2819_OFF(ether_stats_pkts128to255octets) },
+        { "rx_256_to_511_bytes_phy", PPORT_2819_OFF(ether_stats_pkts256to511octets) },
+        { "rx_512_to_1023_bytes_phy", PPORT_2819_OFF(ether_stats_pkts512to1023octets) },
+        { "rx_1024_to_1518_bytes_phy", PPORT_2819_OFF(ether_stats_pkts1024to1518octets) },
+        { "rx_1519_to_2047_bytes_phy", PPORT_2819_OFF(ether_stats_pkts1519to2047octets) },
+        { "rx_2048_to_4095_bytes_phy", PPORT_2819_OFF(ether_stats_pkts2048to4095octets) },
+        { "rx_4096_to_8191_bytes_phy", PPORT_2819_OFF(ether_stats_pkts4096to8191octets) },
+        { "rx_8192_to_10239_bytes_phy", PPORT_2819_OFF(ether_stats_pkts8192to10239octets) },
 };
 
 static const struct counter_desc pport_per_prio_traffic_stats_desc[] = {
-        { "rx_octets", PPORT_PER_PRIO_OFF(rx_octets) },
-        { "rx_frames", PPORT_PER_PRIO_OFF(rx_frames) },
-        { "tx_octets", PPORT_PER_PRIO_OFF(tx_octets) },
-        { "tx_frames", PPORT_PER_PRIO_OFF(tx_frames) },
+        { "rx_prio%d_bytes", PPORT_PER_PRIO_OFF(rx_octets) },
+        { "rx_prio%d_packets", PPORT_PER_PRIO_OFF(rx_frames) },
+        { "tx_prio%d_bytes", PPORT_PER_PRIO_OFF(tx_octets) },
+        { "tx_prio%d_packets", PPORT_PER_PRIO_OFF(tx_frames) },
 };
 
 static const struct counter_desc pport_per_prio_pfc_stats_desc[] = {
-        { "rx_pause", PPORT_PER_PRIO_OFF(rx_pause) },
-        { "rx_pause_duration", PPORT_PER_PRIO_OFF(rx_pause_duration) },
-        { "tx_pause", PPORT_PER_PRIO_OFF(tx_pause) },
-        { "tx_pause_duration", PPORT_PER_PRIO_OFF(tx_pause_duration) },
-        { "rx_pause_transition", PPORT_PER_PRIO_OFF(rx_pause_transition) },
+        { "rx_prio%d_pause", PPORT_PER_PRIO_OFF(rx_pause) },
+        { "rx_prio%d_pause_duration", PPORT_PER_PRIO_OFF(rx_pause_duration) },
+        { "tx_prio%d_pause", PPORT_PER_PRIO_OFF(tx_pause) },
+        { "tx_prio%d_pause_duration", PPORT_PER_PRIO_OFF(tx_pause_duration) },
+        { "rx_prio%d_pause_transition", PPORT_PER_PRIO_OFF(rx_pause_transition) },
 };
 
 struct mlx5e_rq_stats {
         u64 packets;
         u64 bytes;
-        u64 csum_sw;
-        u64 csum_inner;
+        u64 csum_complete;
+        u64 csum_unnecessary_inner;
         u64 csum_none;
         u64 lro_packets;
         u64 lro_bytes;
@@ -292,19 +262,19 @@ struct mlx5e_rq_stats {
 };
 
 static const struct counter_desc rq_stats_desc[] = {
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, packets) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, bytes) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, csum_sw) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, csum_inner) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, csum_none) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, lro_packets) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, lro_bytes) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, wqe_err) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, mpwqe_filler) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, mpwqe_frag) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, buff_alloc_err) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, cqe_compress_blks) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_rq_stats, cqe_compress_pkts) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, packets) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, bytes) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_complete) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_unnecessary_inner) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_none) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, lro_packets) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, lro_bytes) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, wqe_err) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, mpwqe_filler) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, mpwqe_frag) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, buff_alloc_err) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cqe_compress_blks) },
+        { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cqe_compress_pkts) },
 };
 
 struct mlx5e_sq_stats {
@@ -315,28 +285,28 @@ struct mlx5e_sq_stats {
         u64 tso_bytes;
         u64 tso_inner_packets;
         u64 tso_inner_bytes;
-        u64 csum_offload_inner;
+        u64 csum_partial_inner;
         u64 nop;
         /* less likely accessed in data path */
-        u64 csum_offload_none;
+        u64 csum_none;
         u64 stopped;
         u64 wake;
         u64 dropped;
 };
 
 static const struct counter_desc sq_stats_desc[] = {
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, packets) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, bytes) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, tso_packets) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, tso_bytes) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, tso_inner_packets) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, tso_inner_bytes) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, csum_offload_inner) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, nop) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, csum_offload_none) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, stopped) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, wake) },
-        { MLX5E_DECLARE_STAT(struct mlx5e_sq_stats, dropped) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, packets) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, bytes) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_packets) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_bytes) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_inner_packets) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_inner_bytes) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, csum_partial_inner) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, nop) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, csum_none) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, stopped) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, wake) },
+        { MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, dropped) },
 };
 
 #define NUM_SW_COUNTERS                 ARRAY_SIZE(sw_stats_desc)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
index b000ddc29553..5740b465ef84 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
@@ -110,8 +110,20 @@ u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb,
 {
         struct mlx5e_priv *priv = netdev_priv(dev);
         int channel_ix = fallback(dev, skb);
-        int up = (netdev_get_num_tc(dev) && skb_vlan_tag_present(skb)) ?
-                 skb->vlan_tci >> VLAN_PRIO_SHIFT : 0;
+        int up = 0;
+
+        if (!netdev_get_num_tc(dev))
+                return channel_ix;
+
+        if (skb_vlan_tag_present(skb))
+                up = skb->vlan_tci >> VLAN_PRIO_SHIFT;
+
+        /* channel_ix can be larger than num_channels since
+         * dev->num_real_tx_queues = num_channels * num_tc
+         */
+        if (channel_ix >= priv->params.num_channels)
+                channel_ix = reciprocal_scale(channel_ix,
+                                              priv->params.num_channels);
 
         return priv->channeltc_to_txq_map[channel_ix][up];
 }
@@ -123,7 +135,7 @@ static inline u16 mlx5e_get_inline_hdr_size(struct mlx5e_sq *sq,
          * headers and occur before the data gather.
          * Therefore these headers must be copied into the WQE
          */
-#define MLX5E_MIN_INLINE ETH_HLEN
+#define MLX5E_MIN_INLINE (ETH_HLEN + VLAN_HLEN)
 
         if (bf) {
                 u16 ihs = skb_headlen(skb);
@@ -135,7 +147,7 @@ static inline u16 mlx5e_get_inline_hdr_size(struct mlx5e_sq *sq,
                         return skb_headlen(skb);
         }
 
-        return MLX5E_MIN_INLINE;
+        return max(skb_network_offset(skb), MLX5E_MIN_INLINE);
 }
 
 static inline void mlx5e_tx_skb_pull_inline(unsigned char **skb_data,
@@ -192,12 +204,12 @@ static netdev_tx_t mlx5e_sq_xmit(struct mlx5e_sq *sq, struct sk_buff *skb)
                 if (skb->encapsulation) {
                         eseg->cs_flags |= MLX5_ETH_WQE_L3_INNER_CSUM |
                                           MLX5_ETH_WQE_L4_INNER_CSUM;
-                        sq->stats.csum_offload_inner++;
+                        sq->stats.csum_partial_inner++;
                 } else {
                         eseg->cs_flags |= MLX5_ETH_WQE_L4_CSUM;
                 }
         } else
-                sq->stats.csum_offload_none++;
+                sq->stats.csum_none++;
 
         if (sq->cc != sq->prev_cc) {
                 sq->prev_cc = sq->cc;
@@ -341,6 +353,35 @@ netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev)
         return mlx5e_sq_xmit(sq, skb);
 }
 
+void mlx5e_free_tx_descs(struct mlx5e_sq *sq)
+{
+        struct mlx5e_tx_wqe_info *wi;
+        struct sk_buff *skb;
+        u16 ci;
+        int i;
+
+        while (sq->cc != sq->pc) {
+                ci = sq->cc & sq->wq.sz_m1;
+                skb = sq->skb[ci];
+                wi = &sq->wqe_info[ci];
+
+                if (!skb) { /* nop */
+                        sq->cc++;
+                        continue;
+                }
+
+                for (i = 0; i < wi->num_dma; i++) {
+                        struct mlx5e_sq_dma *dma =
+                                mlx5e_dma_get(sq, sq->dma_fifo_cc++);
+
+                        mlx5e_tx_dma_unmap(sq->pdev, dma);
+                }
+
+                dev_kfree_skb_any(skb);
+                sq->cc += wi->num_wqebbs;
+        }
+}
+
 bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget)
 {
         struct mlx5e_sq *sq;
@@ -352,6 +393,9 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget)
 
         sq = container_of(cq, struct mlx5e_sq, cq);
 
+        if (unlikely(test_bit(MLX5E_SQ_STATE_TX_TIMEOUT, &sq->state)))
+                return false;
+
         npkts = 0;
         nbytes = 0;
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c
index 42d16b9458e4..96a59463ae65 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/health.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c
@@ -108,15 +108,21 @@ static int in_fatal(struct mlx5_core_dev *dev)
 
 void mlx5_enter_error_state(struct mlx5_core_dev *dev)
 {
+        mutex_lock(&dev->intf_state_mutex);
         if (dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR)
-                return;
+                goto unlock;
 
         mlx5_core_err(dev, "start\n");
-        if (pci_channel_offline(dev->pdev) || in_fatal(dev))
+        if (pci_channel_offline(dev->pdev) || in_fatal(dev)) {
                 dev->state = MLX5_DEVICE_STATE_INTERNAL_ERROR;
+                trigger_cmd_completions(dev);
+        }
 
         mlx5_core_event(dev, MLX5_DEV_EVENT_SYS_ERROR, 0);
         mlx5_core_err(dev, "end\n");
+
+unlock:
+        mutex_unlock(&dev->intf_state_mutex);
 }
 
 static void mlx5_handle_bad_state(struct mlx5_core_dev *dev)
@@ -245,7 +251,6 @@ static void poll_health(unsigned long data)
         u32 count;
 
         if (dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR) {
-                trigger_cmd_completions(dev);
                 mod_timer(&health->timer, get_next_poll_jiffies());
                 return;
         }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index a19b59348dd6..6695893ddd2d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -1422,46 +1422,31 @@ void mlx5_disable_device(struct mlx5_core_dev *dev)
         mlx5_pci_err_detected(dev->pdev, 0);
 }
 
-/* wait for the device to show vital signs. For now we check
- * that we can read the device ID and that the health buffer
- * shows a non zero value which is different than 0xffffffff
+/* wait for the device to show vital signs by waiting
+ * for the health counter to start counting.
  */
-static void wait_vital(struct pci_dev *pdev)
+static int wait_vital(struct pci_dev *pdev)
 {
         struct mlx5_core_dev *dev = pci_get_drvdata(pdev);
         struct mlx5_core_health *health = &dev->priv.health;
         const int niter = 100;
+        u32 last_count = 0;
         u32 count;
-        u16 did;
         int i;
 
-        /* Wait for firmware to be ready after reset */
-        msleep(1000);
-        for (i = 0; i < niter; i++) {
-                if (pci_read_config_word(pdev, 2, &did)) {
-                        dev_warn(&pdev->dev, "failed reading config word\n");
-                        break;
-                }
-                if (did == pdev->device) {
-                        dev_info(&pdev->dev, "device ID correctly read after %d iterations\n", i);
-                        break;
-                }
-                msleep(50);
-        }
-        if (i == niter)
-                dev_warn(&pdev->dev, "%s-%d: could not read device ID\n", __func__, __LINE__);
-
         for (i = 0; i < niter; i++) {
                 count = ioread32be(health->health_counter);
                 if (count && count != 0xffffffff) {
-                        dev_info(&pdev->dev, "Counter value 0x%x after %d iterations\n", count, i);
-                        break;
+                        if (last_count && last_count != count) {
+                                dev_info(&pdev->dev, "Counter value 0x%x after %d iterations\n", count, i);
+                                return 0;
+                        }
+                        last_count = count;
                 }
                 msleep(50);
         }
 
-        if (i == niter)
-                dev_warn(&pdev->dev, "%s-%d: could not read device ID\n", __func__, __LINE__);
+        return -ETIMEDOUT;
 }
 
 static void mlx5_pci_resume(struct pci_dev *pdev)
@@ -1473,7 +1458,11 @@ static void mlx5_pci_resume(struct pci_dev *pdev)
         dev_info(&pdev->dev, "%s was called\n", __func__);
 
         pci_save_state(pdev);
-        wait_vital(pdev);
+        err = wait_vital(pdev);
+        if (err) {
+                dev_err(&pdev->dev, "%s: wait_vital timed out\n", __func__);
+                return;
+        }
 
         err = mlx5_load_one(dev, priv);
         if (err)
@@ -1508,8 +1497,9 @@ static const struct pci_device_id mlx5_core_pci_table[] = {
         { PCI_VDEVICE(MELLANOX, 0x1014), MLX5_PCI_DEV_IS_VF},   /* ConnectX-4 VF */
         { PCI_VDEVICE(MELLANOX, 0x1015) },                      /* ConnectX-4LX */
         { PCI_VDEVICE(MELLANOX, 0x1016), MLX5_PCI_DEV_IS_VF},   /* ConnectX-4LX VF */
-        { PCI_VDEVICE(MELLANOX, 0x1017) },                      /* ConnectX-5 */
+        { PCI_VDEVICE(MELLANOX, 0x1017) },                      /* ConnectX-5, PCIe 3.0 */
         { PCI_VDEVICE(MELLANOX, 0x1018), MLX5_PCI_DEV_IS_VF},   /* ConnectX-5 VF */
+        { PCI_VDEVICE(MELLANOX, 0x1019) },                      /* ConnectX-5, PCIe 4.0 */
         { 0, }
 };
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
index 9eeee0545f1c..32dea3524cee 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -345,7 +345,6 @@ retry:
                                func_id, npages, err);
                 goto out_4k;
         }
-        dev->priv.fw_pages += npages;
 
         err = mlx5_cmd_status_to_err(&out.hdr);
         if (err) {
@@ -373,6 +372,33 @@ out_free:
         return err;
 }
 
+static int reclaim_pages_cmd(struct mlx5_core_dev *dev,
+                             struct mlx5_manage_pages_inbox *in, int in_size,
+                             struct mlx5_manage_pages_outbox *out, int out_size)
+{
+        struct fw_page *fwp;
+        struct rb_node *p;
+        u32 npages;
+        u32 i = 0;
+
+        if (dev->state != MLX5_DEVICE_STATE_INTERNAL_ERROR)
+                return mlx5_cmd_exec_check_status(dev, (u32 *)in, in_size,
+                                                  (u32 *)out, out_size);
+
+        npages = be32_to_cpu(in->num_entries);
+
+        p = rb_first(&dev->priv.page_root);
+        while (p && i < npages) {
+                fwp = rb_entry(p, struct fw_page, rb_node);
+                out->pas[i] = cpu_to_be64(fwp->addr);
+                p = rb_next(p);
+                i++;
+        }
+
+        out->num_entries = cpu_to_be32(i);
+        return 0;
+}
+
 static int reclaim_pages(struct mlx5_core_dev *dev, u32 func_id, int npages,
                          int *nclaimed)
 {
@@ -398,15 +424,9 @@ static int reclaim_pages(struct mlx5_core_dev *dev, u32 func_id, int npages,
         in.func_id = cpu_to_be16(func_id);
         in.num_entries = cpu_to_be32(npages);
         mlx5_core_dbg(dev, "npages %d, outlen %d\n", npages, outlen);
-        err = mlx5_cmd_exec(dev, &in, sizeof(in), out, outlen);
+        err = reclaim_pages_cmd(dev, &in, sizeof(in), out, outlen);
         if (err) {
-                mlx5_core_err(dev, "failed reclaiming pages\n");
-                goto out_free;
-        }
-        dev->priv.fw_pages -= npages;
-
-        if (out->hdr.status) {
-                err = mlx5_cmd_status_to_err(&out->hdr);
+                mlx5_core_err(dev, "failed reclaiming pages: err %d\n", err);
                 goto out_free;
         }
 
@@ -417,13 +437,15 @@ static int reclaim_pages(struct mlx5_core_dev *dev, u32 func_id, int npages,
                 err = -EINVAL;
                 goto out_free;
         }
-        if (nclaimed)
-                *nclaimed = num_claimed;
 
         for (i = 0; i < num_claimed; i++) {
                 addr = be64_to_cpu(out->pas[i]);
                 free_4k(dev, addr);
         }
+
+        if (nclaimed)
+                *nclaimed = num_claimed;
+
         dev->priv.fw_pages -= num_claimed;
         if (func_id)
                 dev->priv.vfs_pages -= num_claimed;
@@ -514,14 +536,10 @@ int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev)
                 p = rb_first(&dev->priv.page_root);
                 if (p) {
                         fwp = rb_entry(p, struct fw_page, rb_node);
-                        if (dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR) {
-                                free_4k(dev, fwp->addr);
-                                nclaimed = 1;
-                        } else {
-                                err = reclaim_pages(dev, fwp->func_id,
-                                                    optimal_reclaimed_pages(),
-                                                    &nclaimed);
-                        }
+                        err = reclaim_pages(dev, fwp->func_id,
+                                            optimal_reclaimed_pages(),
+                                            &nclaimed);
+
                         if (err) {
                                 mlx5_core_warn(dev, "failed reclaiming pages (%d)\n",
                                                err);
@@ -536,6 +554,13 @@ int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev)
                 }
         } while (p);
 
+        WARN(dev->priv.fw_pages,
+             "FW pages counter is %d after reclaiming all pages\n",
+             dev->priv.fw_pages);
+        WARN(dev->priv.vfs_pages,
+             "VFs FW pages counter is %d after reclaiming all pages\n",
+             dev->priv.vfs_pages);
+
         return 0;
 }
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
index daf44cd4c566..91846dfcbe9c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
@@ -513,7 +513,6 @@ int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,
 {
         int inlen = MLX5_ST_SZ_BYTES(modify_nic_vport_context_in);
         void *nic_vport_context;
-        u8 *guid;
         void *in;
         int err;
 
@@ -535,8 +534,6 @@ int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,
 
         nic_vport_context = MLX5_ADDR_OF(modify_nic_vport_context_in,
                                          in, nic_vport_context);
-        guid = MLX5_ADDR_OF(nic_vport_context, nic_vport_context,
-                            node_guid);
         MLX5_SET64(nic_vport_context, nic_vport_context, node_guid, node_guid);
 
         err = mlx5_modify_nic_vport_context(mdev, in, inlen);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
index f2fd1ef16da7..e25a73ed2981 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
@@ -72,8 +72,8 @@ static int mlx5e_vxlan_core_del_port_cmd(struct mlx5_core_dev *mdev, u16 port)
         u32 in[MLX5_ST_SZ_DW(delete_vxlan_udp_dport_in)];
         u32 out[MLX5_ST_SZ_DW(delete_vxlan_udp_dport_out)];
 
-        memset(&in, 0, sizeof(in));
-        memset(&out, 0, sizeof(out));
+        memset(in, 0, sizeof(in));
+        memset(out, 0, sizeof(out));
 
         MLX5_SET(delete_vxlan_udp_dport_in, in, opcode,
                  MLX5_CMD_OP_DELETE_VXLAN_UDP_DPORT);
@@ -105,6 +105,9 @@ static void mlx5e_vxlan_add_port(struct work_struct *work)
         struct mlx5e_vxlan *vxlan;
         int err;
 
+        if (mlx5e_vxlan_lookup_port(priv, port))
+                goto free_work;
+
         if (mlx5e_vxlan_core_add_port_cmd(priv->mdev, port))
                 goto free_work;
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.c b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
index ce21ee5b2357..821a087c7ae2 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/wq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
@@ -75,14 +75,14 @@ int mlx5_wq_cyc_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
 
         err = mlx5_db_alloc_node(mdev, &wq_ctrl->db, param->db_numa_node);
         if (err) {
-                mlx5_core_warn(mdev, "mlx5_db_alloc() failed, %d\n", err);
+                mlx5_core_warn(mdev, "mlx5_db_alloc_node() failed, %d\n", err);
                 return err;
         }
 
         err = mlx5_buf_alloc_node(mdev, mlx5_wq_cyc_get_byte_size(wq),
                                   &wq_ctrl->buf, param->buf_numa_node);
         if (err) {
-                mlx5_core_warn(mdev, "mlx5_buf_alloc() failed, %d\n", err);
+                mlx5_core_warn(mdev, "mlx5_buf_alloc_node() failed, %d\n", err);
                 goto err_db_free;
         }
 
@@ -111,14 +111,14 @@ int mlx5_cqwq_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
 
         err = mlx5_db_alloc_node(mdev, &wq_ctrl->db, param->db_numa_node);
         if (err) {
-                mlx5_core_warn(mdev, "mlx5_db_alloc() failed, %d\n", err);
+                mlx5_core_warn(mdev, "mlx5_db_alloc_node() failed, %d\n", err);
                 return err;
         }
 
         err = mlx5_buf_alloc_node(mdev, mlx5_cqwq_get_byte_size(wq),
                                   &wq_ctrl->buf, param->buf_numa_node);
         if (err) {
-                mlx5_core_warn(mdev, "mlx5_buf_alloc() failed, %d\n", err);
+                mlx5_core_warn(mdev, "mlx5_buf_alloc_node() failed, %d\n", err);
                 goto err_db_free;
         }
 
@@ -148,13 +148,14 @@ int mlx5_wq_ll_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
 
         err = mlx5_db_alloc_node(mdev, &wq_ctrl->db, param->db_numa_node);
         if (err) {
-                mlx5_core_warn(mdev, "mlx5_db_alloc() failed, %d\n", err);
+                mlx5_core_warn(mdev, "mlx5_db_alloc_node() failed, %d\n", err);
                 return err;
         }
 
-        err = mlx5_buf_alloc(mdev, mlx5_wq_ll_get_byte_size(wq), &wq_ctrl->buf);
+        err = mlx5_buf_alloc_node(mdev, mlx5_wq_ll_get_byte_size(wq),
+                                  &wq_ctrl->buf, param->buf_numa_node);
         if (err) {
-                mlx5_core_warn(mdev, "mlx5_buf_alloc() failed, %d\n", err);
+                mlx5_core_warn(mdev, "mlx5_buf_alloc_node() failed, %d\n", err);
                 goto err_db_free;
         }
 
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index 1977e7a5c530..57d48da709fb 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -2718,7 +2718,7 @@ static inline void mlxsw_reg_ppcnt_pack(char *payload, u8 local_port,
  * Configures the switch priority to buffer table.
  */
 #define MLXSW_REG_PPTB_ID 0x500B
-#define MLXSW_REG_PPTB_LEN 0x0C
+#define MLXSW_REG_PPTB_LEN 0x10
 
 static const struct mlxsw_reg_info mlxsw_reg_pptb = {
         .id = MLXSW_REG_PPTB_ID,
@@ -2784,6 +2784,13 @@ MLXSW_ITEM32(reg, pptb, pm_msb, 0x08, 24, 8);
  */
 MLXSW_ITEM32(reg, pptb, untagged_buff, 0x08, 0, 4);
 
+/* reg_pptb_prio_to_buff_msb
+ * Mapping of switch priority <i+8> to one of the allocated receive port
+ * buffers.
+ * Access: RW
+ */
+MLXSW_ITEM_BIT_ARRAY(reg, pptb, prio_to_buff_msb, 0x0C, 0x04, 4);
+
 #define MLXSW_REG_PPTB_ALL_PRIO 0xFF
 
 static inline void mlxsw_reg_pptb_pack(char *payload, u8 local_port)
@@ -2792,6 +2799,14 @@ static inline void mlxsw_reg_pptb_pack(char *payload, u8 local_port)
         mlxsw_reg_pptb_mm_set(payload, MLXSW_REG_PPTB_MM_UM);
         mlxsw_reg_pptb_local_port_set(payload, local_port);
         mlxsw_reg_pptb_pm_set(payload, MLXSW_REG_PPTB_ALL_PRIO);
+        mlxsw_reg_pptb_pm_msb_set(payload, MLXSW_REG_PPTB_ALL_PRIO);
+}
+
+static inline void mlxsw_reg_pptb_prio_to_buff_pack(char *payload, u8 prio,
+                                                    u8 buff)
+{
+        mlxsw_reg_pptb_prio_to_buff_set(payload, prio, buff);
+        mlxsw_reg_pptb_prio_to_buff_msb_set(payload, prio, buff);
 }
 
 /* PBMC - Port Buffer Management Control Register
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 6f9e3ddff4a8..374080027b2f 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -171,23 +171,6 @@ static int mlxsw_sp_port_admin_status_set(struct mlxsw_sp_port *mlxsw_sp_port,
         return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(paos), paos_pl);
 }
 
-static int mlxsw_sp_port_oper_status_get(struct mlxsw_sp_port *mlxsw_sp_port,
-                                         bool *p_is_up)
-{
-        struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
-        char paos_pl[MLXSW_REG_PAOS_LEN];
-        u8 oper_status;
-        int err;
-
-        mlxsw_reg_paos_pack(paos_pl, mlxsw_sp_port->local_port, 0);
-        err = mlxsw_reg_query(mlxsw_sp->core, MLXSW_REG(paos), paos_pl);
-        if (err)
-                return err;
-        oper_status = mlxsw_reg_paos_oper_status_get(paos_pl);
-        *p_is_up = oper_status == MLXSW_PORT_ADMIN_STATUS_UP ? true : false;
-        return 0;
-}
-
 static int mlxsw_sp_port_dev_addr_set(struct mlxsw_sp_port *mlxsw_sp_port,
                                       unsigned char *addr)
 {
@@ -408,7 +391,11 @@ static netdev_tx_t mlxsw_sp_port_xmit(struct sk_buff *skb,
         }
 
         mlxsw_sp_txhdr_construct(skb, &tx_info);
-        len = skb->len;
+        /* TX header is consumed by HW on the way so we shouldn't count its
+         * bytes as being sent.
+         */
+        len = skb->len - MLXSW_TXHDR_LEN;
+
         /* Due to a race we might fail here because of a full queue. In that
          * unlikely case we simply drop the packet.
          */
@@ -1430,7 +1417,8 @@ static int mlxsw_sp_port_get_settings(struct net_device *dev,
 
         cmd->supported = mlxsw_sp_from_ptys_supported_port(eth_proto_cap) |
                          mlxsw_sp_from_ptys_supported_link(eth_proto_cap) |
-                         SUPPORTED_Pause | SUPPORTED_Asym_Pause;
+                         SUPPORTED_Pause | SUPPORTED_Asym_Pause |
+                         SUPPORTED_Autoneg;
         cmd->advertising = mlxsw_sp_from_ptys_advert_link(eth_proto_admin);
         mlxsw_sp_from_ptys_speed_duplex(netif_carrier_ok(dev),
                                         eth_proto_oper, cmd);
@@ -1489,7 +1477,6 @@ static int mlxsw_sp_port_set_settings(struct net_device *dev,
         u32 eth_proto_new;
         u32 eth_proto_cap;
         u32 eth_proto_admin;
-        bool is_up;
         int err;
 
         speed = ethtool_cmd_speed(cmd);
@@ -1521,12 +1508,7 @@ static int mlxsw_sp_port_set_settings(struct net_device *dev,
                 return err;
         }
 
-        err = mlxsw_sp_port_oper_status_get(mlxsw_sp_port, &is_up);
-        if (err) {
-                netdev_err(dev, "Failed to get oper status");
-                return err;
-        }
-        if (!is_up)
+        if (!netif_running(dev))
                 return 0;
 
         err = mlxsw_sp_port_admin_status_set(mlxsw_sp_port, false);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
index a3720a0fad7d..074cdda7b6f3 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
@@ -194,7 +194,7 @@ static int mlxsw_sp_port_pb_prio_init(struct mlxsw_sp_port *mlxsw_sp_port)
 
         mlxsw_reg_pptb_pack(pptb_pl, mlxsw_sp_port->local_port);
         for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)
-                mlxsw_reg_pptb_prio_to_buff_set(pptb_pl, i, 0);
+                mlxsw_reg_pptb_prio_to_buff_pack(pptb_pl, i, 0);
         return mlxsw_reg_write(mlxsw_sp_port->mlxsw_sp->core, MLXSW_REG(pptb),
                                pptb_pl);
 }
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c
index 0b323661c0b6..01cfb7512827 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c
@@ -103,7 +103,8 @@ static int mlxsw_sp_port_pg_prio_map(struct mlxsw_sp_port *mlxsw_sp_port,
 
         mlxsw_reg_pptb_pack(pptb_pl, mlxsw_sp_port->local_port);
         for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)
-                mlxsw_reg_pptb_prio_to_buff_set(pptb_pl, i, prio_tc[i]);
+                mlxsw_reg_pptb_prio_to_buff_pack(pptb_pl, i, prio_tc[i]);
+
         return mlxsw_reg_write(mlxsw_sp_port->mlxsw_sp->core, MLXSW_REG(pptb),
                                pptb_pl);
 }
@@ -249,6 +250,7 @@ static int mlxsw_sp_dcbnl_ieee_setets(struct net_device *dev,
                 return err;
 
         memcpy(mlxsw_sp_port->dcb.ets, ets, sizeof(*ets));
+        mlxsw_sp_port->dcb.ets->ets_cap = IEEE_8021QAZ_MAX_TCS;
 
         return 0;
 }
@@ -351,7 +353,8 @@ static int mlxsw_sp_dcbnl_ieee_setpfc(struct net_device *dev,
         struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
         int err;
 
-        if (mlxsw_sp_port->link.tx_pause || mlxsw_sp_port->link.rx_pause) {
+        if ((mlxsw_sp_port->link.tx_pause || mlxsw_sp_port->link.rx_pause) &&
+            pfc->pfc_en) {
                 netdev_err(dev, "PAUSE frames already enabled on port\n");
                 return -EINVAL;
         }
@@ -371,6 +374,7 @@ static int mlxsw_sp_dcbnl_ieee_setpfc(struct net_device *dev,
         }
 
         memcpy(mlxsw_sp_port->dcb.pfc, pfc, sizeof(*pfc));
+        mlxsw_sp_port->dcb.pfc->pfc_cap = IEEE_8021QAZ_MAX_TCS;
 
         return 0;
 
diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index 3842eab9449a..25f658b3849a 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
@@ -316,7 +316,10 @@ static netdev_tx_t mlxsw_sx_port_xmit(struct sk_buff *skb,
                 }
         }
         mlxsw_sx_txhdr_construct(skb, &tx_info);
-        len = skb->len;
+        /* TX header is consumed by HW on the way so we shouldn't count its
+         * bytes as being sent.
+         */
+        len = skb->len - MLXSW_TXHDR_LEN;
         /* Due to a race we might fail here because of a full queue. In that
          * unlikely case we simply drop the packet.
          */
diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c
index 7066954c39d6..0a26b11ca8f6 100644
--- a/drivers/net/ethernet/microchip/enc28j60.c
+++ b/drivers/net/ethernet/microchip/enc28j60.c
@@ -1151,7 +1151,8 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
                         enc28j60_phy_read(priv, PHIR);
                 }
                 /* TX complete handler */
-                if ((intflags & EIR_TXIF) != 0) {
+                if (((intflags & EIR_TXIF) != 0) &&
+                    ((intflags & EIR_TXERIF) == 0)) {
                         bool err = false;
                         loop++;
                         if (netif_msg_intr(priv))
@@ -1203,7 +1204,7 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
                                         enc28j60_tx_clear(ndev, true);
                         } else
                                 enc28j60_tx_clear(ndev, true);
-                        locked_reg_bfclr(priv, EIR, EIR_TXERIF);
+                        locked_reg_bfclr(priv, EIR, EIR_TXERIF | EIR_TXIF);
                 }
                 /* RX Error handler */
                 if ((intflags & EIR_RXERIF) != 0) {
@@ -1238,6 +1239,8 @@ static void enc28j60_irq_work_handler(struct work_struct *work)
  */
 static void enc28j60_hw_tx(struct enc28j60_net *priv)
 {
+        BUG_ON(!priv->tx_skb);
+
         if (netif_msg_tx_queued(priv))
                 printk(KERN_DEBUG DRV_NAME
                         ": Tx Packet Len:%d\n", priv->tx_skb->len);
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index fa47c14c743a..ba26bb356b8d 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -2015,7 +2015,7 @@ static void nfp_net_open_stack(struct nfp_net *nn)
 
         netif_tx_wake_all_queues(nn->netdev);
 
-        enable_irq(nn->irq_entries[NFP_NET_CFG_LSC].vector);
+        enable_irq(nn->irq_entries[NFP_NET_IRQ_LSC_IDX].vector);
         nfp_net_read_link_status(nn);
 }
 
@@ -2044,7 +2044,7 @@ static int nfp_net_netdev_open(struct net_device *netdev)
                                       NFP_NET_IRQ_LSC_IDX, nn->lsc_handler);
         if (err)
                 goto err_free_exn;
-        disable_irq(nn->irq_entries[NFP_NET_CFG_LSC].vector);
+        disable_irq(nn->irq_entries[NFP_NET_IRQ_LSC_IDX].vector);
 
         nn->rx_rings = kcalloc(nn->num_rx_rings, sizeof(*nn->rx_rings),
                                GFP_KERNEL);
@@ -2133,7 +2133,7 @@ static void nfp_net_close_stack(struct nfp_net *nn)
 {
         unsigned int r;
 
-        disable_irq(nn->irq_entries[NFP_NET_CFG_LSC].vector);
+        disable_irq(nn->irq_entries[NFP_NET_IRQ_LSC_IDX].vector);
         netif_carrier_off(nn->netdev);
         nn->link_up = false;
 
diff --git a/drivers/net/ethernet/qlogic/qed/qed_hsi.h b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
index 9afc15fdbb02..e29ed5a69566 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_hsi.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
@@ -3700,6 +3700,7 @@ struct public_port {
 #define MEDIA_DA_TWINAX         0x3
 #define MEDIA_BASE_T            0x4
 #define MEDIA_SFP_1G_FIBER      0x5
+#define MEDIA_MODULE_FIBER      0x6
 #define MEDIA_KR                0xf0
 #define MEDIA_NOT_PRESENT       0xff
 
diff --git a/drivers/net/ethernet/qlogic/qed/qed_l2.c b/drivers/net/ethernet/qlogic/qed/qed_l2.c
index 8fba87dd48af..aada4c7e095f 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_l2.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_l2.c
@@ -72,6 +72,7 @@ int qed_sp_eth_vport_start(struct qed_hwfn *p_hwfn,
         p_ramrod->mtu                   = cpu_to_le16(p_params->mtu);
         p_ramrod->inner_vlan_removal_en = p_params->remove_inner_vlan;
         p_ramrod->drop_ttl0_en          = p_params->drop_ttl0;
+        p_ramrod->untagged              = p_params->only_untagged;
 
         SET_FIELD(rx_mode, ETH_VPORT_RX_MODE_UCAST_DROP_ALL, 1);
         SET_FIELD(rx_mode, ETH_VPORT_RX_MODE_MCAST_DROP_ALL, 1);
@@ -247,10 +248,6 @@ qed_sp_update_accept_mode(struct qed_hwfn *p_hwfn,
                 SET_FIELD(state, ETH_VPORT_TX_MODE_UCAST_DROP_ALL,
                           !!(accept_filter & QED_ACCEPT_NONE));
 
-                SET_FIELD(state, ETH_VPORT_TX_MODE_UCAST_ACCEPT_ALL,
-                          (!!(accept_filter & QED_ACCEPT_UCAST_MATCHED) &&
-                           !!(accept_filter & QED_ACCEPT_UCAST_UNMATCHED)));
-
                 SET_FIELD(state, ETH_VPORT_TX_MODE_MCAST_DROP_ALL,
                           !!(accept_filter & QED_ACCEPT_NONE));
 
@@ -1748,7 +1745,8 @@ static int qed_start_vport(struct qed_dev *cdev,
                            start.vport_id, start.mtu);
         }
 
-        qed_reset_vport_stats(cdev);
+        if (params->clear_stats)
+                qed_reset_vport_stats(cdev);
 
         return 0;
 }
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 61cc6869fa65..c7e01b303540 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -1085,6 +1085,7 @@ static int qed_get_port_type(u32 media_type)
         case MEDIA_SFPP_10G_FIBER:
         case MEDIA_SFP_1G_FIBER:
         case MEDIA_XFP_FIBER:
+        case MEDIA_MODULE_FIBER:
         case MEDIA_KR:
                 port_type = PORT_FIBRE;
                 break;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_spq.c b/drivers/net/ethernet/qlogic/qed/qed_spq.c
index acac6626a1b2..b122f6013b6c 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_spq.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_spq.c
@@ -213,19 +213,15 @@ static int qed_spq_hw_post(struct qed_hwfn *p_hwfn,
         SET_FIELD(db.params, CORE_DB_DATA_AGG_VAL_SEL,
                   DQ_XCM_CORE_SPQ_PROD_CMD);
         db.agg_flags = DQ_XCM_CORE_DQ_CF_CMD;
-
-        /* validate producer is up to-date */
-        rmb();
-
         db.spq_prod = cpu_to_le16(qed_chain_get_prod_idx(p_chain));
 
-        /* do not reorder */
-        barrier();
+        /* make sure the SPQE is updated before the doorbell */
+        wmb();
 
         DOORBELL(p_hwfn, qed_db_addr(p_spq->cid, DQ_DEMS_LEGACY), *(u32 *)&db);
 
         /* make sure doorbell is rang */
-        mmiowb();
+        wmb();
 
         DP_VERBOSE(p_hwfn, QED_MSG_SPQ,
                    "Doorbelled [0x%08x, CID 0x%08x] with Flags: %02x agg_params: %02x, prod: %04x\n",
@@ -614,7 +610,9 @@ qed_spq_add_entry(struct qed_hwfn *p_hwfn,
 
                         *p_en2 = *p_ent;
 
-                        kfree(p_ent);
+                        /* EBLOCK responsible to free the allocated p_ent */
+                        if (p_ent->comp_mode != QED_SPQ_MODE_EBLOCK)
+                                kfree(p_ent);
 
                         p_ent = p_en2;
                 }
@@ -749,6 +747,15 @@ int qed_spq_post(struct qed_hwfn *p_hwfn,
                  * Thus, after gaining the answer perform the cleanup here.
                  */
                 rc = qed_spq_block(p_hwfn, p_ent, fw_return_code);
+
+                if (p_ent->queue == &p_spq->unlimited_pending) {
+                        /* This is an allocated p_ent which does not need to
+                         * return to pool.
+                         */
+                        kfree(p_ent);
+                        return rc;
+                }
+
                 if (rc)
                         goto spq_post_fail2;
 
@@ -844,8 +851,12 @@ int qed_spq_completion(struct qed_hwfn *p_hwfn,
                 found->comp_cb.function(p_hwfn, found->comp_cb.cookie, p_data,
                                         fw_return_code);
 
-        if (found->comp_mode != QED_SPQ_MODE_EBLOCK)
-                /* EBLOCK is responsible for freeing its own entry */
+        if ((found->comp_mode != QED_SPQ_MODE_EBLOCK) ||
+            (found->queue == &p_spq->unlimited_pending))
+                /* EBLOCK  is responsible for returning its own entry into the
+                 * free list, unless it originally added the entry into the
+                 * unlimited pending list.
+                 */
                 qed_spq_return_entry(p_hwfn, found);
 
         /* Attempt to post pending requests */
diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index 5733d1888223..f8e11f953acb 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -3231,7 +3231,7 @@ static int qede_stop_queues(struct qede_dev *edev)
         return rc;
 }
 
-static int qede_start_queues(struct qede_dev *edev)
+static int qede_start_queues(struct qede_dev *edev, bool clear_stats)
 {
         int rc, tc, i;
         int vlan_removal_en = 1;
@@ -3462,6 +3462,7 @@ out:
 
 enum qede_load_mode {
         QEDE_LOAD_NORMAL,
+        QEDE_LOAD_RELOAD,
 };
 
 static int qede_load(struct qede_dev *edev, enum qede_load_mode mode)
@@ -3500,7 +3501,7 @@ static int qede_load(struct qede_dev *edev, enum qede_load_mode mode)
                 goto err3;
         DP_INFO(edev, "Setup IRQs succeeded\n");
 
-        rc = qede_start_queues(edev);
+        rc = qede_start_queues(edev, mode != QEDE_LOAD_RELOAD);
         if (rc)
                 goto err4;
         DP_INFO(edev, "Start VPORT, RXQ and TXQ succeeded\n");
@@ -3555,7 +3556,7 @@ void qede_reload(struct qede_dev *edev,
         if (func)
                 func(edev, args);
 
-        qede_load(edev, QEDE_LOAD_NORMAL);
+        qede_load(edev, QEDE_LOAD_RELOAD);
 
         mutex_lock(&edev->qede_lock);
         qede_config_rx_mode(edev->ndev);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index 7bd6f25b4625..87c642d3b075 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -772,6 +772,8 @@ netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         tx_ring->tx_stats.tx_bytes += skb->len;
         tx_ring->tx_stats.xmit_called++;
 
+        /* Ensure writes are complete before HW fetches Tx descriptors */
+        wmb();
         qlcnic_update_cmd_producer(tx_ring);
 
         return NETDEV_TX_OK;
@@ -2220,7 +2222,7 @@ void qlcnic_83xx_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring)
         if (!opcode)
                 return;
 
-        ring = QLCNIC_FETCH_RING_ID(qlcnic_83xx_hndl(sts_data[0]));
+        ring = QLCNIC_FETCH_RING_ID(sts_data[0]);
         qlcnic_83xx_process_rcv_diag(adapter, ring, sts_data);
         desc = &sds_ring->desc_head[consumer];
         desc->status_desc_data[0] = cpu_to_le64(STATUS_OWNER_PHANTOM);
diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index 133e9e35be9e..4c83739d158f 100644
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c
@@ -104,7 +104,8 @@ int efx_farch_test_registers(struct efx_nic *efx,
                              const struct efx_farch_register_test *regs,
                              size_t n_regs)
 {
-        unsigned address = 0, i, j;
+        unsigned address = 0;
+        int i, j;
         efx_oword_t mask, imask, original, reg, buf;
 
         for (i = 0; i < n_regs; ++i) {
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 8af25563f627..b5ab5e120bca 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -116,7 +116,6 @@ struct smsc911x_data {
 
         struct phy_device *phy_dev;
         struct mii_bus *mii_bus;
-        int phy_irq[PHY_MAX_ADDR];
         unsigned int using_extphy;
         int last_duplex;
         int last_carrier;
@@ -1073,7 +1072,6 @@ static int smsc911x_mii_init(struct platform_device *pdev,
         pdata->mii_bus->priv = pdata;
         pdata->mii_bus->read = smsc911x_mii_read;
         pdata->mii_bus->write = smsc911x_mii_write;
-        memcpy(pdata->mii_bus->irq, pdata->phy_irq, sizeof(pdata->mii_bus));
 
         pdata->mii_bus->parent = &pdev->dev;
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a473c182c91d..e4071265be76 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2804,7 +2804,7 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)
                                 priv->tx_path_in_lpi_mode = true;
                         if (status & CORE_IRQ_TX_PATH_EXIT_LPI_MODE)
                                 priv->tx_path_in_lpi_mode = false;
-                        if (status & CORE_IRQ_MTL_RX_OVERFLOW)
+                        if (status & CORE_IRQ_MTL_RX_OVERFLOW && priv->hw->dma->set_rx_tail_ptr)
                                 priv->hw->dma->set_rx_tail_ptr(priv->ioaddr,
                                                         priv->rx_tail_addr,
                                                         STMMAC_CHAN0);
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index e6bb0ecb12c7..53190894f17a 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2505,8 +2505,6 @@ static int cpsw_probe(struct platform_device *pdev)
 clean_ale_ret:
         cpsw_ale_destroy(priv->ale);
 clean_dma_ret:
-        cpdma_chan_destroy(priv->txch);
-        cpdma_chan_destroy(priv->rxch);
         cpdma_ctlr_destroy(priv->dma);
 clean_runtime_disable_ret:
         pm_runtime_disable(&pdev->dev);
@@ -2534,8 +2532,6 @@ static int cpsw_remove(struct platform_device *pdev)
         unregister_netdev(ndev);
 
         cpsw_ale_destroy(priv->ale);
-        cpdma_chan_destroy(priv->txch);
-        cpdma_chan_destroy(priv->rxch);
         cpdma_ctlr_destroy(priv->dma);
         pm_runtime_disable(&pdev->dev);
         device_for_each_child(&pdev->dev, NULL, cpsw_remove_child_device);
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c
index 0a15acc075b3..11213a38c795 100644
--- a/drivers/net/ethernet/tile/tilegx.c
+++ b/drivers/net/ethernet/tile/tilegx.c
@@ -462,7 +462,7 @@ static void tile_tx_timestamp(struct sk_buff *skb, int instance)
         if (unlikely((shtx->tx_flags & SKBTX_HW_TSTAMP) != 0)) {
                 struct mpipe_data *md = &mpipe_data[instance];
                 struct skb_shared_hwtstamps shhwtstamps;
-                struct timespec ts;
+                struct timespec64 ts;
 
                 shtx->tx_flags |= SKBTX_IN_PROGRESS;
                 gxio_mpipe_get_timestamp(&md->context, &ts);
@@ -886,9 +886,9 @@ static struct ptp_clock_info ptp_mpipe_caps = {
 /* Sync mPIPE's timestamp up with Linux system time and register PTP clock. */
 static void register_ptp_clock(struct net_device *dev, struct mpipe_data *md)
 {
-        struct timespec ts;
+        struct timespec64 ts;
 
-        getnstimeofday(&ts);
+        ktime_get_ts64(&ts);
         gxio_mpipe_set_timestamp(&md->context, &ts);
 
         mutex_init(&md->ptp_lock);
diff --git a/drivers/net/fddi/skfp/Makefile b/drivers/net/fddi/skfp/Makefile
index b0be0234abf6..a957a1c7e5ba 100644
--- a/drivers/net/fddi/skfp/Makefile
+++ b/drivers/net/fddi/skfp/Makefile
@@ -17,4 +17,4 @@ skfp-objs :=  skfddi.o    hwmtm.o    fplustm.o  smt.o      cfm.o     \
 #   projects. To keep the source common for all those drivers (and
 #   thus simplify fixes to it), please do not clean it up!
 
-ccflags-y := -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
+ccflags-y := -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index cadefe4fdaa2..9b3dc3c61e00 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -958,8 +958,8 @@ tx_error:
                 dev->stats.collisions++;
         else if (err == -ENETUNREACH)
                 dev->stats.tx_carrier_errors++;
-        else
-                dev->stats.tx_errors++;
+
+        dev->stats.tx_errors++;
         return NETDEV_TX_OK;
 }
 
@@ -1048,8 +1048,8 @@ tx_error:
                 dev->stats.collisions++;
         else if (err == -ENETUNREACH)
                 dev->stats.tx_carrier_errors++;
-        else
-                dev->stats.tx_errors++;
+
+        dev->stats.tx_errors++;
         return NETDEV_TX_OK;
 }
 #endif
@@ -1072,12 +1072,17 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static int __geneve_change_mtu(struct net_device *dev, int new_mtu, bool strict)
 {
+        struct geneve_dev *geneve = netdev_priv(dev);
         /* The max_mtu calculation does not take account of GENEVE
          * options, to avoid excluding potentially valid
          * configurations.
          */
-        int max_mtu = IP_MAX_MTU - GENEVE_BASE_HLEN - sizeof(struct iphdr)
-                - dev->hard_header_len;
+        int max_mtu = IP_MAX_MTU - GENEVE_BASE_HLEN - dev->hard_header_len;
+
+        if (geneve->remote.sa.sa_family == AF_INET6)
+                max_mtu -= sizeof(struct ipv6hdr);
+        else
+                max_mtu -= sizeof(struct iphdr);
 
         if (new_mtu < 68)
                 return -EINVAL;
@@ -1508,6 +1513,7 @@ struct net_device *geneve_dev_create_fb(struct net *net, const char *name,
 {
         struct nlattr *tb[IFLA_MAX + 1];
         struct net_device *dev;
+        LIST_HEAD(list_kill);
         int err;
 
         memset(tb, 0, sizeof(tb));
@@ -1519,8 +1525,10 @@ struct net_device *geneve_dev_create_fb(struct net *net, const char *name,
         err = geneve_configure(net, dev, &geneve_remote_unspec,
                                0, 0, 0, 0, htons(dst_port), true,
                                GENEVE_F_UDP_ZERO_CSUM6_RX);
-        if (err)
-                goto err;
+        if (err) {
+                free_netdev(dev);
+                return ERR_PTR(err);
+        }
 
         /* openvswitch users expect packet sizes to be unrestricted,
          * so set the largest MTU we can.
@@ -1529,10 +1537,15 @@ struct net_device *geneve_dev_create_fb(struct net *net, const char *name,
         if (err)
                 goto err;
 
+        err = rtnl_configure_link(dev, NULL);
+        if (err < 0)
+                goto err;
+
         return dev;
 
  err:
-        free_netdev(dev);
+        geneve_dellink(dev, &list_kill);
+        unregister_netdevice_many(&list_kill);
         return ERR_PTR(err);
 }
 EXPORT_SYMBOL_GPL(geneve_dev_create_fb);
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 47ee2c840b55..8bcd78f94966 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -605,12 +605,41 @@ static void macsec_encrypt_done(struct crypto_async_request *base, int err)
         dev_put(dev);
 }
 
+static struct aead_request *macsec_alloc_req(struct crypto_aead *tfm,
+                                             unsigned char **iv,
+                                             struct scatterlist **sg)
+{
+        size_t size, iv_offset, sg_offset;
+        struct aead_request *req;
+        void *tmp;
+
+        size = sizeof(struct aead_request) + crypto_aead_reqsize(tfm);
+        iv_offset = size;
+        size += GCM_AES_IV_LEN;
+
+        size = ALIGN(size, __alignof__(struct scatterlist));
+        sg_offset = size;
+        size += sizeof(struct scatterlist) * (MAX_SKB_FRAGS + 1);
+
+        tmp = kmalloc(size, GFP_ATOMIC);
+        if (!tmp)
+                return NULL;
+
+        *iv = (unsigned char *)(tmp + iv_offset);
+        *sg = (struct scatterlist *)(tmp + sg_offset);
+        req = tmp;
+
+        aead_request_set_tfm(req, tfm);
+
+        return req;
+}
+
 static struct sk_buff *macsec_encrypt(struct sk_buff *skb,
                                       struct net_device *dev)
 {
         int ret;
-        struct scatterlist sg[MAX_SKB_FRAGS + 1];
-        unsigned char iv[GCM_AES_IV_LEN];
+        struct scatterlist *sg;
+        unsigned char *iv;
         struct ethhdr *eth;
         struct macsec_eth_header *hh;
         size_t unprotected_len;
@@ -668,8 +697,6 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb,
         macsec_fill_sectag(hh, secy, pn);
         macsec_set_shortlen(hh, unprotected_len - 2 * ETH_ALEN);
 
-        macsec_fill_iv(iv, secy->sci, pn);
-
         skb_put(skb, secy->icv_len);
 
         if (skb->len - ETH_HLEN > macsec_priv(dev)->real_dev->mtu) {
@@ -684,13 +711,15 @@ static struct sk_buff *macsec_encrypt(struct sk_buff *skb,
                 return ERR_PTR(-EINVAL);
         }
 
-        req = aead_request_alloc(tx_sa->key.tfm, GFP_ATOMIC);
+        req = macsec_alloc_req(tx_sa->key.tfm, &iv, &sg);
         if (!req) {
                 macsec_txsa_put(tx_sa);
                 kfree_skb(skb);
                 return ERR_PTR(-ENOMEM);
         }
 
+        macsec_fill_iv(iv, secy->sci, pn);
+
         sg_init_table(sg, MAX_SKB_FRAGS + 1);
         skb_to_sgvec(skb, sg, 0, skb->len);
 
@@ -861,7 +890,6 @@ static void macsec_decrypt_done(struct crypto_async_request *base, int err)
 out:
         macsec_rxsa_put(rx_sa);
         dev_put(dev);
-        return;
 }
 
 static struct sk_buff *macsec_decrypt(struct sk_buff *skb,
@@ -871,8 +899,8 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb,
                                       struct macsec_secy *secy)
 {
         int ret;
-        struct scatterlist sg[MAX_SKB_FRAGS + 1];
-        unsigned char iv[GCM_AES_IV_LEN];
+        struct scatterlist *sg;
+        unsigned char *iv;
         struct aead_request *req;
         struct macsec_eth_header *hdr;
         u16 icv_len = secy->icv_len;
@@ -882,7 +910,7 @@ static struct sk_buff *macsec_decrypt(struct sk_buff *skb,
         if (!skb)
                 return ERR_PTR(-ENOMEM);
 
-        req = aead_request_alloc(rx_sa->key.tfm, GFP_ATOMIC);
+        req = macsec_alloc_req(rx_sa->key.tfm, &iv, &sg);
         if (!req) {
                 kfree_skb(skb);
                 return ERR_PTR(-ENOMEM);
@@ -1234,7 +1262,7 @@ static struct crypto_aead *macsec_alloc_tfm(char *key, int key_len, int icv_len)
         struct crypto_aead *tfm;
         int ret;
 
-        tfm = crypto_alloc_aead("gcm(aes)", 0, CRYPTO_ALG_ASYNC);
+        tfm = crypto_alloc_aead("gcm(aes)", 0, 0);
         if (!tfm || IS_ERR(tfm))
                 return NULL;
 
@@ -2612,6 +2640,7 @@ static netdev_tx_t macsec_start_xmit(struct sk_buff *skb,
                 u64_stats_update_begin(&secy_stats->syncp);
                 secy_stats->stats.OutPktsUntagged++;
                 u64_stats_update_end(&secy_stats->syncp);
+                skb->dev = macsec->real_dev;
                 len = skb->len;
                 ret = dev_queue_xmit(skb);
                 count_tx(dev, ret, len);
@@ -3361,6 +3390,7 @@ static void __exit macsec_exit(void)
         genl_unregister_family(&macsec_fam);
         rtnl_link_unregister(&macsec_link_ops);
         unregister_netdevice_notifier(&macsec_notifier);
+        rcu_barrier();
 }
 
 module_init(macsec_init);
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 2afa61b51d41..91177a4a32ad 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -57,6 +57,7 @@
 
 /* PHY CTRL bits */
 #define DP83867_PHYCR_FIFO_DEPTH_SHIFT          14
+#define DP83867_PHYCR_FIFO_DEPTH_MASK           (3 << 14)
 
 /* RGMIIDCTL bits */
 #define DP83867_RGMII_TX_CLK_DELAY_SHIFT        4
@@ -133,8 +134,8 @@ static int dp83867_of_init(struct phy_device *phydev)
 static int dp83867_config_init(struct phy_device *phydev)
 {
         struct dp83867_private *dp83867;
-        int ret;
-        u16 val, delay;
+        int ret, val;
+        u16 delay;
 
         if (!phydev->priv) {
                 dp83867 = devm_kzalloc(&phydev->mdio.dev, sizeof(*dp83867),
@@ -151,8 +152,12 @@ static int dp83867_config_init(struct phy_device *phydev)
         }
 
         if (phy_interface_is_rgmii(phydev)) {
-                ret = phy_write(phydev, MII_DP83867_PHYCTRL,
-                        (dp83867->fifo_depth << DP83867_PHYCR_FIFO_DEPTH_SHIFT));
+                val = phy_read(phydev, MII_DP83867_PHYCTRL);
+                if (val < 0)
+                        return val;
+                val &= ~DP83867_PHYCR_FIFO_DEPTH_MASK;
+                val |= (dp83867->fifo_depth << DP83867_PHYCR_FIFO_DEPTH_SHIFT);
+                ret = phy_write(phydev, MII_DP83867_PHYCTRL, val);
                 if (ret)
                         return ret;
         }
diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
index 2d2e4339f0df..9ec7f7353434 100644
--- a/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@ -23,6 +23,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/gpio.h>
+#include <linux/idr.h>
 
 #define MII_REGS_NUM 29
 
@@ -286,6 +287,8 @@ err_regs:
 }
 EXPORT_SYMBOL_GPL(fixed_phy_add);
 
+static DEFINE_IDA(phy_fixed_ida);
+
 static void fixed_phy_del(int phy_addr)
 {
         struct fixed_mdio_bus *fmb = &platform_fmb;
@@ -297,14 +300,12 @@ static void fixed_phy_del(int phy_addr)
                         if (gpio_is_valid(fp->link_gpio))
                                 gpio_free(fp->link_gpio);
                         kfree(fp);
+                        ida_simple_remove(&phy_fixed_ida, phy_addr);
                         return;
                 }
         }
 }
 
-static int phy_fixed_addr;
-static DEFINE_SPINLOCK(phy_fixed_addr_lock);
-
 struct phy_device *fixed_phy_register(unsigned int irq,
                                       struct fixed_phy_status *status,
                                       int link_gpio,
@@ -319,17 +320,15 @@ struct phy_device *fixed_phy_register(unsigned int irq,
                 return ERR_PTR(-EPROBE_DEFER);
 
         /* Get the next available PHY address, up to PHY_MAX_ADDR */
-        spin_lock(&phy_fixed_addr_lock);
-        if (phy_fixed_addr == PHY_MAX_ADDR) {
-                spin_unlock(&phy_fixed_addr_lock);
-                return ERR_PTR(-ENOSPC);
-        }
-        phy_addr = phy_fixed_addr++;
-        spin_unlock(&phy_fixed_addr_lock);
+        phy_addr = ida_simple_get(&phy_fixed_ida, 0, PHY_MAX_ADDR, GFP_KERNEL);
+        if (phy_addr < 0)
+                return ERR_PTR(phy_addr);
 
         ret = fixed_phy_add(irq, phy_addr, status, link_gpio);
-        if (ret < 0)
+        if (ret < 0) {
+                ida_simple_remove(&phy_fixed_ida, phy_addr);
                 return ERR_PTR(ret);
+        }
 
         phy = get_phy_device(fmb->mii_bus, phy_addr, false);
         if (IS_ERR(phy)) {
@@ -434,6 +433,7 @@ static void __exit fixed_mdio_bus_exit(void)
                 list_del(&fp->node);
                 kfree(fp);
         }
+        ida_destroy(&phy_fixed_ida);
 }
 module_exit(fixed_mdio_bus_exit);
 
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 280e8795b463..ec2c1eee6405 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -285,6 +285,48 @@ static int marvell_config_aneg(struct phy_device *phydev)
         return 0;
 }
 
+static int m88e1111_config_aneg(struct phy_device *phydev)
+{
+        int err;
+
+        /* The Marvell PHY has an errata which requires
+         * that certain registers get written in order
+         * to restart autonegotiation
+         */
+        err = phy_write(phydev, MII_BMCR, BMCR_RESET);
+
+        err = marvell_set_polarity(phydev, phydev->mdix);
+        if (err < 0)
+                return err;
+
+        err = phy_write(phydev, MII_M1111_PHY_LED_CONTROL,
+                        MII_M1111_PHY_LED_DIRECT);
+        if (err < 0)
+                return err;
+
+        err = genphy_config_aneg(phydev);
+        if (err < 0)
+                return err;
+
+        if (phydev->autoneg != AUTONEG_ENABLE) {
+                int bmcr;
+
+                /* A write to speed/duplex bits (that is performed by
+                 * genphy_config_aneg() call above) must be followed by
+                 * a software reset. Otherwise, the write has no effect.
+                 */
+                bmcr = phy_read(phydev, MII_BMCR);
+                if (bmcr < 0)
+                        return bmcr;
+
+                err = phy_write(phydev, MII_BMCR, bmcr | BMCR_RESET);
+                if (err < 0)
+                        return err;
+        }
+
+        return 0;
+}
+
 #ifdef CONFIG_OF_MDIO
 /*
  * Set and/or override some configuration registers based on the
@@ -407,15 +449,7 @@ static int m88e1121_config_aneg(struct phy_device *phydev)
         if (err < 0)
                 return err;
 
-        oldpage = phy_read(phydev, MII_MARVELL_PHY_PAGE);
-
-        phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_88E1121_PHY_LED_PAGE);
-        phy_write(phydev, MII_88E1121_PHY_LED_CTRL, MII_88E1121_PHY_LED_DEF);
-        phy_write(phydev, MII_MARVELL_PHY_PAGE, oldpage);
-
-        err = genphy_config_aneg(phydev);
-
-        return err;
+        return genphy_config_aneg(phydev);
 }
 
 static int m88e1318_config_aneg(struct phy_device *phydev)
@@ -636,6 +670,28 @@ static int m88e1111_config_init(struct phy_device *phydev)
         return phy_write(phydev, MII_BMCR, BMCR_RESET);
 }
 
+static int m88e1121_config_init(struct phy_device *phydev)
+{
+        int err, oldpage;
+
+        oldpage = phy_read(phydev, MII_MARVELL_PHY_PAGE);
+
+        err = phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_88E1121_PHY_LED_PAGE);
+        if (err < 0)
+                return err;
+
+        /* Default PHY LED config: LED[0] .. Link, LED[1] .. Activity */
+        err = phy_write(phydev, MII_88E1121_PHY_LED_CTRL,
+                        MII_88E1121_PHY_LED_DEF);
+        if (err < 0)
+                return err;
+
+        phy_write(phydev, MII_MARVELL_PHY_PAGE, oldpage);
+
+        /* Set marvell,reg-init configuration from device tree */
+        return marvell_config_init(phydev);
+}
+
 static int m88e1510_config_init(struct phy_device *phydev)
 {
         int err;
@@ -668,7 +724,7 @@ static int m88e1510_config_init(struct phy_device *phydev)
                         return err;
         }
 
-        return marvell_config_init(phydev);
+        return m88e1121_config_init(phydev);
 }
 
 static int m88e1118_config_aneg(struct phy_device *phydev)
@@ -1161,7 +1217,7 @@ static struct phy_driver marvell_drivers[] = {
                 .flags = PHY_HAS_INTERRUPT,
                 .probe = marvell_probe,
                 .config_init = &m88e1111_config_init,
-                .config_aneg = &marvell_config_aneg,
+                .config_aneg = &m88e1111_config_aneg,
                 .read_status = &marvell_read_status,
                 .ack_interrupt = &marvell_ack_interrupt,
                 .config_intr = &marvell_config_intr,
@@ -1196,7 +1252,7 @@ static struct phy_driver marvell_drivers[] = {
                 .features = PHY_GBIT_FEATURES,
                 .flags = PHY_HAS_INTERRUPT,
                 .probe = marvell_probe,
-                .config_init = &marvell_config_init,
+                .config_init = &m88e1121_config_init,
                 .config_aneg = &m88e1121_config_aneg,
                 .read_status = &marvell_read_status,
                 .ack_interrupt = &marvell_ack_interrupt,
@@ -1215,7 +1271,7 @@ static struct phy_driver marvell_drivers[] = {
                 .features = PHY_GBIT_FEATURES,
                 .flags = PHY_HAS_INTERRUPT,
                 .probe = marvell_probe,
-                .config_init = &marvell_config_init,
+                .config_init = &m88e1121_config_init,
                 .config_aneg = &m88e1318_config_aneg,
                 .read_status = &marvell_read_status,
                 .ack_interrupt = &marvell_ack_interrupt,
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index 2e21e9366f76..b62c4aaee40b 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -75,22 +75,13 @@ static int smsc_phy_reset(struct phy_device *phydev)
          * in all capable mode before using it.
          */
         if ((rc & MII_LAN83C185_MODE_MASK) == MII_LAN83C185_MODE_POWERDOWN) {
-                int timeout = 50000;
-
-                /* set "all capable" mode and reset the phy */
+                /* set "all capable" mode */
                 rc |= MII_LAN83C185_MODE_ALL;
                 phy_write(phydev, MII_LAN83C185_SPECIAL_MODES, rc);
-                phy_write(phydev, MII_BMCR, BMCR_RESET);
-
-                /* wait end of reset (max 500 ms) */
-                do {
-                        udelay(10);
-                        if (timeout-- == 0)
-                                return -1;
-                        rc = phy_read(phydev, MII_BMCR);
-                } while (rc & BMCR_RESET);
         }
-        return 0;
+
+        /* reset the phy */
+        return genphy_soft_reset(phydev);
 }
 
 static int lan911x_config_init(struct phy_device *phydev)
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 8dedafa1a95d..a30ee427efab 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -2601,8 +2601,6 @@ ppp_unregister_channel(struct ppp_channel *chan)
         spin_lock_bh(&pn->all_channels_lock);
         list_del(&pch->list);
         spin_unlock_bh(&pn->all_channels_lock);
-        put_net(pch->chan_net);
-        pch->chan_net = NULL;
 
         pch->file.dead = 1;
         wake_up_interruptible(&pch->file.rwait);
@@ -3136,6 +3134,9 @@ ppp_disconnect_channel(struct channel *pch)
  */
 static void ppp_destroy_channel(struct channel *pch)
 {
+        put_net(pch->chan_net);
+        pch->chan_net = NULL;
+
         atomic_dec(&channel_count);
 
         if (!pch->file.dead) {
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 2ace126533cd..fdee77207323 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1203,8 +1203,10 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
                 goto err_dev_open;
         }
 
+        netif_addr_lock_bh(dev);
         dev_uc_sync_multiple(port_dev, dev);
         dev_mc_sync_multiple(port_dev, dev);
+        netif_addr_unlock_bh(dev);
 
         err = vlan_vids_add_by_dev(port_dev, dev);
         if (err) {
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 53759c315b97..877c9516e781 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -854,6 +854,13 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
         if (cdc_ncm_init(dev))
                 goto error2;
 
+        /* Some firmwares need a pause here or they will silently fail
+         * to set up the interface properly.  This value was decided
+         * empirically on a Sierra Wireless MC7455 running 02.08.02.00
+         * firmware.
+         */
+        usleep_range(10000, 20000);
+
         /* configure data interface */
         temp = usb_set_interface(dev->udev, iface_no, data_altsetting);
         if (temp) {
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 3f9f6ed3eec4..e9654a685381 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -26,12 +26,13 @@
 #include <linux/mdio.h>
 #include <linux/usb/cdc.h>
 #include <linux/suspend.h>
+#include <linux/acpi.h>
 
 /* Information for net-next */
 #define NETNEXT_VERSION         "08"
 
 /* Information for net */
-#define NET_VERSION             "3"
+#define NET_VERSION             "5"
 
 #define DRIVER_VERSION          "v1." NETNEXT_VERSION "." NET_VERSION
 #define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>"
@@ -116,6 +117,7 @@
 #define USB_TX_DMA              0xd434
 #define USB_TOLERANCE           0xd490
 #define USB_LPM_CTRL            0xd41a
+#define USB_BMU_RESET           0xd4b0
 #define USB_UPS_CTRL            0xd800
 #define USB_MISC_0              0xd81a
 #define USB_POWER_CUT           0xd80a
@@ -338,6 +340,10 @@
 #define TEST_MODE_DISABLE       0x00000001
 #define TX_SIZE_ADJUST1         0x00000100
 
+/* USB_BMU_RESET */
+#define BMU_RESET_EP_IN         0x01
+#define BMU_RESET_EP_OUT        0x02
+
 /* USB_UPS_CTRL */
 #define POWER_CUT               0x0100
 
@@ -455,6 +461,11 @@
 /* SRAM_IMPEDANCE */
 #define RX_DRIVING_MASK         0x6000
 
+/* MAC PASSTHRU */
+#define AD_MASK                 0xfee0
+#define EFUSE                   0xcfdb
+#define PASS_THRU_MASK          0x1
+
 enum rtl_register_content {
         _1000bps        = 0x10,
         _100bps         = 0x08,
@@ -619,6 +630,7 @@ struct r8152 {
                 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
                 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
                 bool (*in_nway)(struct r8152 *);
+                void (*autosuspend_en)(struct r8152 *tp, bool enable);
         } rtl_ops;
 
         int intr_interval;
@@ -1030,6 +1042,65 @@ out1:
         return ret;
 }
 
+/* Devices containing RTL8153-AD can support a persistent
+ * host system provided MAC address.
+ * Examples of this are Dell TB15 and Dell WD15 docks
+ */
+static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa)
+{
+        acpi_status status;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        union acpi_object *obj;
+        int ret = -EINVAL;
+        u32 ocp_data;
+        unsigned char buf[6];
+
+        /* test for -AD variant of RTL8153 */
+        ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0);
+        if ((ocp_data & AD_MASK) != 0x1000)
+                return -ENODEV;
+
+        /* test for MAC address pass-through bit */
+        ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, EFUSE);
+        if ((ocp_data & PASS_THRU_MASK) != 1)
+                return -ENODEV;
+
+        /* returns _AUXMAC_#AABBCCDDEEFF# */
+        status = acpi_evaluate_object(NULL, "\\_SB.AMAC", NULL, &buffer);
+        obj = (union acpi_object *)buffer.pointer;
+        if (!ACPI_SUCCESS(status))
+                return -ENODEV;
+        if (obj->type != ACPI_TYPE_BUFFER || obj->string.length != 0x17) {
+                netif_warn(tp, probe, tp->netdev,
+                           "Invalid buffer when reading pass-thru MAC addr: "
+                           "(%d, %d)\n",
+                           obj->type, obj->string.length);
+                goto amacout;
+        }
+        if (strncmp(obj->string.pointer, "_AUXMAC_#", 9) != 0 ||
+            strncmp(obj->string.pointer + 0x15, "#", 1) != 0) {
+                netif_warn(tp, probe, tp->netdev,
+                           "Invalid header when reading pass-thru MAC addr\n");
+                goto amacout;
+        }
+        ret = hex2bin(buf, obj->string.pointer + 9, 6);
+        if (!(ret == 0 && is_valid_ether_addr(buf))) {
+                netif_warn(tp, probe, tp->netdev,
+                           "Invalid MAC when reading pass-thru MAC addr: "
+                           "%d, %pM\n", ret, buf);
+                ret = -EINVAL;
+                goto amacout;
+        }
+        memcpy(sa->sa_data, buf, 6);
+        ether_addr_copy(tp->netdev->dev_addr, sa->sa_data);
+        netif_info(tp, probe, tp->netdev,
+                   "Using pass-thru MAC addr %pM\n", sa->sa_data);
+
+amacout:
+        kfree(obj);
+        return ret;
+}
+
 static int set_ethernet_addr(struct r8152 *tp)
 {
         struct net_device *dev = tp->netdev;
@@ -1038,8 +1109,15 @@ static int set_ethernet_addr(struct r8152 *tp)
 
         if (tp->version == RTL_VER_01)
                 ret = pla_ocp_read(tp, PLA_IDR, 8, sa.sa_data);
-        else
-                ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa.sa_data);
+        else {
+                /* if this is not an RTL8153-AD, no eFuse mac pass thru set,
+                 * or system doesn't provide valid _SB.AMAC this will be
+                 * be expected to non-zero
+                 */
+                ret = vendor_mac_passthru_addr_read(tp, &sa);
+                if (ret < 0)
+                        ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa.sa_data);
+        }
 
         if (ret < 0) {
                 netif_err(tp, probe, dev, "Get ether addr fail\n");
@@ -2169,7 +2247,7 @@ static void r8153_set_rx_early_timeout(struct r8152 *tp)
 static void r8153_set_rx_early_size(struct r8152 *tp)
 {
         u32 mtu = tp->netdev->mtu;
-        u32 ocp_data = (agg_buf_sz - mtu - VLAN_ETH_HLEN - VLAN_HLEN) / 4;
+        u32 ocp_data = (agg_buf_sz - mtu - VLAN_ETH_HLEN - VLAN_HLEN) / 8;
 
         ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_SIZE, ocp_data);
 }
@@ -2290,10 +2368,6 @@ static u32 __rtl_get_wol(struct r8152 *tp)
         u32 ocp_data;
         u32 wolopts = 0;
 
-        ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CONFIG5);
-        if (!(ocp_data & LAN_WAKE_EN))
-                return 0;
-
         ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34);
         if (ocp_data & LINK_ON_WAKE_EN)
                 wolopts |= WAKE_PHY;
@@ -2326,15 +2400,13 @@ static void __rtl_set_wol(struct r8152 *tp, u32 wolopts)
         ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data);
 
         ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG5);
-        ocp_data &= ~(UWF_EN | BWF_EN | MWF_EN | LAN_WAKE_EN);
+        ocp_data &= ~(UWF_EN | BWF_EN | MWF_EN);
         if (wolopts & WAKE_UCAST)
                 ocp_data |= UWF_EN;
         if (wolopts & WAKE_BCAST)
                 ocp_data |= BWF_EN;
         if (wolopts & WAKE_MCAST)
                 ocp_data |= MWF_EN;
-        if (wolopts & WAKE_ANY)
-                ocp_data |= LAN_WAKE_EN;
         ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG5, ocp_data);
 
         ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
@@ -2403,9 +2475,6 @@ static void rtl_runtime_suspend_enable(struct r8152 *tp, bool enable)
         if (enable) {
                 u32 ocp_data;
 
-                r8153_u1u2en(tp, false);
-                r8153_u2p3en(tp, false);
-
                 __rtl_set_wol(tp, WAKE_ANY);
 
                 ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);
@@ -2416,7 +2485,28 @@ static void rtl_runtime_suspend_enable(struct r8152 *tp, bool enable)
 
                 ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
         } else {
+                u32 ocp_data;
+
                 __rtl_set_wol(tp, tp->saved_wolopts);
+
+                ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);
+
+                ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34);
+                ocp_data &= ~LINK_OFF_WAKE_EN;
+                ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data);
+
+                ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
+        }
+}
+
+static void rtl8153_runtime_enable(struct r8152 *tp, bool enable)
+{
+        rtl_runtime_suspend_enable(tp, enable);
+
+        if (enable) {
+                r8153_u1u2en(tp, false);
+                r8153_u2p3en(tp, false);
+        } else {
                 r8153_u2p3en(tp, true);
                 r8153_u1u2en(tp, true);
         }
@@ -2456,6 +2546,17 @@ static void r8153_teredo_off(struct r8152 *tp)
         ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TEREDO_TIMER, 0);
 }
 
+static void rtl_reset_bmu(struct r8152 *tp)
+{
+        u32 ocp_data;
+
+        ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_BMU_RESET);
+        ocp_data &= ~(BMU_RESET_EP_IN | BMU_RESET_EP_OUT);
+        ocp_write_byte(tp, MCU_TYPE_USB, USB_BMU_RESET, ocp_data);
+        ocp_data |= BMU_RESET_EP_IN | BMU_RESET_EP_OUT;
+        ocp_write_byte(tp, MCU_TYPE_USB, USB_BMU_RESET, ocp_data);
+}
+
 static void r8152_aldps_en(struct r8152 *tp, bool enable)
 {
         if (enable) {
@@ -2681,6 +2782,7 @@ static void r8153_first_init(struct r8152 *tp)
         r8153_hw_phy_cfg(tp);
 
         rtl8152_nic_reset(tp);
+        rtl_reset_bmu(tp);
 
         ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
         ocp_data &= ~NOW_IS_OOB;
@@ -2742,6 +2844,7 @@ static void r8153_enter_oob(struct r8152 *tp)
         ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
 
         rtl_disable(tp);
+        rtl_reset_bmu(tp);
 
         for (i = 0; i < 1000; i++) {
                 ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
@@ -2803,6 +2906,7 @@ static void rtl8153_disable(struct r8152 *tp)
 {
         r8153_aldps_en(tp, false);
         rtl_disable(tp);
+        rtl_reset_bmu(tp);
         r8153_aldps_en(tp, true);
         usb_enable_lpm(tp->udev);
 }
@@ -3382,15 +3486,11 @@ static void r8153_init(struct r8152 *tp)
         r8153_power_cut_en(tp, false);
         r8153_u1u2en(tp, true);
 
-        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, ALDPS_SPDWN_RATIO);
-        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, EEE_SPDWN_RATIO);
-        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3,
-                       PKT_AVAIL_SPDWN_EN | SUSPEND_SPDWN_EN |
-                       U1U2_SPDWN_EN | L1_SPDWN_EN);
-        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4,
-                       PWRSAVE_SPDWN_EN | RXDV_SPDWN_EN | TX10MIDLE_EN |
-                       TP100_SPDWN_EN | TP500_SPDWN_EN | TP1000_SPDWN_EN |
-                       EEE_SPDWN_EN);
+        /* MAC clock speed down */
+        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, 0);
+        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, 0);
+        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3, 0);
+        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, 0);
 
         r8153_enable_eee(tp);
         r8153_aldps_en(tp, true);
@@ -3497,7 +3597,7 @@ static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)
                 napi_disable(&tp->napi);
                 if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
                         rtl_stop_rx(tp);
-                        rtl_runtime_suspend_enable(tp, true);
+                        tp->rtl_ops.autosuspend_en(tp, true);
                 } else {
                         cancel_delayed_work_sync(&tp->schedule);
                         tp->rtl_ops.down(tp);
@@ -3523,7 +3623,7 @@ static int rtl8152_resume(struct usb_interface *intf)
 
         if (netif_running(tp->netdev) && tp->netdev->flags & IFF_UP) {
                 if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
-                        rtl_runtime_suspend_enable(tp, false);
+                        tp->rtl_ops.autosuspend_en(tp, false);
                         clear_bit(SELECTIVE_SUSPEND, &tp->flags);
                         napi_disable(&tp->napi);
                         set_bit(WORK_ENABLE, &tp->flags);
@@ -3542,7 +3642,7 @@ static int rtl8152_resume(struct usb_interface *intf)
                 usb_submit_urb(tp->intr_urb, GFP_KERNEL);
         } else if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
                 if (tp->netdev->flags & IFF_UP)
-                        rtl_runtime_suspend_enable(tp, false);
+                        tp->rtl_ops.autosuspend_en(tp, false);
                 clear_bit(SELECTIVE_SUSPEND, &tp->flags);
         }
 
@@ -4122,6 +4222,7 @@ static int rtl_ops_init(struct r8152 *tp)
                 ops->eee_get            = r8152_get_eee;
                 ops->eee_set            = r8152_set_eee;
                 ops->in_nway            = rtl8152_in_nway;
+                ops->autosuspend_en     = rtl_runtime_suspend_enable;
                 break;
 
         case RTL_VER_03:
@@ -4137,6 +4238,7 @@ static int rtl_ops_init(struct r8152 *tp)
                 ops->eee_get            = r8153_get_eee;
                 ops->eee_set            = r8153_set_eee;
                 ops->in_nway            = rtl8153_in_nway;
+                ops->autosuspend_en     = rtl8153_runtime_enable;
                 break;
 
         default:
@@ -4323,3 +4425,4 @@ module_usb_driver(rtl8152_driver);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
+MODULE_VERSION(DRIVER_VERSION);
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 61ba46404937..6086a0163249 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -395,8 +395,11 @@ int usbnet_change_mtu (struct net_device *net, int new_mtu)
         dev->hard_mtu = net->mtu + net->hard_header_len;
         if (dev->rx_urb_size == old_hard_mtu) {
                 dev->rx_urb_size = dev->hard_mtu;
-                if (dev->rx_urb_size > old_rx_urb_size)
+                if (dev->rx_urb_size > old_rx_urb_size) {
+                        usbnet_pause_rx(dev);
                         usbnet_unlink_rx_urbs(dev);
+                        usbnet_resume_rx(dev);
+                }
         }
 
         /* max qlen depend on hard_mtu and rx_urb_size */
@@ -1508,8 +1511,9 @@ static void usbnet_bh (unsigned long param)
         } else if (netif_running (dev->net) &&
                    netif_device_present (dev->net) &&
                    netif_carrier_ok(dev->net) &&
-                   !timer_pending (&dev->delay) &&
-                   !test_bit (EVENT_RX_HALT, &dev->flags)) {
+                   !timer_pending(&dev->delay) &&
+                   !test_bit(EVENT_RX_PAUSED, &dev->flags) &&
+                   !test_bit(EVENT_RX_HALT, &dev->flags)) {
                 int     temp = dev->rxq.qlen;
 
                 if (temp < RX_QLEN(dev)) {
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index dff08842f26d..8bd8c7e1ee87 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -304,7 +304,7 @@ static int vrf_rt6_create(struct net_device *dev)
         dst_hold(&rt6->dst);
 
         rt6->rt6i_table = rt6i_table;
-        rt6->dst.output = vrf_output6;
+        rt6->dst.output = vrf_output6;
         rcu_assign_pointer(vrf->rt6, rt6);
 
         rc = 0;
@@ -403,7 +403,7 @@ static int vrf_rtable_create(struct net_device *dev)
         if (!rth)
                 return -ENOMEM;
 
-        rth->dst.output = vrf_output;
+        rth->dst.output = vrf_output;
         rth->rt_table_id = vrf->tb_id;
 
         rcu_assign_pointer(vrf->rth, rth);
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index f999db2f97b4..b3b9db68f758 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -2952,30 +2952,6 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
         return 0;
 }
 
-struct net_device *vxlan_dev_create(struct net *net, const char *name,
-                                    u8 name_assign_type, struct vxlan_config *conf)
-{
-        struct nlattr *tb[IFLA_MAX+1];
-        struct net_device *dev;
-        int err;
-
-        memset(&tb, 0, sizeof(tb));
-
-        dev = rtnl_create_link(net, name, name_assign_type,
-                               &vxlan_link_ops, tb);
-        if (IS_ERR(dev))
-                return dev;
-
-        err = vxlan_dev_configure(net, dev, conf);
-        if (err < 0) {
-                free_netdev(dev);
-                return ERR_PTR(err);
-        }
-
-        return dev;
-}
-EXPORT_SYMBOL_GPL(vxlan_dev_create);
-
 static int vxlan_newlink(struct net *src_net, struct net_device *dev,
                          struct nlattr *tb[], struct nlattr *data[])
 {
@@ -3268,6 +3244,40 @@ static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
         .get_link_net   = vxlan_get_link_net,
 };
 
+struct net_device *vxlan_dev_create(struct net *net, const char *name,
+                                    u8 name_assign_type,
+                                    struct vxlan_config *conf)
+{
+        struct nlattr *tb[IFLA_MAX + 1];
+        struct net_device *dev;
+        int err;
+
+        memset(&tb, 0, sizeof(tb));
+
+        dev = rtnl_create_link(net, name, name_assign_type,
+                               &vxlan_link_ops, tb);
+        if (IS_ERR(dev))
+                return dev;
+
+        err = vxlan_dev_configure(net, dev, conf);
+        if (err < 0) {
+                free_netdev(dev);
+                return ERR_PTR(err);
+        }
+
+        err = rtnl_configure_link(dev, NULL);
+        if (err < 0) {
+                LIST_HEAD(list_kill);
+
+                vxlan_dellink(dev, &list_kill);
+                unregister_netdevice_many(&list_kill);
+                return ERR_PTR(err);
+        }
+
+        return dev;
+}
+EXPORT_SYMBOL_GPL(vxlan_dev_create);
+
 static void vxlan_handle_lowerdev_unregister(struct vxlan_net *vn,
                                              struct net_device *dev)
 {
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 49af62428c88..a92a0ba829f5 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -1083,7 +1083,7 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name,
                         }
 
                         ath10k_dbg_dump(ar, ATH10K_DBG_BOOT, "features", "",
-                                        ar->running_fw->fw_file.fw_features,
+                                        fw_file->fw_features,
                                         sizeof(fw_file->fw_features));
                         break;
                 case ATH10K_FW_IE_FW_IMAGE:
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index cc979a4faeb0..813cdd2621a1 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -1904,7 +1904,6 @@ static void ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb)
                         return;
                 }
         }
-        ath10k_htt_rx_msdu_buff_replenish(htt);
 }
 
 static void ath10k_htt_rx_tx_fetch_resp_id_confirm(struct ath10k *ar,
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 6dd1d26b357f..4040f9413e86 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -679,10 +679,10 @@ static int ath10k_peer_create(struct ath10k *ar,
 
         peer = ath10k_peer_find(ar, vdev_id, addr);
         if (!peer) {
+                spin_unlock_bh(&ar->data_lock);
                 ath10k_warn(ar, "failed to find peer %pM on vdev %i after creation\n",
                             addr, vdev_id);
                 ath10k_wmi_peer_delete(ar, vdev_id, addr);
-                spin_unlock_bh(&ar->data_lock);
                 return -ENOENT;
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index 9272ca90632b..80ff69f99229 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -1122,12 +1122,12 @@ enum {
 #define AR9300_NUM_GPIO                          16
 #define AR9330_NUM_GPIO                          16
 #define AR9340_NUM_GPIO                          23
-#define AR9462_NUM_GPIO                          10
+#define AR9462_NUM_GPIO                          14
 #define AR9485_NUM_GPIO                          12
 #define AR9531_NUM_GPIO                          18
 #define AR9550_NUM_GPIO                          24
 #define AR9561_NUM_GPIO                          23
-#define AR9565_NUM_GPIO                          12
+#define AR9565_NUM_GPIO                          14
 #define AR9580_NUM_GPIO                          16
 #define AR7010_NUM_GPIO                          16
 
@@ -1139,12 +1139,12 @@ enum {
 #define AR9300_GPIO_MASK                         0x0000F4FF
 #define AR9330_GPIO_MASK                         0x0000F4FF
 #define AR9340_GPIO_MASK                         0x0000000F
-#define AR9462_GPIO_MASK                         0x000003FF
+#define AR9462_GPIO_MASK                         0x00003FFF
 #define AR9485_GPIO_MASK                         0x00000FFF
 #define AR9531_GPIO_MASK                         0x0000000F
 #define AR9550_GPIO_MASK                         0x0000000F
 #define AR9561_GPIO_MASK                         0x0000000F
-#define AR9565_GPIO_MASK                         0x00000FFF
+#define AR9565_GPIO_MASK                         0x00003FFF
 #define AR9580_GPIO_MASK                         0x0000F4FF
 #define AR7010_GPIO_MASK                         0x0000FFFF
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index e5f267b21316..18a8474b5760 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -3851,8 +3851,8 @@ static int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx,
         if (idx != 0)
                 return -ENOENT;
 
-        if (fw_has_capa(&mvm->fw->ucode_capa,
-                        IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
+        if (!fw_has_capa(&mvm->fw->ucode_capa,
+                         IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
                 return -ENOENT;
 
         mutex_lock(&mvm->mutex);
@@ -3898,8 +3898,8 @@ static void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw,
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
         struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
 
-        if (fw_has_capa(&mvm->fw->ucode_capa,
-                        IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
+        if (!fw_has_capa(&mvm->fw->ucode_capa,
+                         IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
                 return;
 
         /* if beacon filtering isn't on mac80211 does it anyway */
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index ac2c5718e454..2c61516d06ff 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -581,7 +581,7 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm,
                             struct iwl_rx_mpdu_desc *desc)
 {
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);
+        struct iwl_mvm_sta *mvm_sta;
         struct iwl_mvm_baid_data *baid_data;
         struct iwl_mvm_reorder_buffer *buffer;
         struct sk_buff *tail;
@@ -604,6 +604,8 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm,
         if (WARN_ON(IS_ERR_OR_NULL(sta)))
                 return false;
 
+        mvm_sta = iwl_mvm_sta_from_mac80211(sta);
+
         /* not a data packet */
         if (!ieee80211_is_data_qos(hdr->frame_control) ||
             is_multicast_ether_addr(hdr->addr1))
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 6f609dd5c222..e78fc567ff7d 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1222,7 +1222,7 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)
         return -EIO;
 }
 
-#define SCAN_TIMEOUT (16 * HZ)
+#define SCAN_TIMEOUT (20 * HZ)
 
 void iwl_mvm_scan_timeout(unsigned long data)
 {
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index fea4d3437e2f..b23ab4a4504f 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -1852,12 +1852,18 @@ static struct iwl_mvm_sta *iwl_mvm_get_key_sta(struct iwl_mvm *mvm,
             mvmvif->ap_sta_id != IWL_MVM_STATION_COUNT) {
                 u8 sta_id = mvmvif->ap_sta_id;
 
+                sta = rcu_dereference_check(mvm->fw_id_to_mac_id[sta_id],
+                                            lockdep_is_held(&mvm->mutex));
+
                 /*
                  * It is possible that the 'sta' parameter is NULL,
                  * for example when a GTK is removed - the sta_id will then
                  * be the AP ID, and no station was passed by mac80211.
                  */
-                return iwl_mvm_sta_from_staid_protected(mvm, sta_id);
+                if (IS_ERR_OR_NULL(sta))
+                        return NULL;
+
+                return iwl_mvm_sta_from_mac80211(sta);
         }
 
         return NULL;
@@ -1955,6 +1961,14 @@ static int iwl_mvm_send_sta_igtk(struct iwl_mvm *mvm,
                 struct ieee80211_key_seq seq;
                 const u8 *pn;
 
+                switch (keyconf->cipher) {
+                case WLAN_CIPHER_SUITE_AES_CMAC:
+                        igtk_cmd.ctrl_flags |= cpu_to_le32(STA_KEY_FLG_CCM);
+                        break;
+                default:
+                        return -EINVAL;
+                }
+
                 memcpy(igtk_cmd.IGTK, keyconf->key, keyconf->keylen);
                 ieee80211_get_key_rx_seq(keyconf, 0, &seq);
                 pn = seq.aes_cmac.pn;
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
index fe19ace0d6a0..b04cf30f3959 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
@@ -1149,7 +1149,7 @@ static void rtl8192eu_phy_iqcalibrate(struct rtl8xxxu_priv *priv,
 
                 for (i = 0; i < retry; i++) {
                         path_b_ok = rtl8192eu_rx_iqk_path_b(priv);
-                        if (path_a_ok == 0x03) {
+                        if (path_b_ok == 0x03) {
                                 val32 = rtl8xxxu_read32(priv,
                                                         REG_RX_POWER_BEFORE_IQK_B_2);
                                 result[t][6] = (val32 >> 16) & 0x3ff;
diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
index f7718ec685fa..cea8350fbc7e 100644
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@ -344,6 +344,8 @@ struct device *nd_pfn_create(struct nd_region *nd_region)
 int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)
 {
         u64 checksum, offset;
+        unsigned long align;
+        enum nd_pfn_mode mode;
         struct nd_namespace_io *nsio;
         struct nd_pfn_sb *pfn_sb = nd_pfn->pfn_sb;
         struct nd_namespace_common *ndns = nd_pfn->ndns;
@@ -386,22 +388,50 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)
                 return -ENXIO;
         }
 
+        align = le32_to_cpu(pfn_sb->align);
+        offset = le64_to_cpu(pfn_sb->dataoff);
+        if (align == 0)
+                align = 1UL << ilog2(offset);
+        mode = le32_to_cpu(pfn_sb->mode);
+
         if (!nd_pfn->uuid) {
-                /* from probe we allocate */
+                /*
+                 * When probing a namepace via nd_pfn_probe() the uuid
+                 * is NULL (see: nd_pfn_devinit()) we init settings from
+                 * pfn_sb
+                 */
                 nd_pfn->uuid = kmemdup(pfn_sb->uuid, 16, GFP_KERNEL);
                 if (!nd_pfn->uuid)
                         return -ENOMEM;
+                nd_pfn->align = align;
+                nd_pfn->mode = mode;
         } else {
-                /* from init we validate */
+                /*
+                 * When probing a pfn / dax instance we validate the
+                 * live settings against the pfn_sb
+                 */
                 if (memcmp(nd_pfn->uuid, pfn_sb->uuid, 16) != 0)
                         return -ENODEV;
+
+                /*
+                 * If the uuid validates, but other settings mismatch
+                 * return EINVAL because userspace has managed to change
+                 * the configuration without specifying new
+                 * identification.
+                 */
+                if (nd_pfn->align != align || nd_pfn->mode != mode) {
+                        dev_err(&nd_pfn->dev,
+                                        "init failed, settings mismatch\n");
+                        dev_dbg(&nd_pfn->dev, "align: %lx:%lx mode: %d:%d\n",
+                                        nd_pfn->align, align, nd_pfn->mode,
+                                        mode);
+                        return -EINVAL;
+                }
         }
 
-        if (nd_pfn->align == 0)
-                nd_pfn->align = le32_to_cpu(pfn_sb->align);
-        if (nd_pfn->align > nvdimm_namespace_capacity(ndns)) {
+        if (align > nvdimm_namespace_capacity(ndns)) {
                 dev_err(&nd_pfn->dev, "alignment: %lx exceeds capacity %llx\n",
-                                nd_pfn->align, nvdimm_namespace_capacity(ndns));
+                                align, nvdimm_namespace_capacity(ndns));
                 return -EINVAL;
         }
 
@@ -411,7 +441,6 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)
          * namespace has changed since the pfn superblock was
          * established.
          */
-        offset = le64_to_cpu(pfn_sb->dataoff);
         nsio = to_nd_namespace_io(&ndns->dev);
         if (offset >= resource_size(&nsio->res)) {
                 dev_err(&nd_pfn->dev, "pfn array size exceeds capacity of %s\n",
@@ -419,10 +448,11 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)
                 return -EBUSY;
         }
 
-        if ((nd_pfn->align && !IS_ALIGNED(offset, nd_pfn->align))
+        if ((align && !IS_ALIGNED(offset, align))
                         || !IS_ALIGNED(offset, PAGE_SIZE)) {
-                dev_err(&nd_pfn->dev, "bad offset: %#llx dax disabled\n",
-                                offset);
+                dev_err(&nd_pfn->dev,
+                                "bad offset: %#llx dax disabled align: %#lx\n",
+                                offset, align);
                 return -ENXIO;
         }
 
@@ -502,7 +532,6 @@ static struct vmem_altmap *__nvdimm_setup_pfn(struct nd_pfn *nd_pfn,
         res->start += start_pad;
         res->end -= end_trunc;
 
-        nd_pfn->mode = le32_to_cpu(nd_pfn->pfn_sb->mode);
         if (nd_pfn->mode == PFN_MODE_RAM) {
                 if (offset < SZ_8K)
                         return ERR_PTR(-EINVAL);
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 1a51584a382b..d5fb55c0a9d9 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1394,19 +1394,22 @@ static int ns_cmp(void *priv, struct list_head *a, struct list_head *b)
         return nsa->ns_id - nsb->ns_id;
 }
 
-static struct nvme_ns *nvme_find_ns(struct nvme_ctrl *ctrl, unsigned nsid)
+static struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid)
 {
-        struct nvme_ns *ns;
-
-        lockdep_assert_held(&ctrl->namespaces_mutex);
+        struct nvme_ns *ns, *ret = NULL;
 
+        mutex_lock(&ctrl->namespaces_mutex);
         list_for_each_entry(ns, &ctrl->namespaces, list) {
-                if (ns->ns_id == nsid)
-                        return ns;
+                if (ns->ns_id == nsid) {
+                        kref_get(&ns->kref);
+                        ret = ns;
+                        break;
+                }
                 if (ns->ns_id > nsid)
                         break;
         }
-        return NULL;
+        mutex_unlock(&ctrl->namespaces_mutex);
+        return ret;
 }
 
 static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
@@ -1415,8 +1418,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
         struct gendisk *disk;
         int node = dev_to_node(ctrl->dev);
 
-        lockdep_assert_held(&ctrl->namespaces_mutex);
-
         ns = kzalloc_node(sizeof(*ns), GFP_KERNEL, node);
         if (!ns)
                 return;
@@ -1457,7 +1458,10 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
         if (nvme_revalidate_disk(ns->disk))
                 goto out_free_disk;
 
-        list_add_tail_rcu(&ns->list, &ctrl->namespaces);
+        mutex_lock(&ctrl->namespaces_mutex);
+        list_add_tail(&ns->list, &ctrl->namespaces);
+        mutex_unlock(&ctrl->namespaces_mutex);
+
         kref_get(&ctrl->kref);
         if (ns->type == NVME_NS_LIGHTNVM)
                 return;
@@ -1480,8 +1484,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
 
 static void nvme_ns_remove(struct nvme_ns *ns)
 {
-        lockdep_assert_held(&ns->ctrl->namespaces_mutex);
-
         if (test_and_set_bit(NVME_NS_REMOVING, &ns->flags))
                 return;
 
@@ -1494,8 +1496,11 @@ static void nvme_ns_remove(struct nvme_ns *ns)
                 blk_mq_abort_requeue_list(ns->queue);
                 blk_cleanup_queue(ns->queue);
         }
+
+        mutex_lock(&ns->ctrl->namespaces_mutex);
         list_del_init(&ns->list);
-        synchronize_rcu();
+        mutex_unlock(&ns->ctrl->namespaces_mutex);
+
         nvme_put_ns(ns);
 }
 
@@ -1503,10 +1508,11 @@ static void nvme_validate_ns(struct nvme_ctrl *ctrl, unsigned nsid)
 {
         struct nvme_ns *ns;
 
-        ns = nvme_find_ns(ctrl, nsid);
+        ns = nvme_find_get_ns(ctrl, nsid);
         if (ns) {
                 if (revalidate_disk(ns->disk))
                         nvme_ns_remove(ns);
+                nvme_put_ns(ns);
         } else
                 nvme_alloc_ns(ctrl, nsid);
 }
@@ -1535,9 +1541,11 @@ static int nvme_scan_ns_list(struct nvme_ctrl *ctrl, unsigned nn)
                         nvme_validate_ns(ctrl, nsid);
 
                         while (++prev < nsid) {
-                                ns = nvme_find_ns(ctrl, prev);
-                                if (ns)
+                                ns = nvme_find_get_ns(ctrl, prev);
+                                if (ns) {
                                         nvme_ns_remove(ns);
+                                        nvme_put_ns(ns);
+                                }
                         }
                 }
                 nn -= j;
@@ -1552,8 +1560,6 @@ static void nvme_scan_ns_sequential(struct nvme_ctrl *ctrl, unsigned nn)
         struct nvme_ns *ns, *next;
         unsigned i;
 
-        lockdep_assert_held(&ctrl->namespaces_mutex);
-
         for (i = 1; i <= nn; i++)
                 nvme_validate_ns(ctrl, i);
 
@@ -1576,7 +1582,6 @@ static void nvme_scan_work(struct work_struct *work)
         if (nvme_identify_ctrl(ctrl, &id))
                 return;
 
-        mutex_lock(&ctrl->namespaces_mutex);
         nn = le32_to_cpu(id->nn);
         if (ctrl->vs >= NVME_VS(1, 1) &&
             !(ctrl->quirks & NVME_QUIRK_IDENTIFY_CNS)) {
@@ -1585,6 +1590,7 @@ static void nvme_scan_work(struct work_struct *work)
         }
         nvme_scan_ns_sequential(ctrl, nn);
  done:
+        mutex_lock(&ctrl->namespaces_mutex);
         list_sort(NULL, &ctrl->namespaces, ns_cmp);
         mutex_unlock(&ctrl->namespaces_mutex);
         kfree(id);
@@ -1604,6 +1610,11 @@ void nvme_queue_scan(struct nvme_ctrl *ctrl)
 }
 EXPORT_SYMBOL_GPL(nvme_queue_scan);
 
+/*
+ * This function iterates the namespace list unlocked to allow recovery from
+ * controller failure. It is up to the caller to ensure the namespace list is
+ * not modified by scan work while this function is executing.
+ */
 void nvme_remove_namespaces(struct nvme_ctrl *ctrl)
 {
         struct nvme_ns *ns, *next;
@@ -1617,10 +1628,8 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl)
         if (ctrl->state == NVME_CTRL_DEAD)
                 nvme_kill_queues(ctrl);
 
-        mutex_lock(&ctrl->namespaces_mutex);
         list_for_each_entry_safe(ns, next, &ctrl->namespaces, list)
                 nvme_ns_remove(ns);
-        mutex_unlock(&ctrl->namespaces_mutex);
 }
 EXPORT_SYMBOL_GPL(nvme_remove_namespaces);
 
@@ -1791,11 +1800,8 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl)
 {
         struct nvme_ns *ns;
 
-        rcu_read_lock();
-        list_for_each_entry_rcu(ns, &ctrl->namespaces, list) {
-                if (!kref_get_unless_zero(&ns->kref))
-                        continue;
-
+        mutex_lock(&ctrl->namespaces_mutex);
+        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.
@@ -1806,10 +1812,8 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl)
                 blk_set_queue_dying(ns->queue);
                 blk_mq_abort_requeue_list(ns->queue);
                 blk_mq_start_stopped_hw_queues(ns->queue, true);
-
-                nvme_put_ns(ns);
         }
-        rcu_read_unlock();
+        mutex_unlock(&ctrl->namespaces_mutex);
 }
 EXPORT_SYMBOL_GPL(nvme_kill_queues);
 
@@ -1817,8 +1821,8 @@ void nvme_stop_queues(struct nvme_ctrl *ctrl)
 {
         struct nvme_ns *ns;
 
-        rcu_read_lock();
-        list_for_each_entry_rcu(ns, &ctrl->namespaces, list) {
+        mutex_lock(&ctrl->namespaces_mutex);
+        list_for_each_entry(ns, &ctrl->namespaces, list) {
                 spin_lock_irq(ns->queue->queue_lock);
                 queue_flag_set(QUEUE_FLAG_STOPPED, ns->queue);
                 spin_unlock_irq(ns->queue->queue_lock);
@@ -1826,7 +1830,7 @@ void nvme_stop_queues(struct nvme_ctrl *ctrl)
                 blk_mq_cancel_requeue_work(ns->queue);
                 blk_mq_stop_hw_queues(ns->queue);
         }
-        rcu_read_unlock();
+        mutex_unlock(&ctrl->namespaces_mutex);
 }
 EXPORT_SYMBOL_GPL(nvme_stop_queues);
 
@@ -1834,13 +1838,13 @@ void nvme_start_queues(struct nvme_ctrl *ctrl)
 {
         struct nvme_ns *ns;
 
-        rcu_read_lock();
-        list_for_each_entry_rcu(ns, &ctrl->namespaces, list) {
+        mutex_lock(&ctrl->namespaces_mutex);
+        list_for_each_entry(ns, &ctrl->namespaces, list) {
                 queue_flag_clear_unlocked(QUEUE_FLAG_STOPPED, ns->queue);
                 blk_mq_start_stopped_hw_queues(ns->queue, true);
                 blk_mq_kick_requeue_list(ns->queue);
         }
-        rcu_read_unlock();
+        mutex_unlock(&ctrl->namespaces_mutex);
 }
 EXPORT_SYMBOL_GPL(nvme_start_queues);
 
diff --git a/drivers/phy/phy-bcm-ns-usb2.c b/drivers/phy/phy-bcm-ns-usb2.c
index 95ab6b2a0de5..58dff80e9386 100644
--- a/drivers/phy/phy-bcm-ns-usb2.c
+++ b/drivers/phy/phy-bcm-ns-usb2.c
@@ -109,8 +109,8 @@ static int bcm_ns_usb2_probe(struct platform_device *pdev)
         }
 
         usb2->phy = devm_phy_create(dev, NULL, &ops);
-        if (IS_ERR(dev))
-                return PTR_ERR(dev);
+        if (IS_ERR(usb2->phy))
+                return PTR_ERR(usb2->phy);
 
         phy_set_drvdata(usb2->phy, usb2);
         platform_set_drvdata(pdev, usb2);
diff --git a/drivers/phy/phy-miphy28lp.c b/drivers/phy/phy-miphy28lp.c
index 3acd2a1808df..213e2e15339c 100644
--- a/drivers/phy/phy-miphy28lp.c
+++ b/drivers/phy/phy-miphy28lp.c
@@ -1143,7 +1143,8 @@ static int miphy28lp_probe_resets(struct device_node *node,
         struct miphy28lp_dev *miphy_dev = miphy_phy->phydev;
         int err;
 
-        miphy_phy->miphy_rst = of_reset_control_get(node, "miphy-sw-rst");
+        miphy_phy->miphy_rst =
+                of_reset_control_get_shared(node, "miphy-sw-rst");
 
         if (IS_ERR(miphy_phy->miphy_rst)) {
                 dev_err(miphy_dev->dev,
diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c
index 76bb88f0700a..4be3f5dbbc9f 100644
--- a/drivers/phy/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/phy-rcar-gen3-usb2.c
@@ -144,12 +144,6 @@ static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch)
         extcon_set_cable_state_(ch->extcon, EXTCON_USB, true);
 }
 
-static bool rcar_gen3_check_vbus(struct rcar_gen3_chan *ch)
-{
-        return !!(readl(ch->base + USB2_ADPCTRL) &
-                  USB2_ADPCTRL_OTGSESSVLD);
-}
-
 static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
 {
         return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
@@ -157,13 +151,7 @@ static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
 
 static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch)
 {
-        bool is_host = true;
-
-        /* B-device? */
-        if (rcar_gen3_check_id(ch) && rcar_gen3_check_vbus(ch))
-                is_host = false;
-
-        if (is_host)
+        if (!rcar_gen3_check_id(ch))
                 rcar_gen3_init_for_host(ch);
         else
                 rcar_gen3_init_for_peri(ch);
diff --git a/drivers/phy/phy-rockchip-dp.c b/drivers/phy/phy-rockchip-dp.c
index 793ecb6d87bc..8b267a746576 100644
--- a/drivers/phy/phy-rockchip-dp.c
+++ b/drivers/phy/phy-rockchip-dp.c
@@ -90,7 +90,7 @@ static int rockchip_dp_phy_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
-        if (IS_ERR(dp))
+        if (!dp)
                 return -ENOMEM;
 
         dp->dev = dev;
diff --git a/drivers/phy/phy-stih407-usb.c b/drivers/phy/phy-stih407-usb.c
index 1d5ae5f8ef69..b1f44ab669fb 100644
--- a/drivers/phy/phy-stih407-usb.c
+++ b/drivers/phy/phy-stih407-usb.c
@@ -105,13 +105,13 @@ static int stih407_usb2_picophy_probe(struct platform_device *pdev)
         phy_dev->dev = dev;
         dev_set_drvdata(dev, phy_dev);
 
-        phy_dev->rstc = devm_reset_control_get(dev, "global");
+        phy_dev->rstc = devm_reset_control_get_shared(dev, "global");
         if (IS_ERR(phy_dev->rstc)) {
                 dev_err(dev, "failed to ctrl picoPHY reset\n");
                 return PTR_ERR(phy_dev->rstc);
         }
 
-        phy_dev->rstport = devm_reset_control_get(dev, "port");
+        phy_dev->rstport = devm_reset_control_get_exclusive(dev, "port");
         if (IS_ERR(phy_dev->rstport)) {
                 dev_err(dev, "failed to ctrl picoPHY reset\n");
                 return PTR_ERR(phy_dev->rstport);
diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c
index bae54f7a1f48..de3101fbbf40 100644
--- a/drivers/phy/phy-sun4i-usb.c
+++ b/drivers/phy/phy-sun4i-usb.c
@@ -175,7 +175,7 @@ static void sun4i_usb_phy_write(struct sun4i_usb_phy *phy, u32 addr, u32 data,
 {
         struct sun4i_usb_phy_data *phy_data = to_sun4i_usb_phy_data(phy);
         u32 temp, usbc_bit = BIT(phy->index * 2);
-        void *phyctl = phy_data->base + phy_data->cfg->phyctl_offset;
+        void __iomem *phyctl = phy_data->base + phy_data->cfg->phyctl_offset;
         int i;
 
         mutex_lock(&phy_data->mutex);
@@ -514,9 +514,9 @@ static int sun4i_usb_phy_remove(struct platform_device *pdev)
 
         if (data->vbus_power_nb_registered)
                 power_supply_unreg_notifier(&data->vbus_power_nb);
-        if (data->id_det_irq >= 0)
+        if (data->id_det_irq > 0)
                 devm_free_irq(dev, data->id_det_irq, data);
-        if (data->vbus_det_irq >= 0)
+        if (data->vbus_det_irq > 0)
                 devm_free_irq(dev, data->vbus_det_irq, data);
 
         cancel_delayed_work_sync(&data->detect);
@@ -645,11 +645,11 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
 
         data->id_det_irq = gpiod_to_irq(data->id_det_gpio);
         data->vbus_det_irq = gpiod_to_irq(data->vbus_det_gpio);
-        if ((data->id_det_gpio && data->id_det_irq < 0) ||
-            (data->vbus_det_gpio && data->vbus_det_irq < 0))
+        if ((data->id_det_gpio && data->id_det_irq <= 0) ||
+            (data->vbus_det_gpio && data->vbus_det_irq <= 0))
                 data->phy0_poll = true;
 
-        if (data->id_det_irq >= 0) {
+        if (data->id_det_irq > 0) {
                 ret = devm_request_irq(dev, data->id_det_irq,
                                 sun4i_usb_phy0_id_vbus_det_irq,
                                 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
@@ -660,7 +660,7 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
                 }
         }
 
-        if (data->vbus_det_irq >= 0) {
+        if (data->vbus_det_irq > 0) {
                 ret = devm_request_irq(dev, data->vbus_det_irq,
                                 sun4i_usb_phy0_id_vbus_det_irq,
                                 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index e4bc1151e04f..42a5c1dddfef 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -23,7 +23,7 @@ obj-$(CONFIG_PINCTRL_PISTACHIO)	+= pinctrl-pistachio.o
 obj-$(CONFIG_PINCTRL_ROCKCHIP)  += pinctrl-rockchip.o
 obj-$(CONFIG_PINCTRL_SINGLE)    += pinctrl-single.o
 obj-$(CONFIG_PINCTRL_SIRF)      += sirf/
-obj-$(CONFIG_PINCTRL_TEGRA)     += tegra/
+obj-$(CONFIG_ARCH_TEGRA)        += tegra/
 obj-$(CONFIG_PINCTRL_TZ1090)    += pinctrl-tz1090.o
 obj-$(CONFIG_PINCTRL_TZ1090_PDC)        += pinctrl-tz1090-pdc.o
 obj-$(CONFIG_PINCTRL_U300)      += pinctrl-u300.o
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 47ccfcc8a647..eccb47480e1d 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -209,9 +209,9 @@ static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector,
                 pin_reg = &info->pin_regs[pin_id];
 
                 if (pin_reg->mux_reg == -1) {
-                        dev_err(ipctl->dev, "Pin(%s) does not support mux function\n",
+                        dev_dbg(ipctl->dev, "Pin(%s) does not support mux function\n",
                                 info->pins[pin_id].name);
-                        return -EINVAL;
+                        continue;
                 }
 
                 if (info->flags & SHARE_MUX_CONF_REG) {
diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c
index 677a811b3a6f..7abfd42e8ffd 100644
--- a/drivers/pinctrl/intel/pinctrl-baytrail.c
+++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
@@ -401,9 +401,9 @@ static const struct byt_simple_func_mux byt_score_sata_mux[] = {
 static const unsigned int byt_score_plt_clk0_pins[] = { 96 };
 static const unsigned int byt_score_plt_clk1_pins[] = { 97 };
 static const unsigned int byt_score_plt_clk2_pins[] = { 98 };
-static const unsigned int byt_score_plt_clk4_pins[] = { 99 };
-static const unsigned int byt_score_plt_clk5_pins[] = { 100 };
-static const unsigned int byt_score_plt_clk3_pins[] = { 101 };
+static const unsigned int byt_score_plt_clk3_pins[] = { 99 };
+static const unsigned int byt_score_plt_clk4_pins[] = { 100 };
+static const unsigned int byt_score_plt_clk5_pins[] = { 101 };
 static const struct byt_simple_func_mux byt_score_plt_clk_mux[] = {
         SIMPLE_FUNC("plt_clk", 1),
 };
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index cf9bafa10acf..bfdf720db270 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1580,6 +1580,9 @@ static inline void pcs_irq_set(struct pcs_soc_data *pcs_soc,
                 else
                         mask &= ~soc_mask;
                 pcs->write(mask, pcswi->reg);
+
+                /* flush posted write */
+                mask = pcs->read(pcswi->reg);
                 raw_spin_unlock(&pcs->lock);
         }
 
diff --git a/drivers/pinctrl/tegra/Makefile b/drivers/pinctrl/tegra/Makefile
index a927379b6794..d9ea2be69cc4 100644
--- a/drivers/pinctrl/tegra/Makefile
+++ b/drivers/pinctrl/tegra/Makefile
@@ -1,4 +1,4 @@
-obj-y                                   += pinctrl-tegra.o
+obj-$(CONFIG_PINCTRL_TEGRA)             += pinctrl-tegra.o
 obj-$(CONFIG_PINCTRL_TEGRA20)           += pinctrl-tegra20.o
 obj-$(CONFIG_PINCTRL_TEGRA30)           += pinctrl-tegra30.o
 obj-$(CONFIG_PINCTRL_TEGRA114)          += pinctrl-tegra114.o
diff --git a/drivers/platform/chrome/cros_ec_dev.c b/drivers/platform/chrome/cros_ec_dev.c
index 6d8ee3b15872..8abd80dbcbed 100644
--- a/drivers/platform/chrome/cros_ec_dev.c
+++ b/drivers/platform/chrome/cros_ec_dev.c
@@ -151,13 +151,19 @@ static long ec_device_ioctl_xcmd(struct cros_ec_dev *ec, void __user *arg)
                 goto exit;
         }
 
+        if (u_cmd.outsize != s_cmd->outsize ||
+            u_cmd.insize != s_cmd->insize) {
+                ret = -EINVAL;
+                goto exit;
+        }
+
         s_cmd->command += ec->cmd_offset;
         ret = cros_ec_cmd_xfer(ec->ec_dev, s_cmd);
         /* Only copy data to userland if data was received. */
         if (ret < 0)
                 goto exit;
 
-        if (copy_to_user(arg, s_cmd, sizeof(*s_cmd) + u_cmd.insize))
+        if (copy_to_user(arg, s_cmd, sizeof(*s_cmd) + s_cmd->insize))
                 ret = -EFAULT;
 exit:
         kfree(s_cmd);
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 456987c88baa..b13cd074c52a 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -565,11 +565,12 @@ static int power_supply_read_temp(struct thermal_zone_device *tzd,
 
         WARN_ON(tzd == NULL);
         psy = tzd->devdata;
-        ret = psy->desc->get_property(psy, POWER_SUPPLY_PROP_TEMP, &val);
+        ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_TEMP, &val);
+        if (ret)
+                return ret;
 
         /* Convert tenths of degree Celsius to milli degree Celsius. */
-        if (!ret)
-                *temp = val.intval * 100;
+        *temp = val.intval * 100;
 
         return ret;
 }
@@ -612,10 +613,12 @@ static int ps_get_max_charge_cntl_limit(struct thermal_cooling_device *tcd,
         int ret;
 
         psy = tcd->devdata;
-        ret = psy->desc->get_property(psy,
-                POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX, &val);
-        if (!ret)
-                *state = val.intval;
+        ret = power_supply_get_property(psy,
+                        POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX, &val);
+        if (ret)
+                return ret;
+
+        *state = val.intval;
 
         return ret;
 }
@@ -628,10 +631,12 @@ static int ps_get_cur_chrage_cntl_limit(struct thermal_cooling_device *tcd,
         int ret;
 
         psy = tcd->devdata;
-        ret = psy->desc->get_property(psy,
-                POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT, &val);
-        if (!ret)
-                *state = val.intval;
+        ret = power_supply_get_property(psy,
+                        POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT, &val);
+        if (ret)
+                return ret;
+
+        *state = val.intval;
 
         return ret;
 }
diff --git a/drivers/power/tps65217_charger.c b/drivers/power/tps65217_charger.c
index d9f56730c735..73dfae41def8 100644
--- a/drivers/power/tps65217_charger.c
+++ b/drivers/power/tps65217_charger.c
@@ -197,6 +197,7 @@ static int tps65217_charger_probe(struct platform_device *pdev)
 {
         struct tps65217 *tps = dev_get_drvdata(pdev->dev.parent);
         struct tps65217_charger *charger;
+        struct power_supply_config cfg = {};
         int ret;
 
         dev_dbg(&pdev->dev, "%s\n", __func__);
@@ -208,9 +209,12 @@ static int tps65217_charger_probe(struct platform_device *pdev)
         charger->tps = tps;
         charger->dev = &pdev->dev;
 
+        cfg.of_node = pdev->dev.of_node;
+        cfg.drv_data = charger;
+
         charger->ac = devm_power_supply_register(&pdev->dev,
                                                  &tps65217_charger_desc,
-                                                 NULL);
+                                                 &cfg);
         if (IS_ERR(charger->ac)) {
                 dev_err(&pdev->dev, "failed: power supply register\n");
                 return PTR_ERR(charger->ac);
diff --git a/drivers/pps/clients/pps_parport.c b/drivers/pps/clients/pps_parport.c
index 38a8bbe74810..83797d89c30f 100644
--- a/drivers/pps/clients/pps_parport.c
+++ b/drivers/pps/clients/pps_parport.c
@@ -195,7 +195,7 @@ static void parport_detach(struct parport *port)
         struct pps_client_pp *device;
 
         /* FIXME: oooh, this is ugly! */
-        if (strcmp(pardev->name, KBUILD_MODNAME))
+        if (!pardev || strcmp(pardev->name, KBUILD_MODNAME))
                 /* not our port */
                 return;
 
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 63cd5e68c864..3a6d0290c54c 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -296,7 +296,7 @@ static int anatop_regulator_probe(struct platform_device *pdev)
                 if (!sreg->sel && !strcmp(sreg->name, "vddpu"))
                         sreg->sel = 22;
 
-                if (!sreg->sel) {
+                if (!sreg->bypass && !sreg->sel) {
                         dev_err(&pdev->dev, "Failed to read a valid default voltage selector.\n");
                         return -EINVAL;
                 }
diff --git a/drivers/regulator/max77620-regulator.c b/drivers/regulator/max77620-regulator.c
index 321e804aeab0..a1b49a6d538f 100644
--- a/drivers/regulator/max77620-regulator.c
+++ b/drivers/regulator/max77620-regulator.c
@@ -123,6 +123,9 @@ static int max77620_regulator_set_fps_src(struct max77620_regulator *pmic,
         unsigned int val;
         int ret;
 
+        if (!rinfo)
+                return 0;
+
         switch (fps_src) {
         case MAX77620_FPS_SRC_0:
         case MAX77620_FPS_SRC_1:
@@ -171,6 +174,9 @@ static int max77620_regulator_set_fps_slots(struct max77620_regulator *pmic,
         int pd = rpdata->active_fps_pd_slot;
         int ret = 0;
 
+        if (!rinfo)
+                return 0;
+
         if (is_suspend) {
                 pu = rpdata->suspend_fps_pu_slot;
                 pd = rpdata->suspend_fps_pd_slot;
@@ -680,7 +686,6 @@ static struct max77620_regulator_info max77620_regs_info[MAX77620_NUM_REGS] = {
         RAIL_SD(SD1, sd1, "in-sd1", SD1, 600000, 1550000, 12500, 0x22, SD1),
         RAIL_SD(SD2, sd2, "in-sd2", SDX, 600000, 3787500, 12500, 0xFF, NONE),
         RAIL_SD(SD3, sd3, "in-sd3", SDX, 600000, 3787500, 12500, 0xFF, NONE),
-        RAIL_SD(SD4, sd4, "in-sd4", SDX, 600000, 3787500, 12500, 0xFF, NONE),
 
         RAIL_LDO(LDO0, ldo0, "in-ldo0-1", N, 800000, 2375000, 25000),
         RAIL_LDO(LDO1, ldo1, "in-ldo0-1", N, 800000, 2375000, 25000),
diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c
index 526bf23dcb49..6c7fe4778793 100644
--- a/drivers/regulator/qcom_smd-regulator.c
+++ b/drivers/regulator/qcom_smd-regulator.c
@@ -152,7 +152,6 @@ static const struct regulator_ops rpm_smps_ldo_ops_fixed = {
         .enable = rpm_reg_enable,
         .disable = rpm_reg_disable,
         .is_enabled = rpm_reg_is_enabled,
-        .list_voltage = regulator_list_voltage_linear_range,
 
         .get_voltage = rpm_reg_get_voltage,
         .set_voltage = rpm_reg_set_voltage,
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 80b1979e8d95..df036b872b05 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1051,6 +1051,7 @@ static void qeth_l2_remove_device(struct ccwgroup_device *cgdev)
                 qeth_l2_set_offline(cgdev);
 
         if (card->dev) {
+                netif_napi_del(&card->napi);
                 unregister_netdev(card->dev);
                 card->dev = NULL;
         }
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index ac544330daeb..709b52339ff9 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -3226,6 +3226,7 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)
                 qeth_l3_set_offline(cgdev);
 
         if (card->dev) {
+                netif_napi_del(&card->napi);
                 unregister_netdev(card->dev);
                 card->dev = NULL;
         }
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index d6a691e27d33..d6803a9e5ab8 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -10093,6 +10093,7 @@ static int ipr_probe_ioa(struct pci_dev *pdev,
                 ioa_cfg->intr_flag = IPR_USE_MSI;
         else {
                 ioa_cfg->intr_flag = IPR_USE_LSI;
+                ioa_cfg->clear_isr = 1;
                 ioa_cfg->nvectors = 1;
                 dev_info(&pdev->dev, "Cannot enable MSI.\n");
         }
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 5649c200d37c..a92a62dea793 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2548,7 +2548,7 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
         if (!vha->flags.online)
                 return;
 
-        if (rsp->msix->cpuid != smp_processor_id()) {
+        if (rsp->msix && rsp->msix->cpuid != smp_processor_id()) {
                 /* if kernel does not notify qla of IRQ's CPU change,
                  * then set it here.
                  */
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index ff41c310c900..eaccd651ccda 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -429,7 +429,7 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor,
          * here, and we don't know what device it is
          * trying to work with, leave it as-is.
          */
-        vmax = 8;       /* max length of vendor */
+        vmax = sizeof(devinfo->vendor);
         vskip = vendor;
         while (vmax > 0 && *vskip == ' ') {
                 vmax--;
@@ -439,7 +439,7 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor,
         while (vmax > 0 && vskip[vmax - 1] == ' ')
                 --vmax;
 
-        mmax = 16;      /* max length of model */
+        mmax = sizeof(devinfo->model);
         mskip = model;
         while (mmax > 0 && *mskip == ' ') {
                 mmax--;
@@ -455,10 +455,12 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor,
                          * Behave like the older version of get_device_flags.
                          */
                         if (memcmp(devinfo->vendor, vskip, vmax) ||
-                                        devinfo->vendor[vmax])
+                                        (vmax < sizeof(devinfo->vendor) &&
+                                                devinfo->vendor[vmax]))
                                 continue;
                         if (memcmp(devinfo->model, mskip, mmax) ||
-                                        devinfo->model[mmax])
+                                        (mmax < sizeof(devinfo->model) &&
+                                                devinfo->model[mmax]))
                                 continue;
                         return devinfo;
                 } else {
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index cd89682065b9..1026e180eed7 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -578,7 +578,7 @@ static int rockchip_spi_transfer_one(
                 struct spi_device *spi,
                 struct spi_transfer *xfer)
 {
-        int ret = 1;
+        int ret = 0;
         struct rockchip_spi *rs = spi_master_get_devdata(master);
 
         WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) &&
@@ -627,6 +627,8 @@ static int rockchip_spi_transfer_one(
                         spi_enable_chip(rs, 1);
                         ret = rockchip_spi_prepare_dma(rs);
                 }
+                /* successful DMA prepare means the transfer is in progress */
+                ret = ret ? ret : 1;
         } else {
                 spi_enable_chip(rs, 1);
                 ret = rockchip_spi_pio_transfer(rs);
diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c
index 1ddd9e2309b6..cf007f3b83ec 100644
--- a/drivers/spi/spi-sun4i.c
+++ b/drivers/spi/spi-sun4i.c
@@ -173,13 +173,17 @@ static int sun4i_spi_transfer_one(struct spi_master *master,
 {
         struct sun4i_spi *sspi = spi_master_get_devdata(master);
         unsigned int mclk_rate, div, timeout;
+        unsigned int start, end, tx_time;
         unsigned int tx_len = 0;
         int ret = 0;
         u32 reg;
 
         /* We don't support transfer larger than the FIFO */
         if (tfr->len > SUN4I_FIFO_DEPTH)
-                return -EINVAL;
+                return -EMSGSIZE;
+
+        if (tfr->tx_buf && tfr->len >= SUN4I_FIFO_DEPTH)
+                return -EMSGSIZE;
 
         reinit_completion(&sspi->done);
         sspi->tx_buf = tfr->tx_buf;
@@ -269,8 +273,12 @@ static int sun4i_spi_transfer_one(struct spi_master *master,
         sun4i_spi_write(sspi, SUN4I_BURST_CNT_REG, SUN4I_BURST_CNT(tfr->len));
         sun4i_spi_write(sspi, SUN4I_XMIT_CNT_REG, SUN4I_XMIT_CNT(tx_len));
 
-        /* Fill the TX FIFO */
-        sun4i_spi_fill_fifo(sspi, SUN4I_FIFO_DEPTH);
+        /*
+         * Fill the TX FIFO
+         * Filling the FIFO fully causes timeout for some reason
+         * at least on spi2 on A10s
+         */
+        sun4i_spi_fill_fifo(sspi, SUN4I_FIFO_DEPTH - 1);
 
         /* Enable the interrupts */
         sun4i_spi_write(sspi, SUN4I_INT_CTL_REG, SUN4I_INT_CTL_TC);
@@ -279,9 +287,16 @@ static int sun4i_spi_transfer_one(struct spi_master *master,
         reg = sun4i_spi_read(sspi, SUN4I_CTL_REG);
         sun4i_spi_write(sspi, SUN4I_CTL_REG, reg | SUN4I_CTL_XCH);
 
+        tx_time = max(tfr->len * 8 * 2 / (tfr->speed_hz / 1000), 100U);
+        start = jiffies;
         timeout = wait_for_completion_timeout(&sspi->done,
-                                              msecs_to_jiffies(1000));
+                                              msecs_to_jiffies(tx_time));
+        end = jiffies;
         if (!timeout) {
+                dev_warn(&master->dev,
+                         "%s: timeout transferring %u bytes@%iHz for %i(%i)ms",
+                         dev_name(&spi->dev), tfr->len, tfr->speed_hz,
+                         jiffies_to_msecs(end - start), tx_time);
                 ret = -ETIMEDOUT;
                 goto out;
         }
diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c
index 42e2c4bd690a..7fce79a60608 100644
--- a/drivers/spi/spi-sun6i.c
+++ b/drivers/spi/spi-sun6i.c
@@ -160,6 +160,7 @@ static int sun6i_spi_transfer_one(struct spi_master *master,
 {
         struct sun6i_spi *sspi = spi_master_get_devdata(master);
         unsigned int mclk_rate, div, timeout;
+        unsigned int start, end, tx_time;
         unsigned int tx_len = 0;
         int ret = 0;
         u32 reg;
@@ -269,9 +270,16 @@ static int sun6i_spi_transfer_one(struct spi_master *master,
         reg = sun6i_spi_read(sspi, SUN6I_TFR_CTL_REG);
         sun6i_spi_write(sspi, SUN6I_TFR_CTL_REG, reg | SUN6I_TFR_CTL_XCH);
 
+        tx_time = max(tfr->len * 8 * 2 / (tfr->speed_hz / 1000), 100U);
+        start = jiffies;
         timeout = wait_for_completion_timeout(&sspi->done,
-                                              msecs_to_jiffies(1000));
+                                              msecs_to_jiffies(tx_time));
+        end = jiffies;
         if (!timeout) {
+                dev_warn(&master->dev,
+                         "%s: timeout transferring %u bytes@%iHz for %i(%i)ms",
+                         dev_name(&spi->dev), tfr->len, tfr->speed_hz,
+                         jiffies_to_msecs(end - start), tx_time);
                 ret = -ETIMEDOUT;
                 goto out;
         }
diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index 443f664534e1..29ea8d2f9824 100644
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -646,6 +646,13 @@ free_master:
 
 static int ti_qspi_remove(struct platform_device *pdev)
 {
+        struct ti_qspi *qspi = platform_get_drvdata(pdev);
+        int rc;
+
+        rc = spi_master_suspend(qspi->master);
+        if (rc)
+                return rc;
+
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
 
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index a8f533af9eca..ec12181822e6 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -594,7 +594,7 @@ static ssize_t sca3000_read_frequency(struct device *dev,
                 goto error_ret_mut;
         ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
         mutex_unlock(&st->lock);
-        if (ret)
+        if (ret < 0)
                 goto error_ret;
         val = ret;
         if (base_freq > 0)
diff --git a/drivers/staging/iio/adc/ad7606_spi.c b/drivers/staging/iio/adc/ad7606_spi.c
index 825da0769936..9587fa86dc69 100644
--- a/drivers/staging/iio/adc/ad7606_spi.c
+++ b/drivers/staging/iio/adc/ad7606_spi.c
@@ -21,7 +21,7 @@ static int ad7606_spi_read_block(struct device *dev,
 {
         struct spi_device *spi = to_spi_device(dev);
         int i, ret;
-        unsigned short *data;
+        unsigned short *data = buf;
         __be16 *bdata = buf;
 
         ret = spi_read(spi, buf, count * 2);
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 9f43976f4ef2..170ac980abcb 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -444,10 +444,10 @@ static ssize_t ad5933_store(struct device *dev,
                 st->settling_cycles = val;
 
                 /* 2x, 4x handling, see datasheet */
-                if (val > 511)
-                        val = (val >> 1) | (1 << 9);
-                else if (val > 1022)
+                if (val > 1022)
                         val = (val >> 2) | (3 << 9);
+                else if (val > 511)
+                        val = (val >> 1) | (1 << 9);
 
                 dat = cpu_to_be16(val);
                 ret = ad5933_i2c_write(st->client,
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index f856c4544eea..51e0d32883ba 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -667,8 +667,11 @@ static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
                 fsi = tty->driver_data;
         else
                 fsi = tty->link->driver_data;
-        devpts_kill_index(fsi, tty->index);
-        devpts_release(fsi);
+
+        if (fsi) {
+                devpts_kill_index(fsi, tty->index);
+                devpts_release(fsi);
+        }
 }
 
 static const struct tty_operations ptm_unix98_ops = {
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index f973bfce5d08..1e93a37e27f0 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -366,34 +366,22 @@ static void to_utf8(struct vc_data *vc, uint c)
 
 static void do_compute_shiftstate(void)
 {
-        unsigned int i, j, k, sym, val;
+        unsigned int k, sym, val;
 
         shift_state = 0;
         memset(shift_down, 0, sizeof(shift_down));
 
-        for (i = 0; i < ARRAY_SIZE(key_down); i++) {
-
-                if (!key_down[i])
+        for_each_set_bit(k, key_down, min(NR_KEYS, KEY_CNT)) {
+                sym = U(key_maps[0][k]);
+                if (KTYP(sym) != KT_SHIFT && KTYP(sym) != KT_SLOCK)
                         continue;
 
-                k = i * BITS_PER_LONG;
-
-                for (j = 0; j < BITS_PER_LONG; j++, k++) {
-
-                        if (!test_bit(k, key_down))
-                                continue;
+                val = KVAL(sym);
+                if (val == KVAL(K_CAPSSHIFT))
+                        val = KVAL(K_SHIFT);
 
-                        sym = U(key_maps[0][k]);
-                        if (KTYP(sym) != KT_SHIFT && KTYP(sym) != KT_SLOCK)
-                                continue;
-
-                        val = KVAL(sym);
-                        if (val == KVAL(K_CAPSSHIFT))
-                                val = KVAL(K_SHIFT);
-
-                        shift_down[val]++;
-                        shift_state |= (1 << val);
-                }
+                shift_down[val]++;
+                shift_state |= BIT(val);
         }
 }
 
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index dc125322f48f..5b0fe97c46ca 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -750,6 +750,7 @@ static void visual_init(struct vc_data *vc, int num, int init)
         vc->vc_complement_mask = 0;
         vc->vc_can_do_color = 0;
         vc->vc_panic_force_write = false;
+        vc->vc_cur_blink_ms = DEFAULT_CURSOR_BLINK_MS;
         vc->vc_sw->con_init(vc, init);
         if (!vc->vc_complement_mask)
                 vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;
diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c
index 9059b7dc185e..2f537bbdda09 100644
--- a/drivers/usb/common/usb-otg-fsm.c
+++ b/drivers/usb/common/usb-otg-fsm.c
@@ -21,6 +21,7 @@
  * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/mutex.h>
@@ -450,3 +451,4 @@ int otg_statemachine(struct otg_fsm *fsm)
         return fsm->state_changed;
 }
 EXPORT_SYMBOL_GPL(otg_statemachine);
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 34b837ae1ed7..d2e3f655c26f 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2598,26 +2598,23 @@ EXPORT_SYMBOL_GPL(usb_create_hcd);
  * Don't deallocate the bandwidth_mutex until the last shared usb_hcd is
  * deallocated.
  *
- * Make sure to only deallocate the bandwidth_mutex when the primary HCD is
- * freed.  When hcd_release() is called for either hcd in a peer set
- * invalidate the peer's ->shared_hcd and ->primary_hcd pointers to
- * block new peering attempts
+ * Make sure to deallocate the bandwidth_mutex only when the last HCD is
+ * freed.  When hcd_release() is called for either hcd in a peer set,
+ * invalidate the peer's ->shared_hcd and ->primary_hcd pointers.
  */
 static void hcd_release(struct kref *kref)
 {
         struct usb_hcd *hcd = container_of (kref, struct usb_hcd, kref);
 
         mutex_lock(&usb_port_peer_mutex);
-        if (usb_hcd_is_primary_hcd(hcd)) {
-                kfree(hcd->address0_mutex);
-                kfree(hcd->bandwidth_mutex);
-        }
         if (hcd->shared_hcd) {
                 struct usb_hcd *peer = hcd->shared_hcd;
 
                 peer->shared_hcd = NULL;
-                if (peer->primary_hcd == hcd)
-                        peer->primary_hcd = NULL;
+                peer->primary_hcd = NULL;
+        } else {
+                kfree(hcd->address0_mutex);
+                kfree(hcd->bandwidth_mutex);
         }
         mutex_unlock(&usb_port_peer_mutex);
         kfree(hcd);
diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c
index 50d6ae6f88bc..89a2f712fdfe 100644
--- a/drivers/usb/dwc3/dwc3-st.c
+++ b/drivers/usb/dwc3/dwc3-st.c
@@ -233,7 +233,8 @@ static int st_dwc3_probe(struct platform_device *pdev)
         dev_vdbg(&pdev->dev, "glue-logic addr 0x%p, syscfg-reg offset 0x%x\n",
                  dwc3_data->glue_base, dwc3_data->syscfg_reg_off);
 
-        dwc3_data->rstc_pwrdn = devm_reset_control_get(dev, "powerdown");
+        dwc3_data->rstc_pwrdn =
+                devm_reset_control_get_exclusive(dev, "powerdown");
         if (IS_ERR(dwc3_data->rstc_pwrdn)) {
                 dev_err(&pdev->dev, "could not get power controller\n");
                 ret = PTR_ERR(dwc3_data->rstc_pwrdn);
@@ -243,7 +244,8 @@ static int st_dwc3_probe(struct platform_device *pdev)
         /* Manage PowerDown */
         reset_control_deassert(dwc3_data->rstc_pwrdn);
 
-        dwc3_data->rstc_rst = devm_reset_control_get(dev, "softreset");
+        dwc3_data->rstc_rst =
+                devm_reset_control_get_shared(dev, "softreset");
         if (IS_ERR(dwc3_data->rstc_rst)) {
                 dev_err(&pdev->dev, "could not get reset controller\n");
                 ret = PTR_ERR(dwc3_data->rstc_rst);
diff --git a/drivers/usb/host/ehci-st.c b/drivers/usb/host/ehci-st.c
index a94ed677d937..be4a2788fc58 100644
--- a/drivers/usb/host/ehci-st.c
+++ b/drivers/usb/host/ehci-st.c
@@ -206,7 +206,8 @@ static int st_ehci_platform_probe(struct platform_device *dev)
                 priv->clk48 = NULL;
         }
 
-        priv->pwr = devm_reset_control_get_optional(&dev->dev, "power");
+        priv->pwr =
+                devm_reset_control_get_optional_shared(&dev->dev, "power");
         if (IS_ERR(priv->pwr)) {
                 err = PTR_ERR(priv->pwr);
                 if (err == -EPROBE_DEFER)
@@ -214,7 +215,8 @@ static int st_ehci_platform_probe(struct platform_device *dev)
                 priv->pwr = NULL;
         }
 
-        priv->rst = devm_reset_control_get_optional(&dev->dev, "softreset");
+        priv->rst =
+                devm_reset_control_get_optional_shared(&dev->dev, "softreset");
         if (IS_ERR(priv->rst)) {
                 err = PTR_ERR(priv->rst);
                 if (err == -EPROBE_DEFER)
diff --git a/drivers/usb/host/ohci-st.c b/drivers/usb/host/ohci-st.c
index acf2eb2a5676..02816a1515a1 100644
--- a/drivers/usb/host/ohci-st.c
+++ b/drivers/usb/host/ohci-st.c
@@ -188,13 +188,15 @@ static int st_ohci_platform_probe(struct platform_device *dev)
                 priv->clk48 = NULL;
         }
 
-        priv->pwr = devm_reset_control_get_optional(&dev->dev, "power");
+        priv->pwr =
+                devm_reset_control_get_optional_shared(&dev->dev, "power");
         if (IS_ERR(priv->pwr)) {
                 err = PTR_ERR(priv->pwr);
                 goto err_put_clks;
         }
 
-        priv->rst = devm_reset_control_get_optional(&dev->dev, "softreset");
+        priv->rst =
+                devm_reset_control_get_optional_shared(&dev->dev, "softreset");
         if (IS_ERR(priv->rst)) {
                 err = PTR_ERR(priv->rst);
                 goto err_put_clks;
diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
index 076970a54f89..4ce10bcca18b 100644
--- a/drivers/xen/xen-acpi-processor.c
+++ b/drivers/xen/xen-acpi-processor.c
@@ -423,36 +423,7 @@ upload:
 
         return 0;
 }
-static int __init check_prereq(void)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-
-        if (!xen_initial_domain())
-                return -ENODEV;
-
-        if (!acpi_gbl_FADT.smi_command)
-                return -ENODEV;
-
-        if (c->x86_vendor == X86_VENDOR_INTEL) {
-                if (!cpu_has(c, X86_FEATURE_EST))
-                        return -ENODEV;
 
-                return 0;
-        }
-        if (c->x86_vendor == X86_VENDOR_AMD) {
-                /* Copied from powernow-k8.h, can't include ../cpufreq/powernow
-                 * as we get compile warnings for the static functions.
-                 */
-#define CPUID_FREQ_VOLT_CAPABILITIES    0x80000007
-#define USE_HW_PSTATE                   0x00000080
-                u32 eax, ebx, ecx, edx;
-                cpuid(CPUID_FREQ_VOLT_CAPABILITIES, &eax, &ebx, &ecx, &edx);
-                if ((edx & USE_HW_PSTATE) != USE_HW_PSTATE)
-                        return -ENODEV;
-                return 0;
-        }
-        return -ENODEV;
-}
 /* acpi_perf_data is a pointer to percpu data. */
 static struct acpi_processor_performance __percpu *acpi_perf_data;
 
@@ -509,10 +480,10 @@ struct notifier_block xen_acpi_processor_resume_nb = {
 static int __init xen_acpi_processor_init(void)
 {
         unsigned int i;
-        int rc = check_prereq();
+        int rc;
 
-        if (rc)
-                return rc;
+        if (!xen_initial_domain())
+                return -ENODEV;
 
         nr_acpi_bits = get_max_acpi_id() + 1;
         acpi_ids_done = kcalloc(BITS_TO_LONGS(nr_acpi_bits), sizeof(unsigned long), GFP_KERNEL);
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index cacf30d14747..7487971f9f78 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -316,11 +316,18 @@ static int xenbus_write_transaction(unsigned msg_type,
                         rc = -ENOMEM;
                         goto out;
                 }
+        } else {
+                list_for_each_entry(trans, &u->transactions, list)
+                        if (trans->handle.id == u->u.msg.tx_id)
+                                break;
+                if (&trans->list == &u->transactions)
+                        return -ESRCH;
         }
 
         reply = xenbus_dev_request_and_reply(&u->u.msg);
         if (IS_ERR(reply)) {
-                kfree(trans);
+                if (msg_type == XS_TRANSACTION_START)
+                        kfree(trans);
                 rc = PTR_ERR(reply);
                 goto out;
         }
@@ -333,12 +340,7 @@ static int xenbus_write_transaction(unsigned msg_type,
                         list_add(&trans->list, &u->transactions);
                 }
         } else if (u->u.msg.type == XS_TRANSACTION_END) {
-                list_for_each_entry(trans, &u->transactions, list)
-                        if (trans->handle.id == u->u.msg.tx_id)
-                                break;
-                BUG_ON(&trans->list == &u->transactions);
                 list_del(&trans->list);
-
                 kfree(trans);
         }
 
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
index 374b12af8812..22f7cd711c57 100644
--- a/drivers/xen/xenbus/xenbus_xs.c
+++ b/drivers/xen/xenbus/xenbus_xs.c
@@ -232,10 +232,10 @@ static void transaction_resume(void)
 void *xenbus_dev_request_and_reply(struct xsd_sockmsg *msg)
 {
         void *ret;
-        struct xsd_sockmsg req_msg = *msg;
+        enum xsd_sockmsg_type type = msg->type;
         int err;
 
-        if (req_msg.type == XS_TRANSACTION_START)
+        if (type == XS_TRANSACTION_START)
                 transaction_start();
 
         mutex_lock(&xs_state.request_mutex);
@@ -249,12 +249,8 @@ void *xenbus_dev_request_and_reply(struct xsd_sockmsg *msg)
 
         mutex_unlock(&xs_state.request_mutex);
 
-        if (IS_ERR(ret))
-                return ret;
-
         if ((msg->type == XS_TRANSACTION_END) ||
-            ((req_msg.type == XS_TRANSACTION_START) &&
-             (msg->type == XS_ERROR)))
+            ((type == XS_TRANSACTION_START) && (msg->type == XS_ERROR)))
                 transaction_end();
 
         return ret;