113 files changed, 1541 insertions, 650 deletions
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index b75b734ee73a..19182d091587 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -3160,6 +3160,8 @@ static struct acpi_driver acpi_nfit_driver = {
 static __init int nfit_init(void)
 {
+        int ret;
        BUILD_BUG_ON(sizeof(struct acpi_table_nfit) != 40);
        BUILD_BUG_ON(sizeof(struct acpi_nfit_system_address) != 56);
        BUILD_BUG_ON(sizeof(struct acpi_nfit_memory_map) != 48);
@@ -3187,8 +3189,14 @@ static __init int nfit_init(void)
                return -ENOMEM;
        nfit_mce_register();
+        ret = acpi_bus_register_driver(&acpi_nfit_driver);
+        if (ret) {
+                nfit_mce_unregister();
+                destroy_workqueue(nfit_wq);
+        }
+        return ret;
-        return acpi_bus_register_driver(&acpi_nfit_driver);
 }
 static __exit void nfit_exit(void)
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 292dec18ffb8..07bdd51b3b9a 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -1613,7 +1613,7 @@ static int zatm_init_one(struct pci_dev *pci_dev,
        ret = dma_set_mask_and_coherent(&pci_dev->dev, DMA_BIT_MASK(32));
        if (ret < 0)
-                goto out_disable;
+                goto out_release;
        zatm_dev->pci_dev = pci_dev;
        dev->dev_data = zatm_dev;
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 3b8210ebb50e..60303aa28587 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1222,8 +1222,6 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,
        spin_unlock_irq(&dev->power.lock);
-        dev_pm_domain_set(dev, &genpd->domain);
        return gpd_data;
 err_free:
@@ -1237,8 +1235,6 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,
 static void genpd_free_dev_data(struct device *dev,
                                struct generic_pm_domain_data *gpd_data)
 {
-        dev_pm_domain_set(dev, NULL);
        spin_lock_irq(&dev->power.lock);
        dev->power.subsys_data->domain_data = NULL;
@@ -1275,6 +1271,8 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
        if (ret)
                goto out;
+        dev_pm_domain_set(dev, &genpd->domain);
        genpd->device_count++;
        genpd->max_off_time_changed = true;
@@ -1336,6 +1334,8 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,
        if (genpd->detach_dev)
                genpd->detach_dev(genpd, dev);
+        dev_pm_domain_set(dev, NULL);
        list_del_init(&pdd->list_node);
        genpd_unlock(genpd);
diff --git a/drivers/base/regmap/regmap-w1.c b/drivers/base/regmap/regmap-w1.c
index 5f04e7bf063e..e6c64b0be5b2 100644
--- a/drivers/base/regmap/regmap-w1.c
+++ b/drivers/base/regmap/regmap-w1.c
@@ -1,7 +1,7 @@
 /*
 * Register map access API - W1 (1-Wire) support
 *
- * Copyright (C) 2017 OAO Radioavionica
+ * Copyright (c) 2017 Radioavionica Corporation
 * Author: Alex A. Mihaylov <minimumlaw@rambler.ru>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -11,7 +11,7 @@
 #include <linux/regmap.h>
 #include <linux/module.h>
-#include "../../w1/w1.h"
+#include <linux/w1.h>
 #include "internal.h"
diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c
index f6e7491c873c..d509b500a7b5 100644
--- a/drivers/clocksource/timer-of.c
+++ b/drivers/clocksource/timer-of.c
@@ -41,8 +41,16 @@ static __init int timer_irq_init(struct device_node *np,
        struct timer_of *to = container_of(of_irq, struct timer_of, of_irq);
        struct clock_event_device *clkevt = &to->clkevt;
-        of_irq->irq = of_irq->name ? of_irq_get_byname(np, of_irq->name):
+        if (of_irq->name) {
-                irq_of_parse_and_map(np, of_irq->index);
+                of_irq->irq = ret = of_irq_get_byname(np, of_irq->name);
+                if (ret < 0) {
+                        pr_err("Failed to get interrupt %s for %s\n",
+                               of_irq->name, np->full_name);
+                        return ret;
+                }
+        } else  {
+                of_irq->irq = irq_of_parse_and_map(np, of_irq->index);
+        }
        if (!of_irq->irq) {
                pr_err("Failed to map interrupt for %s\n", np->full_name);
                return -EINVAL;
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index b7fb8b7c980d..6cd503525638 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -225,6 +225,9 @@ struct global_params {
 * @vid:                Stores VID limits for this CPU
 * @pid:                Stores PID parameters for this CPU
 * @last_sample_time:   Last Sample time
+ * @aperf_mperf_shift:  Number of clock cycles after aperf, merf is incremented
+ *                      This shift is a multiplier to mperf delta to
+ *                      calculate CPU busy.
 * @prev_aperf:         Last APERF value read from APERF MSR
 * @prev_mperf:         Last MPERF value read from MPERF MSR
 * @prev_tsc:           Last timestamp counter (TSC) value
@@ -259,6 +262,7 @@ struct cpudata {
        u64     last_update;
        u64     last_sample_time;
+        u64     aperf_mperf_shift;
        u64     prev_aperf;
        u64     prev_mperf;
        u64     prev_tsc;
@@ -321,6 +325,7 @@ struct pstate_funcs {
        int (*get_min)(void);
        int (*get_turbo)(void);
        int (*get_scaling)(void);
+        int (*get_aperf_mperf_shift)(void);
        u64 (*get_val)(struct cpudata*, int pstate);
        void (*get_vid)(struct cpudata *);
        void (*update_util)(struct update_util_data *data, u64 time,
@@ -1486,6 +1491,11 @@ static u64 core_get_val(struct cpudata *cpudata, int pstate)
        return val;
 }
+static int knl_get_aperf_mperf_shift(void)
+{
+        return 10;
+}
 static int knl_get_turbo_pstate(void)
 {
        u64 value;
@@ -1543,6 +1553,9 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
        cpu->pstate.max_freq = cpu->pstate.max_pstate * cpu->pstate.scaling;
        cpu->pstate.turbo_freq = cpu->pstate.turbo_pstate * cpu->pstate.scaling;
+        if (pstate_funcs.get_aperf_mperf_shift)
+                cpu->aperf_mperf_shift = pstate_funcs.get_aperf_mperf_shift();
        if (pstate_funcs.get_vid)
                pstate_funcs.get_vid(cpu);
@@ -1616,7 +1629,8 @@ static inline int32_t get_target_pstate_use_cpu_load(struct cpudata *cpu)
        int32_t busy_frac, boost;
        int target, avg_pstate;
-        busy_frac = div_fp(sample->mperf, sample->tsc);
+        busy_frac = div_fp(sample->mperf << cpu->aperf_mperf_shift,
+                           sample->tsc);
        boost = cpu->iowait_boost;
        cpu->iowait_boost >>= 1;
@@ -1675,7 +1689,8 @@ static inline int32_t get_target_pstate_use_performance(struct cpudata *cpu)
                sample_ratio = div_fp(pid_params.sample_rate_ns, duration_ns);
                perf_scaled = mul_fp(perf_scaled, sample_ratio);
        } else {
-                sample_ratio = div_fp(100 * cpu->sample.mperf, cpu->sample.tsc);
+                sample_ratio = div_fp(100 * (cpu->sample.mperf << cpu->aperf_mperf_shift),
+                                      cpu->sample.tsc);
                if (sample_ratio < int_tofp(1))
                        perf_scaled = 0;
        }
@@ -1807,6 +1822,7 @@ static const struct pstate_funcs knl_funcs = {
        .get_max_physical = core_get_max_pstate_physical,
        .get_min = core_get_min_pstate,
        .get_turbo = knl_get_turbo_pstate,
+        .get_aperf_mperf_shift = knl_get_aperf_mperf_shift,
        .get_scaling = core_get_scaling,
        .get_val = core_get_val,
        .update_util = intel_pstate_update_util_pid,
@@ -2403,6 +2419,7 @@ static void __init copy_cpu_funcs(struct pstate_funcs *funcs)
        pstate_funcs.get_val   = funcs->get_val;
        pstate_funcs.get_vid   = funcs->get_vid;
        pstate_funcs.update_util = funcs->update_util;
+        pstate_funcs.get_aperf_mperf_shift = funcs->get_aperf_mperf_shift;
        intel_pstate_use_acpi_profile();
 }
diff --git a/drivers/dax/device-dax.h b/drivers/dax/device-dax.h
index fdcd9769ffde..688b051750bd 100644
--- a/drivers/dax/device-dax.h
+++ b/drivers/dax/device-dax.h
@@ -21,5 +21,5 @@ struct dax_region *alloc_dax_region(struct device *parent,
                int region_id, struct resource *res, unsigned int align,
                void *addr, unsigned long flags);
 struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region,
-                struct resource *res, int count);
+                int id, struct resource *res, int count);
 #endif /* __DEVICE_DAX_H__ */
diff --git a/drivers/dax/device.c b/drivers/dax/device.c
index 12943d19bfc4..e9f3b3e4bbf4 100644
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c
@@ -529,7 +529,8 @@ static void dev_dax_release(struct device *dev)
        struct dax_region *dax_region = dev_dax->region;
        struct dax_device *dax_dev = dev_dax->dax_dev;
-        ida_simple_remove(&dax_region->ida, dev_dax->id);
+        if (dev_dax->id >= 0)
+                ida_simple_remove(&dax_region->ida, dev_dax->id);
        dax_region_put(dax_region);
        put_dax(dax_dev);
        kfree(dev_dax);
@@ -559,7 +560,7 @@ static void unregister_dev_dax(void *dev)
 }
 struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region,
-                struct resource *res, int count)
+                int id, struct resource *res, int count)
 {
        struct device *parent = dax_region->dev;
        struct dax_device *dax_dev;
@@ -567,7 +568,10 @@ struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region,
        struct inode *inode;
        struct device *dev;
        struct cdev *cdev;
-        int rc = 0, i;
+        int rc, i;
+        if (!count)
+                return ERR_PTR(-EINVAL);
        dev_dax = kzalloc(sizeof(*dev_dax) + sizeof(*res) * count, GFP_KERNEL);
        if (!dev_dax)
@@ -587,10 +591,16 @@ struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region,
        if (i < count)
                goto err_id;
-        dev_dax->id = ida_simple_get(&dax_region->ida, 0, 0, GFP_KERNEL);
+        if (id < 0) {
-        if (dev_dax->id < 0) {
+                id = ida_simple_get(&dax_region->ida, 0, 0, GFP_KERNEL);
-                rc = dev_dax->id;
+                dev_dax->id = id;
-                goto err_id;
+                if (id < 0) {
+                        rc = id;
+                        goto err_id;
+                }
+        } else {
+                /* region provider owns @id lifetime */
+                dev_dax->id = -1;
        }
        /*
@@ -598,8 +608,10 @@ struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region,
         * device outside of mmap of the resulting character device.
         */
        dax_dev = alloc_dax(dev_dax, NULL, NULL);
-        if (!dax_dev)
+        if (!dax_dev) {
+                rc = -ENOMEM;
                goto err_dax;
+        }
        /* from here on we're committed to teardown via dax_dev_release() */
        dev = &dev_dax->dev;
@@ -620,7 +632,7 @@ struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region,
        dev->parent = parent;
        dev->groups = dax_attribute_groups;
        dev->release = dev_dax_release;
-        dev_set_name(dev, "dax%d.%d", dax_region->id, dev_dax->id);
+        dev_set_name(dev, "dax%d.%d", dax_region->id, id);
        rc = cdev_device_add(cdev, dev);
        if (rc) {
@@ -636,7 +648,8 @@ struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region,
        return dev_dax;
 err_dax:
-        ida_simple_remove(&dax_region->ida, dev_dax->id);
+        if (dev_dax->id >= 0)
+                ida_simple_remove(&dax_region->ida, dev_dax->id);
 err_id:
        kfree(dev_dax);
diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c
index 9f2a0b4fd801..8d8c852ba8f2 100644
--- a/drivers/dax/pmem.c
+++ b/drivers/dax/pmem.c
@@ -58,13 +58,12 @@ static void dax_pmem_percpu_kill(void *data)
 static int dax_pmem_probe(struct device *dev)
 {
-        int rc;
        void *addr;
        struct resource res;
+        int rc, id, region_id;
        struct nd_pfn_sb *pfn_sb;
        struct dev_dax *dev_dax;
        struct dax_pmem *dax_pmem;
-        struct nd_region *nd_region;
        struct nd_namespace_io *nsio;
        struct dax_region *dax_region;
        struct nd_namespace_common *ndns;
@@ -123,14 +122,17 @@ static int dax_pmem_probe(struct device *dev)
        /* adjust the dax_region resource to the start of data */
        res.start += le64_to_cpu(pfn_sb->dataoff);
-        nd_region = to_nd_region(dev->parent);
+        rc = sscanf(dev_name(&ndns->dev), "namespace%d.%d", &region_id, &id);
-        dax_region = alloc_dax_region(dev, nd_region->id, &res,
+        if (rc != 2)
+                return -EINVAL;
+        dax_region = alloc_dax_region(dev, region_id, &res,
                        le32_to_cpu(pfn_sb->align), addr, PFN_DEV|PFN_MAP);
        if (!dax_region)
                return -ENOMEM;
        /* TODO: support for subdividing a dax region... */
-        dev_dax = devm_create_dev_dax(dax_region, &res, 1);
+        dev_dax = devm_create_dev_dax(dax_region, id, &res, 1);
        /* child dev_dax instances now own the lifetime of the dax_region */
        dax_region_put(dax_region);
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 41b39464ded8..501e16a9227d 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -2732,6 +2732,9 @@ static int hidpp_initialize_battery(struct hidpp_device *hidpp)
                                     hidpp_battery_props,
                                     sizeof(hidpp_battery_props),
                                     GFP_KERNEL);
+        if (!battery_props)
+                return -ENOMEM;
        num_battery_props = ARRAY_SIZE(hidpp_battery_props) - 2;
        if (hidpp->capabilities & HIDPP_CAPABILITY_BATTERY_MILEAGE)
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index f3e35e7a189d..aff20f4b6d97 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -620,16 +620,6 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
        return 0;
 }
-static int mt_touch_input_mapped(struct hid_device *hdev, struct hid_input *hi,
-                struct hid_field *field, struct hid_usage *usage,
-                unsigned long **bit, int *max)
-{
-        if (usage->type == EV_KEY || usage->type == EV_ABS)
-                set_bit(usage->type, hi->input->evbit);
-        return -1;
-}
 static int mt_compute_slot(struct mt_device *td, struct input_dev *input)
 {
        __s32 quirks = td->mtclass.quirks;
@@ -969,8 +959,10 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
                return 0;
        if (field->application == HID_DG_TOUCHSCREEN ||
-            field->application == HID_DG_TOUCHPAD)
+            field->application == HID_DG_TOUCHPAD) {
-                return mt_touch_input_mapped(hdev, hi, field, usage, bit, max);
+                /* We own these mappings, tell hid-input to ignore them */
+                return -1;
+        }
        /* let hid-core decide for the others */
        return 0;
diff --git a/drivers/ide/ide-timings.c b/drivers/ide/ide-timings.c
index 0e05f75934c9..1858e3ce3993 100644
--- a/drivers/ide/ide-timings.c
+++ b/drivers/ide/ide-timings.c
@@ -104,19 +104,19 @@ u16 ide_pio_cycle_time(ide_drive_t *drive, u8 pio)
 EXPORT_SYMBOL_GPL(ide_pio_cycle_time);
 #define ENOUGH(v, unit)         (((v) - 1) / (unit) + 1)
-#define EZ(v, unit)             ((v) ? ENOUGH(v, unit) : 0)
+#define EZ(v, unit)             ((v) ? ENOUGH((v) * 1000, unit) : 0)
 static void ide_timing_quantize(struct ide_timing *t, struct ide_timing *q,
                                int T, int UT)
 {
-        q->setup   = EZ(t->setup   * 1000,  T);
+        q->setup   = EZ(t->setup,   T);
-        q->act8b   = EZ(t->act8b   * 1000,  T);
+        q->act8b   = EZ(t->act8b,   T);
-        q->rec8b   = EZ(t->rec8b   * 1000,  T);
+        q->rec8b   = EZ(t->rec8b,   T);
-        q->cyc8b   = EZ(t->cyc8b   * 1000,  T);
+        q->cyc8b   = EZ(t->cyc8b,   T);
-        q->active  = EZ(t->active  * 1000,  T);
+        q->active  = EZ(t->active,  T);
-        q->recover = EZ(t->recover * 1000,  T);
+        q->recover = EZ(t->recover, T);
-        q->cycle   = EZ(t->cycle   * 1000,  T);
+        q->cycle   = EZ(t->cycle,   T);
-        q->udma    = EZ(t->udma    * 1000, UT);
+        q->udma    = EZ(t->udma,    UT);
 }
 void ide_timing_merge(struct ide_timing *a, struct ide_timing *b,
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index a6cb379a4ebc..01236cef7bfb 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -268,6 +268,7 @@ int rdma_translate_ip(const struct sockaddr *addr,
                        return ret;
                ret = rdma_copy_addr(dev_addr, dev, NULL);
+                dev_addr->bound_dev_if = dev->ifindex;
                if (vlan_id)
                        *vlan_id = rdma_vlan_dev_vlan_id(dev);
                dev_put(dev);
@@ -280,6 +281,7 @@ int rdma_translate_ip(const struct sockaddr *addr,
                                          &((const struct sockaddr_in6 *)addr)->sin6_addr,
                                          dev, 1)) {
                                ret = rdma_copy_addr(dev_addr, dev, NULL);
+                                dev_addr->bound_dev_if = dev->ifindex;
                                if (vlan_id)
                                        *vlan_id = rdma_vlan_dev_vlan_id(dev);
                                break;
@@ -405,10 +407,10 @@ static int addr4_resolve(struct sockaddr_in *src_in,
        fl4.saddr = src_ip;
        fl4.flowi4_oif = addr->bound_dev_if;
        rt = ip_route_output_key(addr->net, &fl4);
-        if (IS_ERR(rt)) {
+        ret = PTR_ERR_OR_ZERO(rt);
-                ret = PTR_ERR(rt);
+        if (ret)
-                goto out;
+                return ret;
-        }
        src_in->sin_family = AF_INET;
        src_in->sin_addr.s_addr = fl4.saddr;
@@ -423,8 +425,6 @@ static int addr4_resolve(struct sockaddr_in *src_in,
        *prt = rt;
        return 0;
-out:
-        return ret;
 }
 #if IS_ENABLED(CONFIG_IPV6)
@@ -509,6 +509,11 @@ static int addr_resolve(struct sockaddr *src_in,
        struct dst_entry *dst;
        int ret;
+        if (!addr->net) {
+                pr_warn_ratelimited("%s: missing namespace\n", __func__);
+                return -EINVAL;
+        }
        if (src_in->sa_family == AF_INET) {
                struct rtable *rt = NULL;
                const struct sockaddr_in *dst_in4 =
@@ -522,8 +527,12 @@ static int addr_resolve(struct sockaddr *src_in,
                if (resolve_neigh)
                        ret = addr_resolve_neigh(&rt->dst, dst_in, addr, seq);
-                ndev = rt->dst.dev;
+                if (addr->bound_dev_if) {
-                dev_hold(ndev);
+                        ndev = dev_get_by_index(addr->net, addr->bound_dev_if);
+                } else {
+                        ndev = rt->dst.dev;
+                        dev_hold(ndev);
+                }
                ip_rt_put(rt);
        } else {
@@ -539,14 +548,27 @@ static int addr_resolve(struct sockaddr *src_in,
                if (resolve_neigh)
                        ret = addr_resolve_neigh(dst, dst_in, addr, seq);
-                ndev = dst->dev;
+                if (addr->bound_dev_if) {
-                dev_hold(ndev);
+                        ndev = dev_get_by_index(addr->net, addr->bound_dev_if);
+                } else {
+                        ndev = dst->dev;
+                        dev_hold(ndev);
+                }
                dst_release(dst);
        }
-        addr->bound_dev_if = ndev->ifindex;
+        if (ndev->flags & IFF_LOOPBACK) {
-        addr->net = dev_net(ndev);
+                ret = rdma_translate_ip(dst_in, addr, NULL);
+                /*
+                 * Put the loopback device and get the translated
+                 * device instead.
+                 */
+                dev_put(ndev);
+                ndev = dev_get_by_index(addr->net, addr->bound_dev_if);
+        } else {
+                addr->bound_dev_if = ndev->ifindex;
+        }
        dev_put(ndev);
        return ret;
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 31bb82d8ecd7..11aff923b633 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -623,22 +623,11 @@ static inline int cma_validate_port(struct ib_device *device, u8 port,
        if ((dev_type != ARPHRD_INFINIBAND) && rdma_protocol_ib(device, port))
                return ret;
-        if (dev_type == ARPHRD_ETHER && rdma_protocol_roce(device, port)) {
+        if (dev_type == ARPHRD_ETHER && rdma_protocol_roce(device, port))
                ndev = dev_get_by_index(&init_net, bound_if_index);
-                if (ndev && ndev->flags & IFF_LOOPBACK) {
+        else
-                        pr_info("detected loopback device\n");
-                        dev_put(ndev);
-                        if (!device->get_netdev)
-                                return -EOPNOTSUPP;
-                        ndev = device->get_netdev(device, port);
-                        if (!ndev)
-                                return -ENODEV;
-                }
-        } else {
                gid_type = IB_GID_TYPE_IB;
-        }
        ret = ib_find_cached_gid_by_port(device, gid, gid_type, port,
                                         ndev, NULL);
@@ -2569,21 +2558,6 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
                        goto err2;
                }
-                if (ndev->flags & IFF_LOOPBACK) {
-                        dev_put(ndev);
-                        if (!id_priv->id.device->get_netdev) {
-                                ret = -EOPNOTSUPP;
-                                goto err2;
-                        }
-                        ndev = id_priv->id.device->get_netdev(id_priv->id.device,
-                                                              id_priv->id.port_num);
-                        if (!ndev) {
-                                ret = -ENODEV;
-                                goto err2;
-                        }
-                }
                supported_gids = roce_gid_type_mask_support(id_priv->id.device,
                                                            id_priv->id.port_num);
                gid_type = cma_route_gid_type(addr->dev_addr.network,
diff --git a/drivers/infiniband/core/roce_gid_mgmt.c b/drivers/infiniband/core/roce_gid_mgmt.c
index db958d3207ef..94a9eefb3cfc 100644
--- a/drivers/infiniband/core/roce_gid_mgmt.c
+++ b/drivers/infiniband/core/roce_gid_mgmt.c
@@ -42,6 +42,8 @@
 #include <rdma/ib_cache.h>
 #include <rdma/ib_addr.h>
+static struct workqueue_struct *gid_cache_wq;
 enum gid_op_type {
        GID_DEL = 0,
        GID_ADD
@@ -560,7 +562,7 @@ static int netdevice_queue_work(struct netdev_event_work_cmd *cmds,
        }
        INIT_WORK(&ndev_work->work, netdevice_event_work_handler);
-        queue_work(ib_wq, &ndev_work->work);
+        queue_work(gid_cache_wq, &ndev_work->work);
        return NOTIFY_DONE;
 }
@@ -693,7 +695,7 @@ static int addr_event(struct notifier_block *this, unsigned long event,
        dev_hold(ndev);
        work->gid_attr.ndev   = ndev;
-        queue_work(ib_wq, &work->work);
+        queue_work(gid_cache_wq, &work->work);
        return NOTIFY_DONE;
 }
@@ -740,6 +742,10 @@ static struct notifier_block nb_inet6addr = {
 int __init roce_gid_mgmt_init(void)
 {
+        gid_cache_wq = alloc_ordered_workqueue("gid-cache-wq", 0);
+        if (!gid_cache_wq)
+                return -ENOMEM;
        register_inetaddr_notifier(&nb_inetaddr);
        if (IS_ENABLED(CONFIG_IPV6))
                register_inet6addr_notifier(&nb_inet6addr);
@@ -764,4 +770,5 @@ void __exit roce_gid_mgmt_cleanup(void)
         * ib-core is removed, all physical devices have been removed,
         * so no issue with remaining hardware contexts.
         */
+        destroy_workqueue(gid_cache_wq);
 }
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 8ba9bfb073d1..3f55d18a3791 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -2005,28 +2005,13 @@ static int modify_qp(struct ib_uverbs_file *file,
        rdma_ah_set_port_num(&attr->alt_ah_attr,
                             cmd->base.alt_dest.port_num);
-        if (qp->real_qp == qp) {
+        ret = ib_modify_qp_with_udata(qp, attr,
-                if (cmd->base.attr_mask & IB_QP_AV) {
+                                      modify_qp_mask(qp->qp_type,
-                        ret = ib_resolve_eth_dmac(qp->device, &attr->ah_attr);
+                                                     cmd->base.attr_mask),
-                        if (ret)
+                                      udata);
-                                goto release_qp;
-                }
-                ret = ib_security_modify_qp(qp,
-                                            attr,
-                                            modify_qp_mask(qp->qp_type,
-                                                           cmd->base.attr_mask),
-                                            udata);
-        } else {
-                ret = ib_security_modify_qp(qp,
-                                            attr,
-                                            modify_qp_mask(qp->qp_type,
-                                                           cmd->base.attr_mask),
-                                            NULL);
-        }
 release_qp:
        uobj_put_obj_read(qp);
 out:
        kfree(attr);
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index c973a83c898b..fb98ed67d5bc 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -452,6 +452,19 @@ int ib_get_gids_from_rdma_hdr(const union rdma_network_hdr *hdr,
 }
 EXPORT_SYMBOL(ib_get_gids_from_rdma_hdr);
+/*
+ * This function creates ah from the incoming packet.
+ * Incoming packet has dgid of the receiver node on which this code is
+ * getting executed and, sgid contains the GID of the sender.
+ *
+ * When resolving mac address of destination, the arrived dgid is used
+ * as sgid and, sgid is used as dgid because sgid contains destinations
+ * GID whom to respond to.
+ *
+ * This is why when calling rdma_addr_find_l2_eth_by_grh() function, the
+ * position of arguments dgid and sgid do not match the order of the
+ * parameters.
+ */
 int ib_init_ah_from_wc(struct ib_device *device, u8 port_num,
                       const struct ib_wc *wc, const struct ib_grh *grh,
                       struct rdma_ah_attr *ah_attr)
@@ -507,11 +520,6 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num,
                }
                resolved_dev = dev_get_by_index(&init_net, if_index);
-                if (resolved_dev->flags & IFF_LOOPBACK) {
-                        dev_put(resolved_dev);
-                        resolved_dev = idev;
-                        dev_hold(resolved_dev);
-                }
                rcu_read_lock();
                if (resolved_dev != idev && !rdma_is_upper_dev_rcu(idev,
                                                                   resolved_dev))
@@ -887,6 +895,7 @@ static const struct {
 } qp_state_table[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = {
        [IB_QPS_RESET] = {
                [IB_QPS_RESET] = { .valid = 1 },
+                [IB_QPS_ERR] =   { .valid = 1 },
                [IB_QPS_INIT]  = {
                        .valid = 1,
                        .req_param = {
@@ -1268,20 +1277,36 @@ out:
 }
 EXPORT_SYMBOL(ib_resolve_eth_dmac);
-int ib_modify_qp(struct ib_qp *qp,
+/**
-                 struct ib_qp_attr *qp_attr,
+ * ib_modify_qp_with_udata - Modifies the attributes for the specified QP.
-                 int qp_attr_mask)
+ * @qp: The QP to modify.
+ * @attr: On input, specifies the QP attributes to modify.  On output,
+ *   the current values of selected QP attributes are returned.
+ * @attr_mask: A bit-mask used to specify which attributes of the QP
+ *   are being modified.
+ * @udata: pointer to user's input output buffer information
+ *   are being modified.
+ * It returns 0 on success and returns appropriate error code on error.
+ */
+int ib_modify_qp_with_udata(struct ib_qp *qp, struct ib_qp_attr *attr,
+                            int attr_mask, struct ib_udata *udata)
 {
+        int ret;
-        if (qp_attr_mask & IB_QP_AV) {
+        if (attr_mask & IB_QP_AV) {
-                int ret;
+                ret = ib_resolve_eth_dmac(qp->device, &attr->ah_attr);
-                ret = ib_resolve_eth_dmac(qp->device, &qp_attr->ah_attr);
                if (ret)
                        return ret;
        }
+        return ib_security_modify_qp(qp, attr, attr_mask, udata);
+}
+EXPORT_SYMBOL(ib_modify_qp_with_udata);
-        return ib_security_modify_qp(qp->real_qp, qp_attr, qp_attr_mask, NULL);
+int ib_modify_qp(struct ib_qp *qp,
+                 struct ib_qp_attr *qp_attr,
+                 int qp_attr_mask)
+{
+        return ib_modify_qp_with_udata(qp, qp_attr, qp_attr_mask, NULL);
 }
 EXPORT_SYMBOL(ib_modify_qp);
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index 2ba00b89df6a..94b54850ec75 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -12847,7 +12847,12 @@ static void remap_intr(struct hfi1_devdata *dd, int isrc, int msix_intr)
        /* clear from the handled mask of the general interrupt */
        m = isrc / 64;
        n = isrc % 64;
-        dd->gi_mask[m] &= ~((u64)1 << n);
+        if (likely(m < CCE_NUM_INT_CSRS)) {
+                dd->gi_mask[m] &= ~((u64)1 << n);
+        } else {
+                dd_dev_err(dd, "remap interrupt err\n");
+                return;
+        }
        /* direct the chip source to the given MSI-X interrupt */
        m = isrc / 8;
diff --git a/drivers/infiniband/hw/hfi1/qp.c b/drivers/infiniband/hw/hfi1/qp.c
index 650305cc0373..1a7af9f60c13 100644
--- a/drivers/infiniband/hw/hfi1/qp.c
+++ b/drivers/infiniband/hw/hfi1/qp.c
@@ -647,18 +647,17 @@ void qp_iter_print(struct seq_file *s, struct qp_iter *iter)
                   qp->pid);
 }
-void *qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp,
+void *qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp)
-                    gfp_t gfp)
 {
        struct hfi1_qp_priv *priv;
-        priv = kzalloc_node(sizeof(*priv), gfp, rdi->dparms.node);
+        priv = kzalloc_node(sizeof(*priv), GFP_KERNEL, rdi->dparms.node);
        if (!priv)
                return ERR_PTR(-ENOMEM);
        priv->owner = qp;
-        priv->s_ahg = kzalloc_node(sizeof(*priv->s_ahg), gfp,
+        priv->s_ahg = kzalloc_node(sizeof(*priv->s_ahg), GFP_KERNEL,
                                   rdi->dparms.node);
        if (!priv->s_ahg) {
                kfree(priv);
diff --git a/drivers/infiniband/hw/hfi1/qp.h b/drivers/infiniband/hw/hfi1/qp.h
index 1eb9cd7b8c19..6fe542b6a927 100644
--- a/drivers/infiniband/hw/hfi1/qp.h
+++ b/drivers/infiniband/hw/hfi1/qp.h
@@ -123,8 +123,7 @@ void hfi1_migrate_qp(struct rvt_qp *qp);
 /*
 * Functions provided by hfi1 driver for rdmavt to use
 */
-void *qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp,
+void *qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp);
-                    gfp_t gfp);
 void qp_priv_free(struct rvt_dev_info *rdi, struct rvt_qp *qp);
 unsigned free_all_qps(struct rvt_dev_info *rdi);
 void notify_qp_reset(struct rvt_qp *qp);
diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
index 37d5d29597a4..23fad6d96944 100644
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
@@ -228,14 +228,14 @@ int hns_roce_v1_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                        switch (wr->opcode) {
                        case IB_WR_RDMA_READ:
                                ps_opcode = HNS_ROCE_WQE_OPCODE_RDMA_READ;
-                                set_raddr_seg(wqe, atomic_wr(wr)->remote_addr,
+                                set_raddr_seg(wqe,  rdma_wr(wr)->remote_addr,
-                                              atomic_wr(wr)->rkey);
+                                               rdma_wr(wr)->rkey);
                                break;
                        case IB_WR_RDMA_WRITE:
                        case IB_WR_RDMA_WRITE_WITH_IMM:
                                ps_opcode = HNS_ROCE_WQE_OPCODE_RDMA_WRITE;
-                                set_raddr_seg(wqe, atomic_wr(wr)->remote_addr,
+                                set_raddr_seg(wqe,  rdma_wr(wr)->remote_addr,
-                                              atomic_wr(wr)->rkey);
+                                              rdma_wr(wr)->rkey);
                                break;
                        case IB_WR_SEND:
                        case IB_WR_SEND_WITH_INV:
@@ -661,9 +661,11 @@ static int hns_roce_v1_rsv_lp_qp(struct hns_roce_dev *hr_dev)
        union ib_gid dgid;
        u64 subnet_prefix;
        int attr_mask = 0;
-        int i;
+        int i, j;
        int ret;
+        u8 queue_en[HNS_ROCE_V1_RESV_QP] = { 0 };
        u8 phy_port;
+        u8 port = 0;
        u8 sl;
        priv = (struct hns_roce_v1_priv *)hr_dev->hw->priv;
@@ -709,11 +711,27 @@ static int hns_roce_v1_rsv_lp_qp(struct hns_roce_dev *hr_dev)
        attr.rnr_retry          = 7;
        attr.timeout            = 0x12;
        attr.path_mtu           = IB_MTU_256;
+        attr.ah_attr.type       = RDMA_AH_ATTR_TYPE_ROCE;
        rdma_ah_set_grh(&attr.ah_attr, NULL, 0, 0, 1, 0);
        rdma_ah_set_static_rate(&attr.ah_attr, 3);
        subnet_prefix = cpu_to_be64(0xfe80000000000000LL);
        for (i = 0; i < HNS_ROCE_V1_RESV_QP; i++) {
+                phy_port = (i >= HNS_ROCE_MAX_PORTS) ? (i - 2) :
+                                (i % HNS_ROCE_MAX_PORTS);
+                sl = i / HNS_ROCE_MAX_PORTS;
+                for (j = 0; j < caps->num_ports; j++) {
+                        if (hr_dev->iboe.phy_port[j] == phy_port) {
+                                queue_en[i] = 1;
+                                port = j;
+                                break;
+                        }
+                }
+                if (!queue_en[i])
+                        continue;
                free_mr->mr_free_qp[i] = hns_roce_v1_create_lp_qp(hr_dev, pd);
                if (IS_ERR(free_mr->mr_free_qp[i])) {
                        dev_err(dev, "Create loop qp failed!\n");
@@ -721,15 +739,7 @@ static int hns_roce_v1_rsv_lp_qp(struct hns_roce_dev *hr_dev)
                }
                hr_qp = free_mr->mr_free_qp[i];
-                sl = i / caps->num_ports;
+                hr_qp->port             = port;
-                if (caps->num_ports == HNS_ROCE_MAX_PORTS)
-                        phy_port = (i >= HNS_ROCE_MAX_PORTS) ? (i - 2) :
-                                (i % caps->num_ports);
-                else
-                        phy_port = i % caps->num_ports;
-                hr_qp->port             = phy_port + 1;
                hr_qp->phy_port         = phy_port;
                hr_qp->ibqp.qp_type     = IB_QPT_RC;
                hr_qp->ibqp.device      = &hr_dev->ib_dev;
@@ -739,23 +749,22 @@ static int hns_roce_v1_rsv_lp_qp(struct hns_roce_dev *hr_dev)
                hr_qp->ibqp.recv_cq     = cq;
                hr_qp->ibqp.send_cq     = cq;
-                rdma_ah_set_port_num(&attr.ah_attr, phy_port + 1);
+                rdma_ah_set_port_num(&attr.ah_attr, port + 1);
-                rdma_ah_set_sl(&attr.ah_attr, phy_port + 1);
+                rdma_ah_set_sl(&attr.ah_attr, sl);
-                attr.port_num           = phy_port + 1;
+                attr.port_num           = port + 1;
                attr.dest_qp_num        = hr_qp->qpn;
                memcpy(rdma_ah_retrieve_dmac(&attr.ah_attr),
-                       hr_dev->dev_addr[phy_port],
+                       hr_dev->dev_addr[port],
                       MAC_ADDR_OCTET_NUM);
                memcpy(&dgid.raw, &subnet_prefix, sizeof(u64));
-                memcpy(&dgid.raw[8], hr_dev->dev_addr[phy_port], 3);
+                memcpy(&dgid.raw[8], hr_dev->dev_addr[port], 3);
-                memcpy(&dgid.raw[13], hr_dev->dev_addr[phy_port] + 3, 3);
+                memcpy(&dgid.raw[13], hr_dev->dev_addr[port] + 3, 3);
                dgid.raw[11] = 0xff;
                dgid.raw[12] = 0xfe;
                dgid.raw[8] ^= 2;
                rdma_ah_set_dgid_raw(&attr.ah_attr, dgid.raw);
-                attr_mask |= IB_QP_PORT;
                ret = hr_dev->hw->modify_qp(&hr_qp->ibqp, &attr, attr_mask,
                                            IB_QPS_RESET, IB_QPS_INIT);
@@ -812,6 +821,9 @@ static void hns_roce_v1_release_lp_qp(struct hns_roce_dev *hr_dev)
        for (i = 0; i < HNS_ROCE_V1_RESV_QP; i++) {
                hr_qp = free_mr->mr_free_qp[i];
+                if (!hr_qp)
+                        continue;
                ret = hns_roce_v1_destroy_qp(&hr_qp->ibqp);
                if (ret)
                        dev_err(dev, "Destroy qp %d for mr free failed(%d)!\n",
@@ -963,7 +975,7 @@ static void hns_roce_v1_mr_free_work_fn(struct work_struct *work)
                msecs_to_jiffies(HNS_ROCE_V1_FREE_MR_TIMEOUT_MSECS) + jiffies;
        int i;
        int ret;
-        int ne;
+        int ne = 0;
        mr_work = container_of(work, struct hns_roce_mr_free_work, work);
        hr_mr = (struct hns_roce_mr *)mr_work->mr;
@@ -976,6 +988,10 @@ static void hns_roce_v1_mr_free_work_fn(struct work_struct *work)
        for (i = 0; i < HNS_ROCE_V1_RESV_QP; i++) {
                hr_qp = free_mr->mr_free_qp[i];
+                if (!hr_qp)
+                        continue;
+                ne++;
                ret = hns_roce_v1_send_lp_wqe(hr_qp);
                if (ret) {
                        dev_err(dev,
@@ -985,7 +1001,6 @@ static void hns_roce_v1_mr_free_work_fn(struct work_struct *work)
                }
        }
-        ne = HNS_ROCE_V1_RESV_QP;
        do {
                ret = hns_roce_v1_poll_cq(&mr_free_cq->ib_cq, ne, wc);
                if (ret < 0) {
@@ -995,7 +1010,8 @@ static void hns_roce_v1_mr_free_work_fn(struct work_struct *work)
                        goto free_work;
                }
                ne -= ret;
-                msleep(HNS_ROCE_V1_FREE_MR_WAIT_VALUE);
+                usleep_range(HNS_ROCE_V1_FREE_MR_WAIT_VALUE * 1000,
+                             (1 + HNS_ROCE_V1_FREE_MR_WAIT_VALUE) * 1000);
        } while (ne && time_before_eq(jiffies, end));
        if (ne != 0)
@@ -2181,7 +2197,7 @@ static int hns_roce_v1_poll_one(struct hns_roce_cq *hr_cq,
                }
                wc->wr_id = wq->wrid[wq->tail & (wq->wqe_cnt - 1)];
                ++wq->tail;
-                } else {
+        } else {
                /* RQ conrespond to CQE */
                wc->byte_len = le32_to_cpu(cqe->byte_cnt);
                opcode = roce_get_field(cqe->cqe_byte_4,
@@ -3533,10 +3549,12 @@ static int check_qp_db_process_status(struct hns_roce_dev *hr_dev,
                                        old_cnt = roce_get_field(old_send,
                                        ROCEE_SDB_SEND_PTR_SDB_SEND_PTR_M,
                                        ROCEE_SDB_SEND_PTR_SDB_SEND_PTR_S);
-                                        if (cur_cnt - old_cnt > SDB_ST_CMP_VAL)
+                                        if (cur_cnt - old_cnt >
+                                            SDB_ST_CMP_VAL) {
                                                success_flags = 1;
-                                        else {
+                                        } else {
-                                            send_ptr = roce_get_field(old_send,
+                                                send_ptr =
+                                                        roce_get_field(old_send,
                                            ROCEE_SDB_SEND_PTR_SDB_SEND_PTR_M,
                                            ROCEE_SDB_SEND_PTR_SDB_SEND_PTR_S) +
                                            roce_get_field(sdb_retry_cnt,
@@ -3641,6 +3659,7 @@ static void hns_roce_v1_destroy_qp_work_fn(struct work_struct *work)
        struct hns_roce_dev *hr_dev;
        struct hns_roce_qp *hr_qp;
        struct device *dev;
+        unsigned long qpn;
        int ret;
        qp_work_entry = container_of(work, struct hns_roce_qp_work, work);
@@ -3648,8 +3667,9 @@ static void hns_roce_v1_destroy_qp_work_fn(struct work_struct *work)
        dev = &hr_dev->pdev->dev;
        priv = (struct hns_roce_v1_priv *)hr_dev->hw->priv;
        hr_qp = qp_work_entry->qp;
+        qpn = hr_qp->qpn;
-        dev_dbg(dev, "Schedule destroy QP(0x%lx) work.\n", hr_qp->qpn);
+        dev_dbg(dev, "Schedule destroy QP(0x%lx) work.\n", qpn);
        qp_work_entry->sche_cnt++;
@@ -3660,7 +3680,7 @@ static void hns_roce_v1_destroy_qp_work_fn(struct work_struct *work)
                                         &qp_work_entry->db_wait_stage);
        if (ret) {
                dev_err(dev, "Check QP(0x%lx) db process status failed!\n",
-                        hr_qp->qpn);
+                        qpn);
                return;
        }
@@ -3674,7 +3694,7 @@ static void hns_roce_v1_destroy_qp_work_fn(struct work_struct *work)
        ret = hns_roce_v1_modify_qp(&hr_qp->ibqp, NULL, 0, hr_qp->state,
                                    IB_QPS_RESET);
        if (ret) {
-                dev_err(dev, "Modify QP(0x%lx) to RST failed!\n", hr_qp->qpn);
+                dev_err(dev, "Modify QP(0x%lx) to RST failed!\n", qpn);
                return;
        }
@@ -3683,14 +3703,14 @@ static void hns_roce_v1_destroy_qp_work_fn(struct work_struct *work)
        if (hr_qp->ibqp.qp_type == IB_QPT_RC) {
                /* RC QP, release QPN */
-                hns_roce_release_range_qp(hr_dev, hr_qp->qpn, 1);
+                hns_roce_release_range_qp(hr_dev, qpn, 1);
                kfree(hr_qp);
        } else
                kfree(hr_to_hr_sqp(hr_qp));
        kfree(qp_work_entry);
-        dev_dbg(dev, "Accomplished destroy QP(0x%lx) work.\n", hr_qp->qpn);
+        dev_dbg(dev, "Accomplished destroy QP(0x%lx) work.\n", qpn);
 }
 int hns_roce_v1_destroy_qp(struct ib_qp *ibqp)
diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
index c3b41f95e70a..d9777b662eba 100644
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -125,8 +125,6 @@ static int handle_en_event(struct hns_roce_dev *hr_dev, u8 port,
                return -ENODEV;
        }
-        spin_lock_bh(&hr_dev->iboe.lock);
        switch (event) {
        case NETDEV_UP:
        case NETDEV_CHANGE:
@@ -144,7 +142,6 @@ static int handle_en_event(struct hns_roce_dev *hr_dev, u8 port,
                break;
        }
-        spin_unlock_bh(&hr_dev->iboe.lock);
        return 0;
 }
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 4f5a143fc0a7..ff931c580557 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -102,7 +102,7 @@ static int mlx4_ib_alloc_cq_buf(struct mlx4_ib_dev *dev, struct mlx4_ib_cq_buf *
        int err;
        err = mlx4_buf_alloc(dev->dev, nent * dev->dev->caps.cqe_size,
-                             PAGE_SIZE * 2, &buf->buf, GFP_KERNEL);
+                             PAGE_SIZE * 2, &buf->buf);
        if (err)
                goto out;
@@ -113,7 +113,7 @@ static int mlx4_ib_alloc_cq_buf(struct mlx4_ib_dev *dev, struct mlx4_ib_cq_buf *
        if (err)
                goto err_buf;
-        err = mlx4_buf_write_mtt(dev->dev, &buf->mtt, &buf->buf, GFP_KERNEL);
+        err = mlx4_buf_write_mtt(dev->dev, &buf->mtt, &buf->buf);
        if (err)
                goto err_mtt;
@@ -219,7 +219,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev,
                uar = &to_mucontext(context)->uar;
        } else {
-                err = mlx4_db_alloc(dev->dev, &cq->db, 1, GFP_KERNEL);
+                err = mlx4_db_alloc(dev->dev, &cq->db, 1);
                if (err)
                        goto err_cq;
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 75b2f7d4cd95..d1b43cbbfea7 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1155,7 +1155,7 @@ static void mlx4_ib_disassociate_ucontext(struct ib_ucontext *ibcontext)
                         * call to mlx4_ib_vma_close.
                         */
                        put_task_struct(owning_process);
-                        msleep(1);
+                        usleep_range(1000, 2000);
                        owning_process = get_pid_task(ibcontext->tgid,
                                                      PIDTYPE_PID);
                        if (!owning_process ||
diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
index 3405e947dc1e..b73f89700ef9 100644
--- a/drivers/infiniband/hw/mlx4/mcg.c
+++ b/drivers/infiniband/hw/mlx4/mcg.c
@@ -1091,7 +1091,7 @@ static void _mlx4_ib_mcg_port_cleanup(struct mlx4_ib_demux_ctx *ctx, int destroy
                if (!count)
                        break;
-                msleep(1);
+                usleep_range(1000, 2000);
        } while (time_after(end, jiffies));
        flush_workqueue(ctx->mcg_wq);
diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index c2b9cbf4da05..9db82e67e959 100644
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -185,7 +185,6 @@ enum mlx4_ib_qp_flags {
        MLX4_IB_QP_LSO = IB_QP_CREATE_IPOIB_UD_LSO,
        MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK = IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK,
        MLX4_IB_QP_NETIF = IB_QP_CREATE_NETIF_QP,
-        MLX4_IB_QP_CREATE_USE_GFP_NOIO = IB_QP_CREATE_USE_GFP_NOIO,
        /* Mellanox specific flags start from IB_QP_CREATE_RESERVED_START */
        MLX4_IB_ROCE_V2_GSI_QP = MLX4_IB_QP_CREATE_ROCE_V2_GSI,
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 996e9058e515..75c0e6c5dd56 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -634,8 +634,8 @@ static void mlx4_ib_free_qp_counter(struct mlx4_ib_dev *dev,
 static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
                            struct ib_qp_init_attr *init_attr,
-                            struct ib_udata *udata, int sqpn, struct mlx4_ib_qp **caller_qp,
+                            struct ib_udata *udata, int sqpn,
-                            gfp_t gfp)
+                            struct mlx4_ib_qp **caller_qp)
 {
        int qpn;
        int err;
@@ -691,14 +691,14 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
                if (qp_type == MLX4_IB_QPT_SMI || qp_type == MLX4_IB_QPT_GSI ||
                    (qp_type & (MLX4_IB_QPT_PROXY_SMI | MLX4_IB_QPT_PROXY_SMI_OWNER |
                                MLX4_IB_QPT_PROXY_GSI | MLX4_IB_QPT_TUN_SMI_OWNER))) {
-                        sqp = kzalloc(sizeof (struct mlx4_ib_sqp), gfp);
+                        sqp = kzalloc(sizeof(struct mlx4_ib_sqp), GFP_KERNEL);
                        if (!sqp)
                                return -ENOMEM;
                        qp = &sqp->qp;
                        qp->pri.vid = 0xFFFF;
                        qp->alt.vid = 0xFFFF;
                } else {
-                        qp = kzalloc(sizeof (struct mlx4_ib_qp), gfp);
+                        qp = kzalloc(sizeof(struct mlx4_ib_qp), GFP_KERNEL);
                        if (!qp)
                                return -ENOMEM;
                        qp->pri.vid = 0xFFFF;
@@ -780,7 +780,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
                        goto err;
                if (qp_has_rq(init_attr)) {
-                        err = mlx4_db_alloc(dev->dev, &qp->db, 0, gfp);
+                        err = mlx4_db_alloc(dev->dev, &qp->db, 0);
                        if (err)
                                goto err;
@@ -788,7 +788,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
                }
                if (mlx4_buf_alloc(dev->dev, qp->buf_size, qp->buf_size,
-                                   &qp->buf, gfp)) {
+                                   &qp->buf)) {
                        memcpy(&init_attr->cap, &backup_cap,
                               sizeof(backup_cap));
                        err = set_kernel_sq_size(dev, &init_attr->cap, qp_type,
@@ -797,7 +797,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
                                goto err_db;
                        if (mlx4_buf_alloc(dev->dev, qp->buf_size,
-                                           PAGE_SIZE * 2, &qp->buf, gfp)) {
+                                           PAGE_SIZE * 2, &qp->buf)) {
                                err = -ENOMEM;
                                goto err_db;
                        }
@@ -808,20 +808,20 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
                if (err)
                        goto err_buf;
-                err = mlx4_buf_write_mtt(dev->dev, &qp->mtt, &qp->buf, gfp);
+                err = mlx4_buf_write_mtt(dev->dev, &qp->mtt, &qp->buf);
                if (err)
                        goto err_mtt;
                qp->sq.wrid = kmalloc_array(qp->sq.wqe_cnt, sizeof(u64),
-                                        gfp | __GFP_NOWARN);
+                                        GFP_KERNEL | __GFP_NOWARN);
                if (!qp->sq.wrid)
                        qp->sq.wrid = __vmalloc(qp->sq.wqe_cnt * sizeof(u64),
-                                                gfp, PAGE_KERNEL);
+                                                GFP_KERNEL, PAGE_KERNEL);
                qp->rq.wrid = kmalloc_array(qp->rq.wqe_cnt, sizeof(u64),
-                                        gfp | __GFP_NOWARN);
+                                        GFP_KERNEL | __GFP_NOWARN);
                if (!qp->rq.wrid)
                        qp->rq.wrid = __vmalloc(qp->rq.wqe_cnt * sizeof(u64),
-                                                gfp, PAGE_KERNEL);
+                                                GFP_KERNEL, PAGE_KERNEL);
                if (!qp->sq.wrid || !qp->rq.wrid) {
                        err = -ENOMEM;
                        goto err_wrid;
@@ -859,7 +859,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
        if (init_attr->create_flags & IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK)
                qp->flags |= MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK;
-        err = mlx4_qp_alloc(dev->dev, qpn, &qp->mqp, gfp);
+        err = mlx4_qp_alloc(dev->dev, qpn, &qp->mqp);
        if (err)
                goto err_qpn;
@@ -1127,10 +1127,7 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd,
        int err;
        int sup_u_create_flags = MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK;
        u16 xrcdn = 0;
-        gfp_t gfp;
-        gfp = (init_attr->create_flags & MLX4_IB_QP_CREATE_USE_GFP_NOIO) ?
-                GFP_NOIO : GFP_KERNEL;
        /*
         * We only support LSO, vendor flag1, and multicast loopback blocking,
         * and only for kernel UD QPs.
@@ -1140,8 +1137,7 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd,
                                        MLX4_IB_SRIOV_TUNNEL_QP |
                                        MLX4_IB_SRIOV_SQP |
                                        MLX4_IB_QP_NETIF |
-                                        MLX4_IB_QP_CREATE_ROCE_V2_GSI |
+                                        MLX4_IB_QP_CREATE_ROCE_V2_GSI))
-                                        MLX4_IB_QP_CREATE_USE_GFP_NOIO))
                return ERR_PTR(-EINVAL);
        if (init_attr->create_flags & IB_QP_CREATE_NETIF_QP) {
@@ -1154,7 +1150,6 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd,
                        return ERR_PTR(-EINVAL);
                if ((init_attr->create_flags & ~(MLX4_IB_SRIOV_SQP |
-                                                 MLX4_IB_QP_CREATE_USE_GFP_NOIO |
                                                 MLX4_IB_QP_CREATE_ROCE_V2_GSI  |
                                                 MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK) &&
                     init_attr->qp_type != IB_QPT_UD) ||
@@ -1179,7 +1174,7 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd,
        case IB_QPT_RC:
        case IB_QPT_UC:
        case IB_QPT_RAW_PACKET:
-                qp = kzalloc(sizeof *qp, gfp);
+                qp = kzalloc(sizeof(*qp), GFP_KERNEL);
                if (!qp)
                        return ERR_PTR(-ENOMEM);
                qp->pri.vid = 0xFFFF;
@@ -1188,7 +1183,7 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd,
        case IB_QPT_UD:
        {
                err = create_qp_common(to_mdev(pd->device), pd, init_attr,
-                                       udata, 0, &qp, gfp);
+                                       udata, 0, &qp);
                if (err) {
                        kfree(qp);
                        return ERR_PTR(err);
@@ -1217,8 +1212,7 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd,
                }
                err = create_qp_common(to_mdev(pd->device), pd, init_attr, udata,
-                                       sqpn,
+                                       sqpn, &qp);
-                                       &qp, gfp);
                if (err)
                        return ERR_PTR(err);
diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
index e32dd58937a8..0facaf5f6d23 100644
--- a/drivers/infiniband/hw/mlx4/srq.c
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@ -135,14 +135,14 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
                if (err)
                        goto err_mtt;
        } else {
-                err = mlx4_db_alloc(dev->dev, &srq->db, 0, GFP_KERNEL);
+                err = mlx4_db_alloc(dev->dev, &srq->db, 0);
                if (err)
                        goto err_srq;
                *srq->db.db = 0;
-                if (mlx4_buf_alloc(dev->dev, buf_size, PAGE_SIZE * 2, &srq->buf,
+                if (mlx4_buf_alloc(dev->dev, buf_size, PAGE_SIZE * 2,
-                                   GFP_KERNEL)) {
+                                   &srq->buf)) {
                        err = -ENOMEM;
                        goto err_db;
                }
@@ -167,7 +167,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
                if (err)
                        goto err_buf;
-                err = mlx4_buf_write_mtt(dev->dev, &srq->mtt, &srq->buf, GFP_KERNEL);
+                err = mlx4_buf_write_mtt(dev->dev, &srq->mtt, &srq->buf);
                if (err)
                        goto err_mtt;
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 763bb5b36144..8ab2f1360a45 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -582,6 +582,15 @@ static void clean_keys(struct mlx5_ib_dev *dev, int c)
        }
 }
+static void mlx5_mr_cache_debugfs_cleanup(struct mlx5_ib_dev *dev)
+{
+        if (!mlx5_debugfs_root)
+                return;
+        debugfs_remove_recursive(dev->cache.root);
+        dev->cache.root = NULL;
+}
 static int mlx5_mr_cache_debugfs_init(struct mlx5_ib_dev *dev)
 {
        struct mlx5_mr_cache *cache = &dev->cache;
@@ -600,38 +609,34 @@ static int mlx5_mr_cache_debugfs_init(struct mlx5_ib_dev *dev)
                sprintf(ent->name, "%d", ent->order);
                ent->dir = debugfs_create_dir(ent->name,  cache->root);
                if (!ent->dir)
-                        return -ENOMEM;
+                        goto err;
                ent->fsize = debugfs_create_file("size", 0600, ent->dir, ent,
                                                 &size_fops);
                if (!ent->fsize)
-                        return -ENOMEM;
+                        goto err;
                ent->flimit = debugfs_create_file("limit", 0600, ent->dir, ent,
                                                  &limit_fops);
                if (!ent->flimit)
-                        return -ENOMEM;
+                        goto err;
                ent->fcur = debugfs_create_u32("cur", 0400, ent->dir,
                                               &ent->cur);
                if (!ent->fcur)
-                        return -ENOMEM;
+                        goto err;
                ent->fmiss = debugfs_create_u32("miss", 0600, ent->dir,
                                                &ent->miss);
                if (!ent->fmiss)
-                        return -ENOMEM;
+                        goto err;
        }
        return 0;
-}
+err:
+        mlx5_mr_cache_debugfs_cleanup(dev);
-static void mlx5_mr_cache_debugfs_cleanup(struct mlx5_ib_dev *dev)
-{
-        if (!mlx5_debugfs_root)
-                return;
-        debugfs_remove_recursive(dev->cache.root);
+        return -ENOMEM;
 }
 static void delay_time_func(unsigned long ctx)
@@ -692,6 +697,11 @@ int mlx5_mr_cache_init(struct mlx5_ib_dev *dev)
        if (err)
                mlx5_ib_warn(dev, "cache debugfs failure\n");
+        /*
+         * We don't want to fail driver if debugfs failed to initialize,
+         * so we are not forwarding error to the user.
+         */
        return 0;
 }
@@ -1779,7 +1789,7 @@ mlx5_ib_sg_to_klms(struct mlx5_ib_mr *mr,
        mr->ndescs = sg_nents;
        for_each_sg(sgl, sg, sg_nents, i) {
-                if (unlikely(i > mr->max_descs))
+                if (unlikely(i >= mr->max_descs))
                        break;
                klms[i].va = cpu_to_be64(sg_dma_address(sg) + sg_offset);
                klms[i].bcount = cpu_to_be32(sg_dma_len(sg) - sg_offset);
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 8f9d8b4ad583..b0adf65e4bdb 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -551,7 +551,7 @@ struct nes_adapter *nes_init_adapter(struct nes_device *nesdev, u8 hw_rev) {
                        if ((0x0F000100 == (pcs_control_status0 & 0x0F000100))
                            || (0x0F000100 == (pcs_control_status1 & 0x0F000100)))
                                int_cnt++;
-                        msleep(1);
+                        usleep_range(1000, 2000);
                }
                if (int_cnt > 1) {
                        spin_lock_irqsave(&nesadapter->phy_lock, flags);
@@ -592,7 +592,7 @@ struct nes_adapter *nes_init_adapter(struct nes_device *nesdev, u8 hw_rev) {
                                                break;
                                        }
                                }
-                                msleep(1);
+                                usleep_range(1000, 2000);
                        }
                }
        }
diff --git a/drivers/infiniband/hw/qib/qib_qp.c b/drivers/infiniband/hw/qib/qib_qp.c
index 5984981e7dd4..a343e3b5d4cb 100644
--- a/drivers/infiniband/hw/qib/qib_qp.c
+++ b/drivers/infiniband/hw/qib/qib_qp.c
@@ -104,10 +104,9 @@ const struct rvt_operation_params qib_post_parms[RVT_OPERATION_MAX] = {
 };
-static void get_map_page(struct rvt_qpn_table *qpt, struct rvt_qpn_map *map,
+static void get_map_page(struct rvt_qpn_table *qpt, struct rvt_qpn_map *map)
-                         gfp_t gfp)
 {
-        unsigned long page = get_zeroed_page(gfp);
+        unsigned long page = get_zeroed_page(GFP_KERNEL);
        /*
         * Free the page if someone raced with us installing it.
@@ -126,7 +125,7 @@ static void get_map_page(struct rvt_qpn_table *qpt, struct rvt_qpn_map *map,
 * zero/one for QP type IB_QPT_SMI/IB_QPT_GSI.
 */
 int qib_alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt,
-                  enum ib_qp_type type, u8 port, gfp_t gfp)
+                  enum ib_qp_type type, u8 port)
 {
        u32 i, offset, max_scan, qpn;
        struct rvt_qpn_map *map;
@@ -160,7 +159,7 @@ int qib_alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt,
        max_scan = qpt->nmaps - !offset;
        for (i = 0;;) {
                if (unlikely(!map->page)) {
-                        get_map_page(qpt, map, gfp);
+                        get_map_page(qpt, map);
                        if (unlikely(!map->page))
                                break;
                }
@@ -317,16 +316,16 @@ u32 qib_mtu_from_qp(struct rvt_dev_info *rdi, struct rvt_qp *qp, u32 pmtu)
        return ib_mtu_enum_to_int(pmtu);
 }
-void *qib_qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp, gfp_t gfp)
+void *qib_qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp)
 {
        struct qib_qp_priv *priv;
-        priv = kzalloc(sizeof(*priv), gfp);
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return ERR_PTR(-ENOMEM);
        priv->owner = qp;
-        priv->s_hdr = kzalloc(sizeof(*priv->s_hdr), gfp);
+        priv->s_hdr = kzalloc(sizeof(*priv->s_hdr), GFP_KERNEL);
        if (!priv->s_hdr) {
                kfree(priv);
                return ERR_PTR(-ENOMEM);
diff --git a/drivers/infiniband/hw/qib/qib_verbs.h b/drivers/infiniband/hw/qib/qib_verbs.h
index da0db5485ddc..a52fc67b40d7 100644
--- a/drivers/infiniband/hw/qib/qib_verbs.h
+++ b/drivers/infiniband/hw/qib/qib_verbs.h
@@ -274,11 +274,11 @@ int qib_get_counters(struct qib_pportdata *ppd,
 * Functions provided by qib driver for rdmavt to use
 */
 unsigned qib_free_all_qps(struct rvt_dev_info *rdi);
-void *qib_qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp, gfp_t gfp);
+void *qib_qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp);
 void qib_qp_priv_free(struct rvt_dev_info *rdi, struct rvt_qp *qp);
 void qib_notify_qp_reset(struct rvt_qp *qp);
 int qib_alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt,
-                  enum ib_qp_type type, u8 port, gfp_t gfp);
+                  enum ib_qp_type type, u8 port);
 void qib_restart_rc(struct rvt_qp *qp, u32 psn, int wait);
 #ifdef CONFIG_DEBUG_FS
diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 727e81cc2c8f..459865439a0b 100644
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -118,10 +118,9 @@ const int ib_rvt_state_ops[IB_QPS_ERR + 1] = {
 EXPORT_SYMBOL(ib_rvt_state_ops);
 static void get_map_page(struct rvt_qpn_table *qpt,
-                         struct rvt_qpn_map *map,
+                         struct rvt_qpn_map *map)
-                         gfp_t gfp)
 {
-        unsigned long page = get_zeroed_page(gfp);
+        unsigned long page = get_zeroed_page(GFP_KERNEL);
        /*
         * Free the page if someone raced with us installing it.
@@ -173,7 +172,7 @@ static int init_qpn_table(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt)
                    rdi->dparms.qpn_res_start, rdi->dparms.qpn_res_end);
        for (i = rdi->dparms.qpn_res_start; i <= rdi->dparms.qpn_res_end; i++) {
                if (!map->page) {
-                        get_map_page(qpt, map, GFP_KERNEL);
+                        get_map_page(qpt, map);
                        if (!map->page) {
                                ret = -ENOMEM;
                                break;
@@ -342,14 +341,14 @@ static inline unsigned mk_qpn(struct rvt_qpn_table *qpt,
 * Return: The queue pair number
 */
 static int alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt,
-                     enum ib_qp_type type, u8 port_num, gfp_t gfp)
+                     enum ib_qp_type type, u8 port_num)
 {
        u32 i, offset, max_scan, qpn;
        struct rvt_qpn_map *map;
        u32 ret;
        if (rdi->driver_f.alloc_qpn)
-                return rdi->driver_f.alloc_qpn(rdi, qpt, type, port_num, gfp);
+                return rdi->driver_f.alloc_qpn(rdi, qpt, type, port_num);
        if (type == IB_QPT_SMI || type == IB_QPT_GSI) {
                unsigned n;
@@ -374,7 +373,7 @@ static int alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt,
        max_scan = qpt->nmaps - !offset;
        for (i = 0;;) {
                if (unlikely(!map->page)) {
-                        get_map_page(qpt, map, gfp);
+                        get_map_page(qpt, map);
                        if (unlikely(!map->page))
                                break;
                }
@@ -672,7 +671,6 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
        struct ib_qp *ret = ERR_PTR(-ENOMEM);
        struct rvt_dev_info *rdi = ib_to_rvt(ibpd->device);
        void *priv = NULL;
-        gfp_t gfp;
        size_t sqsize;
        if (!rdi)
@@ -680,18 +678,9 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
        if (init_attr->cap.max_send_sge > rdi->dparms.props.max_sge ||
            init_attr->cap.max_send_wr > rdi->dparms.props.max_qp_wr ||
-            init_attr->create_flags & ~(IB_QP_CREATE_USE_GFP_NOIO))
+            init_attr->create_flags)
                return ERR_PTR(-EINVAL);
-        /* GFP_NOIO is applicable to RC QP's only */
-        if (init_attr->create_flags & IB_QP_CREATE_USE_GFP_NOIO &&
-            init_attr->qp_type != IB_QPT_RC)
-                return ERR_PTR(-EINVAL);
-        gfp = init_attr->create_flags & IB_QP_CREATE_USE_GFP_NOIO ?
-                                                GFP_NOIO : GFP_KERNEL;
        /* Check receive queue parameters if no SRQ is specified. */
        if (!init_attr->srq) {
                if (init_attr->cap.max_recv_sge > rdi->dparms.props.max_sge ||
@@ -719,14 +708,7 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
                sz = sizeof(struct rvt_sge) *
                        init_attr->cap.max_send_sge +
                        sizeof(struct rvt_swqe);
-                if (gfp == GFP_NOIO)
+                swq = vzalloc_node(sqsize * sz, rdi->dparms.node);
-                        swq = __vmalloc(
-                                sqsize * sz,
-                                gfp | __GFP_ZERO, PAGE_KERNEL);
-                else
-                        swq = vzalloc_node(
-                                sqsize * sz,
-                                rdi->dparms.node);
                if (!swq)
                        return ERR_PTR(-ENOMEM);
@@ -741,7 +723,8 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
                } else if (init_attr->cap.max_recv_sge > 1)
                        sg_list_sz = sizeof(*qp->r_sg_list) *
                                (init_attr->cap.max_recv_sge - 1);
-                qp = kzalloc_node(sz + sg_list_sz, gfp, rdi->dparms.node);
+                qp = kzalloc_node(sz + sg_list_sz, GFP_KERNEL,
+                                  rdi->dparms.node);
                if (!qp)
                        goto bail_swq;
@@ -751,7 +734,7 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
                                kzalloc_node(
                                        sizeof(*qp->s_ack_queue) *
                                         rvt_max_atomic(rdi),
-                                        gfp,
+                                        GFP_KERNEL,
                                        rdi->dparms.node);
                        if (!qp->s_ack_queue)
                                goto bail_qp;
@@ -766,7 +749,7 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
                 * Driver needs to set up it's private QP structure and do any
                 * initialization that is needed.
                 */
-                priv = rdi->driver_f.qp_priv_alloc(rdi, qp, gfp);
+                priv = rdi->driver_f.qp_priv_alloc(rdi, qp);
                if (IS_ERR(priv)) {
                        ret = priv;
                        goto bail_qp;
@@ -786,11 +769,6 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
                                qp->r_rq.wq = vmalloc_user(
                                                sizeof(struct rvt_rwq) +
                                                qp->r_rq.size * sz);
-                        else if (gfp == GFP_NOIO)
-                                qp->r_rq.wq = __vmalloc(
-                                                sizeof(struct rvt_rwq) +
-                                                qp->r_rq.size * sz,
-                                                gfp | __GFP_ZERO, PAGE_KERNEL);
                        else
                                qp->r_rq.wq = vzalloc_node(
                                                sizeof(struct rvt_rwq) +
@@ -824,7 +802,7 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd,
                err = alloc_qpn(rdi, &rdi->qp_dev->qpn_table,
                                init_attr->qp_type,
-                                init_attr->port_num, gfp);
+                                init_attr->port_num);
                if (err < 0) {
                        ret = ERR_PTR(err);
                        goto bail_rq_wq;
diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index c3a140ed4df2..08f3f90d2912 100644
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -441,6 +441,8 @@ static void rxe_skb_tx_dtor(struct sk_buff *skb)
        if (unlikely(qp->need_req_skb &&
                     skb_out < RXE_INFLIGHT_SKBS_PER_QP_LOW))
                rxe_run_task(&qp->req.task, 1);
+        rxe_drop_ref(qp);
 }
 int rxe_send(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, struct sk_buff *skb)
@@ -473,6 +475,7 @@ int rxe_send(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, struct sk_buff *skb)
                return -EAGAIN;
        }
+        rxe_add_ref(pkt->qp);
        atomic_inc(&pkt->qp->skb_out);
        kfree_skb(skb);
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index 073e66783f1d..07511718d98d 100644
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -1240,6 +1240,8 @@ int rxe_register_device(struct rxe_dev *rxe)
        addrconf_addr_eui48((unsigned char *)&dev->node_guid,
                            rxe->ndev->dev_addr);
        dev->dev.dma_ops = &dma_virt_ops;
+        dma_coerce_mask_and_coherent(&dev->dev,
+                                     dma_get_required_mask(dev->dev.parent));
        dev->uverbs_abi_ver = RXE_UVERBS_ABI_VERSION;
        dev->uverbs_cmd_mask = BIT_ULL(IB_USER_VERBS_CMD_GET_CONTEXT)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 7cbcfdac6529..f87d104837dc 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -39,6 +39,7 @@
 #include <linux/vmalloc.h>
 #include <linux/moduleparam.h>
 #include <linux/sched/signal.h>
+#include <linux/sched/mm.h>
 #include "ipoib.h"
@@ -954,7 +955,7 @@ void ipoib_cm_dev_stop(struct net_device *dev)
                        break;
                }
                spin_unlock_irq(&priv->lock);
-                msleep(1);
+                usleep_range(1000, 2000);
                ipoib_drain_cq(dev);
                spin_lock_irq(&priv->lock);
        }
@@ -1047,9 +1048,8 @@ static struct ib_qp *ipoib_cm_create_tx_qp(struct net_device *dev, struct ipoib_
                .sq_sig_type            = IB_SIGNAL_ALL_WR,
                .qp_type                = IB_QPT_RC,
                .qp_context             = tx,
-                .create_flags           = IB_QP_CREATE_USE_GFP_NOIO
+                .create_flags           = 0
        };
        struct ib_qp *tx_qp;
        if (dev->features & NETIF_F_SG)
@@ -1057,10 +1057,6 @@ static struct ib_qp *ipoib_cm_create_tx_qp(struct net_device *dev, struct ipoib_
                        min_t(u32, priv->ca->attrs.max_sge, MAX_SKB_FRAGS + 1);
        tx_qp = ib_create_qp(priv->pd, &attr);
-        if (PTR_ERR(tx_qp) == -EINVAL) {
-                attr.create_flags &= ~IB_QP_CREATE_USE_GFP_NOIO;
-                tx_qp = ib_create_qp(priv->pd, &attr);
-        }
        tx->max_send_sge = attr.cap.max_send_sge;
        return tx_qp;
 }
@@ -1131,10 +1127,11 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
                            struct sa_path_rec *pathrec)
 {
        struct ipoib_dev_priv *priv = ipoib_priv(p->dev);
+        unsigned int noio_flag;
        int ret;
-        p->tx_ring = __vmalloc(ipoib_sendq_size * sizeof *p->tx_ring,
+        noio_flag = memalloc_noio_save();
-                               GFP_NOIO, PAGE_KERNEL);
+        p->tx_ring = vzalloc(ipoib_sendq_size * sizeof(*p->tx_ring));
        if (!p->tx_ring) {
                ret = -ENOMEM;
                goto err_tx;
@@ -1142,9 +1139,10 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
        memset(p->tx_ring, 0, ipoib_sendq_size * sizeof *p->tx_ring);
        p->qp = ipoib_cm_create_tx_qp(p->dev, p);
+        memalloc_noio_restore(noio_flag);
        if (IS_ERR(p->qp)) {
                ret = PTR_ERR(p->qp);
-                ipoib_warn(priv, "failed to allocate tx qp: %d\n", ret);
+                ipoib_warn(priv, "failed to create tx qp: %d\n", ret);
                goto err_qp;
        }
@@ -1206,7 +1204,7 @@ static void ipoib_cm_tx_destroy(struct ipoib_cm_tx *p)
                                goto timeout;
                        }
-                        msleep(1);
+                        usleep_range(1000, 2000);
                }
        }
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index efe7402f4885..57a9655e844d 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -770,7 +770,7 @@ int ipoib_ib_dev_stop_default(struct net_device *dev)
                ipoib_drain_cq(dev);
-                msleep(1);
+                usleep_range(1000, 2000);
        }
        ipoib_dbg(priv, "All sends and receives done.\n");
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 6e86eeee370e..70dacaf9044e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -233,6 +233,7 @@ static netdev_features_t ipoib_fix_features(struct net_device *dev, netdev_featu
 static int ipoib_change_mtu(struct net_device *dev, int new_mtu)
 {
        struct ipoib_dev_priv *priv = ipoib_priv(dev);
+        int ret = 0;
        /* dev->mtu > 2K ==> connected mode */
        if (ipoib_cm_admin_enabled(dev)) {
@@ -256,9 +257,34 @@ static int ipoib_change_mtu(struct net_device *dev, int new_mtu)
                ipoib_dbg(priv, "MTU must be smaller than the underlying "
                                "link layer MTU - 4 (%u)\n", priv->mcast_mtu);
-        dev->mtu = min(priv->mcast_mtu, priv->admin_mtu);
+        new_mtu = min(priv->mcast_mtu, priv->admin_mtu);
-        return 0;
+        if (priv->rn_ops->ndo_change_mtu) {
+                bool carrier_status = netif_carrier_ok(dev);
+                netif_carrier_off(dev);
+                /* notify lower level on the real mtu */
+                ret = priv->rn_ops->ndo_change_mtu(dev, new_mtu);
+                if (carrier_status)
+                        netif_carrier_on(dev);
+        } else {
+                dev->mtu = new_mtu;
+        }
+        return ret;
+}
+static void ipoib_get_stats(struct net_device *dev,
+                            struct rtnl_link_stats64 *stats)
+{
+        struct ipoib_dev_priv *priv = ipoib_priv(dev);
+        if (priv->rn_ops->ndo_get_stats64)
+                priv->rn_ops->ndo_get_stats64(dev, stats);
+        else
+                netdev_stats_to_stats64(stats, &dev->stats);
 }
 /* Called with an RCU read lock taken */
@@ -1808,6 +1834,7 @@ static const struct net_device_ops ipoib_netdev_ops_pf = {
        .ndo_get_vf_stats        = ipoib_get_vf_stats,
        .ndo_set_vf_guid         = ipoib_set_vf_guid,
        .ndo_set_mac_address     = ipoib_set_mac,
+        .ndo_get_stats64         = ipoib_get_stats,
 };
 static const struct net_device_ops ipoib_netdev_ops_vf = {
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 5a887efb4bdf..37b33d708c2d 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -83,6 +83,7 @@ static struct scsi_host_template iscsi_iser_sht;
 static struct iscsi_transport iscsi_iser_transport;
 static struct scsi_transport_template *iscsi_iser_scsi_transport;
 static struct workqueue_struct *release_wq;
+static DEFINE_MUTEX(unbind_iser_conn_mutex);
 struct iser_global ig;
 int iser_debug_level = 0;
@@ -550,12 +551,14 @@ iscsi_iser_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
         */
        if (iser_conn) {
                mutex_lock(&iser_conn->state_mutex);
+                mutex_lock(&unbind_iser_conn_mutex);
                iser_conn_terminate(iser_conn);
                iscsi_conn_stop(cls_conn, flag);
                /* unbind */
                iser_conn->iscsi_conn = NULL;
                conn->dd_data = NULL;
+                mutex_unlock(&unbind_iser_conn_mutex);
                complete(&iser_conn->stop_completion);
                mutex_unlock(&iser_conn->state_mutex);
@@ -977,13 +980,21 @@ static int iscsi_iser_slave_alloc(struct scsi_device *sdev)
        struct iser_conn *iser_conn;
        struct ib_device *ib_dev;
+        mutex_lock(&unbind_iser_conn_mutex);
        session = starget_to_session(scsi_target(sdev))->dd_data;
        iser_conn = session->leadconn->dd_data;
+        if (!iser_conn) {
+                mutex_unlock(&unbind_iser_conn_mutex);
+                return -ENOTCONN;
+        }
        ib_dev = iser_conn->ib_conn.device->ib_device;
        if (!(ib_dev->attrs.device_cap_flags & IB_DEVICE_SG_GAPS_REG))
                blk_queue_virt_boundary(sdev->request_queue, ~MASK_4K);
+        mutex_unlock(&unbind_iser_conn_mutex);
        return 0;
 }
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index c538a38c91ce..26a004e97ae0 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -708,8 +708,14 @@ iser_calc_scsi_params(struct iser_conn *iser_conn,
        unsigned short sg_tablesize, sup_sg_tablesize;
        sg_tablesize = DIV_ROUND_UP(max_sectors * 512, SIZE_4K);
-        sup_sg_tablesize = min_t(unsigned, ISCSI_ISER_MAX_SG_TABLESIZE,
+        if (device->ib_device->attrs.device_cap_flags &
-                                 device->ib_device->attrs.max_fast_reg_page_list_len);
+                        IB_DEVICE_MEM_MGT_EXTENSIONS)
+                sup_sg_tablesize =
+                        min_t(
+                         uint, ISCSI_ISER_MAX_SG_TABLESIZE,
+                         device->ib_device->attrs.max_fast_reg_page_list_len);
+        else
+                sup_sg_tablesize = ISCSI_ISER_MAX_SG_TABLESIZE;
        iser_conn->scsi_sg_tablesize = min(sg_tablesize, sup_sg_tablesize);
 }
diff --git a/drivers/irqchip/irq-digicolor.c b/drivers/irqchip/irq-digicolor.c
index dad85e74c37c..3aae015469a5 100644
--- a/drivers/irqchip/irq-digicolor.c
+++ b/drivers/irqchip/irq-digicolor.c
@@ -71,7 +71,7 @@ static void __init digicolor_set_gc(void __iomem *reg_base, unsigned irq_base,
 static int __init digicolor_of_init(struct device_node *node,
                                struct device_node *parent)
 {
-        static void __iomem *reg_base;
+        void __iomem *reg_base;
        unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
        struct regmap *ucregs;
        int ret;
diff --git a/drivers/irqchip/irq-gic-realview.c b/drivers/irqchip/irq-gic-realview.c
index 54c296401525..18d58d2b4ffe 100644
--- a/drivers/irqchip/irq-gic-realview.c
+++ b/drivers/irqchip/irq-gic-realview.c
@@ -43,7 +43,7 @@ static const struct of_device_id syscon_pldset_of_match[] = {
 static int __init
 realview_gic_of_init(struct device_node *node, struct device_node *parent)
 {
-        static struct regmap *map;
+        struct regmap *map;
        struct device_node *np;
        const struct of_device_id *gic_id;
        u32 pld1_ctrl;
diff --git a/drivers/irqchip/irq-mips-cpu.c b/drivers/irqchip/irq-mips-cpu.c
index 0a8ed1c05518..14461cbfab2f 100644
--- a/drivers/irqchip/irq-mips-cpu.c
+++ b/drivers/irqchip/irq-mips-cpu.c
@@ -154,7 +154,7 @@ asmlinkage void __weak plat_irq_dispatch(void)
 static int mips_cpu_intc_map(struct irq_domain *d, unsigned int irq,
                             irq_hw_number_t hw)
 {
-        static struct irq_chip *chip;
+        struct irq_chip *chip;
        if (hw < 2 && cpu_has_mipsmt) {
                /* Software interrupts are used for MT/CMT IPI */
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 832ebf4062f7..6ab1d3afec02 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -950,7 +950,6 @@ static void __init __gic_init(unsigned long gic_base_addr,
                                               &gic_irq_domain_ops, NULL);
        if (!gic_irq_domain)
                panic("Failed to add GIC IRQ domain");
-        gic_irq_domain->name = "mips-gic-irq";
        gic_ipi_domain = irq_domain_add_hierarchy(gic_irq_domain,
                                                  IRQ_DOMAIN_FLAG_IPI_PER_CPU,
@@ -959,7 +958,6 @@ static void __init __gic_init(unsigned long gic_base_addr,
        if (!gic_ipi_domain)
                panic("Failed to add GIC IPI domain");
-        gic_ipi_domain->name = "mips-gic-ipi";
        irq_domain_update_bus_token(gic_ipi_domain, DOMAIN_BUS_IPI);
        if (node &&
diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c
index 060d357f107f..6f423bc49d0d 100644
--- a/drivers/isdn/divert/isdn_divert.c
+++ b/drivers/isdn/divert/isdn_divert.c
@@ -485,18 +485,19 @@ static int isdn_divert_icall(isdn_ctrl *ic)
                                cs->deflect_dest[0] = '\0';
                                retval = 4; /* only proceed */
                        }
-                        sprintf(cs->info, "%d 0x%lx %s %s %s %s 0x%x 0x%x %d %d %s\n",
+                        snprintf(cs->info, sizeof(cs->info),
-                                cs->akt_state,
+                                 "%d 0x%lx %s %s %s %s 0x%x 0x%x %d %d %s\n",
-                                cs->divert_id,
+                                 cs->akt_state,
-                                divert_if.drv_to_name(cs->ics.driver),
+                                 cs->divert_id,
-                                (ic->command == ISDN_STAT_ICALLW) ? "1" : "0",
+                                 divert_if.drv_to_name(cs->ics.driver),
-                                cs->ics.parm.setup.phone,
+                                 (ic->command == ISDN_STAT_ICALLW) ? "1" : "0",
-                                cs->ics.parm.setup.eazmsn,
+                                 cs->ics.parm.setup.phone,
-                                cs->ics.parm.setup.si1,
+                                 cs->ics.parm.setup.eazmsn,
-                                cs->ics.parm.setup.si2,
+                                 cs->ics.parm.setup.si1,
-                                cs->ics.parm.setup.screen,
+                                 cs->ics.parm.setup.si2,
-                                dv->rule.waittime,
+                                 cs->ics.parm.setup.screen,
-                                cs->deflect_dest);
+                                 dv->rule.waittime,
+                                 cs->deflect_dest);
                        if ((dv->rule.action == DEFLECT_REPORT) ||
                            (dv->rule.action == DEFLECT_REJECT)) {
                                put_info_buffer(cs->info);
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 40c7e2cf423b..034cabac699d 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -42,7 +42,7 @@ static char *revision = "$Revision: 1.1.2.2 $";
 static bool suppress_pollack;
-static struct pci_device_id c4_pci_tbl[] = {
+static const struct pci_device_id c4_pci_tbl[] = {
        { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C4, 0, 0, (unsigned long)4 },
        { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C2, 0, 0, (unsigned long)2 },
        { }                     /* Terminating entry */
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index 8b7ad4f1ab01..b2023e08dcd2 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -110,7 +110,7 @@ typedef struct _diva_os_thread_dpc {
 /*
  This table should be sorted by PCI device ID
 */
-static struct pci_device_id divas_pci_tbl[] = {
+static const struct pci_device_id divas_pci_tbl[] = {
        /* Diva Server BRI-2M PCI 0xE010 */
        { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRA),
          CARDTYPE_MAESTRA_PCI },
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index e3fa1cd64470..dce6632daae1 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -1142,7 +1142,7 @@ fritz_remove_pci(struct pci_dev *pdev)
                        pr_info("%s: drvdata already removed\n", __func__);
 }
-static struct pci_device_id fcpci_ids[] = {
+static const struct pci_device_id fcpci_ids[] = {
        { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID,
          0, 0, (unsigned long) "Fritz!Card PCI"},
        { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1_V2, PCI_ANY_ID, PCI_ANY_ID,
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index aea0c9616ea5..3cf07b8ced1c 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -5348,7 +5348,7 @@ static const struct hm_map hfcm_map[] = {
 #undef H
 #define H(x)    ((unsigned long)&hfcm_map[x])
-static struct pci_device_id hfmultipci_ids[] = {
+static const struct pci_device_id hfmultipci_ids[] = {
        /* Cards with HFC-4S Chip */
        { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_VENDOR_ID_CCD,
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 5dc246d71c16..d2e401a8090e 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -2161,7 +2161,7 @@ static const struct _hfc_map hfc_map[] =
        {},
 };
-static struct pci_device_id hfc_ids[] =
+static const struct pci_device_id hfc_ids[] =
 {
        { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_2BD0),
          (unsigned long) &hfc_map[0] },
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c
index afde4edef9ae..6a6d848bd18e 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -1137,7 +1137,7 @@ static void nj_remove(struct pci_dev *pdev)
 /* We cannot select cards with PCI_SUB... IDs, since here are cards with
 * SUB IDs set to PCI_ANY_ID, so we need to match all and reject
 * known other cards which not work with this driver - see probe function */
-static struct pci_device_id nj_pci_ids[] = {
+static const struct pci_device_id nj_pci_ids[] = {
        { PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { }
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 3052c836b89f..d80072fef434 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -1398,7 +1398,7 @@ w6692_remove_pci(struct pci_dev *pdev)
                        pr_notice("%s: drvdata already removed\n", __func__);
 }
-static struct pci_device_id w6692_ids[] = {
+static const struct pci_device_id w6692_ids[] = {
        { PCI_VENDOR_ID_DYNALINK, PCI_DEVICE_ID_DYNALINK_IS64PH,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, (ulong)&w6692_map[0]},
        { PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692,
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index c7d68675b028..7108bdb8742e 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -1909,7 +1909,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if)
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
-static struct pci_device_id hisax_pci_tbl[] __used = {
+static const struct pci_device_id hisax_pci_tbl[] __used = {
 #ifdef CONFIG_HISAX_FRITZPCI
        {PCI_VDEVICE(AVM,      PCI_DEVICE_ID_AVM_A1)                    },
 #endif
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index 90f051ce0259..9090cc1e1f29 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -86,7 +86,7 @@ typedef struct {
        char *device_name;
 } hfc4s8s_param;
-static struct pci_device_id hfc4s8s_ids[] = {
+static const struct pci_device_id hfc4s8s_ids[] = {
        {.vendor = PCI_VENDOR_ID_CCD,
         .device = PCI_DEVICE_ID_4S,
         .subvendor = 0x1397,
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 5a9f39ed1d5d..e4f7573ba9bf 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -52,7 +52,7 @@ module_param(debug, int, 0);
 MODULE_AUTHOR("Kai Germaschewski <kai.germaschewski@gmx.de>/Karsten Keil <kkeil@suse.de>");
 MODULE_DESCRIPTION("AVM Fritz!PCI/PnP ISDN driver");
-static struct pci_device_id fcpci_ids[] = {
+static const struct pci_device_id fcpci_ids[] = {
        { .vendor      = PCI_VENDOR_ID_AVM,
          .device      = PCI_DEVICE_ID_AVM_A1,
          .subvendor   = PCI_ANY_ID,
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index f4eace5ea184..40f3cd7eab0f 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -156,7 +156,8 @@ static int read_sb_page(struct mddev *mddev, loff_t offset,
        rdev_for_each(rdev, mddev) {
                if (! test_bit(In_sync, &rdev->flags)
-                    || test_bit(Faulty, &rdev->flags))
+                    || test_bit(Faulty, &rdev->flags)
+                    || test_bit(Bitmap_sync, &rdev->flags))
                        continue;
                target = offset + index * (PAGE_SIZE/512);
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 991f0fe2dcc6..b50eb4ac1b82 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -134,7 +134,9 @@ enum flag_bits {
        Faulty,                 /* device is known to have a fault */
        In_sync,                /* device is in_sync with rest of array */
        Bitmap_sync,            /* ..actually, not quite In_sync.  Need a
-                                 * bitmap-based recovery to get fully in sync
+                                 * bitmap-based recovery to get fully in sync.
+                                 * The bit is only meaningful before device
+                                 * has been passed to pers->hot_add_disk.
                                 */
        WriteMostly,            /* Avoid reading if at all possible */
        AutoDetected,           /* added by auto-detect */
diff --git a/drivers/md/raid5-ppl.c b/drivers/md/raid5-ppl.c
index 77cce3573aa8..44ad5baf3206 100644
--- a/drivers/md/raid5-ppl.c
+++ b/drivers/md/raid5-ppl.c
@@ -1150,7 +1150,7 @@ int ppl_init_log(struct r5conf *conf)
                goto err;
        }
-        ppl_conf->bs = bioset_create(conf->raid_disks, 0, 0);
+        ppl_conf->bs = bioset_create(conf->raid_disks, 0, BIOSET_NEED_BVECS);
        if (!ppl_conf->bs) {
                ret = -ENOMEM;
                goto err;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 2ceb338b094b..aeeb8d6854e2 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -7951,12 +7951,10 @@ static void end_reshape(struct r5conf *conf)
 {
        if (!test_bit(MD_RECOVERY_INTR, &conf->mddev->recovery)) {
-                struct md_rdev *rdev;
                spin_lock_irq(&conf->device_lock);
                conf->previous_raid_disks = conf->raid_disks;
-                rdev_for_each(rdev, conf->mddev)
+                md_finish_reshape(conf->mddev);
-                        rdev->data_offset = rdev->new_data_offset;
                smp_wmb();
                conf->reshape_progress = MaxSector;
                conf->mddev->reshape_position = MaxSector;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 14ff622190a5..181839d6fbea 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4596,7 +4596,7 @@ static int bond_check_params(struct bond_params *params)
        }
        ad_user_port_key = valptr->value;
-        if (bond_mode == BOND_MODE_TLB) {
+        if ((bond_mode == BOND_MODE_TLB) || (bond_mode == BOND_MODE_ALB)) {
                bond_opt_initstr(&newval, "default");
                valptr = bond_opt_parse(bond_opt_get(BOND_OPT_TLB_DYNAMIC_LB),
                                        &newval);
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index e68d368e20ac..7f36d3e3c98b 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1665,6 +1665,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM53125",
                .vlans = 4096,
                .enabled_ports = 0xff,
+                .arl_entries = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 53b088166c28..5bcdd33101b0 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3178,6 +3178,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
        .port_set_jumbo_size = mv88e6165_port_set_jumbo_size,
        .port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,
        .port_pause_limit = mv88e6390_port_pause_limit,
+        .port_set_cmode = mv88e6390x_port_set_cmode,
        .port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
        .port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
        .stats_snapshot = mv88e6390_g1_stats_snapshot,
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index d3906f6b01bd..86058a9f3417 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -1785,16 +1785,18 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
        xgene_enet_gpiod_get(pdata);
-        pdata->clk = devm_clk_get(&pdev->dev, NULL);
+        if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) {
-        if (IS_ERR(pdata->clk)) {
+                pdata->clk = devm_clk_get(&pdev->dev, NULL);
-                /* Abort if the clock is defined but couldn't be retrived.
+                if (IS_ERR(pdata->clk)) {
-                 * Always abort if the clock is missing on DT system as
+                        /* Abort if the clock is defined but couldn't be
-                 * the driver can't cope with this case.
+                         * retrived. Always abort if the clock is missing on
-                 */
+                         * DT system as the driver can't cope with this case.
-                if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
+                         */
-                        return PTR_ERR(pdata->clk);
+                        if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
-                /* Firmware may have set up the clock already. */
+                                return PTR_ERR(pdata->clk);
-                dev_info(dev, "clocks have been setup already\n");
+                        /* Firmware may have set up the clock already. */
+                        dev_info(dev, "clocks have been setup already\n");
+                }
        }
        if (pdata->phy_mode != PHY_INTERFACE_MODE_XGMII)
diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c
index 73aca97a96bc..d937083db9a4 100644
--- a/drivers/net/ethernet/broadcom/bgmac-platform.c
+++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
@@ -50,11 +50,14 @@ static u32 platform_bgmac_idm_read(struct bgmac *bgmac, u16 offset)
 static void platform_bgmac_idm_write(struct bgmac *bgmac, u16 offset, u32 value)
 {
-        return writel(value, bgmac->plat.idm_base + offset);
+        writel(value, bgmac->plat.idm_base + offset);
 }
 static bool platform_bgmac_clk_enabled(struct bgmac *bgmac)
 {
+        if (!bgmac->plat.idm_base)
+                return true;
        if ((bgmac_idm_read(bgmac, BCMA_IOCTL) & BGMAC_CLK_EN) != BGMAC_CLK_EN)
                return false;
        if (bgmac_idm_read(bgmac, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET)
@@ -66,6 +69,9 @@ static void platform_bgmac_clk_enable(struct bgmac *bgmac, u32 flags)
 {
        u32 val;
+        if (!bgmac->plat.idm_base)
+                return;
        /* The Reset Control register only contains a single bit to show if the
         * controller is currently in reset.  Do a sanity check here, just in
         * case the bootloader happened to leave the device in reset.
@@ -180,6 +186,7 @@ static int bgmac_probe(struct platform_device *pdev)
        bgmac->feature_flags |= BGMAC_FEAT_CMDCFG_SR_REV4;
        bgmac->feature_flags |= BGMAC_FEAT_TX_MASK_SETUP;
        bgmac->feature_flags |= BGMAC_FEAT_RX_MASK_SETUP;
+        bgmac->feature_flags |= BGMAC_FEAT_IDM_MASK;
        bgmac->dev = &pdev->dev;
        bgmac->dma_dev = &pdev->dev;
@@ -207,15 +214,13 @@ static int bgmac_probe(struct platform_device *pdev)
                return PTR_ERR(bgmac->plat.base);
        regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "idm_base");
-        if (!regs) {
+        if (regs) {
-                dev_err(&pdev->dev, "Unable to obtain idm resource\n");
+                bgmac->plat.idm_base = devm_ioremap_resource(&pdev->dev, regs);
-                return -EINVAL;
+                if (IS_ERR(bgmac->plat.idm_base))
+                        return PTR_ERR(bgmac->plat.idm_base);
+                bgmac->feature_flags &= ~BGMAC_FEAT_IDM_MASK;
        }
-        bgmac->plat.idm_base = devm_ioremap_resource(&pdev->dev, regs);
-        if (IS_ERR(bgmac->plat.idm_base))
-                return PTR_ERR(bgmac->plat.idm_base);
        regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nicpm_base");
        if (regs) {
                bgmac->plat.nicpm_base = devm_ioremap_resource(&pdev->dev,
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index ba4d2e145bb9..48d672b204a4 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -622,9 +622,11 @@ static int bgmac_dma_alloc(struct bgmac *bgmac)
        BUILD_BUG_ON(BGMAC_MAX_TX_RINGS > ARRAY_SIZE(ring_base));
        BUILD_BUG_ON(BGMAC_MAX_RX_RINGS > ARRAY_SIZE(ring_base));
-        if (!(bgmac_idm_read(bgmac, BCMA_IOST) & BCMA_IOST_DMA64)) {
+        if (!(bgmac->feature_flags & BGMAC_FEAT_IDM_MASK)) {
-                dev_err(bgmac->dev, "Core does not report 64-bit DMA\n");
+                if (!(bgmac_idm_read(bgmac, BCMA_IOST) & BCMA_IOST_DMA64)) {
-                return -ENOTSUPP;
+                        dev_err(bgmac->dev, "Core does not report 64-bit DMA\n");
+                        return -ENOTSUPP;
+                }
        }
        for (i = 0; i < BGMAC_MAX_TX_RINGS; i++) {
@@ -855,9 +857,11 @@ static void bgmac_mac_speed(struct bgmac *bgmac)
 static void bgmac_miiconfig(struct bgmac *bgmac)
 {
        if (bgmac->feature_flags & BGMAC_FEAT_FORCE_SPEED_2500) {
-                bgmac_idm_write(bgmac, BCMA_IOCTL,
+                if (!(bgmac->feature_flags & BGMAC_FEAT_IDM_MASK)) {
-                                bgmac_idm_read(bgmac, BCMA_IOCTL) | 0x40 |
+                        bgmac_idm_write(bgmac, BCMA_IOCTL,
-                                BGMAC_BCMA_IOCTL_SW_CLKEN);
+                                        bgmac_idm_read(bgmac, BCMA_IOCTL) |
+                                        0x40 | BGMAC_BCMA_IOCTL_SW_CLKEN);
+                }
                bgmac->mac_speed = SPEED_2500;
                bgmac->mac_duplex = DUPLEX_FULL;
                bgmac_mac_speed(bgmac);
@@ -874,11 +878,36 @@ static void bgmac_miiconfig(struct bgmac *bgmac)
        }
 }
+static void bgmac_chip_reset_idm_config(struct bgmac *bgmac)
+{
+        u32 iost;
+        iost = bgmac_idm_read(bgmac, BCMA_IOST);
+        if (bgmac->feature_flags & BGMAC_FEAT_IOST_ATTACHED)
+                iost &= ~BGMAC_BCMA_IOST_ATTACHED;
+        /* 3GMAC: for BCM4707 & BCM47094, only do core reset at bgmac_probe() */
+        if (!(bgmac->feature_flags & BGMAC_FEAT_NO_RESET)) {
+                u32 flags = 0;
+                if (iost & BGMAC_BCMA_IOST_ATTACHED) {
+                        flags = BGMAC_BCMA_IOCTL_SW_CLKEN;
+                        if (!bgmac->has_robosw)
+                                flags |= BGMAC_BCMA_IOCTL_SW_RESET;
+                }
+                bgmac_clk_enable(bgmac, flags);
+        }
+        if (iost & BGMAC_BCMA_IOST_ATTACHED && !bgmac->has_robosw)
+                bgmac_idm_write(bgmac, BCMA_IOCTL,
+                                bgmac_idm_read(bgmac, BCMA_IOCTL) &
+                                ~BGMAC_BCMA_IOCTL_SW_RESET);
+}
 /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipreset */
 static void bgmac_chip_reset(struct bgmac *bgmac)
 {
        u32 cmdcfg_sr;
-        u32 iost;
        int i;
        if (bgmac_clk_enabled(bgmac)) {
@@ -899,20 +928,8 @@ static void bgmac_chip_reset(struct bgmac *bgmac)
                /* TODO: Clear software multicast filter list */
        }
-        iost = bgmac_idm_read(bgmac, BCMA_IOST);
+        if (!(bgmac->feature_flags & BGMAC_FEAT_IDM_MASK))
-        if (bgmac->feature_flags & BGMAC_FEAT_IOST_ATTACHED)
+                bgmac_chip_reset_idm_config(bgmac);
-                iost &= ~BGMAC_BCMA_IOST_ATTACHED;
-        /* 3GMAC: for BCM4707 & BCM47094, only do core reset at bgmac_probe() */
-        if (!(bgmac->feature_flags & BGMAC_FEAT_NO_RESET)) {
-                u32 flags = 0;
-                if (iost & BGMAC_BCMA_IOST_ATTACHED) {
-                        flags = BGMAC_BCMA_IOCTL_SW_CLKEN;
-                        if (!bgmac->has_robosw)
-                                flags |= BGMAC_BCMA_IOCTL_SW_RESET;
-                }
-                bgmac_clk_enable(bgmac, flags);
-        }
        /* Request Misc PLL for corerev > 2 */
        if (bgmac->feature_flags & BGMAC_FEAT_MISC_PLL_REQ) {
@@ -970,11 +987,6 @@ static void bgmac_chip_reset(struct bgmac *bgmac)
                                      BGMAC_CHIPCTL_7_IF_TYPE_RGMII);
        }
-        if (iost & BGMAC_BCMA_IOST_ATTACHED && !bgmac->has_robosw)
-                bgmac_idm_write(bgmac, BCMA_IOCTL,
-                                bgmac_idm_read(bgmac, BCMA_IOCTL) &
-                                ~BGMAC_BCMA_IOCTL_SW_RESET);
        /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/gmac_reset
         * Specs don't say about using BGMAC_CMDCFG_SR, but in this routine
         * BGMAC_CMDCFG is read _after_ putting chip in a reset. So it has to
@@ -1497,8 +1509,10 @@ int bgmac_enet_probe(struct bgmac *bgmac)
        bgmac_clk_enable(bgmac, 0);
        /* This seems to be fixing IRQ by assigning OOB #6 to the core */
-        if (bgmac->feature_flags & BGMAC_FEAT_IRQ_ID_OOB_6)
+        if (!(bgmac->feature_flags & BGMAC_FEAT_IDM_MASK)) {
-                bgmac_idm_write(bgmac, BCMA_OOB_SEL_OUT_A30, 0x86);
+                if (bgmac->feature_flags & BGMAC_FEAT_IRQ_ID_OOB_6)
+                        bgmac_idm_write(bgmac, BCMA_OOB_SEL_OUT_A30, 0x86);
+        }
        bgmac_chip_reset(bgmac);
diff --git a/drivers/net/ethernet/broadcom/bgmac.h b/drivers/net/ethernet/broadcom/bgmac.h
index c1818766c501..443d57b10264 100644
--- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h
@@ -425,6 +425,7 @@
 #define BGMAC_FEAT_CC4_IF_SW_TYPE       BIT(17)
 #define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII BIT(18)
 #define BGMAC_FEAT_CC7_IF_TYPE_RGMII    BIT(19)
+#define BGMAC_FEAT_IDM_MASK             BIT(20)
 struct bgmac_slot_info {
        union {
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 43423744fdfa..1e33abde4a3e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -2886,7 +2886,7 @@ static int bnx2x_test_nvram_tbl(struct bnx2x *bp,
 static int bnx2x_test_nvram(struct bnx2x *bp)
 {
-        const struct crc_pair nvram_tbl[] = {
+        static const struct crc_pair nvram_tbl[] = {
                {     0,  0x14 }, /* bootstrap */
                {  0x14,  0xec }, /* dir */
                { 0x100, 0x350 }, /* manuf_info */
@@ -2895,7 +2895,7 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
                { 0x708,  0x70 }, /* manuf_key_info */
                {     0,     0 }
        };
-        const struct crc_pair nvram_tbl2[] = {
+        static const struct crc_pair nvram_tbl2[] = {
                { 0x7e8, 0x350 }, /* manuf_info2 */
                { 0xb38,  0xf0 }, /* feature_info */
                {     0,     0 }
@@ -3162,7 +3162,8 @@ static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
                if (is_multi(bp)) {
                        for_each_eth_queue(bp, i) {
                                memset(queue_name, 0, sizeof(queue_name));
-                                sprintf(queue_name, "%d", i);
+                                snprintf(queue_name, sizeof(queue_name),
+                                         "%d", i);
                                for (j = 0; j < BNX2X_NUM_Q_STATS; j++)
                                        snprintf(buf + (k + j)*ETH_GSTRING_LEN,
                                                ETH_GSTRING_LEN,
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index daca1c9d254b..7b0b399aaedd 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1202,12 +1202,21 @@ static struct enet_cb *bcmgenet_get_txcb(struct bcmgenet_priv *priv,
        return tx_cb_ptr;
 }
-/* Simple helper to free a control block's resources */
+static struct enet_cb *bcmgenet_put_txcb(struct bcmgenet_priv *priv,
-static void bcmgenet_free_cb(struct enet_cb *cb)
+                                         struct bcmgenet_tx_ring *ring)
 {
-        dev_kfree_skb_any(cb->skb);
+        struct enet_cb *tx_cb_ptr;
-        cb->skb = NULL;
-        dma_unmap_addr_set(cb, dma_addr, 0);
+        tx_cb_ptr = ring->cbs;
+        tx_cb_ptr += ring->write_ptr - ring->cb_ptr;
+        /* Rewinding local write pointer */
+        if (ring->write_ptr == ring->cb_ptr)
+                ring->write_ptr = ring->end_ptr;
+        else
+                ring->write_ptr--;
+        return tx_cb_ptr;
 }
 static inline void bcmgenet_rx_ring16_int_disable(struct bcmgenet_rx_ring *ring)
@@ -1260,18 +1269,72 @@ static inline void bcmgenet_tx_ring_int_disable(struct bcmgenet_tx_ring *ring)
                                 INTRL2_CPU_MASK_SET);
 }
+/* Simple helper to free a transmit control block's resources
+ * Returns an skb when the last transmit control block associated with the
+ * skb is freed.  The skb should be freed by the caller if necessary.
+ */
+static struct sk_buff *bcmgenet_free_tx_cb(struct device *dev,
+                                           struct enet_cb *cb)
+{
+        struct sk_buff *skb;
+        skb = cb->skb;
+        if (skb) {
+                cb->skb = NULL;
+                if (cb == GENET_CB(skb)->first_cb)
+                        dma_unmap_single(dev, dma_unmap_addr(cb, dma_addr),
+                                         dma_unmap_len(cb, dma_len),
+                                         DMA_TO_DEVICE);
+                else
+                        dma_unmap_page(dev, dma_unmap_addr(cb, dma_addr),
+                                       dma_unmap_len(cb, dma_len),
+                                       DMA_TO_DEVICE);
+                dma_unmap_addr_set(cb, dma_addr, 0);
+                if (cb == GENET_CB(skb)->last_cb)
+                        return skb;
+        } else if (dma_unmap_addr(cb, dma_addr)) {
+                dma_unmap_page(dev,
+                               dma_unmap_addr(cb, dma_addr),
+                               dma_unmap_len(cb, dma_len),
+                               DMA_TO_DEVICE);
+                dma_unmap_addr_set(cb, dma_addr, 0);
+        }
+        return 0;
+}
+/* Simple helper to free a receive control block's resources */
+static struct sk_buff *bcmgenet_free_rx_cb(struct device *dev,
+                                           struct enet_cb *cb)
+{
+        struct sk_buff *skb;
+        skb = cb->skb;
+        cb->skb = NULL;
+        if (dma_unmap_addr(cb, dma_addr)) {
+                dma_unmap_single(dev, dma_unmap_addr(cb, dma_addr),
+                                 dma_unmap_len(cb, dma_len), DMA_FROM_DEVICE);
+                dma_unmap_addr_set(cb, dma_addr, 0);
+        }
+        return skb;
+}
 /* Unlocked version of the reclaim routine */
 static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,
                                          struct bcmgenet_tx_ring *ring)
 {
        struct bcmgenet_priv *priv = netdev_priv(dev);
-        struct device *kdev = &priv->pdev->dev;
+        unsigned int txbds_processed = 0;
-        struct enet_cb *tx_cb_ptr;
-        unsigned int pkts_compl = 0;
        unsigned int bytes_compl = 0;
-        unsigned int c_index;
+        unsigned int pkts_compl = 0;
        unsigned int txbds_ready;
-        unsigned int txbds_processed = 0;
+        unsigned int c_index;
+        struct sk_buff *skb;
        /* Clear status before servicing to reduce spurious interrupts */
        if (ring->index == DESC_INDEX)
@@ -1292,21 +1355,12 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,
        /* Reclaim transmitted buffers */
        while (txbds_processed < txbds_ready) {
-                tx_cb_ptr = &priv->tx_cbs[ring->clean_ptr];
+                skb = bcmgenet_free_tx_cb(&priv->pdev->dev,
-                if (tx_cb_ptr->skb) {
+                                          &priv->tx_cbs[ring->clean_ptr]);
+                if (skb) {
                        pkts_compl++;
-                        bytes_compl += GENET_CB(tx_cb_ptr->skb)->bytes_sent;
+                        bytes_compl += GENET_CB(skb)->bytes_sent;
-                        dma_unmap_single(kdev,
+                        dev_kfree_skb_any(skb);
-                                         dma_unmap_addr(tx_cb_ptr, dma_addr),
-                                         dma_unmap_len(tx_cb_ptr, dma_len),
-                                         DMA_TO_DEVICE);
-                        bcmgenet_free_cb(tx_cb_ptr);
-                } else if (dma_unmap_addr(tx_cb_ptr, dma_addr)) {
-                        dma_unmap_page(kdev,
-                                       dma_unmap_addr(tx_cb_ptr, dma_addr),
-                                       dma_unmap_len(tx_cb_ptr, dma_len),
-                                       DMA_TO_DEVICE);
-                        dma_unmap_addr_set(tx_cb_ptr, dma_addr, 0);
                }
                txbds_processed++;
@@ -1380,95 +1434,6 @@ static void bcmgenet_tx_reclaim_all(struct net_device *dev)
        bcmgenet_tx_reclaim(dev, &priv->tx_rings[DESC_INDEX]);
 }
-/* Transmits a single SKB (either head of a fragment or a single SKB)
- * caller must hold priv->lock
- */
-static int bcmgenet_xmit_single(struct net_device *dev,
-                                struct sk_buff *skb,
-                                u16 dma_desc_flags,
-                                struct bcmgenet_tx_ring *ring)
-{
-        struct bcmgenet_priv *priv = netdev_priv(dev);
-        struct device *kdev = &priv->pdev->dev;
-        struct enet_cb *tx_cb_ptr;
-        unsigned int skb_len;
-        dma_addr_t mapping;
-        u32 length_status;
-        int ret;
-        tx_cb_ptr = bcmgenet_get_txcb(priv, ring);
-        if (unlikely(!tx_cb_ptr))
-                BUG();
-        tx_cb_ptr->skb = skb;
-        skb_len = skb_headlen(skb);
-        mapping = dma_map_single(kdev, skb->data, skb_len, DMA_TO_DEVICE);
-        ret = dma_mapping_error(kdev, mapping);
-        if (ret) {
-                priv->mib.tx_dma_failed++;
-                netif_err(priv, tx_err, dev, "Tx DMA map failed\n");
-                dev_kfree_skb(skb);
-                return ret;
-        }
-        dma_unmap_addr_set(tx_cb_ptr, dma_addr, mapping);
-        dma_unmap_len_set(tx_cb_ptr, dma_len, skb_len);
-        length_status = (skb_len << DMA_BUFLENGTH_SHIFT) | dma_desc_flags |
-                        (priv->hw_params->qtag_mask << DMA_TX_QTAG_SHIFT) |
-                        DMA_TX_APPEND_CRC;
-        if (skb->ip_summed == CHECKSUM_PARTIAL)
-                length_status |= DMA_TX_DO_CSUM;
-        dmadesc_set(priv, tx_cb_ptr->bd_addr, mapping, length_status);
-        return 0;
-}
-/* Transmit a SKB fragment */
-static int bcmgenet_xmit_frag(struct net_device *dev,
-                              skb_frag_t *frag,
-                              u16 dma_desc_flags,
-                              struct bcmgenet_tx_ring *ring)
-{
-        struct bcmgenet_priv *priv = netdev_priv(dev);
-        struct device *kdev = &priv->pdev->dev;
-        struct enet_cb *tx_cb_ptr;
-        unsigned int frag_size;
-        dma_addr_t mapping;
-        int ret;
-        tx_cb_ptr = bcmgenet_get_txcb(priv, ring);
-        if (unlikely(!tx_cb_ptr))
-                BUG();
-        tx_cb_ptr->skb = NULL;
-        frag_size = skb_frag_size(frag);
-        mapping = skb_frag_dma_map(kdev, frag, 0, frag_size, DMA_TO_DEVICE);
-        ret = dma_mapping_error(kdev, mapping);
-        if (ret) {
-                priv->mib.tx_dma_failed++;
-                netif_err(priv, tx_err, dev, "%s: Tx DMA map failed\n",
-                          __func__);
-                return ret;
-        }
-        dma_unmap_addr_set(tx_cb_ptr, dma_addr, mapping);
-        dma_unmap_len_set(tx_cb_ptr, dma_len, frag_size);
-        dmadesc_set(priv, tx_cb_ptr->bd_addr, mapping,
-                    (frag_size << DMA_BUFLENGTH_SHIFT) | dma_desc_flags |
-                    (priv->hw_params->qtag_mask << DMA_TX_QTAG_SHIFT));
-        return 0;
-}
 /* Reallocate the SKB to put enough headroom in front of it and insert
 * the transmit checksum offsets in the descriptors
 */
@@ -1535,11 +1500,16 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev,
 static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct bcmgenet_priv *priv = netdev_priv(dev);
+        struct device *kdev = &priv->pdev->dev;
        struct bcmgenet_tx_ring *ring = NULL;
+        struct enet_cb *tx_cb_ptr;
        struct netdev_queue *txq;
        unsigned long flags = 0;
        int nr_frags, index;
-        u16 dma_desc_flags;
+        dma_addr_t mapping;
+        unsigned int size;
+        skb_frag_t *frag;
+        u32 len_stat;
        int ret;
        int i;
@@ -1592,29 +1562,53 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
                }
        }
-        dma_desc_flags = DMA_SOP;
+        for (i = 0; i <= nr_frags; i++) {
-        if (nr_frags == 0)
+                tx_cb_ptr = bcmgenet_get_txcb(priv, ring);
-                dma_desc_flags |= DMA_EOP;
-        /* Transmit single SKB or head of fragment list */
+                if (unlikely(!tx_cb_ptr))
-        ret = bcmgenet_xmit_single(dev, skb, dma_desc_flags, ring);
+                        BUG();
-        if (ret) {
-                ret = NETDEV_TX_OK;
+                if (!i) {
-                goto out;
+                        /* Transmit single SKB or head of fragment list */
-        }
+                        GENET_CB(skb)->first_cb = tx_cb_ptr;
+                        size = skb_headlen(skb);
+                        mapping = dma_map_single(kdev, skb->data, size,
+                                                 DMA_TO_DEVICE);
+                } else {
+                        /* xmit fragment */
+                        frag = &skb_shinfo(skb)->frags[i - 1];
+                        size = skb_frag_size(frag);
+                        mapping = skb_frag_dma_map(kdev, frag, 0, size,
+                                                   DMA_TO_DEVICE);
+                }
-        /* xmit fragment */
+                ret = dma_mapping_error(kdev, mapping);
-        for (i = 0; i < nr_frags; i++) {
-                ret = bcmgenet_xmit_frag(dev,
-                                         &skb_shinfo(skb)->frags[i],
-                                         (i == nr_frags - 1) ? DMA_EOP : 0,
-                                         ring);
                if (ret) {
+                        priv->mib.tx_dma_failed++;
+                        netif_err(priv, tx_err, dev, "Tx DMA map failed\n");
                        ret = NETDEV_TX_OK;
-                        goto out;
+                        goto out_unmap_frags;
+                }
+                dma_unmap_addr_set(tx_cb_ptr, dma_addr, mapping);
+                dma_unmap_len_set(tx_cb_ptr, dma_len, size);
+                tx_cb_ptr->skb = skb;
+                len_stat = (size << DMA_BUFLENGTH_SHIFT) |
+                           (priv->hw_params->qtag_mask << DMA_TX_QTAG_SHIFT);
+                if (!i) {
+                        len_stat |= DMA_TX_APPEND_CRC | DMA_SOP;
+                        if (skb->ip_summed == CHECKSUM_PARTIAL)
+                                len_stat |= DMA_TX_DO_CSUM;
                }
+                if (i == nr_frags)
+                        len_stat |= DMA_EOP;
+                dmadesc_set(priv, tx_cb_ptr->bd_addr, mapping, len_stat);
        }
+        GENET_CB(skb)->last_cb = tx_cb_ptr;
        skb_tx_timestamp(skb);
        /* Decrement total BD count and advance our write pointer */
@@ -1635,6 +1629,19 @@ out:
        spin_unlock_irqrestore(&ring->lock, flags);
        return ret;
+out_unmap_frags:
+        /* Back up for failed control block mapping */
+        bcmgenet_put_txcb(priv, ring);
+        /* Unmap successfully mapped control blocks */
+        while (i-- > 0) {
+                tx_cb_ptr = bcmgenet_put_txcb(priv, ring);
+                bcmgenet_free_tx_cb(kdev, tx_cb_ptr);
+        }
+        dev_kfree_skb(skb);
+        goto out;
 }
 static struct sk_buff *bcmgenet_rx_refill(struct bcmgenet_priv *priv,
@@ -1666,14 +1673,12 @@ static struct sk_buff *bcmgenet_rx_refill(struct bcmgenet_priv *priv,
        }
        /* Grab the current Rx skb from the ring and DMA-unmap it */
-        rx_skb = cb->skb;
+        rx_skb = bcmgenet_free_rx_cb(kdev, cb);
-        if (likely(rx_skb))
-                dma_unmap_single(kdev, dma_unmap_addr(cb, dma_addr),
-                                 priv->rx_buf_len, DMA_FROM_DEVICE);
        /* Put the new Rx skb on the ring */
        cb->skb = skb;
        dma_unmap_addr_set(cb, dma_addr, mapping);
+        dma_unmap_len_set(cb, dma_len, priv->rx_buf_len);
        dmadesc_set_addr(priv, cb->bd_addr, mapping);
        /* Return the current Rx skb to caller */
@@ -1880,22 +1885,16 @@ static int bcmgenet_alloc_rx_buffers(struct bcmgenet_priv *priv,
 static void bcmgenet_free_rx_buffers(struct bcmgenet_priv *priv)
 {
-        struct device *kdev = &priv->pdev->dev;
+        struct sk_buff *skb;
        struct enet_cb *cb;
        int i;
        for (i = 0; i < priv->num_rx_bds; i++) {
                cb = &priv->rx_cbs[i];
-                if (dma_unmap_addr(cb, dma_addr)) {
+                skb = bcmgenet_free_rx_cb(&priv->pdev->dev, cb);
-                        dma_unmap_single(kdev,
+                if (skb)
-                                         dma_unmap_addr(cb, dma_addr),
+                        dev_kfree_skb_any(skb);
-                                         priv->rx_buf_len, DMA_FROM_DEVICE);
-                        dma_unmap_addr_set(cb, dma_addr, 0);
-                }
-                if (cb->skb)
-                        bcmgenet_free_cb(cb);
        }
 }
@@ -2479,8 +2478,10 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv)
 static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)
 {
-        int i;
        struct netdev_queue *txq;
+        struct sk_buff *skb;
+        struct enet_cb *cb;
+        int i;
        bcmgenet_fini_rx_napi(priv);
        bcmgenet_fini_tx_napi(priv);
@@ -2489,10 +2490,10 @@ static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)
        bcmgenet_dma_teardown(priv);
        for (i = 0; i < priv->num_tx_bds; i++) {
-                if (priv->tx_cbs[i].skb != NULL) {
+                cb = priv->tx_cbs + i;
-                        dev_kfree_skb(priv->tx_cbs[i].skb);
+                skb = bcmgenet_free_tx_cb(&priv->pdev->dev, cb);
-                        priv->tx_cbs[i].skb = NULL;
+                if (skb)
-                }
+                        dev_kfree_skb(skb);
        }
        for (i = 0; i < priv->hw_params->tx_queues; i++) {
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
index efd07020b89f..b9344de669f8 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
@@ -544,6 +544,8 @@ struct bcmgenet_hw_params {
 };
 struct bcmgenet_skb_cb {
+        struct enet_cb *first_cb;       /* First control block of SKB */
+        struct enet_cb *last_cb;        /* Last control block of SKB */
        unsigned int bytes_sent;        /* bytes on the wire (no TSB) */
 };
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
index 28ecda3d3404..ebd353bc78ff 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
@@ -335,7 +335,7 @@ lio_ethtool_get_channels(struct net_device *dev,
 static int lio_get_eeprom_len(struct net_device *netdev)
 {
-        u8 buf[128];
+        u8 buf[192];
        struct lio *lio = GET_LIO(netdev);
        struct octeon_device *oct_dev = lio->oct_dev;
        struct octeon_board_info *board_info;
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index a0ca68ce3fbb..79112563a25a 100644
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -1008,7 +1008,7 @@ static void bgx_print_qlm_mode(struct bgx *bgx, u8 lmacid)
 {
        struct device *dev = &bgx->pdev->dev;
        struct lmac *lmac;
-        char str[20];
+        char str[27];
        if (!bgx->is_dlm && lmacid)
                return;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c
index 50517cfd9671..9f9d6cae39d5 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c
@@ -441,7 +441,8 @@ void cxgb4_ptp_init(struct adapter *adapter)
        adapter->ptp_clock = ptp_clock_register(&adapter->ptp_clock_info,
                                                &adapter->pdev->dev);
-        if (!adapter->ptp_clock) {
+        if (IS_ERR_OR_NULL(adapter->ptp_clock)) {
+                adapter->ptp_clock = NULL;
                dev_err(adapter->pdev_dev,
                        "PTP %s Clock registration has failed\n", __func__);
                return;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h b/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
index 99987d8e437e..aa28299aef5f 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
@@ -174,6 +174,8 @@ CH_PCI_DEVICE_ID_TABLE_DEFINE_BEGIN
        CH_PCI_ID_TABLE_FENTRY(0x50a0), /* Custom T540-CR */
        CH_PCI_ID_TABLE_FENTRY(0x50a1), /* Custom T540-CR */
        CH_PCI_ID_TABLE_FENTRY(0x50a2), /* Custom T540-KR4 */
+        CH_PCI_ID_TABLE_FENTRY(0x50a3), /* Custom T580-KR4 */
+        CH_PCI_ID_TABLE_FENTRY(0x50a4), /* Custom 2x T540-CR */
        /* T6 adapters:
         */
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
index ff864a187d5a..a37166ee577b 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
@@ -776,8 +776,9 @@ void hns_ae_update_led_status(struct hnae_handle *handle)
        assert(handle);
        mac_cb = hns_get_mac_cb(handle);
-        if (!mac_cb->cpld_ctrl)
+        if (mac_cb->media_type != HNAE_MEDIA_TYPE_FIBER)
                return;
        hns_set_led_opt(mac_cb);
 }
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
index 7a8addda726e..408b63faf9a8 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
@@ -53,6 +53,34 @@ static u32 dsaf_read_sub(struct dsaf_device *dsaf_dev, u32 reg)
        return ret;
 }
+static void hns_dsaf_acpi_ledctrl_by_port(struct hns_mac_cb *mac_cb, u8 op_type,
+                                      u32 link, u32 port, u32 act)
+{
+       union acpi_object *obj;
+       union acpi_object obj_args[3], argv4;
+       obj_args[0].integer.type = ACPI_TYPE_INTEGER;
+       obj_args[0].integer.value = link;
+       obj_args[1].integer.type = ACPI_TYPE_INTEGER;
+       obj_args[1].integer.value = port;
+       obj_args[2].integer.type = ACPI_TYPE_INTEGER;
+       obj_args[2].integer.value = act;
+       argv4.type = ACPI_TYPE_PACKAGE;
+       argv4.package.count = 3;
+       argv4.package.elements = obj_args;
+       obj = acpi_evaluate_dsm(ACPI_HANDLE(mac_cb->dev),
+                               &hns_dsaf_acpi_dsm_guid, 0, op_type, &argv4);
+       if (!obj) {
+               dev_warn(mac_cb->dev, "ledctrl fail, link:%d port:%d act:%d!\n",
+                        link, port, act);
+               return;
+       }
+       ACPI_FREE(obj);
+}
 static void hns_cpld_set_led(struct hns_mac_cb *mac_cb, int link_status,
                             u16 speed, int data)
 {
@@ -93,6 +121,18 @@ static void hns_cpld_set_led(struct hns_mac_cb *mac_cb, int link_status,
        }
 }
+static void hns_cpld_set_led_acpi(struct hns_mac_cb *mac_cb, int link_status,
+                            u16 speed, int data)
+{
+       if (!mac_cb) {
+               pr_err("cpld_led_set mac_cb is null!\n");
+               return;
+       }
+       hns_dsaf_acpi_ledctrl_by_port(mac_cb, HNS_OP_LED_SET_FUNC,
+               link_status, mac_cb->mac_id, data);
+}
 static void cpld_led_reset(struct hns_mac_cb *mac_cb)
 {
        if (!mac_cb || !mac_cb->cpld_ctrl)
@@ -103,6 +143,20 @@ static void cpld_led_reset(struct hns_mac_cb *mac_cb)
        mac_cb->cpld_led_value = CPLD_LED_DEFAULT_VALUE;
 }
+static void cpld_led_reset_acpi(struct hns_mac_cb *mac_cb)
+{
+       if (!mac_cb) {
+               pr_err("cpld_led_reset mac_cb is null!\n");
+               return;
+       }
+       if (mac_cb->media_type != HNAE_MEDIA_TYPE_FIBER)
+                return;
+       hns_dsaf_acpi_ledctrl_by_port(mac_cb, HNS_OP_LED_SET_FUNC,
+               0, mac_cb->mac_id, 0);
+}
 static int cpld_set_led_id(struct hns_mac_cb *mac_cb,
                           enum hnae_led_state status)
 {
@@ -604,8 +658,8 @@ struct dsaf_misc_op *hns_misc_op_get(struct dsaf_device *dsaf_dev)
                misc_op->cfg_serdes_loopback = hns_mac_config_sds_loopback;
        } else if (is_acpi_node(dsaf_dev->dev->fwnode)) {
-                misc_op->cpld_set_led = hns_cpld_set_led;
+                misc_op->cpld_set_led = hns_cpld_set_led_acpi;
-                misc_op->cpld_reset_led = cpld_led_reset;
+                misc_op->cpld_reset_led = cpld_led_reset_acpi;
                misc_op->cpld_set_led_id = cpld_set_led_id;
                misc_op->dsaf_reset = hns_dsaf_rst_acpi;
diff --git a/drivers/net/ethernet/mellanox/mlx4/alloc.c b/drivers/net/ethernet/mellanox/mlx4/alloc.c
index 249a4584401a..b651c1210555 100644
--- a/drivers/net/ethernet/mellanox/mlx4/alloc.c
+++ b/drivers/net/ethernet/mellanox/mlx4/alloc.c
@@ -283,7 +283,7 @@ int mlx4_zone_add_one(struct mlx4_zone_allocator *zone_alloc,
 }
 /* Should be called under a lock */
-static int __mlx4_zone_remove_one_entry(struct mlx4_zone_entry *entry)
+static void __mlx4_zone_remove_one_entry(struct mlx4_zone_entry *entry)
 {
        struct mlx4_zone_allocator *zone_alloc = entry->allocator;
@@ -315,8 +315,6 @@ static int __mlx4_zone_remove_one_entry(struct mlx4_zone_entry *entry)
                }
                zone_alloc->mask = mask;
        }
-        return 0;
 }
 void mlx4_zone_allocator_destroy(struct mlx4_zone_allocator *zone_alloc)
@@ -457,7 +455,7 @@ struct mlx4_bitmap *mlx4_zone_get_bitmap(struct mlx4_zone_allocator *zones, u32
 int mlx4_zone_remove_one(struct mlx4_zone_allocator *zones, u32 uid)
 {
        struct mlx4_zone_entry *zone;
-        int res;
+        int res = 0;
        spin_lock(&zones->lock);
@@ -468,7 +466,7 @@ int mlx4_zone_remove_one(struct mlx4_zone_allocator *zones, u32 uid)
                goto out;
        }
-        res = __mlx4_zone_remove_one_entry(zone);
+        __mlx4_zone_remove_one_entry(zone);
 out:
        spin_unlock(&zones->lock);
@@ -578,7 +576,7 @@ out:
 }
 static int mlx4_buf_direct_alloc(struct mlx4_dev *dev, int size,
-                                 struct mlx4_buf *buf, gfp_t gfp)
+                                 struct mlx4_buf *buf)
 {
        dma_addr_t t;
@@ -587,7 +585,7 @@ static int mlx4_buf_direct_alloc(struct mlx4_dev *dev, int size,
        buf->page_shift   = get_order(size) + PAGE_SHIFT;
        buf->direct.buf   =
                dma_zalloc_coherent(&dev->persist->pdev->dev,
-                                    size, &t, gfp);
+                                    size, &t, GFP_KERNEL);
        if (!buf->direct.buf)
                return -ENOMEM;
@@ -607,10 +605,10 @@ static int mlx4_buf_direct_alloc(struct mlx4_dev *dev, int size,
 *  multiple pages, so we don't require too much contiguous memory.
 */
 int mlx4_buf_alloc(struct mlx4_dev *dev, int size, int max_direct,
-                   struct mlx4_buf *buf, gfp_t gfp)
+                   struct mlx4_buf *buf)
 {
        if (size <= max_direct) {
-                return mlx4_buf_direct_alloc(dev, size, buf, gfp);
+                return mlx4_buf_direct_alloc(dev, size, buf);
        } else {
                dma_addr_t t;
                int i;
@@ -620,14 +618,14 @@ int mlx4_buf_alloc(struct mlx4_dev *dev, int size, int max_direct,
                buf->npages     = buf->nbufs;
                buf->page_shift  = PAGE_SHIFT;
                buf->page_list   = kcalloc(buf->nbufs, sizeof(*buf->page_list),
-                                           gfp);
+                                           GFP_KERNEL);
                if (!buf->page_list)
                        return -ENOMEM;
                for (i = 0; i < buf->nbufs; ++i) {
                        buf->page_list[i].buf =
                                dma_zalloc_coherent(&dev->persist->pdev->dev,
-                                                    PAGE_SIZE, &t, gfp);
+                                                    PAGE_SIZE, &t, GFP_KERNEL);
                        if (!buf->page_list[i].buf)
                                goto err_free;
@@ -663,12 +661,11 @@ void mlx4_buf_free(struct mlx4_dev *dev, int size, struct mlx4_buf *buf)
 }
 EXPORT_SYMBOL_GPL(mlx4_buf_free);
-static struct mlx4_db_pgdir *mlx4_alloc_db_pgdir(struct device *dma_device,
+static struct mlx4_db_pgdir *mlx4_alloc_db_pgdir(struct device *dma_device)
-                                                 gfp_t gfp)
 {
        struct mlx4_db_pgdir *pgdir;
-        pgdir = kzalloc(sizeof *pgdir, gfp);
+        pgdir = kzalloc(sizeof(*pgdir), GFP_KERNEL);
        if (!pgdir)
                return NULL;
@@ -676,7 +673,7 @@ static struct mlx4_db_pgdir *mlx4_alloc_db_pgdir(struct device *dma_device,
        pgdir->bits[0] = pgdir->order0;
        pgdir->bits[1] = pgdir->order1;
        pgdir->db_page = dma_alloc_coherent(dma_device, PAGE_SIZE,
-                                            &pgdir->db_dma, gfp);
+                                            &pgdir->db_dma, GFP_KERNEL);
        if (!pgdir->db_page) {
                kfree(pgdir);
                return NULL;
@@ -716,7 +713,7 @@ found:
        return 0;
 }
-int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, int order, gfp_t gfp)
+int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, int order)
 {
        struct mlx4_priv *priv = mlx4_priv(dev);
        struct mlx4_db_pgdir *pgdir;
@@ -728,7 +725,7 @@ int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, int order, gfp_t gfp
                if (!mlx4_alloc_db_from_pgdir(pgdir, db, order))
                        goto out;
-        pgdir = mlx4_alloc_db_pgdir(&dev->persist->pdev->dev, gfp);
+        pgdir = mlx4_alloc_db_pgdir(&dev->persist->pdev->dev);
        if (!pgdir) {
                ret = -ENOMEM;
                goto out;
@@ -780,13 +777,13 @@ int mlx4_alloc_hwq_res(struct mlx4_dev *dev, struct mlx4_hwq_resources *wqres,
 {
        int err;
-        err = mlx4_db_alloc(dev, &wqres->db, 1, GFP_KERNEL);
+        err = mlx4_db_alloc(dev, &wqres->db, 1);
        if (err)
                return err;
        *wqres->db.db = 0;
-        err = mlx4_buf_direct_alloc(dev, size, &wqres->buf, GFP_KERNEL);
+        err = mlx4_buf_direct_alloc(dev, size, &wqres->buf);
        if (err)
                goto err_db;
@@ -795,7 +792,7 @@ int mlx4_alloc_hwq_res(struct mlx4_dev *dev, struct mlx4_hwq_resources *wqres,
        if (err)
                goto err_buf;
-        err = mlx4_buf_write_mtt(dev, &wqres->mtt, &wqres->buf, GFP_KERNEL);
+        err = mlx4_buf_write_mtt(dev, &wqres->mtt, &wqres->buf);
        if (err)
                goto err_mtt;
diff --git a/drivers/net/ethernet/mellanox/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c
index fa6d2354a0e9..c56a511b918e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cq.c
@@ -224,11 +224,11 @@ int __mlx4_cq_alloc_icm(struct mlx4_dev *dev, int *cqn)
        if (*cqn == -1)
                return -ENOMEM;
-        err = mlx4_table_get(dev, &cq_table->table, *cqn, GFP_KERNEL);
+        err = mlx4_table_get(dev, &cq_table->table, *cqn);
        if (err)
                goto err_out;
-        err = mlx4_table_get(dev, &cq_table->cmpt_table, *cqn, GFP_KERNEL);
+        err = mlx4_table_get(dev, &cq_table->cmpt_table, *cqn);
        if (err)
                goto err_put;
        return 0;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index e5fb89505a13..436f7689a032 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -1042,7 +1042,7 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, int qpn,
        if (!context)
                return -ENOMEM;
-        err = mlx4_qp_alloc(mdev->dev, qpn, qp, GFP_KERNEL);
+        err = mlx4_qp_alloc(mdev->dev, qpn, qp);
        if (err) {
                en_err(priv, "Failed to allocate qp #%x\n", qpn);
                goto out;
@@ -1086,7 +1086,7 @@ int mlx4_en_create_drop_qp(struct mlx4_en_priv *priv)
                en_err(priv, "Failed reserving drop qpn\n");
                return err;
        }
-        err = mlx4_qp_alloc(priv->mdev->dev, qpn, &priv->drop_qp, GFP_KERNEL);
+        err = mlx4_qp_alloc(priv->mdev->dev, qpn, &priv->drop_qp);
        if (err) {
                en_err(priv, "Failed allocating drop qp\n");
                mlx4_qp_release_range(priv->mdev->dev, qpn, 1);
@@ -1158,8 +1158,7 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
        }
        /* Configure RSS indirection qp */
-        err = mlx4_qp_alloc(mdev->dev, priv->base_qpn, rss_map->indir_qp,
+        err = mlx4_qp_alloc(mdev->dev, priv->base_qpn, rss_map->indir_qp);
-                            GFP_KERNEL);
        if (err) {
                en_err(priv, "Failed to allocate RSS indirection QP\n");
                goto rss_err;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 4f3a9b27ce4a..73faa3d77921 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -111,7 +111,7 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
                goto err_hwq_res;
        }
-        err = mlx4_qp_alloc(mdev->dev, ring->qpn, &ring->sp_qp, GFP_KERNEL);
+        err = mlx4_qp_alloc(mdev->dev, ring->qpn, &ring->sp_qp);
        if (err) {
                en_err(priv, "Failed allocating qp %d\n", ring->qpn);
                goto err_reserve;
diff --git a/drivers/net/ethernet/mellanox/mlx4/icm.c b/drivers/net/ethernet/mellanox/mlx4/icm.c
index e1f9e7cebf8f..5a7816e7c7b4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/icm.c
+++ b/drivers/net/ethernet/mellanox/mlx4/icm.c
@@ -251,8 +251,7 @@ int mlx4_UNMAP_ICM_AUX(struct mlx4_dev *dev)
                        MLX4_CMD_TIME_CLASS_B, MLX4_CMD_NATIVE);
 }
-int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj,
+int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj)
-                   gfp_t gfp)
 {
        u32 i = (obj & (table->num_obj - 1)) /
                        (MLX4_TABLE_CHUNK_SIZE / table->obj_size);
@@ -266,7 +265,7 @@ int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj,
        }
        table->icm[i] = mlx4_alloc_icm(dev, MLX4_TABLE_CHUNK_SIZE >> PAGE_SHIFT,
-                                       (table->lowmem ? gfp : GFP_HIGHUSER) |
+                                       (table->lowmem ? GFP_KERNEL : GFP_HIGHUSER) |
                                       __GFP_NOWARN, table->coherent);
        if (!table->icm[i]) {
                ret = -ENOMEM;
@@ -363,7 +362,7 @@ int mlx4_table_get_range(struct mlx4_dev *dev, struct mlx4_icm_table *table,
        u32 i;
        for (i = start; i <= end; i += inc) {
-                err = mlx4_table_get(dev, table, i, GFP_KERNEL);
+                err = mlx4_table_get(dev, table, i);
                if (err)
                        goto fail;
        }
diff --git a/drivers/net/ethernet/mellanox/mlx4/icm.h b/drivers/net/ethernet/mellanox/mlx4/icm.h
index 0c7364550150..dee67fa39107 100644
--- a/drivers/net/ethernet/mellanox/mlx4/icm.h
+++ b/drivers/net/ethernet/mellanox/mlx4/icm.h
@@ -71,8 +71,7 @@ struct mlx4_icm *mlx4_alloc_icm(struct mlx4_dev *dev, int npages,
                                gfp_t gfp_mask, int coherent);
 void mlx4_free_icm(struct mlx4_dev *dev, struct mlx4_icm *icm, int coherent);
-int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj,
+int mlx4_table_get(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj);
-                   gfp_t gfp);
 void mlx4_table_put(struct mlx4_dev *dev, struct mlx4_icm_table *table, u32 obj);
 int mlx4_table_get_range(struct mlx4_dev *dev, struct mlx4_icm_table *table,
                         u32 start, u32 end);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index 30616cd0140d..706d7f21ac5c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -969,7 +969,7 @@ void mlx4_cleanup_cq_table(struct mlx4_dev *dev);
 void mlx4_cleanup_qp_table(struct mlx4_dev *dev);
 void mlx4_cleanup_srq_table(struct mlx4_dev *dev);
 void mlx4_cleanup_mcg_table(struct mlx4_dev *dev);
-int __mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn, gfp_t gfp);
+int __mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn);
 void __mlx4_qp_free_icm(struct mlx4_dev *dev, int qpn);
 int __mlx4_cq_alloc_icm(struct mlx4_dev *dev, int *cqn);
 void __mlx4_cq_free_icm(struct mlx4_dev *dev, int cqn);
@@ -977,7 +977,7 @@ int __mlx4_srq_alloc_icm(struct mlx4_dev *dev, int *srqn);
 void __mlx4_srq_free_icm(struct mlx4_dev *dev, int srqn);
 int __mlx4_mpt_reserve(struct mlx4_dev *dev);
 void __mlx4_mpt_release(struct mlx4_dev *dev, u32 index);
-int __mlx4_mpt_alloc_icm(struct mlx4_dev *dev, u32 index, gfp_t gfp);
+int __mlx4_mpt_alloc_icm(struct mlx4_dev *dev, u32 index);
 void __mlx4_mpt_free_icm(struct mlx4_dev *dev, u32 index);
 u32 __mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order);
 void __mlx4_free_mtt_range(struct mlx4_dev *dev, u32 first_seg, int order);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index ce852ca22a96..24282cd017d3 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -479,14 +479,14 @@ static void mlx4_mpt_release(struct mlx4_dev *dev, u32 index)
        __mlx4_mpt_release(dev, index);
 }
-int __mlx4_mpt_alloc_icm(struct mlx4_dev *dev, u32 index, gfp_t gfp)
+int __mlx4_mpt_alloc_icm(struct mlx4_dev *dev, u32 index)
 {
        struct mlx4_mr_table *mr_table = &mlx4_priv(dev)->mr_table;
-        return mlx4_table_get(dev, &mr_table->dmpt_table, index, gfp);
+        return mlx4_table_get(dev, &mr_table->dmpt_table, index);
 }
-static int mlx4_mpt_alloc_icm(struct mlx4_dev *dev, u32 index, gfp_t gfp)
+static int mlx4_mpt_alloc_icm(struct mlx4_dev *dev, u32 index)
 {
        u64 param = 0;
@@ -497,7 +497,7 @@ static int mlx4_mpt_alloc_icm(struct mlx4_dev *dev, u32 index, gfp_t gfp)
                                                        MLX4_CMD_TIME_CLASS_A,
                                                        MLX4_CMD_WRAPPED);
        }
-        return __mlx4_mpt_alloc_icm(dev, index, gfp);
+        return __mlx4_mpt_alloc_icm(dev, index);
 }
 void __mlx4_mpt_free_icm(struct mlx4_dev *dev, u32 index)
@@ -629,7 +629,7 @@ int mlx4_mr_enable(struct mlx4_dev *dev, struct mlx4_mr *mr)
        struct mlx4_mpt_entry *mpt_entry;
        int err;
-        err = mlx4_mpt_alloc_icm(dev, key_to_hw_index(mr->key), GFP_KERNEL);
+        err = mlx4_mpt_alloc_icm(dev, key_to_hw_index(mr->key));
        if (err)
                return err;
@@ -787,14 +787,13 @@ int mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
 EXPORT_SYMBOL_GPL(mlx4_write_mtt);
 int mlx4_buf_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
-                       struct mlx4_buf *buf, gfp_t gfp)
+                       struct mlx4_buf *buf)
 {
        u64 *page_list;
        int err;
        int i;
-        page_list = kmalloc(buf->npages * sizeof *page_list,
+        page_list = kcalloc(buf->npages, sizeof(*page_list), GFP_KERNEL);
-                            gfp);
        if (!page_list)
                return -ENOMEM;
@@ -841,7 +840,7 @@ int mlx4_mw_enable(struct mlx4_dev *dev, struct mlx4_mw *mw)
        struct mlx4_mpt_entry *mpt_entry;
        int err;
-        err = mlx4_mpt_alloc_icm(dev, key_to_hw_index(mw->key), GFP_KERNEL);
+        err = mlx4_mpt_alloc_icm(dev, key_to_hw_index(mw->key));
        if (err)
                return err;
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
index 5a310d313e94..26747212526b 100644
--- a/drivers/net/ethernet/mellanox/mlx4/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx4/qp.c
@@ -301,29 +301,29 @@ void mlx4_qp_release_range(struct mlx4_dev *dev, int base_qpn, int cnt)
 }
 EXPORT_SYMBOL_GPL(mlx4_qp_release_range);
-int __mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn, gfp_t gfp)
+int __mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn)
 {
        struct mlx4_priv *priv = mlx4_priv(dev);
        struct mlx4_qp_table *qp_table = &priv->qp_table;
        int err;
-        err = mlx4_table_get(dev, &qp_table->qp_table, qpn, gfp);
+        err = mlx4_table_get(dev, &qp_table->qp_table, qpn);
        if (err)
                goto err_out;
-        err = mlx4_table_get(dev, &qp_table->auxc_table, qpn, gfp);
+        err = mlx4_table_get(dev, &qp_table->auxc_table, qpn);
        if (err)
                goto err_put_qp;
-        err = mlx4_table_get(dev, &qp_table->altc_table, qpn, gfp);
+        err = mlx4_table_get(dev, &qp_table->altc_table, qpn);
        if (err)
                goto err_put_auxc;
-        err = mlx4_table_get(dev, &qp_table->rdmarc_table, qpn, gfp);
+        err = mlx4_table_get(dev, &qp_table->rdmarc_table, qpn);
        if (err)
                goto err_put_altc;
-        err = mlx4_table_get(dev, &qp_table->cmpt_table, qpn, gfp);
+        err = mlx4_table_get(dev, &qp_table->cmpt_table, qpn);
        if (err)
                goto err_put_rdmarc;
@@ -345,7 +345,7 @@ err_out:
        return err;
 }
-static int mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn, gfp_t gfp)
+static int mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn)
 {
        u64 param = 0;
@@ -355,7 +355,7 @@ static int mlx4_qp_alloc_icm(struct mlx4_dev *dev, int qpn, gfp_t gfp)
                                    MLX4_CMD_ALLOC_RES, MLX4_CMD_TIME_CLASS_A,
                                    MLX4_CMD_WRAPPED);
        }
-        return __mlx4_qp_alloc_icm(dev, qpn, gfp);
+        return __mlx4_qp_alloc_icm(dev, qpn);
 }
 void __mlx4_qp_free_icm(struct mlx4_dev *dev, int qpn)
@@ -397,7 +397,7 @@ struct mlx4_qp *mlx4_qp_lookup(struct mlx4_dev *dev, u32 qpn)
        return qp;
 }
-int mlx4_qp_alloc(struct mlx4_dev *dev, int qpn, struct mlx4_qp *qp, gfp_t gfp)
+int mlx4_qp_alloc(struct mlx4_dev *dev, int qpn, struct mlx4_qp *qp)
 {
        struct mlx4_priv *priv = mlx4_priv(dev);
        struct mlx4_qp_table *qp_table = &priv->qp_table;
@@ -408,7 +408,7 @@ int mlx4_qp_alloc(struct mlx4_dev *dev, int qpn, struct mlx4_qp *qp, gfp_t gfp)
        qp->qpn = qpn;
-        err = mlx4_qp_alloc_icm(dev, qpn, gfp);
+        err = mlx4_qp_alloc_icm(dev, qpn);
        if (err)
                return err;
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index 812783865205..215e21c3dc8a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -1822,7 +1822,7 @@ static int qp_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
                        return err;
                if (!fw_reserved(dev, qpn)) {
-                        err = __mlx4_qp_alloc_icm(dev, qpn, GFP_KERNEL);
+                        err = __mlx4_qp_alloc_icm(dev, qpn);
                        if (err) {
                                res_abort_move(dev, slave, RES_QP, qpn);
                                return err;
@@ -1909,7 +1909,7 @@ static int mpt_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
                if (err)
                        return err;
-                err = __mlx4_mpt_alloc_icm(dev, mpt->key, GFP_KERNEL);
+                err = __mlx4_mpt_alloc_icm(dev, mpt->key);
                if (err) {
                        res_abort_move(dev, slave, RES_MPT, id);
                        return err;
diff --git a/drivers/net/ethernet/mellanox/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c
index f44d089e2ca6..bedf52126824 100644
--- a/drivers/net/ethernet/mellanox/mlx4/srq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/srq.c
@@ -100,11 +100,11 @@ int __mlx4_srq_alloc_icm(struct mlx4_dev *dev, int *srqn)
        if (*srqn == -1)
                return -ENOMEM;
-        err = mlx4_table_get(dev, &srq_table->table, *srqn, GFP_KERNEL);
+        err = mlx4_table_get(dev, &srq_table->table, *srqn);
        if (err)
                goto err_out;
-        err = mlx4_table_get(dev, &srq_table->cmpt_table, *srqn, GFP_KERNEL);
+        err = mlx4_table_get(dev, &srq_table->cmpt_table, *srqn);
        if (err)
                goto err_put;
        return 0;
diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c
index 746d94e28470..60850bfa3d32 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -766,11 +766,13 @@ static void emac_shutdown(struct platform_device *pdev)
        struct emac_adapter *adpt = netdev_priv(netdev);
        struct emac_sgmii *sgmii = &adpt->phy;
-        /* Closing the SGMII turns off its interrupts */
+        if (netdev->flags & IFF_UP) {
-        sgmii->close(adpt);
+                /* Closing the SGMII turns off its interrupts */
+                sgmii->close(adpt);
-        /* Resetting the MAC turns off all DMA and its interrupts */
+                /* Resetting the MAC turns off all DMA and its interrupts */
-        emac_mac_reset(adpt);
+                emac_mac_reset(adpt);
+        }
 }
 static struct platform_driver emac_platform_driver = {
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index b607936e1b3e..9c0488e0f08e 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -90,17 +90,13 @@ struct ioc3_private {
        spinlock_t ioc3_lock;
        struct mii_if_info mii;
+        struct net_device *dev;
        struct pci_dev *pdev;
        /* Members used by autonegotiation  */
        struct timer_list ioc3_timer;
 };
-static inline struct net_device *priv_netdev(struct ioc3_private *dev)
-{
-        return (void *)dev - ((sizeof(struct net_device) + 31) & ~31);
-}
 static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static void ioc3_set_multicast_list(struct net_device *dev);
 static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev);
@@ -427,7 +423,7 @@ static void ioc3_get_eaddr_nic(struct ioc3_private *ip)
                nic[i] = nic_read_byte(ioc3);
        for (i = 2; i < 8; i++)
-                priv_netdev(ip)->dev_addr[i - 2] = nic[i];
+                ip->dev->dev_addr[i - 2] = nic[i];
 }
 /*
@@ -439,7 +435,7 @@ static void ioc3_get_eaddr(struct ioc3_private *ip)
 {
        ioc3_get_eaddr_nic(ip);
-        printk("Ethernet address is %pM.\n", priv_netdev(ip)->dev_addr);
+        printk("Ethernet address is %pM.\n", ip->dev->dev_addr);
 }
 static void __ioc3_set_mac_address(struct net_device *dev)
@@ -790,13 +786,12 @@ static void ioc3_timer(unsigned long data)
 */
 static int ioc3_mii_init(struct ioc3_private *ip)
 {
-        struct net_device *dev = priv_netdev(ip);
        int i, found = 0, res = 0;
        int ioc3_phy_workaround = 1;
        u16 word;
        for (i = 0; i < 32; i++) {
-                word = ioc3_mdio_read(dev, i, MII_PHYSID1);
+                word = ioc3_mdio_read(ip->dev, i, MII_PHYSID1);
                if (word != 0xffff && word != 0x0000) {
                        found = 1;
@@ -1276,6 +1271,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        SET_NETDEV_DEV(dev, &pdev->dev);
        ip = netdev_priv(dev);
+        ip->dev = dev;
        dev->irq = pdev->irq;
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index f233bf8b4ebb..c4407e8e39a3 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -117,7 +117,7 @@ static void dwmac4_tx_queue_routing(struct mac_device_info *hw,
        void __iomem *ioaddr = hw->pcsr;
        u32 value;
-        const struct stmmac_rx_routing route_possibilities[] = {
+        static const struct stmmac_rx_routing route_possibilities[] = {
                { GMAC_RXQCTRL_AVCPQ_MASK, GMAC_RXQCTRL_AVCPQ_SHIFT },
                { GMAC_RXQCTRL_PTPQ_MASK, GMAC_RXQCTRL_PTPQ_SHIFT },
                { GMAC_RXQCTRL_DCBCPQ_MASK, GMAC_RXQCTRL_DCBCPQ_SHIFT },
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 1853f7ff6657..1763e48c84e2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4120,8 +4120,15 @@ int stmmac_dvr_probe(struct device *device,
        if ((phyaddr >= 0) && (phyaddr <= 31))
                priv->plat->phy_addr = phyaddr;
-        if (priv->plat->stmmac_rst)
+        if (priv->plat->stmmac_rst) {
+                ret = reset_control_assert(priv->plat->stmmac_rst);
                reset_control_deassert(priv->plat->stmmac_rst);
+                /* Some reset controllers have only reset callback instead of
+                 * assert + deassert callbacks pair.
+                 */
+                if (ret == -ENOTSUPP)
+                        reset_control_reset(priv->plat->stmmac_rst);
+        }
        /* Init MAC and get the capabilities */
        ret = stmmac_hw_init(priv);
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 46cb7f8955a2..4bb04aaf9650 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -9532,7 +9532,7 @@ static struct niu_parent *niu_get_parent(struct niu *np,
                p = niu_new_parent(np, id, ptype);
        if (p) {
-                char port_name[6];
+                char port_name[8];
                int err;
                sprintf(port_name, "port%d", port);
@@ -9553,7 +9553,7 @@ static void niu_put_parent(struct niu *np)
 {
        struct niu_parent *p = np->parent;
        u8 port = np->port;
-        char port_name[6];
+        char port_name[8];
        BUG_ON(!p || p->ports[port] != np);
diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c
index 711fbbbc4b1f..163d8d16bc24 100644
--- a/drivers/net/ethernet/tehuti/tehuti.c
+++ b/drivers/net/ethernet/tehuti/tehuti.c
@@ -654,6 +654,8 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)
                        RET(-EFAULT);
                }
                DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]);
+        } else {
+                return -EOPNOTSUPP;
        }
        if (!capable(CAP_SYS_RAWIO))
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 1850e348f555..badd0a8caeb9 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -3089,6 +3089,31 @@ static int cpsw_probe(struct platform_device *pdev)
                        cpsw->quirk_irq = true;
        }
+        ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
+        ndev->netdev_ops = &cpsw_netdev_ops;
+        ndev->ethtool_ops = &cpsw_ethtool_ops;
+        netif_napi_add(ndev, &cpsw->napi_rx, cpsw_rx_poll, CPSW_POLL_WEIGHT);
+        netif_tx_napi_add(ndev, &cpsw->napi_tx, cpsw_tx_poll, CPSW_POLL_WEIGHT);
+        cpsw_split_res(ndev);
+        /* register the network device */
+        SET_NETDEV_DEV(ndev, &pdev->dev);
+        ret = register_netdev(ndev);
+        if (ret) {
+                dev_err(priv->dev, "error registering net device\n");
+                ret = -ENODEV;
+                goto clean_ale_ret;
+        }
+        if (cpsw->data.dual_emac) {
+                ret = cpsw_probe_dual_emac(priv);
+                if (ret) {
+                        cpsw_err(priv, probe, "error probe slave 2 emac interface\n");
+                        goto clean_unregister_netdev_ret;
+                }
+        }
        /* Grab RX and TX IRQs. Note that we also have RX_THRESHOLD and
         * MISC IRQs which are always kept disabled with this driver so
         * we will not request them.
@@ -3127,33 +3152,9 @@ static int cpsw_probe(struct platform_device *pdev)
                goto clean_ale_ret;
        }
-        ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
-        ndev->netdev_ops = &cpsw_netdev_ops;
-        ndev->ethtool_ops = &cpsw_ethtool_ops;
-        netif_napi_add(ndev, &cpsw->napi_rx, cpsw_rx_poll, CPSW_POLL_WEIGHT);
-        netif_tx_napi_add(ndev, &cpsw->napi_tx, cpsw_tx_poll, CPSW_POLL_WEIGHT);
-        cpsw_split_res(ndev);
-        /* register the network device */
-        SET_NETDEV_DEV(ndev, &pdev->dev);
-        ret = register_netdev(ndev);
-        if (ret) {
-                dev_err(priv->dev, "error registering net device\n");
-                ret = -ENODEV;
-                goto clean_ale_ret;
-        }
        cpsw_notice(priv, probe,
                    "initialized device (regs %pa, irq %d, pool size %d)\n",
                    &ss_res->start, ndev->irq, dma_params.descs_pool_size);
-        if (cpsw->data.dual_emac) {
-                ret = cpsw_probe_dual_emac(priv);
-                if (ret) {
-                        cpsw_err(priv, probe, "error probe slave 2 emac interface\n");
-                        goto clean_unregister_netdev_ret;
-                }
-        }
        pm_runtime_put(&pdev->dev);
diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c
index 00755b6a42cf..c608e1dfaf09 100644
--- a/drivers/net/phy/mdio-mux.c
+++ b/drivers/net/phy/mdio-mux.c
@@ -135,8 +135,8 @@ int mdio_mux_init(struct device *dev,
        for_each_available_child_of_node(dev->of_node, child_bus_node) {
                int v;
-                v = of_mdio_parse_addr(dev, child_bus_node);
+                r = of_property_read_u32(child_bus_node, "reg", &v);
-                if (v < 0) {
+                if (r) {
                        dev_err(dev,
                                "Error: Failed to find reg for child %s\n",
                                of_node_full_name(child_bus_node));
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 13028833bee3..bd4303944e44 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -120,6 +120,7 @@ struct ppp {
        int             n_channels;     /* how many channels are attached 54 */
        spinlock_t      rlock;          /* lock for receive side 58 */
        spinlock_t      wlock;          /* lock for transmit side 5c */
+        int             *xmit_recursion __percpu; /* xmit recursion detect */
        int             mru;            /* max receive unit 60 */
        unsigned int    flags;          /* control bits 64 */
        unsigned int    xstate;         /* transmit state bits 68 */
@@ -1025,6 +1026,7 @@ static int ppp_dev_configure(struct net *src_net, struct net_device *dev,
        struct ppp *ppp = netdev_priv(dev);
        int indx;
        int err;
+        int cpu;
        ppp->dev = dev;
        ppp->ppp_net = src_net;
@@ -1039,6 +1041,15 @@ static int ppp_dev_configure(struct net *src_net, struct net_device *dev,
        INIT_LIST_HEAD(&ppp->channels);
        spin_lock_init(&ppp->rlock);
        spin_lock_init(&ppp->wlock);
+        ppp->xmit_recursion = alloc_percpu(int);
+        if (!ppp->xmit_recursion) {
+                err = -ENOMEM;
+                goto err1;
+        }
+        for_each_possible_cpu(cpu)
+                (*per_cpu_ptr(ppp->xmit_recursion, cpu)) = 0;
 #ifdef CONFIG_PPP_MULTILINK
        ppp->minseq = -1;
        skb_queue_head_init(&ppp->mrq);
@@ -1050,11 +1061,15 @@ static int ppp_dev_configure(struct net *src_net, struct net_device *dev,
        err = ppp_unit_register(ppp, conf->unit, conf->ifname_is_set);
        if (err < 0)
-                return err;
+                goto err2;
        conf->file->private_data = &ppp->file;
        return 0;
+err2:
+        free_percpu(ppp->xmit_recursion);
+err1:
+        return err;
 }
 static const struct nla_policy ppp_nl_policy[IFLA_PPP_MAX + 1] = {
@@ -1400,18 +1415,16 @@ static void __ppp_xmit_process(struct ppp *ppp)
        ppp_xmit_unlock(ppp);
 }
-static DEFINE_PER_CPU(int, ppp_xmit_recursion);
 static void ppp_xmit_process(struct ppp *ppp)
 {
        local_bh_disable();
-        if (unlikely(__this_cpu_read(ppp_xmit_recursion)))
+        if (unlikely(*this_cpu_ptr(ppp->xmit_recursion)))
                goto err;
-        __this_cpu_inc(ppp_xmit_recursion);
+        (*this_cpu_ptr(ppp->xmit_recursion))++;
        __ppp_xmit_process(ppp);
-        __this_cpu_dec(ppp_xmit_recursion);
+        (*this_cpu_ptr(ppp->xmit_recursion))--;
        local_bh_enable();
@@ -1905,7 +1918,7 @@ static void __ppp_channel_push(struct channel *pch)
                read_lock(&pch->upl);
                ppp = pch->ppp;
                if (ppp)
-                        __ppp_xmit_process(ppp);
+                        ppp_xmit_process(ppp);
                read_unlock(&pch->upl);
        }
 }
@@ -1914,9 +1927,7 @@ static void ppp_channel_push(struct channel *pch)
 {
        local_bh_disable();
-        __this_cpu_inc(ppp_xmit_recursion);
        __ppp_channel_push(pch);
-        __this_cpu_dec(ppp_xmit_recursion);
        local_bh_enable();
 }
@@ -3057,6 +3068,7 @@ static void ppp_destroy_interface(struct ppp *ppp)
 #endif /* CONFIG_PPP_FILTER */
        kfree_skb(ppp->xmit_pending);
+        free_percpu(ppp->xmit_recursion);
        free_netdev(ppp->dev);
 }
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index d103a1d4fb36..8f572b9f3625 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -768,8 +768,10 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
        u8 *buf;
        int len;
        int temp;
+        int err;
        u8 iface_no;
        struct usb_cdc_parsed_header hdr;
+        u16 curr_ntb_format;
        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
        if (!ctx)
@@ -874,6 +876,32 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
                goto error2;
        }
+        /*
+         * Some Huawei devices have been observed to come out of reset in NDP32 mode.
+         * Let's check if this is the case, and set the device to NDP16 mode again if
+         * needed.
+        */
+        if (ctx->drvflags & CDC_NCM_FLAG_RESET_NTB16) {
+                err = usbnet_read_cmd(dev, USB_CDC_GET_NTB_FORMAT,
+                                      USB_TYPE_CLASS | USB_DIR_IN | USB_RECIP_INTERFACE,
+                                      0, iface_no, &curr_ntb_format, 2);
+                if (err < 0) {
+                        goto error2;
+                }
+                if (curr_ntb_format == USB_CDC_NCM_NTB32_FORMAT) {
+                        dev_info(&intf->dev, "resetting NTB format to 16-bit");
+                        err = usbnet_write_cmd(dev, USB_CDC_SET_NTB_FORMAT,
+                                               USB_TYPE_CLASS | USB_DIR_OUT
+                                               | USB_RECIP_INTERFACE,
+                                               USB_CDC_NCM_NTB16_FORMAT,
+                                               iface_no, NULL, 0);
+                        if (err < 0)
+                                goto error2;
+                }
+        }
        cdc_ncm_find_endpoints(dev, ctx->data);
        cdc_ncm_find_endpoints(dev, ctx->control);
        if (!dev->in || !dev->out || !dev->status) {
diff --git a/drivers/net/usb/huawei_cdc_ncm.c b/drivers/net/usb/huawei_cdc_ncm.c
index 2680a65cd5e4..63f28908afda 100644
--- a/drivers/net/usb/huawei_cdc_ncm.c
+++ b/drivers/net/usb/huawei_cdc_ncm.c
@@ -80,6 +80,12 @@ static int huawei_cdc_ncm_bind(struct usbnet *usbnet_dev,
         * be at the end of the frame.
         */
        drvflags |= CDC_NCM_FLAG_NDP_TO_END;
+        /* Additionally, it has been reported that some Huawei E3372H devices, with
+         * firmware version 21.318.01.00.541, come out of reset in NTB32 format mode, hence
+         * needing to be set to the NTB16 one again.
+         */
+        drvflags |= CDC_NCM_FLAG_RESET_NTB16;
        ret = cdc_ncm_bind_common(usbnet_dev, intf, 1, drvflags);
        if (ret)
                goto err;
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 2dfca96a63b6..340c13484e5c 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -898,6 +898,7 @@ static const struct ethtool_ops smsc95xx_ethtool_ops = {
        .set_wol        = smsc95xx_ethtool_set_wol,
        .get_link_ksettings     = smsc95xx_get_link_ksettings,
        .set_link_ksettings     = smsc95xx_set_link_ksettings,
+        .get_ts_info    = ethtool_op_get_ts_info,
 };
 static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index ba1c9f93592b..9c51b8be0038 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -311,7 +311,7 @@ struct vmxnet3_intr {
        u8  num_intrs;                  /* # of intr vectors */
        u8  event_intr_idx;             /* idx of the intr vector for event */
        u8  mod_levels[VMXNET3_LINUX_MAX_MSIX_VECT]; /* moderation level */
-        char    event_msi_vector_name[IFNAMSIZ+11];
+        char    event_msi_vector_name[IFNAMSIZ+17];
 #ifdef CONFIG_PCI_MSI
        struct msix_entry msix_entries[VMXNET3_LINUX_MAX_MSIX_VECT];
 #endif
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index 6e2e760d98b1..0b75def39c6c 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -5704,7 +5704,7 @@ static void rt2800_init_freq_calibration(struct rt2x00_dev *rt2x00dev)
 static void rt2800_init_bbp_5592_glrt(struct rt2x00_dev *rt2x00dev)
 {
-        const u8 glrt_table[] = {
+        static const u8 glrt_table[] = {
                0xE0, 0x1F, 0X38, 0x32, 0x08, 0x28, 0x19, 0x0A, 0xFF, 0x00, /* 128 ~ 137 */
                0x16, 0x10, 0x10, 0x0B, 0x36, 0x2C, 0x26, 0x24, 0x42, 0x36, /* 138 ~ 147 */
                0x30, 0x2D, 0x4C, 0x46, 0x3D, 0x40, 0x3E, 0x42, 0x3D, 0x40, /* 148 ~ 157 */
diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c
index 7cd99b1f8596..75bc08c6838c 100644
--- a/drivers/nvdimm/core.c
+++ b/drivers/nvdimm/core.c
@@ -421,14 +421,15 @@ static void set_badblock(struct badblocks *bb, sector_t s, int num)
 static void __add_badblock_range(struct badblocks *bb, u64 ns_offset, u64 len)
 {
        const unsigned int sector_size = 512;
-        sector_t start_sector;
+        sector_t start_sector, end_sector;
        u64 num_sectors;
        u32 rem;
        start_sector = div_u64(ns_offset, sector_size);
-        num_sectors = div_u64_rem(len, sector_size, &rem);
+        end_sector = div_u64_rem(ns_offset + len, sector_size, &rem);
        if (rem)
-                num_sectors++;
+                end_sector++;
+        num_sectors = end_sector - start_sector;
        if (unlikely(num_sectors > (u64)INT_MAX)) {
                u64 remaining = num_sectors;
diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index 077f62e208aa..6a4367cc9caa 100644
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -3401,9 +3401,10 @@ static int cxlflash_afu_debug(struct cxlflash_cfg *cfg,
                if (is_write) {
                        req_flags |= SISL_REQ_FLAGS_HOST_WRITE;
-                        rc = copy_from_user(kbuf, ubuf, ulen);
+                        if (copy_from_user(kbuf, ubuf, ulen)) {
-                        if (unlikely(rc))
+                                rc = -EFAULT;
                                goto out;
+                        }
                }
        }
@@ -3431,8 +3432,10 @@ static int cxlflash_afu_debug(struct cxlflash_cfg *cfg,
                goto out;
        }
-        if (ulen && !is_write)
+        if (ulen && !is_write) {
-                rc = copy_to_user(ubuf, kbuf, ulen);
+                if (copy_to_user(ubuf, kbuf, ulen))
+                        rc = -EFAULT;
+        }
 out:
        kfree(buf);
        dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 551d103c27f1..2bfea7082e3a 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -1693,7 +1693,7 @@ static int prep_ssp_v2_hw(struct hisi_hba *hisi_hba,
 static int parse_trans_tx_err_code_v2_hw(u32 err_msk)
 {
-        const u8 trans_tx_err_code_prio[] = {
+        static const u8 trans_tx_err_code_prio[] = {
                TRANS_TX_OPEN_FAIL_WITH_IT_NEXUS_LOSS,
                TRANS_TX_ERR_PHY_NOT_ENABLE,
                TRANS_TX_OPEN_CNX_ERR_WRONG_DESTINATION,
@@ -1738,7 +1738,7 @@ static int parse_trans_tx_err_code_v2_hw(u32 err_msk)
 static int parse_trans_rx_err_code_v2_hw(u32 err_msk)
 {
-        const u8 trans_rx_err_code_prio[] = {
+        static const u8 trans_rx_err_code_prio[] = {
                TRANS_RX_ERR_WITH_RXFRAME_CRC_ERR,
                TRANS_RX_ERR_WITH_RXFIS_8B10B_DISP_ERR,
                TRANS_RX_ERR_WITH_RXFRAME_HAVE_ERRPRM,
@@ -1784,7 +1784,7 @@ static int parse_trans_rx_err_code_v2_hw(u32 err_msk)
 static int parse_dma_tx_err_code_v2_hw(u32 err_msk)
 {
-        const u8 dma_tx_err_code_prio[] = {
+        static const u8 dma_tx_err_code_prio[] = {
                DMA_TX_UNEXP_XFER_ERR,
                DMA_TX_UNEXP_RETRANS_ERR,
                DMA_TX_XFER_LEN_OVERFLOW,
@@ -1810,7 +1810,7 @@ static int parse_dma_tx_err_code_v2_hw(u32 err_msk)
 static int parse_sipc_rx_err_code_v2_hw(u32 err_msk)
 {
-        const u8 sipc_rx_err_code_prio[] = {
+        static const u8 sipc_rx_err_code_prio[] = {
                SIPC_RX_FIS_STATUS_ERR_BIT_VLD,
                SIPC_RX_PIO_WRSETUP_STATUS_DRQ_ERR,
                SIPC_RX_FIS_STATUS_BSY_BIT_ERR,
@@ -1836,7 +1836,7 @@ static int parse_sipc_rx_err_code_v2_hw(u32 err_msk)
 static int parse_dma_rx_err_code_v2_hw(u32 err_msk)
 {
-        const u8 dma_rx_err_code_prio[] = {
+        static const u8 dma_rx_err_code_prio[] = {
                DMA_RX_UNKNOWN_FRM_ERR,
                DMA_RX_DATA_LEN_OVERFLOW,
                DMA_RX_DATA_LEN_UNDERFLOW,
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 47f66e949745..ed197bc8e801 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -213,7 +213,7 @@ static void sci_task_request_build_ssp_task_iu(struct isci_request *ireq)
 * @task_context:
 *
 */
-static void scu_ssp_reqeust_construct_task_context(
+static void scu_ssp_request_construct_task_context(
        struct isci_request *ireq,
        struct scu_task_context *task_context)
 {
@@ -425,7 +425,7 @@ static void scu_ssp_io_request_construct_task_context(struct isci_request *ireq,
        u8 prot_type = scsi_get_prot_type(scmd);
        u8 prot_op = scsi_get_prot_op(scmd);
-        scu_ssp_reqeust_construct_task_context(ireq, task_context);
+        scu_ssp_request_construct_task_context(ireq, task_context);
        task_context->ssp_command_iu_length =
                sizeof(struct ssp_cmd_iu) / sizeof(u32);
@@ -472,7 +472,7 @@ static void scu_ssp_task_request_construct_task_context(struct isci_request *ire
 {
        struct scu_task_context *task_context = ireq->tc;
-        scu_ssp_reqeust_construct_task_context(ireq, task_context);
+        scu_ssp_request_construct_task_context(ireq, task_context);
        task_context->control_frame                = 1;
        task_context->priority                     = SCU_TASK_PRIORITY_HIGH;
@@ -495,7 +495,7 @@ static void scu_ssp_task_request_construct_task_context(struct isci_request *ire
 * the command buffer is complete. none Revisit task context construction to
 * determine what is common for SSP/SMP/STP task context structures.
 */
-static void scu_sata_reqeust_construct_task_context(
+static void scu_sata_request_construct_task_context(
        struct isci_request *ireq,
        struct scu_task_context *task_context)
 {
@@ -562,7 +562,7 @@ static void scu_stp_raw_request_construct_task_context(struct isci_request *ireq
 {
        struct scu_task_context *task_context = ireq->tc;
-        scu_sata_reqeust_construct_task_context(ireq, task_context);
+        scu_sata_request_construct_task_context(ireq, task_context);
        task_context->control_frame         = 0;
        task_context->priority              = SCU_TASK_PRIORITY_NORMAL;
@@ -613,7 +613,7 @@ static void sci_stp_optimized_request_construct(struct isci_request *ireq,
        struct scu_task_context *task_context = ireq->tc;
        /* Build the STP task context structure */
-        scu_sata_reqeust_construct_task_context(ireq, task_context);
+        scu_sata_request_construct_task_context(ireq, task_context);
        /* Copy over the SGL elements */
        sci_request_build_sgl(ireq);
@@ -1401,7 +1401,7 @@ static enum sci_status sci_stp_request_pio_data_out_transmit_data(struct isci_re
 * @data_buffer: The buffer of data to be copied.
 * @length: The length of the data transfer.
 *
- * Copy the data from the buffer for the length specified to the IO reqeust SGL
+ * Copy the data from the buffer for the length specified to the IO request SGL
 * specified data region. enum sci_status
 */
 static enum sci_status
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index fd501f8dbb11..8660f923ace0 100644
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -573,7 +573,7 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp,
                event = DISC_EV_FAILED;
        }
        if (error)
-                fc_disc_error(disc, fp);
+                fc_disc_error(disc, ERR_PTR(error));
        else if (event != DISC_EV_NONE)
                fc_disc_done(disc, event);
        fc_frame_free(fp);
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index b58bba4604e8..7786c97e033f 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -1227,7 +1227,7 @@ static void qedf_rport_event_handler(struct fc_lport *lport,
                if (rdata->spp_type != FC_TYPE_FCP) {
                        QEDF_INFO(&(qedf->dbg_ctx), QEDF_LOG_DISC,
-                            "Not offlading since since spp type isn't FCP\n");
+                            "Not offloading since spp type isn't FCP\n");
                        break;
                }
                if (!(rdata->ids.roles & FC_RPORT_ROLE_FCP_TARGET)) {
diff --git a/drivers/scsi/qedi/qedi.h b/drivers/scsi/qedi/qedi.h
index 32632c9b2276..91d2f51c351b 100644
--- a/drivers/scsi/qedi/qedi.h
+++ b/drivers/scsi/qedi/qedi.h
@@ -23,11 +23,17 @@
 #include <linux/qed/qed_iscsi_if.h>
 #include <linux/qed/qed_ll2_if.h>
 #include "qedi_version.h"
+#include "qedi_nvm_iscsi_cfg.h"
 #define QEDI_MODULE_NAME                "qedi"
 struct qedi_endpoint;
+#ifndef GET_FIELD2
+#define GET_FIELD2(value, name) \
+        (((value) & (name ## _MASK)) >> (name ## _OFFSET))
+#endif
 /*
 * PCI function probe defines
 */
@@ -66,6 +72,11 @@ struct qedi_endpoint;
 #define QEDI_HW_DMA_BOUNDARY    0xfff
 #define QEDI_PATH_HANDLE        0xFE0000000UL
+enum qedi_nvm_tgts {
+        QEDI_NVM_TGT_PRI,
+        QEDI_NVM_TGT_SEC,
+};
 struct qedi_uio_ctrl {
        /* meta data */
        u32 uio_hsi_version;
@@ -283,6 +294,8 @@ struct qedi_ctx {
        void *bdq_pbl_list;
        dma_addr_t bdq_pbl_list_dma;
        u8 bdq_pbl_list_num_entries;
+        struct nvm_iscsi_cfg *iscsi_cfg;
+        dma_addr_t nvm_buf_dma;
        void __iomem *bdq_primary_prod;
        void __iomem *bdq_secondary_prod;
        u16 bdq_prod_idx;
@@ -337,6 +350,10 @@ struct qedi_ctx {
        bool use_fast_sge;
        atomic_t num_offloads;
+#define SYSFS_FLAG_FW_SEL_BOOT 2
+#define IPV6_LEN        41
+#define IPV4_LEN        17
+        struct iscsi_boot_kset *boot_kset;
 };
 struct qedi_work {
diff --git a/drivers/scsi/qedi/qedi_fw.c b/drivers/scsi/qedi/qedi_fw.c
index 19254bd739d9..93d54acd4a22 100644
--- a/drivers/scsi/qedi/qedi_fw.c
+++ b/drivers/scsi/qedi/qedi_fw.c
@@ -1411,7 +1411,7 @@ static void qedi_tmf_work(struct work_struct *work)
        list_work = kzalloc(sizeof(*list_work), GFP_ATOMIC);
        if (!list_work) {
-                QEDI_ERR(&qedi->dbg_ctx, "Memory alloction failed\n");
+                QEDI_ERR(&qedi->dbg_ctx, "Memory allocation failed\n");
                goto abort_ret;
        }
diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
index 5f5a4ef2e529..2c3783684815 100644
--- a/drivers/scsi/qedi/qedi_main.c
+++ b/drivers/scsi/qedi/qedi_main.c
@@ -19,6 +19,7 @@
 #include <linux/mm.h>
 #include <linux/if_vlan.h>
 #include <linux/cpu.h>
+#include <linux/iscsi_boot_sysfs.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
@@ -1143,6 +1144,30 @@ exit_setup_int:
        return rc;
 }
+static void qedi_free_nvm_iscsi_cfg(struct qedi_ctx *qedi)
+{
+        if (qedi->iscsi_cfg)
+                dma_free_coherent(&qedi->pdev->dev,
+                                  sizeof(struct nvm_iscsi_cfg),
+                                  qedi->iscsi_cfg, qedi->nvm_buf_dma);
+}
+static int qedi_alloc_nvm_iscsi_cfg(struct qedi_ctx *qedi)
+{
+        qedi->iscsi_cfg = dma_zalloc_coherent(&qedi->pdev->dev,
+                                             sizeof(struct nvm_iscsi_cfg),
+                                             &qedi->nvm_buf_dma, GFP_KERNEL);
+        if (!qedi->iscsi_cfg) {
+                QEDI_ERR(&qedi->dbg_ctx, "Could not allocate NVM BUF.\n");
+                return -ENOMEM;
+        }
+        QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_INFO,
+                  "NVM BUF addr=0x%p dma=0x%llx.\n", qedi->iscsi_cfg,
+                  qedi->nvm_buf_dma);
+        return 0;
+}
 static void qedi_free_bdq(struct qedi_ctx *qedi)
 {
        int i;
@@ -1183,6 +1208,7 @@ static void qedi_free_global_queues(struct qedi_ctx *qedi)
                kfree(gl[i]);
        }
        qedi_free_bdq(qedi);
+        qedi_free_nvm_iscsi_cfg(qedi);
 }
 static int qedi_alloc_bdq(struct qedi_ctx *qedi)
@@ -1309,6 +1335,11 @@ static int qedi_alloc_global_queues(struct qedi_ctx *qedi)
        if (rc)
                goto mem_alloc_failure;
+        /* Allocate DMA coherent buffers for NVM_ISCSI_CFG */
+        rc = qedi_alloc_nvm_iscsi_cfg(qedi);
+        if (rc)
+                goto mem_alloc_failure;
        /* Allocate a CQ and an associated PBL for each MSI-X
         * vector.
         */
@@ -1671,6 +1702,387 @@ void qedi_reset_host_mtu(struct qedi_ctx *qedi, u16 mtu)
        qedi_ops->ll2->start(qedi->cdev, &params);
 }
+/**
+ * qedi_get_nvram_block: - Scan through the iSCSI NVRAM block (while accounting
+ * for gaps) for the matching absolute-pf-id of the QEDI device.
+ */
+static struct nvm_iscsi_block *
+qedi_get_nvram_block(struct qedi_ctx *qedi)
+{
+        int i;
+        u8 pf;
+        u32 flags;
+        struct nvm_iscsi_block *block;
+        pf = qedi->dev_info.common.abs_pf_id;
+        block = &qedi->iscsi_cfg->block[0];
+        for (i = 0; i < NUM_OF_ISCSI_PF_SUPPORTED; i++, block++) {
+                flags = ((block->id) & NVM_ISCSI_CFG_BLK_CTRL_FLAG_MASK) >>
+                        NVM_ISCSI_CFG_BLK_CTRL_FLAG_OFFSET;
+                if (flags & (NVM_ISCSI_CFG_BLK_CTRL_FLAG_IS_NOT_EMPTY |
+                                NVM_ISCSI_CFG_BLK_CTRL_FLAG_PF_MAPPED) &&
+                        (pf == (block->id & NVM_ISCSI_CFG_BLK_MAPPED_PF_ID_MASK)
+                                >> NVM_ISCSI_CFG_BLK_MAPPED_PF_ID_OFFSET))
+                        return block;
+        }
+        return NULL;
+}
+static ssize_t qedi_show_boot_eth_info(void *data, int type, char *buf)
+{
+        struct qedi_ctx *qedi = data;
+        struct nvm_iscsi_initiator *initiator;
+        char *str = buf;
+        int rc = 1;
+        u32 ipv6_en, dhcp_en, ip_len;
+        struct nvm_iscsi_block *block;
+        char *fmt, *ip, *sub, *gw;
+        block = qedi_get_nvram_block(qedi);
+        if (!block)
+                return 0;
+        initiator = &block->initiator;
+        ipv6_en = block->generic.ctrl_flags &
+                  NVM_ISCSI_CFG_GEN_IPV6_ENABLED;
+        dhcp_en = block->generic.ctrl_flags &
+                  NVM_ISCSI_CFG_GEN_DHCP_TCPIP_CONFIG_ENABLED;
+        /* Static IP assignments. */
+        fmt = ipv6_en ? "%pI6\n" : "%pI4\n";
+        ip = ipv6_en ? initiator->ipv6.addr.byte : initiator->ipv4.addr.byte;
+        ip_len = ipv6_en ? IPV6_LEN : IPV4_LEN;
+        sub = ipv6_en ? initiator->ipv6.subnet_mask.byte :
+              initiator->ipv4.subnet_mask.byte;
+        gw = ipv6_en ? initiator->ipv6.gateway.byte :
+             initiator->ipv4.gateway.byte;
+        /* DHCP IP adjustments. */
+        fmt = dhcp_en ? "%s\n" : fmt;
+        if (dhcp_en) {
+                ip = ipv6_en ? "0::0" : "0.0.0.0";
+                sub = ip;
+                gw = ip;
+                ip_len = ipv6_en ? 5 : 8;
+        }
+        switch (type) {
+        case ISCSI_BOOT_ETH_IP_ADDR:
+                rc = snprintf(str, ip_len, fmt, ip);
+                break;
+        case ISCSI_BOOT_ETH_SUBNET_MASK:
+                rc = snprintf(str, ip_len, fmt, sub);
+                break;
+        case ISCSI_BOOT_ETH_GATEWAY:
+                rc = snprintf(str, ip_len, fmt, gw);
+                break;
+        case ISCSI_BOOT_ETH_FLAGS:
+                rc = snprintf(str, 3, "%hhd\n",
+                              SYSFS_FLAG_FW_SEL_BOOT);
+                break;
+        case ISCSI_BOOT_ETH_INDEX:
+                rc = snprintf(str, 3, "0\n");
+                break;
+        case ISCSI_BOOT_ETH_MAC:
+                rc = sysfs_format_mac(str, qedi->mac, ETH_ALEN);
+                break;
+        case ISCSI_BOOT_ETH_VLAN:
+                rc = snprintf(str, 12, "%d\n",
+                              GET_FIELD2(initiator->generic_cont0,
+                                         NVM_ISCSI_CFG_INITIATOR_VLAN));
+                break;
+        case ISCSI_BOOT_ETH_ORIGIN:
+                if (dhcp_en)
+                        rc = snprintf(str, 3, "3\n");
+                break;
+        default:
+                rc = 0;
+                break;
+        }
+        return rc;
+}
+static umode_t qedi_eth_get_attr_visibility(void *data, int type)
+{
+        int rc = 1;
+        switch (type) {
+        case ISCSI_BOOT_ETH_FLAGS:
+        case ISCSI_BOOT_ETH_MAC:
+        case ISCSI_BOOT_ETH_INDEX:
+        case ISCSI_BOOT_ETH_IP_ADDR:
+        case ISCSI_BOOT_ETH_SUBNET_MASK:
+        case ISCSI_BOOT_ETH_GATEWAY:
+        case ISCSI_BOOT_ETH_ORIGIN:
+        case ISCSI_BOOT_ETH_VLAN:
+                rc = 0444;
+                break;
+        default:
+                rc = 0;
+                break;
+        }
+        return rc;
+}
+static ssize_t qedi_show_boot_ini_info(void *data, int type, char *buf)
+{
+        struct qedi_ctx *qedi = data;
+        struct nvm_iscsi_initiator *initiator;
+        char *str = buf;
+        int rc;
+        struct nvm_iscsi_block *block;
+        block = qedi_get_nvram_block(qedi);
+        if (!block)
+                return 0;
+        initiator = &block->initiator;
+        switch (type) {
+        case ISCSI_BOOT_INI_INITIATOR_NAME:
+                rc = snprintf(str, NVM_ISCSI_CFG_ISCSI_NAME_MAX_LEN, "%s\n",
+                              initiator->initiator_name.byte);
+                break;
+        default:
+                rc = 0;
+                break;
+        }
+        return rc;
+}
+static umode_t qedi_ini_get_attr_visibility(void *data, int type)
+{
+        int rc;
+        switch (type) {
+        case ISCSI_BOOT_INI_INITIATOR_NAME:
+                rc = 0444;
+                break;
+        default:
+                rc = 0;
+                break;
+        }
+        return rc;
+}
+static ssize_t
+qedi_show_boot_tgt_info(struct qedi_ctx *qedi, int type,
+                        char *buf, enum qedi_nvm_tgts idx)
+{
+        char *str = buf;
+        int rc = 1;
+        u32 ctrl_flags, ipv6_en, chap_en, mchap_en, ip_len;
+        struct nvm_iscsi_block *block;
+        char *chap_name, *chap_secret;
+        char *mchap_name, *mchap_secret;
+        block = qedi_get_nvram_block(qedi);
+        if (!block)
+                goto exit_show_tgt_info;
+        QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_EVT,
+                  "Port:%d, tgt_idx:%d\n",
+                  GET_FIELD2(block->id, NVM_ISCSI_CFG_BLK_MAPPED_PF_ID), idx);
+        ctrl_flags = block->target[idx].ctrl_flags &
+                     NVM_ISCSI_CFG_TARGET_ENABLED;
+        if (!ctrl_flags) {
+                QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_EVT,
+                          "Target disabled\n");
+                goto exit_show_tgt_info;
+        }
+        ipv6_en = block->generic.ctrl_flags &
+                  NVM_ISCSI_CFG_GEN_IPV6_ENABLED;
+        ip_len = ipv6_en ? IPV6_LEN : IPV4_LEN;
+        chap_en = block->generic.ctrl_flags &
+                  NVM_ISCSI_CFG_GEN_CHAP_ENABLED;
+        chap_name = chap_en ? block->initiator.chap_name.byte : NULL;
+        chap_secret = chap_en ? block->initiator.chap_password.byte : NULL;
+        mchap_en = block->generic.ctrl_flags &
+                  NVM_ISCSI_CFG_GEN_CHAP_MUTUAL_ENABLED;
+        mchap_name = mchap_en ? block->target[idx].chap_name.byte : NULL;
+        mchap_secret = mchap_en ? block->target[idx].chap_password.byte : NULL;
+        switch (type) {
+        case ISCSI_BOOT_TGT_NAME:
+                rc = snprintf(str, NVM_ISCSI_CFG_ISCSI_NAME_MAX_LEN, "%s\n",
+                              block->target[idx].target_name.byte);
+                break;
+        case ISCSI_BOOT_TGT_IP_ADDR:
+                if (ipv6_en)
+                        rc = snprintf(str, ip_len, "%pI6\n",
+                                      block->target[idx].ipv6_addr.byte);
+                else
+                        rc = snprintf(str, ip_len, "%pI4\n",
+                                      block->target[idx].ipv4_addr.byte);
+                break;
+        case ISCSI_BOOT_TGT_PORT:
+                rc = snprintf(str, 12, "%d\n",
+                              GET_FIELD2(block->target[idx].generic_cont0,
+                                         NVM_ISCSI_CFG_TARGET_TCP_PORT));
+                break;
+        case ISCSI_BOOT_TGT_LUN:
+                rc = snprintf(str, 22, "%.*d\n",
+                              block->target[idx].lun.value[1],
+                              block->target[idx].lun.value[0]);
+                break;
+        case ISCSI_BOOT_TGT_CHAP_NAME:
+                rc = snprintf(str, NVM_ISCSI_CFG_CHAP_NAME_MAX_LEN, "%s\n",
+                              chap_name);
+                break;
+        case ISCSI_BOOT_TGT_CHAP_SECRET:
+                rc = snprintf(str, NVM_ISCSI_CFG_CHAP_PWD_MAX_LEN, "%s\n",
+                              chap_secret);
+                break;
+        case ISCSI_BOOT_TGT_REV_CHAP_NAME:
+                rc = snprintf(str, NVM_ISCSI_CFG_CHAP_NAME_MAX_LEN, "%s\n",
+                              mchap_name);
+                break;
+        case ISCSI_BOOT_TGT_REV_CHAP_SECRET:
+                rc = snprintf(str, NVM_ISCSI_CFG_CHAP_PWD_MAX_LEN, "%s\n",
+                              mchap_secret);
+                break;
+        case ISCSI_BOOT_TGT_FLAGS:
+                rc = snprintf(str, 3, "%hhd\n", SYSFS_FLAG_FW_SEL_BOOT);
+                break;
+        case ISCSI_BOOT_TGT_NIC_ASSOC:
+                rc = snprintf(str, 3, "0\n");
+                break;
+        default:
+                rc = 0;
+                break;
+        }
+exit_show_tgt_info:
+        return rc;
+}
+static ssize_t qedi_show_boot_tgt_pri_info(void *data, int type, char *buf)
+{
+        struct qedi_ctx *qedi = data;
+        return qedi_show_boot_tgt_info(qedi, type, buf, QEDI_NVM_TGT_PRI);
+}
+static ssize_t qedi_show_boot_tgt_sec_info(void *data, int type, char *buf)
+{
+        struct qedi_ctx *qedi = data;
+        return qedi_show_boot_tgt_info(qedi, type, buf, QEDI_NVM_TGT_SEC);
+}
+static umode_t qedi_tgt_get_attr_visibility(void *data, int type)
+{
+        int rc;
+        switch (type) {
+        case ISCSI_BOOT_TGT_NAME:
+        case ISCSI_BOOT_TGT_IP_ADDR:
+        case ISCSI_BOOT_TGT_PORT:
+        case ISCSI_BOOT_TGT_LUN:
+        case ISCSI_BOOT_TGT_CHAP_NAME:
+        case ISCSI_BOOT_TGT_CHAP_SECRET:
+        case ISCSI_BOOT_TGT_REV_CHAP_NAME:
+        case ISCSI_BOOT_TGT_REV_CHAP_SECRET:
+        case ISCSI_BOOT_TGT_NIC_ASSOC:
+        case ISCSI_BOOT_TGT_FLAGS:
+                rc = 0444;
+                break;
+        default:
+                rc = 0;
+                break;
+        }
+        return rc;
+}
+static void qedi_boot_release(void *data)
+{
+        struct qedi_ctx *qedi = data;
+        scsi_host_put(qedi->shost);
+}
+static int qedi_get_boot_info(struct qedi_ctx *qedi)
+{
+        int ret = 1;
+        u16 len;
+        len = sizeof(struct nvm_iscsi_cfg);
+        QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_INFO,
+                  "Get NVM iSCSI CFG image\n");
+        ret = qedi_ops->common->nvm_get_image(qedi->cdev,
+                                              QED_NVM_IMAGE_ISCSI_CFG,
+                                              (char *)qedi->iscsi_cfg, len);
+        if (ret)
+                QEDI_ERR(&qedi->dbg_ctx,
+                         "Could not get NVM image. ret = %d\n", ret);
+        return ret;
+}
+static int qedi_setup_boot_info(struct qedi_ctx *qedi)
+{
+        struct iscsi_boot_kobj *boot_kobj;
+        if (qedi_get_boot_info(qedi))
+                return -EPERM;
+        qedi->boot_kset = iscsi_boot_create_host_kset(qedi->shost->host_no);
+        if (!qedi->boot_kset)
+                goto kset_free;
+        if (!scsi_host_get(qedi->shost))
+                goto kset_free;
+        boot_kobj = iscsi_boot_create_target(qedi->boot_kset, 0, qedi,
+                                             qedi_show_boot_tgt_pri_info,
+                                             qedi_tgt_get_attr_visibility,
+                                             qedi_boot_release);
+        if (!boot_kobj)
+                goto put_host;
+        if (!scsi_host_get(qedi->shost))
+                goto kset_free;
+        boot_kobj = iscsi_boot_create_target(qedi->boot_kset, 1, qedi,
+                                             qedi_show_boot_tgt_sec_info,
+                                             qedi_tgt_get_attr_visibility,
+                                             qedi_boot_release);
+        if (!boot_kobj)
+                goto put_host;
+        if (!scsi_host_get(qedi->shost))
+                goto kset_free;
+        boot_kobj = iscsi_boot_create_initiator(qedi->boot_kset, 0, qedi,
+                                                qedi_show_boot_ini_info,
+                                                qedi_ini_get_attr_visibility,
+                                                qedi_boot_release);
+        if (!boot_kobj)
+                goto put_host;
+        if (!scsi_host_get(qedi->shost))
+                goto kset_free;
+        boot_kobj = iscsi_boot_create_ethernet(qedi->boot_kset, 0, qedi,
+                                               qedi_show_boot_eth_info,
+                                               qedi_eth_get_attr_visibility,
+                                               qedi_boot_release);
+        if (!boot_kobj)
+                goto put_host;
+        return 0;
+put_host:
+        scsi_host_put(qedi->shost);
+kset_free:
+        iscsi_boot_destroy_kset(qedi->boot_kset);
+        return -ENOMEM;
+}
 static void __qedi_remove(struct pci_dev *pdev, int mode)
 {
        struct qedi_ctx *qedi = pci_get_drvdata(pdev);
@@ -1724,6 +2136,9 @@ static void __qedi_remove(struct pci_dev *pdev, int mode)
                        qedi->ll2_recv_thread = NULL;
                }
                qedi_ll2_free_skbs(qedi);
+                if (qedi->boot_kset)
+                        iscsi_boot_destroy_kset(qedi->boot_kset);
        }
 }
@@ -1967,6 +2382,10 @@ static int __qedi_probe(struct pci_dev *pdev, int mode)
                /* F/w needs 1st task context memory entry for performance */
                set_bit(QEDI_RESERVE_TASK_ID, qedi->task_idx_map);
                atomic_set(&qedi->num_offloads, 0);
+                if (qedi_setup_boot_info(qedi))
+                        QEDI_ERR(&qedi->dbg_ctx,
+                                 "No iSCSI boot target configured\n");
        }
        return 0;
diff --git a/drivers/scsi/qedi/qedi_nvm_iscsi_cfg.h b/drivers/scsi/qedi/qedi_nvm_iscsi_cfg.h
new file mode 100644
index 000000000000..df39b69b366d
--- /dev/null
+++ b/drivers/scsi/qedi/qedi_nvm_iscsi_cfg.h
@@ -0,0 +1,210 @@
+/*
+ * QLogic iSCSI Offload Driver
+ * Copyright (c) 2016 Cavium Inc.
+ *
+ * This software is available under the terms of the GNU General Public License
+ * (GPL) Version 2, available from the file COPYING in the main directory of
+ * this source tree.
+ */
+#ifndef NVM_ISCSI_CFG_H
+#define NVM_ISCSI_CFG_H
+#define NUM_OF_ISCSI_TARGET_PER_PF    4   /* Defined as per the
+                                           * ISCSI IBFT constraint
+                                           */
+#define NUM_OF_ISCSI_PF_SUPPORTED     4   /* One PF per Port -
+                                           * assuming 4 port card
+                                           */
+#define NVM_ISCSI_CFG_DHCP_NAME_MAX_LEN  256
+union nvm_iscsi_dhcp_vendor_id {
+        u32 value[NVM_ISCSI_CFG_DHCP_NAME_MAX_LEN / 4];
+        u8  byte[NVM_ISCSI_CFG_DHCP_NAME_MAX_LEN];
+};
+#define NVM_ISCSI_IPV4_ADDR_BYTE_LEN 4
+union nvm_iscsi_ipv4_addr {
+        u32 addr;
+        u8  byte[NVM_ISCSI_IPV4_ADDR_BYTE_LEN];
+};
+#define NVM_ISCSI_IPV6_ADDR_BYTE_LEN 16
+union nvm_iscsi_ipv6_addr {
+        u32 addr[4];
+        u8  byte[NVM_ISCSI_IPV6_ADDR_BYTE_LEN];
+};
+struct nvm_iscsi_initiator_ipv4 {
+        union nvm_iscsi_ipv4_addr addr;                         /* 0x0 */
+        union nvm_iscsi_ipv4_addr subnet_mask;                  /* 0x4 */
+        union nvm_iscsi_ipv4_addr gateway;                      /* 0x8 */
+        union nvm_iscsi_ipv4_addr primary_dns;                  /* 0xC */
+        union nvm_iscsi_ipv4_addr secondary_dns;                /* 0x10 */
+        union nvm_iscsi_ipv4_addr dhcp_addr;                    /* 0x14 */
+        union nvm_iscsi_ipv4_addr isns_server;                  /* 0x18 */
+        union nvm_iscsi_ipv4_addr slp_server;                   /* 0x1C */
+        union nvm_iscsi_ipv4_addr primay_radius_server;         /* 0x20 */
+        union nvm_iscsi_ipv4_addr secondary_radius_server;      /* 0x24 */
+        union nvm_iscsi_ipv4_addr rsvd[4];                      /* 0x28 */
+};
+struct nvm_iscsi_initiator_ipv6 {
+        union nvm_iscsi_ipv6_addr addr;                         /* 0x0 */
+        union nvm_iscsi_ipv6_addr subnet_mask;                  /* 0x10 */
+        union nvm_iscsi_ipv6_addr gateway;                      /* 0x20 */
+        union nvm_iscsi_ipv6_addr primary_dns;                  /* 0x30 */
+        union nvm_iscsi_ipv6_addr secondary_dns;                /* 0x40 */
+        union nvm_iscsi_ipv6_addr dhcp_addr;                    /* 0x50 */
+        union nvm_iscsi_ipv6_addr isns_server;                  /* 0x60 */
+        union nvm_iscsi_ipv6_addr slp_server;                   /* 0x70 */
+        union nvm_iscsi_ipv6_addr primay_radius_server;         /* 0x80 */
+        union nvm_iscsi_ipv6_addr secondary_radius_server;      /* 0x90 */
+        union nvm_iscsi_ipv6_addr rsvd[3];                      /* 0xA0 */
+        u32   config;                                           /* 0xD0 */
+#define NVM_ISCSI_CFG_INITIATOR_IPV6_SUBNET_MASK_PREFIX_MASK      0x000000FF
+#define NVM_ISCSI_CFG_INITIATOR_IPV6_SUBNET_MASK_PREFIX_OFFSET    0
+        u32   rsvd_1[3];
+};
+#define NVM_ISCSI_CFG_ISCSI_NAME_MAX_LEN  256
+union nvm_iscsi_name {
+        u32 value[NVM_ISCSI_CFG_ISCSI_NAME_MAX_LEN / 4];
+        u8  byte[NVM_ISCSI_CFG_ISCSI_NAME_MAX_LEN];
+};
+#define NVM_ISCSI_CFG_CHAP_NAME_MAX_LEN  256
+union nvm_iscsi_chap_name {
+        u32 value[NVM_ISCSI_CFG_CHAP_NAME_MAX_LEN / 4];
+        u8  byte[NVM_ISCSI_CFG_CHAP_NAME_MAX_LEN];
+};
+#define NVM_ISCSI_CFG_CHAP_PWD_MAX_LEN  16 /* md5 need per RFC1996
+                                            * is 16 octets
+                                            */
+union nvm_iscsi_chap_password {
+        u32 value[NVM_ISCSI_CFG_CHAP_PWD_MAX_LEN / 4];
+        u8 byte[NVM_ISCSI_CFG_CHAP_PWD_MAX_LEN];
+};
+union nvm_iscsi_lun {
+        u8  byte[8];
+        u32 value[2];
+};
+struct nvm_iscsi_generic {
+        u32 ctrl_flags;                                         /* 0x0 */
+#define NVM_ISCSI_CFG_GEN_CHAP_ENABLED                 BIT(0)
+#define NVM_ISCSI_CFG_GEN_DHCP_TCPIP_CONFIG_ENABLED    BIT(1)
+#define NVM_ISCSI_CFG_GEN_DHCP_ISCSI_CONFIG_ENABLED    BIT(2)
+#define NVM_ISCSI_CFG_GEN_IPV6_ENABLED                 BIT(3)
+#define NVM_ISCSI_CFG_GEN_IPV4_FALLBACK_ENABLED        BIT(4)
+#define NVM_ISCSI_CFG_GEN_ISNS_WORLD_LOGIN             BIT(5)
+#define NVM_ISCSI_CFG_GEN_ISNS_SELECTIVE_LOGIN         BIT(6)
+#define NVM_ISCSI_CFG_GEN_ADDR_REDIRECT_ENABLED        BIT(7)
+#define NVM_ISCSI_CFG_GEN_CHAP_MUTUAL_ENABLED          BIT(8)
+        u32 timeout;                                            /* 0x4 */
+#define NVM_ISCSI_CFG_GEN_DHCP_REQUEST_TIMEOUT_MASK       0x0000FFFF
+#define NVM_ISCSI_CFG_GEN_DHCP_REQUEST_TIMEOUT_OFFSET     0
+#define NVM_ISCSI_CFG_GEN_PORT_LOGIN_TIMEOUT_MASK         0xFFFF0000
+#define NVM_ISCSI_CFG_GEN_PORT_LOGIN_TIMEOUT_OFFSET       16
+        union nvm_iscsi_dhcp_vendor_id  dhcp_vendor_id;         /* 0x8  */
+        u32 rsvd[62];                                           /* 0x108 */
+};
+struct nvm_iscsi_initiator {
+        struct nvm_iscsi_initiator_ipv4 ipv4;                   /* 0x0 */
+        struct nvm_iscsi_initiator_ipv6 ipv6;                   /* 0x38 */
+        union nvm_iscsi_name           initiator_name;          /* 0x118 */
+        union nvm_iscsi_chap_name      chap_name;               /* 0x218 */
+        union nvm_iscsi_chap_password  chap_password;           /* 0x318 */
+        u32 generic_cont0;                                      /* 0x398 */
+#define NVM_ISCSI_CFG_INITIATOR_VLAN_MASK               0x0000FFFF
+#define NVM_ISCSI_CFG_INITIATOR_VLAN_OFFSET             0
+#define NVM_ISCSI_CFG_INITIATOR_IP_VERSION_MASK         0x00030000
+#define NVM_ISCSI_CFG_INITIATOR_IP_VERSION_OFFSET       16
+#define NVM_ISCSI_CFG_INITIATOR_IP_VERSION_4            1
+#define NVM_ISCSI_CFG_INITIATOR_IP_VERSION_6            2
+#define NVM_ISCSI_CFG_INITIATOR_IP_VERSION_4_AND_6      3
+        u32 ctrl_flags;
+#define NVM_ISCSI_CFG_INITIATOR_IP_VERSION_PRIORITY_V6     BIT(0)
+#define NVM_ISCSI_CFG_INITIATOR_VLAN_ENABLED               BIT(1)
+        u32 rsvd[116];                                          /* 0x32C */
+};
+struct nvm_iscsi_target {
+        u32 ctrl_flags;                                         /* 0x0 */
+#define NVM_ISCSI_CFG_TARGET_ENABLED            BIT(0)
+#define NVM_ISCSI_CFG_BOOT_TIME_LOGIN_STATUS    BIT(1)
+        u32 generic_cont0;                                      /* 0x4 */
+#define NVM_ISCSI_CFG_TARGET_TCP_PORT_MASK      0x0000FFFF
+#define NVM_ISCSI_CFG_TARGET_TCP_PORT_OFFSET    0
+        u32 ip_ver;
+#define NVM_ISCSI_CFG_IPv4       4
+#define NVM_ISCSI_CFG_IPv6       6
+        u32 rsvd_1[7];                                          /* 0x24 */
+        union nvm_iscsi_ipv4_addr ipv4_addr;                    /* 0x28 */
+        union nvm_iscsi_ipv6_addr ipv6_addr;                    /* 0x2C */
+        union nvm_iscsi_lun lun;                                /* 0x3C */
+        union nvm_iscsi_name           target_name;             /* 0x44 */
+        union nvm_iscsi_chap_name      chap_name;               /* 0x144 */
+        union nvm_iscsi_chap_password  chap_password;           /* 0x244 */
+        u32 rsvd_2[107];                                        /* 0x2C4 */
+};
+struct nvm_iscsi_block {
+        u32 id;                                                 /* 0x0 */
+#define NVM_ISCSI_CFG_BLK_MAPPED_PF_ID_MASK         0x0000000F
+#define NVM_ISCSI_CFG_BLK_MAPPED_PF_ID_OFFSET       0
+#define NVM_ISCSI_CFG_BLK_CTRL_FLAG_MASK            0x00000FF0
+#define NVM_ISCSI_CFG_BLK_CTRL_FLAG_OFFSET          4
+#define NVM_ISCSI_CFG_BLK_CTRL_FLAG_IS_NOT_EMPTY    BIT(0)
+#define NVM_ISCSI_CFG_BLK_CTRL_FLAG_PF_MAPPED       BIT(1)
+        u32 rsvd_1[5];                                          /* 0x4 */
+        struct nvm_iscsi_generic     generic;                   /* 0x18 */
+        struct nvm_iscsi_initiator   initiator;                 /* 0x218 */
+        struct nvm_iscsi_target      target[NUM_OF_ISCSI_TARGET_PER_PF];
+                                                                /* 0x718 */
+        u32 rsvd_2[58];                                         /* 0x1718 */
+        /* total size - 0x1800 - 6K block */
+};
+struct nvm_iscsi_cfg {
+        u32 id;                                                 /* 0x0 */
+#define NVM_ISCSI_CFG_BLK_VERSION_MINOR_MASK     0x000000FF
+#define NVM_ISCSI_CFG_BLK_VERSION_MAJOR_MASK     0x0000FF00
+#define NVM_ISCSI_CFG_BLK_SIGNATURE_MASK         0xFFFF0000
+#define NVM_ISCSI_CFG_BLK_SIGNATURE              0x49430000 /* IC - Iscsi
+                                                             * Config
+                                                             */
+#define NVM_ISCSI_CFG_BLK_VERSION_MAJOR          0
+#define NVM_ISCSI_CFG_BLK_VERSION_MINOR          10
+#define NVM_ISCSI_CFG_BLK_VERSION ((NVM_ISCSI_CFG_BLK_VERSION_MAJOR << 8) | \
+                                   NVM_ISCSI_CFG_BLK_VERSION_MINOR)
+        struct nvm_iscsi_block  block[NUM_OF_ISCSI_PF_SUPPORTED]; /* 0x4 */
+};
+#endif
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index c2dc836dc484..e101cd3043b9 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -3727,7 +3727,7 @@ static struct qla_tgt_cmd *qlt_ctio_to_cmd(struct scsi_qla_host *vha,
        h &= QLA_CMD_HANDLE_MASK;
        if (h != QLA_TGT_NULL_HANDLE) {
-                if (unlikely(h > req->num_outstanding_cmds)) {
+                if (unlikely(h >= req->num_outstanding_cmds)) {
                        ql_dbg(ql_dbg_tgt, vha, 0xe052,
                            "qla_target(%d): Wrong handle %x received\n",
                            vha->vp_idx, handle);
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 21225d62b0c1..1e82d4128a84 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -758,8 +758,11 @@ static bool sg_is_valid_dxfer(sg_io_hdr_t *hp)
                if (hp->dxferp || hp->dxfer_len > 0)
                        return false;
                return true;
-        case SG_DXFER_TO_DEV:
        case SG_DXFER_FROM_DEV:
+                if (hp->dxfer_len < 0)
+                        return false;
+                return true;
+        case SG_DXFER_TO_DEV:
        case SG_DXFER_TO_FROM_DEV:
                if (!hp->dxferp || hp->dxfer_len == 0)
                        return false;
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 8b93197daefe..9be211d68b15 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -837,6 +837,7 @@ static struct scsi_host_template virtscsi_host_template_multi = {
        .eh_abort_handler = virtscsi_abort,
        .eh_device_reset_handler = virtscsi_device_reset,
        .eh_timed_out = virtscsi_eh_timed_out,
+        .slave_alloc = virtscsi_device_alloc,
        .can_queue = 1024,
        .dma_boundary = UINT_MAX,