224 files changed, 4250 insertions, 1634 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 6f0459cb745b..d236aef7e59f 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -50,6 +50,8 @@ source "drivers/i2c/Kconfig"
 source "drivers/spi/Kconfig"
+source "drivers/hsi/Kconfig"
 source "drivers/pps/Kconfig"
 source "drivers/ptp/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 262b19d6b627..95952c82bf16 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -53,6 +53,7 @@ obj-$(CONFIG_ATA)		+= ata/
 obj-$(CONFIG_TARGET_CORE)       += target/
 obj-$(CONFIG_MTD)               += mtd/
 obj-$(CONFIG_SPI)               += spi/
+obj-y                           += hsi/
 obj-y                           += net/
 obj-$(CONFIG_ATM)               += atm/
 obj-$(CONFIG_FUSION)            += message/
diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
index b258cab9061c..7586544fddb4 100644
--- a/drivers/acpi/ec_sys.c
+++ b/drivers/acpi/ec_sys.c
@@ -27,12 +27,6 @@ MODULE_PARM_DESC(write_support, "Dangerous, reboot and removal of battery may "
 static struct dentry *acpi_ec_debugfs_dir;
-static int acpi_ec_open_io(struct inode *i, struct file *f)
-{
-        f->private_data = i->i_private;
-        return 0;
-}
 static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
                               size_t count, loff_t *off)
 {
@@ -95,7 +89,7 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
 static const struct file_operations acpi_ec_io_ops = {
        .owner = THIS_MODULE,
-        .open  = acpi_ec_open_io,
+        .open  = simple_open,
        .read  = acpi_ec_read_io,
        .write = acpi_ec_write_io,
        .llseek = default_llseek,
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 6c9387d646ec..5401814c874d 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -16,10 +16,11 @@
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/mutex.h>
-#include <linux/kthread.h>
+#include <linux/workqueue.h>
 #include <linux/highmem.h>
 #include <linux/firmware.h>
 #include <linux/slab.h>
+#include <linux/sched.h>
 #define to_dev(obj) container_of(obj, struct device, kobj)
@@ -81,6 +82,11 @@ enum {
 static int loading_timeout = 60;        /* In seconds */
+static inline long firmware_loading_timeout(void)
+{
+        return loading_timeout > 0 ? loading_timeout * HZ : MAX_SCHEDULE_TIMEOUT;
+}
 /* fw_lock could be moved to 'struct firmware_priv' but since it is just
 * guarding for corner cases a global lock should be OK */
 static DEFINE_MUTEX(fw_lock);
@@ -440,13 +446,11 @@ fw_create_instance(struct firmware *firmware, const char *fw_name,
 {
        struct firmware_priv *fw_priv;
        struct device *f_dev;
-        int error;
        fw_priv = kzalloc(sizeof(*fw_priv) + strlen(fw_name) + 1 , GFP_KERNEL);
        if (!fw_priv) {
                dev_err(device, "%s: kmalloc failed\n", __func__);
-                error = -ENOMEM;
+                return ERR_PTR(-ENOMEM);
-                goto err_out;
        }
        fw_priv->fw = firmware;
@@ -463,98 +467,80 @@ fw_create_instance(struct firmware *firmware, const char *fw_name,
        f_dev->parent = device;
        f_dev->class = &firmware_class;
-        dev_set_uevent_suppress(f_dev, true);
-        /* Need to pin this module until class device is destroyed */
-        __module_get(THIS_MODULE);
-        error = device_add(f_dev);
-        if (error) {
-                dev_err(device, "%s: device_register failed\n", __func__);
-                goto err_put_dev;
-        }
-        error = device_create_bin_file(f_dev, &firmware_attr_data);
-        if (error) {
-                dev_err(device, "%s: sysfs_create_bin_file failed\n", __func__);
-                goto err_del_dev;
-        }
-        error = device_create_file(f_dev, &dev_attr_loading);
-        if (error) {
-                dev_err(device, "%s: device_create_file failed\n", __func__);
-                goto err_del_bin_attr;
-        }
-        if (uevent)
-                dev_set_uevent_suppress(f_dev, false);
        return fw_priv;
-err_del_bin_attr:
-        device_remove_bin_file(f_dev, &firmware_attr_data);
-err_del_dev:
-        device_del(f_dev);
-err_put_dev:
-        put_device(f_dev);
-err_out:
-        return ERR_PTR(error);
 }
-static void fw_destroy_instance(struct firmware_priv *fw_priv)
+static struct firmware_priv *
-{
+_request_firmware_prepare(const struct firmware **firmware_p, const char *name,
-        struct device *f_dev = &fw_priv->dev;
+                          struct device *device, bool uevent, bool nowait)
-        device_remove_file(f_dev, &dev_attr_loading);
-        device_remove_bin_file(f_dev, &firmware_attr_data);
-        device_unregister(f_dev);
-}
-static int _request_firmware(const struct firmware **firmware_p,
-                             const char *name, struct device *device,
-                             bool uevent, bool nowait)
 {
-        struct firmware_priv *fw_priv;
        struct firmware *firmware;
-        int retval = 0;
+        struct firmware_priv *fw_priv;
        if (!firmware_p)
-                return -EINVAL;
+                return ERR_PTR(-EINVAL);
        *firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL);
        if (!firmware) {
                dev_err(device, "%s: kmalloc(struct firmware) failed\n",
                        __func__);
-                return -ENOMEM;
+                return ERR_PTR(-ENOMEM);
        }
        if (fw_get_builtin_firmware(firmware, name)) {
                dev_dbg(device, "firmware: using built-in firmware %s\n", name);
-                return 0;
+                return NULL;
+        }
+        fw_priv = fw_create_instance(firmware, name, device, uevent, nowait);
+        if (IS_ERR(fw_priv)) {
+                release_firmware(firmware);
+                *firmware_p = NULL;
        }
+        return fw_priv;
+}
-        read_lock_usermodehelper();
+static void _request_firmware_cleanup(const struct firmware **firmware_p)
+{
+        release_firmware(*firmware_p);
+        *firmware_p = NULL;
+}
-        if (WARN_ON(usermodehelper_is_disabled())) {
+static int _request_firmware_load(struct firmware_priv *fw_priv, bool uevent,
-                dev_err(device, "firmware: %s will not be loaded\n", name);
+                                  long timeout)
-                retval = -EBUSY;
+{
-                goto out;
+        int retval = 0;
+        struct device *f_dev = &fw_priv->dev;
+        dev_set_uevent_suppress(f_dev, true);
+        /* Need to pin this module until class device is destroyed */
+        __module_get(THIS_MODULE);
+        retval = device_add(f_dev);
+        if (retval) {
+                dev_err(f_dev, "%s: device_register failed\n", __func__);
+                goto err_put_dev;
        }
-        if (uevent)
+        retval = device_create_bin_file(f_dev, &firmware_attr_data);
-                dev_dbg(device, "firmware: requesting %s\n", name);
+        if (retval) {
+                dev_err(f_dev, "%s: sysfs_create_bin_file failed\n", __func__);
+                goto err_del_dev;
+        }
-        fw_priv = fw_create_instance(firmware, name, device, uevent, nowait);
+        retval = device_create_file(f_dev, &dev_attr_loading);
-        if (IS_ERR(fw_priv)) {
+        if (retval) {
-                retval = PTR_ERR(fw_priv);
+                dev_err(f_dev, "%s: device_create_file failed\n", __func__);
-                goto out;
+                goto err_del_bin_attr;
        }
        if (uevent) {
-                if (loading_timeout > 0)
+                dev_set_uevent_suppress(f_dev, false);
+                dev_dbg(f_dev, "firmware: requesting %s\n", fw_priv->fw_id);
+                if (timeout != MAX_SCHEDULE_TIMEOUT)
                        mod_timer(&fw_priv->timeout,
-                                  round_jiffies_up(jiffies +
+                                  round_jiffies_up(jiffies + timeout));
-                                                   loading_timeout * HZ));
                kobject_uevent(&fw_priv->dev.kobj, KOBJ_ADD);
        }
@@ -570,16 +556,13 @@ static int _request_firmware(const struct firmware **firmware_p,
        fw_priv->fw = NULL;
        mutex_unlock(&fw_lock);
-        fw_destroy_instance(fw_priv);
+        device_remove_file(f_dev, &dev_attr_loading);
+err_del_bin_attr:
-out:
+        device_remove_bin_file(f_dev, &firmware_attr_data);
-        read_unlock_usermodehelper();
+err_del_dev:
+        device_del(f_dev);
-        if (retval) {
+err_put_dev:
-                release_firmware(firmware);
+        put_device(f_dev);
-                *firmware_p = NULL;
-        }
        return retval;
 }
@@ -602,7 +585,26 @@ int
 request_firmware(const struct firmware **firmware_p, const char *name,
                 struct device *device)
 {
-        return _request_firmware(firmware_p, name, device, true, false);
+        struct firmware_priv *fw_priv;
+        int ret;
+        fw_priv = _request_firmware_prepare(firmware_p, name, device, true,
+                                            false);
+        if (IS_ERR_OR_NULL(fw_priv))
+                return PTR_RET(fw_priv);
+        ret = usermodehelper_read_trylock();
+        if (WARN_ON(ret)) {
+                dev_err(device, "firmware: %s will not be loaded\n", name);
+        } else {
+                ret = _request_firmware_load(fw_priv, true,
+                                        firmware_loading_timeout());
+                usermodehelper_read_unlock();
+        }
+        if (ret)
+                _request_firmware_cleanup(firmware_p);
+        return ret;
 }
 /**
@@ -629,25 +631,39 @@ struct firmware_work {
        bool uevent;
 };
-static int request_firmware_work_func(void *arg)
+static void request_firmware_work_func(struct work_struct *work)
 {
-        struct firmware_work *fw_work = arg;
+        struct firmware_work *fw_work;
        const struct firmware *fw;
+        struct firmware_priv *fw_priv;
+        long timeout;
        int ret;
-        if (!arg) {
+        fw_work = container_of(work, struct firmware_work, work);
-                WARN_ON(1);
+        fw_priv = _request_firmware_prepare(&fw, fw_work->name, fw_work->device,
-                return 0;
+                        fw_work->uevent, true);
+        if (IS_ERR_OR_NULL(fw_priv)) {
+                ret = PTR_RET(fw_priv);
+                goto out;
+        }
+        timeout = usermodehelper_read_lock_wait(firmware_loading_timeout());
+        if (timeout) {
+                ret = _request_firmware_load(fw_priv, fw_work->uevent, timeout);
+                usermodehelper_read_unlock();
+        } else {
+                dev_dbg(fw_work->device, "firmware: %s loading timed out\n",
+                        fw_work->name);
+                ret = -EAGAIN;
        }
+        if (ret)
+                _request_firmware_cleanup(&fw);
-        ret = _request_firmware(&fw, fw_work->name, fw_work->device,
+ out:
-                                fw_work->uevent, true);
        fw_work->cont(fw, fw_work->context);
        module_put(fw_work->module);
        kfree(fw_work);
-        return ret;
 }
 /**
@@ -673,7 +689,6 @@ request_firmware_nowait(
        const char *name, struct device *device, gfp_t gfp, void *context,
        void (*cont)(const struct firmware *fw, void *context))
 {
-        struct task_struct *task;
        struct firmware_work *fw_work;
        fw_work = kzalloc(sizeof (struct firmware_work), gfp);
@@ -692,15 +707,8 @@ request_firmware_nowait(
                return -EFAULT;
        }
-        task = kthread_run(request_firmware_work_func, fw_work,
+        INIT_WORK(&fw_work->work, request_firmware_work_func);
-                            "firmware/%s", name);
+        schedule_work(&fw_work->work);
-        if (IS_ERR(task)) {
-                fw_work->cont(NULL, fw_work->context);
-                module_put(fw_work->module);
-                kfree(fw_work);
-                return PTR_ERR(task);
-        }
        return 0;
 }
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 541f821d4ea6..bd0f3949bcf9 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -532,6 +532,8 @@ static int rpm_suspend(struct device *dev, int rpmflags)
        dev->power.suspend_time = ktime_set(0, 0);
        dev->power.max_time_suspended_ns = -1;
        dev->power.deferred_resume = false;
+        wake_up_all(&dev->power.wait_queue);
        if (retval == -EAGAIN || retval == -EBUSY) {
                dev->power.runtime_error = 0;
@@ -547,7 +549,6 @@ static int rpm_suspend(struct device *dev, int rpmflags)
        } else {
                pm_runtime_cancel_pending(dev);
        }
-        wake_up_all(&dev->power.wait_queue);
        goto out;
 }
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 5157fa04c2f0..fb14a6343d4f 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -396,7 +396,7 @@ static int regcache_rbtree_sync(struct regmap *map, unsigned int min,
                                                           map->cache_word_size);
                        /* Is this the hardware default?  If so skip. */
-                        ret = regcache_lookup_reg(map, i);
+                        ret = regcache_lookup_reg(map, regtmp);
                        if (ret >= 0 && val == map->reg_defaults[ret].def)
                                continue;
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index 58517a5dac13..251eb70f83e7 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -27,12 +27,6 @@ static size_t regmap_calc_reg_len(int max_val, char *buf, size_t buf_size)
        return strlen(buf);
 }
-static int regmap_open_file(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t regmap_name_read_file(struct file *file,
                                     char __user *user_buf, size_t count,
                                     loff_t *ppos)
@@ -57,7 +51,7 @@ static ssize_t regmap_name_read_file(struct file *file,
 }
 static const struct file_operations regmap_name_fops = {
-        .open = regmap_open_file,
+        .open = simple_open,
        .read = regmap_name_read_file,
        .llseek = default_llseek,
 };
@@ -174,7 +168,7 @@ static ssize_t regmap_map_write_file(struct file *file,
 #endif
 static const struct file_operations regmap_map_fops = {
-        .open = regmap_open_file,
+        .open = simple_open,
        .read = regmap_map_read_file,
        .write = regmap_map_write_file,
        .llseek = default_llseek,
@@ -243,7 +237,7 @@ out:
 }
 static const struct file_operations regmap_access_fops = {
-        .open = regmap_open_file,
+        .open = simple_open,
        .read = regmap_access_read_file,
        .llseek = default_llseek,
 };
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 76a08236430a..b0b00d70c166 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -1030,37 +1030,6 @@ static int fd_wait_for_completion(unsigned long delay, timeout_fn function)
        return 0;
 }
-static DEFINE_SPINLOCK(floppy_hlt_lock);
-static int hlt_disabled;
-static void floppy_disable_hlt(void)
-{
-        unsigned long flags;
-        WARN_ONCE(1, "floppy_disable_hlt() scheduled for removal in 2012");
-        spin_lock_irqsave(&floppy_hlt_lock, flags);
-        if (!hlt_disabled) {
-                hlt_disabled = 1;
-#ifdef HAVE_DISABLE_HLT
-                disable_hlt();
-#endif
-        }
-        spin_unlock_irqrestore(&floppy_hlt_lock, flags);
-}
-static void floppy_enable_hlt(void)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&floppy_hlt_lock, flags);
-        if (hlt_disabled) {
-                hlt_disabled = 0;
-#ifdef HAVE_DISABLE_HLT
-                enable_hlt();
-#endif
-        }
-        spin_unlock_irqrestore(&floppy_hlt_lock, flags);
-}
 static void setup_DMA(void)
 {
        unsigned long f;
@@ -1105,7 +1074,6 @@ static void setup_DMA(void)
        fd_enable_dma();
        release_dma_lock(f);
 #endif
-        floppy_disable_hlt();
 }
 static void show_floppy(void);
@@ -1707,7 +1675,6 @@ irqreturn_t floppy_interrupt(int irq, void *dev_id)
        fd_disable_dma();
        release_dma_lock(f);
-        floppy_enable_hlt();
        do_floppy = NULL;
        if (fdc >= N_FDC || FDCS->address == -1) {
                /* we don't even know which FDC is the culprit */
@@ -1856,8 +1823,6 @@ static void floppy_shutdown(unsigned long data)
                show_floppy();
        cancel_activity();
-        floppy_enable_hlt();
        flags = claim_dma_lock();
        fd_disable_dma();
        release_dma_lock(flags);
@@ -4508,7 +4473,6 @@ static void floppy_release_irq_and_dma(void)
 #if N_FDC > 1
        set_dor(1, ~8, 0);
 #endif
-        floppy_enable_hlt();
        if (floppy_track_buffer && max_buffer_sectors) {
                tmpsize = max_buffer_sectors * 1024;
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index d5e1ab956740..98cbeba8cd53 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1475,7 +1475,7 @@ static int __init xlblk_init(void)
        if (!xen_domain())
                return -ENODEV;
-        if (!xen_platform_pci_unplug)
+        if (xen_hvm_domain() && !xen_platform_pci_unplug)
                return -ENODEV;
        if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c
index 6c20bbb54b71..428dbb7574bd 100644
--- a/drivers/bluetooth/btmrvl_debugfs.c
+++ b/drivers/bluetooth/btmrvl_debugfs.c
@@ -45,12 +45,6 @@ struct btmrvl_debugfs_data {
        struct dentry *txdnldready;
 };
-static int btmrvl_open_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t btmrvl_hscfgcmd_write(struct file *file,
                        const char __user *ubuf, size_t count, loff_t *ppos)
 {
@@ -93,7 +87,7 @@ static ssize_t btmrvl_hscfgcmd_read(struct file *file, char __user *userbuf,
 static const struct file_operations btmrvl_hscfgcmd_fops = {
        .read   = btmrvl_hscfgcmd_read,
        .write  = btmrvl_hscfgcmd_write,
-        .open   = btmrvl_open_generic,
+        .open   = simple_open,
        .llseek = default_llseek,
 };
@@ -134,7 +128,7 @@ static ssize_t btmrvl_psmode_read(struct file *file, char __user *userbuf,
 static const struct file_operations btmrvl_psmode_fops = {
        .read   = btmrvl_psmode_read,
        .write  = btmrvl_psmode_write,
-        .open   = btmrvl_open_generic,
+        .open   = simple_open,
        .llseek = default_llseek,
 };
@@ -180,7 +174,7 @@ static ssize_t btmrvl_pscmd_read(struct file *file, char __user *userbuf,
 static const struct file_operations btmrvl_pscmd_fops = {
        .read = btmrvl_pscmd_read,
        .write = btmrvl_pscmd_write,
-        .open = btmrvl_open_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -221,7 +215,7 @@ static ssize_t btmrvl_gpiogap_read(struct file *file, char __user *userbuf,
 static const struct file_operations btmrvl_gpiogap_fops = {
        .read   = btmrvl_gpiogap_read,
        .write  = btmrvl_gpiogap_write,
-        .open   = btmrvl_open_generic,
+        .open   = simple_open,
        .llseek = default_llseek,
 };
@@ -265,7 +259,7 @@ static ssize_t btmrvl_hscmd_read(struct file *file, char __user *userbuf,
 static const struct file_operations btmrvl_hscmd_fops = {
        .read   = btmrvl_hscmd_read,
        .write  = btmrvl_hscmd_write,
-        .open   = btmrvl_open_generic,
+        .open   = simple_open,
        .llseek = default_llseek,
 };
@@ -305,7 +299,7 @@ static ssize_t btmrvl_hsmode_read(struct file *file, char __user * userbuf,
 static const struct file_operations btmrvl_hsmode_fops = {
        .read   = btmrvl_hsmode_read,
        .write  = btmrvl_hsmode_write,
-        .open   = btmrvl_open_generic,
+        .open   = simple_open,
        .llseek = default_llseek,
 };
@@ -323,7 +317,7 @@ static ssize_t btmrvl_curpsmode_read(struct file *file, char __user *userbuf,
 static const struct file_operations btmrvl_curpsmode_fops = {
        .read   = btmrvl_curpsmode_read,
-        .open   = btmrvl_open_generic,
+        .open   = simple_open,
        .llseek = default_llseek,
 };
@@ -341,7 +335,7 @@ static ssize_t btmrvl_psstate_read(struct file *file, char __user * userbuf,
 static const struct file_operations btmrvl_psstate_fops = {
        .read   = btmrvl_psstate_read,
-        .open   = btmrvl_open_generic,
+        .open   = simple_open,
        .llseek = default_llseek,
 };
@@ -359,7 +353,7 @@ static ssize_t btmrvl_hsstate_read(struct file *file, char __user *userbuf,
 static const struct file_operations btmrvl_hsstate_fops = {
        .read   = btmrvl_hsstate_read,
-        .open   = btmrvl_open_generic,
+        .open   = simple_open,
        .llseek = default_llseek,
 };
@@ -378,7 +372,7 @@ static ssize_t btmrvl_txdnldready_read(struct file *file, char __user *userbuf,
 static const struct file_operations btmrvl_txdnldready_fops = {
        .read   = btmrvl_txdnldready_read,
-        .open   = btmrvl_open_generic,
+        .open   = simple_open,
        .llseek = default_llseek,
 };
diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index 5da67f165afa..7ea18a5fe71c 100644
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -234,6 +234,7 @@
 #define PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_GT2_IG          0x0166
 #define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB              0x0158  /* Server */
 #define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT1_IG          0x015A
+#define PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT2_IG          0x016A
 int intel_gmch_probe(struct pci_dev *pdev,
                               struct agp_bridge_data *bridge);
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 5cf47ac2d401..7f025fb620de 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -1190,7 +1190,6 @@ static inline int needs_idle_maps(void)
 {
 #ifdef CONFIG_INTEL_IOMMU
        const unsigned short gpu_devid = intel_private.pcidev->device;
-        extern int intel_iommu_gfx_mapped;
        /* Query intel_iommu to see if we need the workaround. Presumably that
         * was loaded first.
@@ -1459,6 +1458,8 @@ static const struct intel_gtt_driver_description {
            "Ivybridge", &sandybridge_gtt_driver },
        { PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT1_IG,
            "Ivybridge", &sandybridge_gtt_driver },
+        { PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT2_IG,
+            "Ivybridge", &sandybridge_gtt_driver },
        { 0, NULL, NULL }
 };
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index 57501ca9204b..46118f845948 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -301,7 +301,7 @@ apm_ioctl(struct file *filp, u_int cmd, u_long arg)
                         * anything critical, chill a bit on each iteration.
                         */
                        while (wait_event_freezable(apm_suspend_waitqueue,
-                                        as->suspend_state == SUSPEND_DONE))
+                                        as->suspend_state != SUSPEND_ACKED))
                                msleep(10);
                        break;
                case SUSPEND_ACKTO:
diff --git a/drivers/char/tile-srom.c b/drivers/char/tile-srom.c
index 4dc019408fac..3b22a606f79d 100644
--- a/drivers/char/tile-srom.c
+++ b/drivers/char/tile-srom.c
@@ -194,17 +194,17 @@ static ssize_t srom_read(struct file *filp, char __user *buf,
                hv_retval = _srom_read(srom->hv_devhdl, kernbuf,
                                       *f_pos, bytes_this_pass);
-                if (hv_retval > 0) {
+                if (hv_retval <= 0) {
-                        if (copy_to_user(buf, kernbuf, hv_retval) != 0) {
-                                retval = -EFAULT;
-                                break;
-                        }
-                } else if (hv_retval <= 0) {
                        if (retval == 0)
                                retval = hv_retval;
                        break;
                }
+                if (copy_to_user(buf, kernbuf, hv_retval) != 0) {
+                        retval = -EFAULT;
+                        break;
+                }
                retval += hv_retval;
                *f_pos += hv_retval;
                buf += hv_retval;
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index b58b56187065..ddf86b6500b7 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1038,12 +1038,6 @@ static struct attribute_group port_attribute_group = {
        .attrs = port_sysfs_entries,
 };
-static int debugfs_open(struct inode *inode, struct file *filp)
-{
-        filp->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t debugfs_read(struct file *filp, char __user *ubuf,
                            size_t count, loff_t *offp)
 {
@@ -1087,7 +1081,7 @@ static ssize_t debugfs_read(struct file *filp, char __user *ubuf,
 static const struct file_operations port_debugfs_ops = {
        .owner = THIS_MODULE,
-        .open  = debugfs_open,
+        .open  = simple_open,
        .read  = debugfs_read,
 };
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 32d790dd8180..ffbb44685915 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -51,9 +51,6 @@ config ARM_S5PV210_CPUFREQ
 config ARM_EXYNOS_CPUFREQ
        bool "SAMSUNG EXYNOS SoCs"
        depends on ARCH_EXYNOS
-        select ARM_EXYNOS4210_CPUFREQ if CPU_EXYNOS4210
-        select ARM_EXYNOS4X12_CPUFREQ if (SOC_EXYNOS4212 || SOC_EXYNOS4412)
-        select ARM_EXYNOS5250_CPUFREQ if SOC_EXYNOS5250
        default y
        help
          This adds the CPUFreq driver common part for Samsung
@@ -62,20 +59,19 @@ config ARM_EXYNOS_CPUFREQ
          If in doubt, say N.
 config ARM_EXYNOS4210_CPUFREQ
-        bool "Samsung EXYNOS4210"
+        def_bool CPU_EXYNOS4210
-        depends on ARCH_EXYNOS
        help
          This adds the CPUFreq driver for Samsung EXYNOS4210
          SoC (S5PV310 or S5PC210).
 config ARM_EXYNOS4X12_CPUFREQ
-        bool "Samsung EXYNOS4X12"
+        def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412)
        help
          This adds the CPUFreq driver for Samsung EXYNOS4X12
          SoC (EXYNOS4212 or EXYNOS4412).
 config ARM_EXYNOS5250_CPUFREQ
-        bool "Samsung EXYNOS5250"
+        def_bool SOC_EXYNOS5250
        help
          This adds the CPUFreq driver for Samsung EXYNOS5250
          SoC.
diff --git a/drivers/cpufreq/db8500-cpufreq.c b/drivers/cpufreq/db8500-cpufreq.c
index a22ffa5bff9f..0bf1b8910eeb 100644
--- a/drivers/cpufreq/db8500-cpufreq.c
+++ b/drivers/cpufreq/db8500-cpufreq.c
@@ -142,7 +142,7 @@ static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy)
        policy->cpuinfo.transition_latency = 20 * 1000; /* in ns */
        /* policy sharing between dual CPUs */
-        cpumask_copy(policy->cpus, &cpu_present_map);
+        cpumask_copy(policy->cpus, cpu_present_mask);
        policy->shared_type = CPUFREQ_SHARED_TYPE_ALL;
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index dc89455f5550..750925f9638b 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -104,13 +104,6 @@ static void coh901318_list_print(struct coh901318_chan *cohc,
 static struct coh901318_base *debugfs_dma_base;
 static struct dentry *dma_dentry;
-static int coh901318_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static int coh901318_debugfs_read(struct file *file, char __user *buf,
                                  size_t count, loff_t *f_pos)
 {
@@ -158,7 +151,7 @@ static int coh901318_debugfs_read(struct file *file, char __user *buf,
 static const struct file_operations coh901318_debugfs_status_operations = {
        .owner          = THIS_MODULE,
-        .open           = coh901318_debugfs_open,
+        .open           = simple_open,
        .read           = coh901318_debugfs_read,
        .llseek         = default_llseek,
 };
diff --git a/drivers/dma/sa11x0-dma.c b/drivers/dma/sa11x0-dma.c
index 16a6b48883cf..ec78ccef9132 100644
--- a/drivers/dma/sa11x0-dma.c
+++ b/drivers/dma/sa11x0-dma.c
@@ -585,7 +585,7 @@ static dma_cookie_t sa11x0_dma_tx_submit(struct dma_async_tx_descriptor *tx)
 static struct dma_async_tx_descriptor *sa11x0_dma_prep_slave_sg(
        struct dma_chan *chan, struct scatterlist *sg, unsigned int sglen,
-        enum dma_transfer_direction dir, unsigned long flags)
+        enum dma_transfer_direction dir, unsigned long flags, void *context)
 {
        struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan);
        struct sa11x0_dma_desc *txd;
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index 36e1486eb9aa..d0c372e30de4 100644
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -754,9 +754,7 @@ static int __init mce_amd_init(void)
        if (c->x86_vendor != X86_VENDOR_AMD)
                return 0;
-        if ((c->x86 < 0xf || c->x86 > 0x12) &&
+        if (c->x86 < 0xf || c->x86 > 0x15)
-            (c->x86 != 0x14 || c->x86_model > 0xf) &&
-            (c->x86 != 0x15 || c->x86_model > 0xf))
                return 0;
        fam_ops = kzalloc(sizeof(struct amd_decoder_ops), GFP_KERNEL);
@@ -797,7 +795,7 @@ static int __init mce_amd_init(void)
                break;
        default:
-                printk(KERN_WARNING "Huh? What family is that: %d?!\n", c->x86);
+                printk(KERN_WARNING "Huh? What family is it: 0x%x?!\n", c->x86);
                kfree(fam_ops);
                return -EINVAL;
        }
diff --git a/drivers/edac/tile_edac.c b/drivers/edac/tile_edac.c
index 1d5cf06f6c6b..e99d00976189 100644
--- a/drivers/edac/tile_edac.c
+++ b/drivers/edac/tile_edac.c
@@ -145,7 +145,11 @@ static int __devinit tile_edac_mc_probe(struct platform_device *pdev)
        mci->edac_ctl_cap = EDAC_FLAG_SECDED;
        mci->mod_name = DRV_NAME;
+#ifdef __tilegx__
+        mci->ctl_name = "TILEGx_Memory_Controller";
+#else
        mci->ctl_name = "TILEPro_Memory_Controller";
+#endif
        mci->dev_name = dev_name(&pdev->dev);
        mci->edac_check = tile_edac_check;
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 32de6707e3c4..12f349b3830d 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -22,7 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
-#include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/irqdomain.h>
@@ -37,7 +37,8 @@
 #define GPIO_PORT(x)            (((x) >> 3) & 0x3)
 #define GPIO_BIT(x)             ((x) & 0x7)
-#define GPIO_REG(x)             (GPIO_BANK(x) * 0x80 + GPIO_PORT(x) * 4)
+#define GPIO_REG(x)             (GPIO_BANK(x) * tegra_gpio_bank_stride + \
+                                        GPIO_PORT(x) * 4)
 #define GPIO_CNF(x)             (GPIO_REG(x) + 0x00)
 #define GPIO_OE(x)              (GPIO_REG(x) + 0x10)
@@ -48,12 +49,12 @@
 #define GPIO_INT_LVL(x)         (GPIO_REG(x) + 0x60)
 #define GPIO_INT_CLR(x)         (GPIO_REG(x) + 0x70)
-#define GPIO_MSK_CNF(x)         (GPIO_REG(x) + 0x800)
+#define GPIO_MSK_CNF(x)         (GPIO_REG(x) + tegra_gpio_upper_offset + 0x00)
-#define GPIO_MSK_OE(x)          (GPIO_REG(x) + 0x810)
+#define GPIO_MSK_OE(x)          (GPIO_REG(x) + tegra_gpio_upper_offset + 0x10)
-#define GPIO_MSK_OUT(x)         (GPIO_REG(x) + 0X820)
+#define GPIO_MSK_OUT(x)         (GPIO_REG(x) + tegra_gpio_upper_offset + 0X20)
-#define GPIO_MSK_INT_STA(x)     (GPIO_REG(x) + 0x840)
+#define GPIO_MSK_INT_STA(x)     (GPIO_REG(x) + tegra_gpio_upper_offset + 0x40)
-#define GPIO_MSK_INT_ENB(x)     (GPIO_REG(x) + 0x850)
+#define GPIO_MSK_INT_ENB(x)     (GPIO_REG(x) + tegra_gpio_upper_offset + 0x50)
-#define GPIO_MSK_INT_LVL(x)     (GPIO_REG(x) + 0x860)
+#define GPIO_MSK_INT_LVL(x)     (GPIO_REG(x) + tegra_gpio_upper_offset + 0x60)
 #define GPIO_INT_LVL_MASK               0x010101
 #define GPIO_INT_LVL_EDGE_RISING        0x000101
@@ -78,6 +79,8 @@ struct tegra_gpio_bank {
 static struct irq_domain *irq_domain;
 static void __iomem *regs;
 static u32 tegra_gpio_bank_count;
+static u32 tegra_gpio_bank_stride;
+static u32 tegra_gpio_upper_offset;
 static struct tegra_gpio_bank *tegra_gpio_banks;
 static inline void tegra_gpio_writel(u32 val, u32 reg)
@@ -333,6 +336,26 @@ static struct irq_chip tegra_gpio_irq_chip = {
 #endif
 };
+struct tegra_gpio_soc_config {
+        u32 bank_stride;
+        u32 upper_offset;
+};
+static struct tegra_gpio_soc_config tegra20_gpio_config = {
+        .bank_stride = 0x80,
+        .upper_offset = 0x800,
+};
+static struct tegra_gpio_soc_config tegra30_gpio_config = {
+        .bank_stride = 0x100,
+        .upper_offset = 0x80,
+};
+static struct of_device_id tegra_gpio_of_match[] __devinitdata = {
+        { .compatible = "nvidia,tegra30-gpio", .data = &tegra30_gpio_config },
+        { .compatible = "nvidia,tegra20-gpio", .data = &tegra20_gpio_config },
+        { },
+};
 /* This lock class tells lockdep that GPIO irqs are in a different
 * category than their parents, so it won't report false recursion.
@@ -341,6 +364,8 @@ static struct lock_class_key gpio_lock_class;
 static int __devinit tegra_gpio_probe(struct platform_device *pdev)
 {
+        const struct of_device_id *match;
+        struct tegra_gpio_soc_config *config;
        int irq_base;
        struct resource *res;
        struct tegra_gpio_bank *bank;
@@ -348,6 +373,15 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
        int i;
        int j;
+        match = of_match_device(tegra_gpio_of_match, &pdev->dev);
+        if (match)
+                config = (struct tegra_gpio_soc_config *)match->data;
+        else
+                config = &tegra20_gpio_config;
+        tegra_gpio_bank_stride = config->bank_stride;
+        tegra_gpio_upper_offset = config->upper_offset;
        for (;;) {
                res = platform_get_resource(pdev, IORESOURCE_IRQ, tegra_gpio_bank_count);
                if (!res)
@@ -402,7 +436,7 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
                return -ENODEV;
        }
-        for (i = 0; i < 7; i++) {
+        for (i = 0; i < tegra_gpio_bank_count; i++) {
                for (j = 0; j < 4; j++) {
                        int gpio = tegra_gpio_compose(i, j, 0);
                        tegra_gpio_writel(0x00, GPIO_INT_ENB(gpio));
@@ -441,11 +475,6 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
        return 0;
 }
-static struct of_device_id tegra_gpio_of_match[] __devinitdata = {
-        { .compatible = "nvidia,tegra20-gpio", },
-        { },
-};
 static struct platform_driver tegra_gpio_driver = {
        .driver         = {
                .name   = "tegra-gpio",
@@ -485,7 +514,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused)
        int i;
        int j;
-        for (i = 0; i < 7; i++) {
+        for (i = 0; i < tegra_gpio_bank_count; i++) {
                for (j = 0; j < 4; j++) {
                        int gpio = tegra_gpio_compose(i, j, 0);
                        seq_printf(s,
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index cc1148837e24..e354bc0b052a 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -9,6 +9,7 @@ menuconfig DRM
        depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU
        select I2C
        select I2C_ALGOBIT
+        select DMA_SHARED_BUFFER
        help
          Kernel-level support for the Direct Rendering Infrastructure (DRI)
          introduced in XFree86 4.0. If you say Y here, you need to select
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index a858532806ae..c20da5bda355 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -12,7 +12,7 @@ drm-y       :=	drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \
                drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \
                drm_crtc.o drm_modes.o drm_edid.o \
                drm_info.o drm_debugfs.o drm_encoder_slave.o \
-                drm_trace_points.o drm_global.o
+                drm_trace_points.o drm_global.o drm_prime.o
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 0b65fbc8a630..6116e3b75393 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -136,6 +136,10 @@ static struct drm_ioctl_desc drm_ioctls[] = {
        DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH|DRM_UNLOCKED),
        DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
+        DRM_IOCTL_DEF(DRM_IOCTL_PRIME_HANDLE_TO_FD, drm_prime_handle_to_fd_ioctl, DRM_AUTH|DRM_UNLOCKED),
+        DRM_IOCTL_DEF(DRM_IOCTL_PRIME_FD_TO_HANDLE, drm_prime_fd_to_handle_ioctl, DRM_AUTH|DRM_UNLOCKED),
        DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
        DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
        DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETCRTC, drm_mode_setcrtc, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 7740dd26f007..a0d6e894d97c 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -559,9 +559,13 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
                return -EINVAL;
        /* Need to resize the fb object !!! */
-        if (var->bits_per_pixel > fb->bits_per_pixel || var->xres > fb->width || var->yres > fb->height) {
+        if (var->bits_per_pixel > fb->bits_per_pixel ||
+            var->xres > fb->width || var->yres > fb->height ||
+            var->xres_virtual > fb->width || var->yres_virtual > fb->height) {
                DRM_DEBUG("fb userspace requested width/height/bpp is greater than current fb "
-                          "object %dx%d-%d > %dx%d-%d\n", var->xres, var->yres, var->bits_per_pixel,
+                          "request %dx%d-%d (virtual %dx%d) > %dx%d-%d\n",
+                          var->xres, var->yres, var->bits_per_pixel,
+                          var->xres_virtual, var->yres_virtual,
                          fb->width, fb->height, fb->bits_per_pixel);
                return -EINVAL;
        }
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 7348a3dab250..cdfbf27b2b3c 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -271,6 +271,9 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
        if (dev->driver->driver_features & DRIVER_GEM)
                drm_gem_open(dev, priv);
+        if (drm_core_check_feature(dev, DRIVER_PRIME))
+                drm_prime_init_file_private(&priv->prime);
        if (dev->driver->open) {
                ret = dev->driver->open(dev, priv);
                if (ret < 0)
@@ -571,6 +574,10 @@ int drm_release(struct inode *inode, struct file *filp)
        if (dev->driver->postclose)
                dev->driver->postclose(dev, file_priv);
+        if (drm_core_check_feature(dev, DRIVER_PRIME))
+                drm_prime_destroy_file_private(&file_priv->prime);
        kfree(file_priv);
        /* ========================================================
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 0ef358e53245..83114b5e3cee 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -35,6 +35,7 @@
 #include <linux/mman.h>
 #include <linux/pagemap.h>
 #include <linux/shmem_fs.h>
+#include <linux/dma-buf.h>
 #include "drmP.h"
 /** @file drm_gem.c
@@ -232,6 +233,10 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)
        idr_remove(&filp->object_idr, handle);
        spin_unlock(&filp->table_lock);
+        if (obj->import_attach)
+                drm_prime_remove_imported_buf_handle(&filp->prime,
+                                obj->import_attach->dmabuf);
        if (dev->driver->gem_close_object)
                dev->driver->gem_close_object(obj, filp);
        drm_gem_object_handle_unreference_unlocked(obj);
@@ -527,6 +532,10 @@ drm_gem_object_release_handle(int id, void *ptr, void *data)
        struct drm_gem_object *obj = ptr;
        struct drm_device *dev = obj->dev;
+        if (obj->import_attach)
+                drm_prime_remove_imported_buf_handle(&file_priv->prime,
+                                obj->import_attach->dmabuf);
        if (dev->driver->gem_close_object)
                dev->driver->gem_close_object(obj, file_priv);
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
new file mode 100644
index 000000000000..1bdf2b54eaf6
--- /dev/null
+++ b/drivers/gpu/drm/drm_prime.c
@@ -0,0 +1,304 @@
+/*
+ * Copyright © 2012 Red Hat
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *      Dave Airlie <airlied@redhat.com>
+ *      Rob Clark <rob.clark@linaro.org>
+ *
+ */
+#include <linux/export.h>
+#include <linux/dma-buf.h>
+#include "drmP.h"
+/*
+ * DMA-BUF/GEM Object references and lifetime overview:
+ *
+ * On the export the dma_buf holds a reference to the exporting GEM
+ * object. It takes this reference in handle_to_fd_ioctl, when it
+ * first calls .prime_export and stores the exporting GEM object in
+ * the dma_buf priv. This reference is released when the dma_buf
+ * object goes away in the driver .release function.
+ *
+ * On the import the importing GEM object holds a reference to the
+ * dma_buf (which in turn holds a ref to the exporting GEM object).
+ * It takes that reference in the fd_to_handle ioctl.
+ * It calls dma_buf_get, creates an attachment to it and stores the
+ * attachment in the GEM object. When this attachment is destroyed
+ * when the imported object is destroyed, we remove the attachment
+ * and drop the reference to the dma_buf.
+ *
+ * Thus the chain of references always flows in one direction
+ * (avoiding loops): importing_gem -> dmabuf -> exporting_gem
+ *
+ * Self-importing: if userspace is using PRIME as a replacement for flink
+ * then it will get a fd->handle request for a GEM object that it created.
+ * Drivers should detect this situation and return back the gem object
+ * from the dma-buf private.
+ */
+struct drm_prime_member {
+        struct list_head entry;
+        struct dma_buf *dma_buf;
+        uint32_t handle;
+};
+int drm_gem_prime_handle_to_fd(struct drm_device *dev,
+                struct drm_file *file_priv, uint32_t handle, uint32_t flags,
+                int *prime_fd)
+{
+        struct drm_gem_object *obj;
+        void *buf;
+        obj = drm_gem_object_lookup(dev, file_priv, handle);
+        if (!obj)
+                return -ENOENT;
+        mutex_lock(&file_priv->prime.lock);
+        /* re-export the original imported object */
+        if (obj->import_attach) {
+                get_dma_buf(obj->import_attach->dmabuf);
+                *prime_fd = dma_buf_fd(obj->import_attach->dmabuf, flags);
+                drm_gem_object_unreference_unlocked(obj);
+                mutex_unlock(&file_priv->prime.lock);
+                return 0;
+        }
+        if (obj->export_dma_buf) {
+                get_dma_buf(obj->export_dma_buf);
+                *prime_fd = dma_buf_fd(obj->export_dma_buf, flags);
+                drm_gem_object_unreference_unlocked(obj);
+        } else {
+                buf = dev->driver->gem_prime_export(dev, obj, flags);
+                if (IS_ERR(buf)) {
+                        /* normally the created dma-buf takes ownership of the ref,
+                         * but if that fails then drop the ref
+                         */
+                        drm_gem_object_unreference_unlocked(obj);
+                        mutex_unlock(&file_priv->prime.lock);
+                        return PTR_ERR(buf);
+                }
+                obj->export_dma_buf = buf;
+                *prime_fd = dma_buf_fd(buf, flags);
+        }
+        mutex_unlock(&file_priv->prime.lock);
+        return 0;
+}
+EXPORT_SYMBOL(drm_gem_prime_handle_to_fd);
+int drm_gem_prime_fd_to_handle(struct drm_device *dev,
+                struct drm_file *file_priv, int prime_fd, uint32_t *handle)
+{
+        struct dma_buf *dma_buf;
+        struct drm_gem_object *obj;
+        int ret;
+        dma_buf = dma_buf_get(prime_fd);
+        if (IS_ERR(dma_buf))
+                return PTR_ERR(dma_buf);
+        mutex_lock(&file_priv->prime.lock);
+        ret = drm_prime_lookup_imported_buf_handle(&file_priv->prime,
+                        dma_buf, handle);
+        if (!ret) {
+                ret = 0;
+                goto out_put;
+        }
+        /* never seen this one, need to import */
+        obj = dev->driver->gem_prime_import(dev, dma_buf);
+        if (IS_ERR(obj)) {
+                ret = PTR_ERR(obj);
+                goto out_put;
+        }
+        ret = drm_gem_handle_create(file_priv, obj, handle);
+        drm_gem_object_unreference_unlocked(obj);
+        if (ret)
+                goto out_put;
+        ret = drm_prime_add_imported_buf_handle(&file_priv->prime,
+                        dma_buf, *handle);
+        if (ret)
+                goto fail;
+        mutex_unlock(&file_priv->prime.lock);
+        return 0;
+fail:
+        /* hmm, if driver attached, we are relying on the free-object path
+         * to detach.. which seems ok..
+         */
+        drm_gem_object_handle_unreference_unlocked(obj);
+out_put:
+        dma_buf_put(dma_buf);
+        mutex_unlock(&file_priv->prime.lock);
+        return ret;
+}
+EXPORT_SYMBOL(drm_gem_prime_fd_to_handle);
+int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data,
+                                 struct drm_file *file_priv)
+{
+        struct drm_prime_handle *args = data;
+        uint32_t flags;
+        if (!drm_core_check_feature(dev, DRIVER_PRIME))
+                return -EINVAL;
+        if (!dev->driver->prime_handle_to_fd)
+                return -ENOSYS;
+        /* check flags are valid */
+        if (args->flags & ~DRM_CLOEXEC)
+                return -EINVAL;
+        /* we only want to pass DRM_CLOEXEC which is == O_CLOEXEC */
+        flags = args->flags & DRM_CLOEXEC;
+        return dev->driver->prime_handle_to_fd(dev, file_priv,
+                        args->handle, flags, &args->fd);
+}
+int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data,
+                                 struct drm_file *file_priv)
+{
+        struct drm_prime_handle *args = data;
+        if (!drm_core_check_feature(dev, DRIVER_PRIME))
+                return -EINVAL;
+        if (!dev->driver->prime_fd_to_handle)
+                return -ENOSYS;
+        return dev->driver->prime_fd_to_handle(dev, file_priv,
+                        args->fd, &args->handle);
+}
+/*
+ * drm_prime_pages_to_sg
+ *
+ * this helper creates an sg table object from a set of pages
+ * the driver is responsible for mapping the pages into the
+ * importers address space
+ */
+struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages)
+{
+        struct sg_table *sg = NULL;
+        struct scatterlist *iter;
+        int i;
+        int ret;
+        sg = kmalloc(sizeof(struct sg_table), GFP_KERNEL);
+        if (!sg)
+                goto out;
+        ret = sg_alloc_table(sg, nr_pages, GFP_KERNEL);
+        if (ret)
+                goto out;
+        for_each_sg(sg->sgl, iter, nr_pages, i)
+                sg_set_page(iter, pages[i], PAGE_SIZE, 0);
+        return sg;
+out:
+        kfree(sg);
+        return NULL;
+}
+EXPORT_SYMBOL(drm_prime_pages_to_sg);
+/* helper function to cleanup a GEM/prime object */
+void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg)
+{
+        struct dma_buf_attachment *attach;
+        struct dma_buf *dma_buf;
+        attach = obj->import_attach;
+        if (sg)
+                dma_buf_unmap_attachment(attach, sg, DMA_BIDIRECTIONAL);
+        dma_buf = attach->dmabuf;
+        dma_buf_detach(attach->dmabuf, attach);
+        /* remove the reference */
+        dma_buf_put(dma_buf);
+}
+EXPORT_SYMBOL(drm_prime_gem_destroy);
+void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv)
+{
+        INIT_LIST_HEAD(&prime_fpriv->head);
+        mutex_init(&prime_fpriv->lock);
+}
+EXPORT_SYMBOL(drm_prime_init_file_private);
+void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv)
+{
+        struct drm_prime_member *member, *safe;
+        list_for_each_entry_safe(member, safe, &prime_fpriv->head, entry) {
+                list_del(&member->entry);
+                kfree(member);
+        }
+}
+EXPORT_SYMBOL(drm_prime_destroy_file_private);
+int drm_prime_add_imported_buf_handle(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf, uint32_t handle)
+{
+        struct drm_prime_member *member;
+        member = kmalloc(sizeof(*member), GFP_KERNEL);
+        if (!member)
+                return -ENOMEM;
+        member->dma_buf = dma_buf;
+        member->handle = handle;
+        list_add(&member->entry, &prime_fpriv->head);
+        return 0;
+}
+EXPORT_SYMBOL(drm_prime_add_imported_buf_handle);
+int drm_prime_lookup_imported_buf_handle(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf, uint32_t *handle)
+{
+        struct drm_prime_member *member;
+        list_for_each_entry(member, &prime_fpriv->head, entry) {
+                if (member->dma_buf == dma_buf) {
+                        *handle = member->handle;
+                        return 0;
+                }
+        }
+        return -ENOENT;
+}
+EXPORT_SYMBOL(drm_prime_lookup_imported_buf_handle);
+void drm_prime_remove_imported_buf_handle(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf)
+{
+        struct drm_prime_member *member, *safe;
+        mutex_lock(&prime_fpriv->lock);
+        list_for_each_entry_safe(member, safe, &prime_fpriv->head, entry) {
+                if (member->dma_buf == dma_buf) {
+                        list_del(&member->entry);
+                        kfree(member);
+                }
+        }
+        mutex_unlock(&prime_fpriv->lock);
+}
+EXPORT_SYMBOL(drm_prime_remove_imported_buf_handle);
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index fdb7ccefffbd..b505b70dba05 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1502,14 +1502,6 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)
        return 0;
 }
-static int
-i915_debugfs_common_open(struct inode *inode,
-                         struct file *filp)
-{
-        filp->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t
 i915_wedged_read(struct file *filp,
                 char __user *ubuf,
@@ -1560,7 +1552,7 @@ i915_wedged_write(struct file *filp,
 static const struct file_operations i915_wedged_fops = {
        .owner = THIS_MODULE,
-        .open = i915_debugfs_common_open,
+        .open = simple_open,
        .read = i915_wedged_read,
        .write = i915_wedged_write,
        .llseek = default_llseek,
@@ -1622,7 +1614,7 @@ i915_max_freq_write(struct file *filp,
 static const struct file_operations i915_max_freq_fops = {
        .owner = THIS_MODULE,
-        .open = i915_debugfs_common_open,
+        .open = simple_open,
        .read = i915_max_freq_read,
        .write = i915_max_freq_write,
        .llseek = default_llseek,
@@ -1693,7 +1685,7 @@ i915_cache_sharing_write(struct file *filp,
 static const struct file_operations i915_cache_sharing_fops = {
        .owner = THIS_MODULE,
-        .open = i915_debugfs_common_open,
+        .open = simple_open,
        .read = i915_cache_sharing_read,
        .write = i915_cache_sharing_write,
        .llseek = default_llseek,
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 9341eb8ce93b..785f67f963ef 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1183,6 +1183,21 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
        return can_switch;
 }
+static bool
+intel_enable_ppgtt(struct drm_device *dev)
+{
+        if (i915_enable_ppgtt >= 0)
+                return i915_enable_ppgtt;
+#ifdef CONFIG_INTEL_IOMMU
+        /* Disable ppgtt on SNB if VT-d is on. */
+        if (INTEL_INFO(dev)->gen == 6 && intel_iommu_gfx_mapped)
+                return false;
+#endif
+        return true;
+}
 static int i915_load_gem_init(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1197,7 +1212,7 @@ static int i915_load_gem_init(struct drm_device *dev)
        drm_mm_init(&dev_priv->mm.stolen, 0, prealloc_size);
        mutex_lock(&dev->struct_mutex);
-        if (i915_enable_ppgtt && HAS_ALIASING_PPGTT(dev)) {
+        if (intel_enable_ppgtt(dev) && HAS_ALIASING_PPGTT(dev)) {
                /* PPGTT pdes are stolen from global gtt ptes, so shrink the
                 * aperture accordingly when using aliasing ppgtt. */
                gtt_size -= I915_PPGTT_PD_ENTRIES*PAGE_SIZE;
@@ -1207,8 +1222,10 @@ static int i915_load_gem_init(struct drm_device *dev)
                i915_gem_do_init(dev, 0, mappable_size, gtt_size);
                ret = i915_gem_init_aliasing_ppgtt(dev);
-                if (ret)
+                if (ret) {
+                        mutex_unlock(&dev->struct_mutex);
                        return ret;
+                }
        } else {
                /* Let GEM Manage all of the aperture.
                 *
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 1a7559b59997..dfa55e7478fb 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -66,7 +66,11 @@ MODULE_PARM_DESC(semaphores,
 int i915_enable_rc6 __read_mostly = -1;
 module_param_named(i915_enable_rc6, i915_enable_rc6, int, 0600);
 MODULE_PARM_DESC(i915_enable_rc6,
-                "Enable power-saving render C-state 6 (default: -1 (use per-chip default)");
+                "Enable power-saving render C-state 6. "
+                "Different stages can be selected via bitmask values "
+                "(0 = disable; 1 = enable rc6; 2 = enable deep rc6; 4 = enable deepest rc6). "
+                "For example, 3 would enable rc6 and deep rc6, and 7 would enable everything. "
+                "default: -1 (use per-chip default)");
 int i915_enable_fbc __read_mostly = -1;
 module_param_named(i915_enable_fbc, i915_enable_fbc, int, 0600);
@@ -103,8 +107,8 @@ MODULE_PARM_DESC(enable_hangcheck,
                "WARNING: Disabling this can cause system wide hangs. "
                "(default: true)");
-bool i915_enable_ppgtt __read_mostly = 1;
+int i915_enable_ppgtt __read_mostly = -1;
-module_param_named(i915_enable_ppgtt, i915_enable_ppgtt, bool, 0600);
+module_param_named(i915_enable_ppgtt, i915_enable_ppgtt, int, 0600);
 MODULE_PARM_DESC(i915_enable_ppgtt,
                "Enable PPGTT (default: true)");
@@ -292,6 +296,7 @@ static const struct pci_device_id pciidlist[] = {		/* aka */
        INTEL_VGA_DEVICE(0x0152, &intel_ivybridge_d_info), /* GT1 desktop */
        INTEL_VGA_DEVICE(0x0162, &intel_ivybridge_d_info), /* GT2 desktop */
        INTEL_VGA_DEVICE(0x015a, &intel_ivybridge_d_info), /* GT1 server */
+        INTEL_VGA_DEVICE(0x016a, &intel_ivybridge_d_info), /* GT2 server */
        {0, 0, 0}
 };
@@ -533,7 +538,9 @@ static int i915_drm_thaw(struct drm_device *dev)
                drm_irq_install(dev);
                /* Resume the modeset for every activated CRTC */
+                mutex_lock(&dev->mode_config.mutex);
                drm_helper_resume_force_mode(dev);
+                mutex_unlock(&dev->mode_config.mutex);
                if (IS_IRONLAKE_M(dev))
                        ironlake_enable_rc6(dev);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c0f19f572004..5fabc6c31fec 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1053,6 +1053,27 @@ struct drm_i915_file_private {
 #include "i915_trace.h"
+/**
+ * RC6 is a special power stage which allows the GPU to enter an very
+ * low-voltage mode when idle, using down to 0V while at this stage.  This
+ * stage is entered automatically when the GPU is idle when RC6 support is
+ * enabled, and as soon as new workload arises GPU wakes up automatically as well.
+ *
+ * There are different RC6 modes available in Intel GPU, which differentiate
+ * among each other with the latency required to enter and leave RC6 and
+ * voltage consumed by the GPU in different states.
+ *
+ * The combination of the following flags define which states GPU is allowed
+ * to enter, while RC6 is the normal RC6 state, RC6p is the deep RC6, and
+ * RC6pp is deepest RC6. Their support by hardware varies according to the
+ * GPU, BIOS, chipset and platform. RC6 is usually the safest one and the one
+ * which brings the most power savings; deeper states save more power, but
+ * require higher latency to switch to and wake up.
+ */
+#define INTEL_RC6_ENABLE                        (1<<0)
+#define INTEL_RC6p_ENABLE                       (1<<1)
+#define INTEL_RC6pp_ENABLE                      (1<<2)
 extern struct drm_ioctl_desc i915_ioctls[];
 extern int i915_max_ioctl;
 extern unsigned int i915_fbpercrtc __always_unused;
@@ -1065,7 +1086,7 @@ extern int i915_vbt_sdvo_panel_type __read_mostly;
 extern int i915_enable_rc6 __read_mostly;
 extern int i915_enable_fbc __read_mostly;
 extern bool i915_enable_hangcheck __read_mostly;
-extern bool i915_enable_ppgtt __read_mostly;
+extern int i915_enable_ppgtt __read_mostly;
 extern int i915_suspend(struct drm_device *dev, pm_message_t state);
 extern int i915_resume(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 1f441f5c2405..4c65c639f772 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1472,16 +1472,19 @@ i915_gem_object_move_to_active(struct drm_i915_gem_object *obj,
        list_move_tail(&obj->ring_list, &ring->active_list);
        obj->last_rendering_seqno = seqno;
-        if (obj->fenced_gpu_access) {
-                struct drm_i915_fence_reg *reg;
-                BUG_ON(obj->fence_reg == I915_FENCE_REG_NONE);
+        if (obj->fenced_gpu_access) {
                obj->last_fenced_seqno = seqno;
                obj->last_fenced_ring = ring;
-                reg = &dev_priv->fence_regs[obj->fence_reg];
+                /* Bump MRU to take account of the delayed flush */
-                list_move_tail(&reg->lru_list, &dev_priv->mm.fence_list);
+                if (obj->fence_reg != I915_FENCE_REG_NONE) {
+                        struct drm_i915_fence_reg *reg;
+                        reg = &dev_priv->fence_regs[obj->fence_reg];
+                        list_move_tail(&reg->lru_list,
+                                       &dev_priv->mm.fence_list);
+                }
        }
 }
@@ -3754,12 +3757,32 @@ void i915_gem_init_ppgtt(struct drm_device *dev)
        drm_i915_private_t *dev_priv = dev->dev_private;
        uint32_t pd_offset;
        struct intel_ring_buffer *ring;
+        struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
+        uint32_t __iomem *pd_addr;
+        uint32_t pd_entry;
        int i;
        if (!dev_priv->mm.aliasing_ppgtt)
                return;
-        pd_offset = dev_priv->mm.aliasing_ppgtt->pd_offset;
+        pd_addr = dev_priv->mm.gtt->gtt + ppgtt->pd_offset/sizeof(uint32_t);
+        for (i = 0; i < ppgtt->num_pd_entries; i++) {
+                dma_addr_t pt_addr;
+                if (dev_priv->mm.gtt->needs_dmar)
+                        pt_addr = ppgtt->pt_dma_addr[i];
+                else
+                        pt_addr = page_to_phys(ppgtt->pt_pages[i]);
+                pd_entry = GEN6_PDE_ADDR_ENCODE(pt_addr);
+                pd_entry |= GEN6_PDE_VALID;
+                writel(pd_entry, pd_addr + i);
+        }
+        readl(pd_addr);
+        pd_offset = ppgtt->pd_offset;
        pd_offset /= 64; /* in cachelines, */
        pd_offset <<= 16;
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 81687af00893..f51a696486cb 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -498,8 +498,8 @@ pin_and_fence_object(struct drm_i915_gem_object *obj,
                                if (ret)
                                        goto err_unpin;
                        }
+                        obj->pending_fenced_gpu_access = true;
                }
-                obj->pending_fenced_gpu_access = need_fence;
        }
        entry->offset = obj->gtt_offset;
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 2eacd78bb93b..a135c61f4119 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -65,9 +65,7 @@ int i915_gem_init_aliasing_ppgtt(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct i915_hw_ppgtt *ppgtt;
-        uint32_t pd_entry;
        unsigned first_pd_entry_in_global_pt;
-        uint32_t __iomem *pd_addr;
        int i;
        int ret = -ENOMEM;
@@ -100,7 +98,6 @@ int i915_gem_init_aliasing_ppgtt(struct drm_device *dev)
                        goto err_pt_alloc;
        }
-        pd_addr = dev_priv->mm.gtt->gtt + first_pd_entry_in_global_pt;
        for (i = 0; i < ppgtt->num_pd_entries; i++) {
                dma_addr_t pt_addr;
                if (dev_priv->mm.gtt->needs_dmar) {
@@ -117,13 +114,7 @@ int i915_gem_init_aliasing_ppgtt(struct drm_device *dev)
                        ppgtt->pt_dma_addr[i] = pt_addr;
                } else
                        pt_addr = page_to_phys(ppgtt->pt_pages[i]);
-                pd_entry = GEN6_PDE_ADDR_ENCODE(pt_addr);
-                pd_entry |= GEN6_PDE_VALID;
-                writel(pd_entry, pd_addr + i);
        }
-        readl(pd_addr);
        ppgtt->scratch_page_dma_addr = dev_priv->mm.gtt->scratch_page_dma;
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 3886cf051bac..2abf4eb94039 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2385,6 +2385,7 @@
 #define   PIPECONF_DISABLE      0
 #define   PIPECONF_DOUBLE_WIDE  (1<<30)
 #define   I965_PIPECONF_ACTIVE  (1<<30)
+#define   PIPECONF_FRAME_START_DELAY_MASK (3<<27)
 #define   PIPECONF_SINGLE_WIDE  0
 #define   PIPECONF_PIPE_UNLOCKED 0
 #define   PIPECONF_PIPE_LOCKED  (1<<25)
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 8168d8f8a634..b48fc2a8410c 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -24,6 +24,7 @@
 *    Eric Anholt <eric@anholt.net>
 *
 */
+#include <linux/dmi.h>
 #include <drm/drm_dp_helper.h>
 #include "drmP.h"
 #include "drm.h"
@@ -621,6 +622,26 @@ init_vbt_defaults(struct drm_i915_private *dev_priv)
        dev_priv->edp.bpp = 18;
 }
+static int __init intel_no_opregion_vbt_callback(const struct dmi_system_id *id)
+{
+        DRM_DEBUG_KMS("Falling back to manually reading VBT from "
+                      "VBIOS ROM for %s\n",
+                      id->ident);
+        return 1;
+}
+static const struct dmi_system_id intel_no_opregion_vbt[] = {
+        {
+                .callback = intel_no_opregion_vbt_callback,
+                .ident = "ThinkCentre A57",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "97027RG"),
+                },
+        },
+        { }
+};
 /**
 * intel_parse_bios - find VBT and initialize settings from the BIOS
 * @dev: DRM device
@@ -641,7 +662,7 @@ intel_parse_bios(struct drm_device *dev)
        init_vbt_defaults(dev_priv);
        /* XXX Should this validation be moved to intel_opregion.c? */
-        if (dev_priv->opregion.vbt) {
+        if (!dmi_check_system(intel_no_opregion_vbt) && dev_priv->opregion.vbt) {
                struct vbt_header *vbt = dev_priv->opregion.vbt;
                if (memcmp(vbt->signature, "$VBT", 4) == 0) {
                        DRM_DEBUG_KMS("Using VBT from OpRegion: %20s\n",
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d514719f65e2..91b35fd1db8c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5539,7 +5539,8 @@ void ironlake_init_pch_refclk(struct drm_device *dev)
                if (intel_panel_use_ssc(dev_priv) && can_ssc) {
                        DRM_DEBUG_KMS("Using SSC on panel\n");
                        temp |= DREF_SSC1_ENABLE;
-                }
+                } else
+                        temp &= ~DREF_SSC1_ENABLE;
                /* Get SSC going before enabling the outputs */
                I915_WRITE(PCH_DREF_CONTROL, temp);
@@ -7580,6 +7581,12 @@ static void intel_sanitize_modesetting(struct drm_device *dev,
        struct drm_i915_private *dev_priv = dev->dev_private;
        u32 reg, val;
+        /* Clear any frame start delays used for debugging left by the BIOS */
+        for_each_pipe(pipe) {
+                reg = PIPECONF(pipe);
+                I915_WRITE(reg, I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK);
+        }
        if (HAS_PCH_SPLIT(dev))
                return;
@@ -8215,7 +8222,7 @@ void intel_init_emon(struct drm_device *dev)
        dev_priv->corr = (lcfuse & LCFUSE_HIV_MASK);
 }
-static bool intel_enable_rc6(struct drm_device *dev)
+static int intel_enable_rc6(struct drm_device *dev)
 {
        /*
         * Respect the kernel parameter if it is set
@@ -8233,11 +8240,11 @@ static bool intel_enable_rc6(struct drm_device *dev)
         * Disable rc6 on Sandybridge
         */
        if (INTEL_INFO(dev)->gen == 6) {
-                DRM_DEBUG_DRIVER("Sandybridge: RC6 disabled\n");
+                DRM_DEBUG_DRIVER("Sandybridge: deep RC6 disabled\n");
-                return 0;
+                return INTEL_RC6_ENABLE;
        }
-        DRM_DEBUG_DRIVER("RC6 enabled\n");
+        DRM_DEBUG_DRIVER("RC6 and deep RC6 enabled\n");
-        return 1;
+        return (INTEL_RC6_ENABLE | INTEL_RC6p_ENABLE);
 }
 void gen6_enable_rps(struct drm_i915_private *dev_priv)
@@ -8247,6 +8254,7 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv)
        u32 pcu_mbox, rc6_mask = 0;
        u32 gtfifodbg;
        int cur_freq, min_freq, max_freq;
+        int rc6_mode;
        int i;
        /* Here begins a magic sequence of register writes to enable
@@ -8284,9 +8292,20 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv)
        I915_WRITE(GEN6_RC6p_THRESHOLD, 100000);
        I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */
-        if (intel_enable_rc6(dev_priv->dev))
+        rc6_mode = intel_enable_rc6(dev_priv->dev);
-                rc6_mask = GEN6_RC_CTL_RC6_ENABLE |
+        if (rc6_mode & INTEL_RC6_ENABLE)
-                        ((IS_GEN7(dev_priv->dev)) ? GEN6_RC_CTL_RC6p_ENABLE : 0);
+                rc6_mask |= GEN6_RC_CTL_RC6_ENABLE;
+        if (rc6_mode & INTEL_RC6p_ENABLE)
+                rc6_mask |= GEN6_RC_CTL_RC6p_ENABLE;
+        if (rc6_mode & INTEL_RC6pp_ENABLE)
+                rc6_mask |= GEN6_RC_CTL_RC6pp_ENABLE;
+        DRM_INFO("Enabling RC6 states: RC6 %s, RC6p %s, RC6pp %s\n",
+                        (rc6_mode & INTEL_RC6_ENABLE) ? "on" : "off",
+                        (rc6_mode & INTEL_RC6p_ENABLE) ? "on" : "off",
+                        (rc6_mode & INTEL_RC6pp_ENABLE) ? "on" : "off");
        I915_WRITE(GEN6_RC_CONTROL,
                   rc6_mask |
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index c5c0973af8a1..95db2e988227 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -755,6 +755,14 @@ static const struct dmi_system_id intel_no_lvds[] = {
                        DMI_MATCH(DMI_BOARD_NAME, "hp st5747"),
                },
        },
+        {
+                .callback = intel_no_lvds_dmi_callback,
+                .ident = "MSI Wind Box DC500",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
+                        DMI_MATCH(DMI_BOARD_NAME, "MS-7469"),
+                },
+        },
        { }     /* terminating entry */
 };
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index fc66af6a9448..e25581a9f60f 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -626,7 +626,7 @@ gen6_ring_get_seqno(struct intel_ring_buffer *ring)
        /* Workaround to force correct ordering between irq and seqno writes on
         * ivb (and maybe also on snb) by reading from a CS register (like
         * ACTHD) before reading the status page. */
-        if (IS_GEN7(dev))
+        if (IS_GEN6(dev) || IS_GEN7(dev))
                intel_ring_get_active_head(ring);
        return intel_read_status_page(ring, I915_GEM_HWS_INDEX);
 }
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 7aa0450399a1..a464771a7240 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -411,6 +411,9 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
        old_obj = intel_plane->obj;
+        src_w = src_w >> 16;
+        src_h = src_h >> 16;
        /* Pipe must be running... */
        if (!(I915_READ(PIPECONF(pipe)) & PIPECONF_ENABLE))
                return -EINVAL;
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index ca1639918f57..97a81260485a 100644
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -13,6 +13,7 @@ config DRM_NOUVEAU
        select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT
        select ACPI_WMI if ACPI
        select MXM_WMI if ACPI
+        select POWER_SUPPLY
        help
          Choose this option for open-source nVidia support.
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 637afe71de56..80963d05b54a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -177,14 +177,15 @@ bios_shadow_pci(struct nvbios *bios)
        if (!pci_enable_rom(pdev)) {
                void __iomem *rom = pci_map_rom(pdev, &length);
-                if (rom) {
+                if (rom && length) {
                        bios->data = kmalloc(length, GFP_KERNEL);
                        if (bios->data) {
                                memcpy_fromio(bios->data, rom, length);
                                bios->length = length;
                        }
-                        pci_unmap_rom(pdev, rom);
                }
+                if (rom)
+                        pci_unmap_rom(pdev, rom);
                pci_disable_rom(pdev);
        }
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
index 44e6416d4a33..846afb0bfef4 100644
--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
@@ -436,11 +436,11 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data,
        }
        if (dev_priv->card_type < NV_C0) {
-                init->subchan[0].handle = NvSw;
+                init->subchan[0].handle = 0x00000000;
-                init->subchan[0].grclass = NV_SW;
+                init->subchan[0].grclass = 0x0000;
-                init->nr_subchan = 1;
+                init->subchan[1].handle = NvSw;
-        } else {
+                init->subchan[1].grclass = NV_SW;
-                init->nr_subchan = 0;
+                init->nr_subchan = 2;
        }
        /* Named memory object area */
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h
index bcf0fd9e313e..23d4edf992b7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.h
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.h
@@ -48,8 +48,8 @@ void nv50_dma_push(struct nouveau_channel *, struct nouveau_bo *,
 /* Hardcoded object assignments to subchannels (subchannel id). */
 enum {
-        NvSubSw         = 0,
+        NvSubM2MF       = 0,
-        NvSubM2MF       = 1,
+        NvSubSw         = 1,
        NvSub2D         = 2,
        NvSubCtxSurf2D  = 2,
        NvSubGdiRect    = 3,
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index a4886b36d0fa..c2a8511e855a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -642,7 +642,7 @@ nouveau_card_channel_init(struct drm_device *dev)
                OUT_RING  (chan, chan->vram_handle);
                OUT_RING  (chan, chan->gart_handle);
        } else
-        if (dev_priv->card_type <= NV_C0) {
+        if (dev_priv->card_type <= NV_D0) {
                ret = nouveau_gpuobj_gr_new(chan, 0x9039, 0x9039);
                if (ret)
                        goto error;
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
index d1bd239cd9e9..5ce9bf51a8de 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -1306,8 +1306,11 @@ struct atom_context *atom_parse(struct card_info *card, void *bios)
 int atom_asic_init(struct atom_context *ctx)
 {
+        struct radeon_device *rdev = ctx->card->dev->dev_private;
        int hwi = CU16(ctx->data_table + ATOM_DATA_FWI_PTR);
        uint32_t ps[16];
+        int ret;
        memset(ps, 0, 64);
        ps[0] = cpu_to_le32(CU32(hwi + ATOM_FWI_DEFSCLK_PTR));
@@ -1317,7 +1320,17 @@ int atom_asic_init(struct atom_context *ctx)
        if (!CU16(ctx->cmd_table + 4 + 2 * ATOM_CMD_INIT))
                return 1;
-        return atom_execute_table(ctx, ATOM_CMD_INIT, ps);
+        ret = atom_execute_table(ctx, ATOM_CMD_INIT, ps);
+        if (ret)
+                return ret;
+        memset(ps, 0, 64);
+        if (rdev->family < CHIP_R600) {
+                if (CU16(ctx->cmd_table + 4 + 2 * ATOM_CMD_SPDFANCNTL))
+                        atom_execute_table(ctx, ATOM_CMD_SPDFANCNTL, ps);
+        }
+        return ret;
 }
 void atom_destroy(struct atom_context *ctx)
diff --git a/drivers/gpu/drm/radeon/atom.h b/drivers/gpu/drm/radeon/atom.h
index 93cfe2086ba0..25fea631dad2 100644
--- a/drivers/gpu/drm/radeon/atom.h
+++ b/drivers/gpu/drm/radeon/atom.h
@@ -44,6 +44,7 @@
 #define ATOM_CMD_SETSCLK        0x0A
 #define ATOM_CMD_SETMCLK        0x0B
 #define ATOM_CMD_SETPCLK        0x0C
+#define ATOM_CMD_SPDFANCNTL     0x39
 #define ATOM_DATA_FWI_PTR       0xC
 #define ATOM_DATA_IIO_PTR       0x32
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index 6f70158d34e4..df6a4dbd93f8 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -241,7 +241,8 @@ int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, u64 max_offset,
                                domain_start = bo->rdev->mc.vram_start;
                        else
                                domain_start = bo->rdev->mc.gtt_start;
-                        WARN_ON_ONCE((*gpu_addr - domain_start) > max_offset);
+                        WARN_ON_ONCE(max_offset <
+                                     (radeon_bo_gpu_offset(bo) - domain_start));
                }
                return 0;
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index 5340c5f3987b..53673907a6a0 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -47,7 +47,7 @@ static struct vm_operations_struct udl_gem_vm_ops = {
 static const struct file_operations udl_driver_fops = {
        .owner = THIS_MODULE,
        .open = drm_open,
-        .mmap = drm_gem_mmap,
+        .mmap = udl_drm_gem_mmap,
        .poll = drm_poll,
        .read = drm_read,
        .unlocked_ioctl = drm_ioctl,
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index 1612954a5bc4..96820d03a303 100644
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -121,6 +121,7 @@ struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev,
 int udl_gem_vmap(struct udl_gem_object *obj);
 void udl_gem_vunmap(struct udl_gem_object *obj);
+int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
 int udl_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
 int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index 852642dc1187..92f19ef329b0 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -71,6 +71,20 @@ int udl_dumb_destroy(struct drm_file *file, struct drm_device *dev,
        return drm_gem_handle_delete(file, handle);
 }
+int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+        int ret;
+        ret = drm_gem_mmap(filp, vma);
+        if (ret)
+                return ret;
+        vma->vm_flags &= ~VM_PFNMAP;
+        vma->vm_flags |= VM_MIXEDMAP;
+        return ret;
+}
 int udl_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
        struct udl_gem_object *obj = to_udl_bo(vma->vm_private_data);
diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c
index 12f9777c385d..45c3433f7986 100644
--- a/drivers/hid/hid-picolcd.c
+++ b/drivers/hid/hid-picolcd.c
@@ -1525,12 +1525,6 @@ static const struct file_operations picolcd_debug_reset_fops = {
 /*
 * The "eeprom" file
 */
-static int picolcd_debug_eeprom_open(struct inode *i, struct file *f)
-{
-        f->private_data = i->i_private;
-        return 0;
-}
 static ssize_t picolcd_debug_eeprom_read(struct file *f, char __user *u,
                size_t s, loff_t *off)
 {
@@ -1618,7 +1612,7 @@ static ssize_t picolcd_debug_eeprom_write(struct file *f, const char __user *u,
 */
 static const struct file_operations picolcd_debug_eeprom_fops = {
        .owner    = THIS_MODULE,
-        .open     = picolcd_debug_eeprom_open,
+        .open     = simple_open,
        .read     = picolcd_debug_eeprom_read,
        .write    = picolcd_debug_eeprom_write,
        .llseek   = generic_file_llseek,
@@ -1627,12 +1621,6 @@ static const struct file_operations picolcd_debug_eeprom_fops = {
 /*
 * The "flash" file
 */
-static int picolcd_debug_flash_open(struct inode *i, struct file *f)
-{
-        f->private_data = i->i_private;
-        return 0;
-}
 /* record a flash address to buf (bounds check to be done by caller) */
 static int _picolcd_flash_setaddr(struct picolcd_data *data, u8 *buf, long off)
 {
@@ -1817,7 +1805,7 @@ static ssize_t picolcd_debug_flash_write(struct file *f, const char __user *u,
 */
 static const struct file_operations picolcd_debug_flash_fops = {
        .owner    = THIS_MODULE,
-        .open     = picolcd_debug_flash_open,
+        .open     = simple_open,
        .read     = picolcd_debug_flash_read,
        .write    = picolcd_debug_flash_write,
        .llseek   = generic_file_llseek,
diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
index 17dabc1f339e..eec329197c16 100644
--- a/drivers/hid/hid-wiimote-debug.c
+++ b/drivers/hid/hid-wiimote-debug.c
@@ -23,12 +23,6 @@ struct wiimote_debug {
        struct dentry *drm;
 };
-static int wiidebug_eeprom_open(struct inode *i, struct file *f)
-{
-        f->private_data = i->i_private;
-        return 0;
-}
 static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
                                                                loff_t *off)
 {
@@ -83,7 +77,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
 static const struct file_operations wiidebug_eeprom_fops = {
        .owner = THIS_MODULE,
-        .open = wiidebug_eeprom_open,
+        .open = simple_open,
        .read = wiidebug_eeprom_read,
        .llseek = generic_file_llseek,
 };
diff --git a/drivers/hsi/Kconfig b/drivers/hsi/Kconfig
new file mode 100644
index 000000000000..d94e38dd80c7
--- /dev/null
+++ b/drivers/hsi/Kconfig
@@ -0,0 +1,19 @@
+#
+# HSI driver configuration
+#
+menuconfig HSI
+        tristate "HSI support"
+        ---help---
+          The "High speed synchronous Serial Interface" is
+          synchronous serial interface used mainly to connect
+          application engines and cellular modems.
+if HSI
+config HSI_BOARDINFO
+        bool
+        default y
+source "drivers/hsi/clients/Kconfig"
+endif # HSI
diff --git a/drivers/hsi/Makefile b/drivers/hsi/Makefile
new file mode 100644
index 000000000000..9d5d33f90de2
--- /dev/null
+++ b/drivers/hsi/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for HSI
+#
+obj-$(CONFIG_HSI_BOARDINFO)     += hsi_boardinfo.o
+obj-$(CONFIG_HSI)               += hsi.o
+obj-y                           += clients/
diff --git a/drivers/hsi/clients/Kconfig b/drivers/hsi/clients/Kconfig
new file mode 100644
index 000000000000..3bacd275f479
--- /dev/null
+++ b/drivers/hsi/clients/Kconfig
@@ -0,0 +1,13 @@
+#
+# HSI clients configuration
+#
+comment "HSI clients"
+config HSI_CHAR
+        tristate "HSI/SSI character driver"
+        depends on HSI
+        ---help---
+          If you say Y here, you will enable the HSI/SSI character driver.
+          This driver provides a simple character device interface for
+          serial communication with the cellular modem over HSI/SSI bus.
diff --git a/drivers/hsi/clients/Makefile b/drivers/hsi/clients/Makefile
new file mode 100644
index 000000000000..327c0e27c8b0
--- /dev/null
+++ b/drivers/hsi/clients/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for HSI clients
+#
+obj-$(CONFIG_HSI_CHAR)  += hsi_char.o
diff --git a/drivers/hsi/clients/hsi_char.c b/drivers/hsi/clients/hsi_char.c
new file mode 100644
index 000000000000..88a050df2389
--- /dev/null
+++ b/drivers/hsi/clients/hsi_char.c
@@ -0,0 +1,802 @@
+/*
+ * HSI character device driver, implements the character device
+ * interface.
+ *
+ * Copyright (C) 2010 Nokia Corporation. All rights reserved.
+ *
+ * Contact: Andras Domokos <andras.domokos@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/atomic.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/kmemleak.h>
+#include <linux/ioctl.h>
+#include <linux/wait.h>
+#include <linux/fs.h>
+#include <linux/sched.h>
+#include <linux/device.h>
+#include <linux/cdev.h>
+#include <linux/uaccess.h>
+#include <linux/scatterlist.h>
+#include <linux/stat.h>
+#include <linux/hsi/hsi.h>
+#include <linux/hsi/hsi_char.h>
+#define HSC_DEVS                16 /* Num of channels */
+#define HSC_MSGS                4
+#define HSC_RXBREAK             0
+#define HSC_ID_BITS             6
+#define HSC_PORT_ID_BITS        4
+#define HSC_ID_MASK             3
+#define HSC_PORT_ID_MASK        3
+#define HSC_CH_MASK             0xf
+/*
+ * We support up to 4 controllers that can have up to 4
+ * ports, which should currently be more than enough.
+ */
+#define HSC_BASEMINOR(id, port_id) \
+                ((((id) & HSC_ID_MASK) << HSC_ID_BITS) | \
+                (((port_id) & HSC_PORT_ID_MASK) << HSC_PORT_ID_BITS))
+enum {
+        HSC_CH_OPEN,
+        HSC_CH_READ,
+        HSC_CH_WRITE,
+        HSC_CH_WLINE,
+};
+enum {
+        HSC_RX,
+        HSC_TX,
+};
+struct hsc_client_data;
+/**
+ * struct hsc_channel - hsi_char internal channel data
+ * @ch: channel number
+ * @flags: Keeps state of the channel (open/close, reading, writing)
+ * @free_msgs_list: List of free HSI messages/requests
+ * @rx_msgs_queue: List of pending RX requests
+ * @tx_msgs_queue: List of pending TX requests
+ * @lock: Serialize access to the lists
+ * @cl: reference to the associated hsi_client
+ * @cl_data: reference to the client data that this channels belongs to
+ * @rx_wait: RX requests wait queue
+ * @tx_wait: TX requests wait queue
+ */
+struct hsc_channel {
+        unsigned int            ch;
+        unsigned long           flags;
+        struct list_head        free_msgs_list;
+        struct list_head        rx_msgs_queue;
+        struct list_head        tx_msgs_queue;
+        spinlock_t              lock;
+        struct hsi_client       *cl;
+        struct hsc_client_data *cl_data;
+        wait_queue_head_t       rx_wait;
+        wait_queue_head_t       tx_wait;
+};
+/**
+ * struct hsc_client_data - hsi_char internal client data
+ * @cdev: Characther device associated to the hsi_client
+ * @lock: Lock to serialize open/close access
+ * @flags: Keeps track of port state (rx hwbreak armed)
+ * @usecnt: Use count for claiming the HSI port (mutex protected)
+ * @cl: Referece to the HSI client
+ * @channels: Array of channels accessible by the client
+ */
+struct hsc_client_data {
+        struct cdev             cdev;
+        struct mutex            lock;
+        unsigned long           flags;
+        unsigned int            usecnt;
+        struct hsi_client       *cl;
+        struct hsc_channel      channels[HSC_DEVS];
+};
+/* Stores the major number dynamically allocated for hsi_char */
+static unsigned int hsc_major;
+/* Maximum buffer size that hsi_char will accept from userspace */
+static unsigned int max_data_size = 0x1000;
+module_param(max_data_size, uint, S_IRUSR | S_IWUSR);
+MODULE_PARM_DESC(max_data_size, "max read/write data size [4,8..65536] (^2)");
+static void hsc_add_tail(struct hsc_channel *channel, struct hsi_msg *msg,
+                                                        struct list_head *queue)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&channel->lock, flags);
+        list_add_tail(&msg->link, queue);
+        spin_unlock_irqrestore(&channel->lock, flags);
+}
+static struct hsi_msg *hsc_get_first_msg(struct hsc_channel *channel,
+                                                        struct list_head *queue)
+{
+        struct hsi_msg *msg = NULL;
+        unsigned long flags;
+        spin_lock_irqsave(&channel->lock, flags);
+        if (list_empty(queue))
+                goto out;
+        msg = list_first_entry(queue, struct hsi_msg, link);
+        list_del(&msg->link);
+out:
+        spin_unlock_irqrestore(&channel->lock, flags);
+        return msg;
+}
+static inline void hsc_msg_free(struct hsi_msg *msg)
+{
+        kfree(sg_virt(msg->sgt.sgl));
+        hsi_free_msg(msg);
+}
+static void hsc_free_list(struct list_head *list)
+{
+        struct hsi_msg *msg, *tmp;
+        list_for_each_entry_safe(msg, tmp, list, link) {
+                list_del(&msg->link);
+                hsc_msg_free(msg);
+        }
+}
+static void hsc_reset_list(struct hsc_channel *channel, struct list_head *l)
+{
+        unsigned long flags;
+        LIST_HEAD(list);
+        spin_lock_irqsave(&channel->lock, flags);
+        list_splice_init(l, &list);
+        spin_unlock_irqrestore(&channel->lock, flags);
+        hsc_free_list(&list);
+}
+static inline struct hsi_msg *hsc_msg_alloc(unsigned int alloc_size)
+{
+        struct hsi_msg *msg;
+        void *buf;
+        msg = hsi_alloc_msg(1, GFP_KERNEL);
+        if (!msg)
+                goto out;
+        buf = kmalloc(alloc_size, GFP_KERNEL);
+        if (!buf) {
+                hsi_free_msg(msg);
+                goto out;
+        }
+        sg_init_one(msg->sgt.sgl, buf, alloc_size);
+        /* Ignore false positive, due to sg pointer handling */
+        kmemleak_ignore(buf);
+        return msg;
+out:
+        return NULL;
+}
+static inline int hsc_msgs_alloc(struct hsc_channel *channel)
+{
+        struct hsi_msg *msg;
+        int i;
+        for (i = 0; i < HSC_MSGS; i++) {
+                msg = hsc_msg_alloc(max_data_size);
+                if (!msg)
+                        goto out;
+                msg->channel = channel->ch;
+                list_add_tail(&msg->link, &channel->free_msgs_list);
+        }
+        return 0;
+out:
+        hsc_free_list(&channel->free_msgs_list);
+        return -ENOMEM;
+}
+static inline unsigned int hsc_msg_len_get(struct hsi_msg *msg)
+{
+        return msg->sgt.sgl->length;
+}
+static inline void hsc_msg_len_set(struct hsi_msg *msg, unsigned int len)
+{
+        msg->sgt.sgl->length = len;
+}
+static void hsc_rx_completed(struct hsi_msg *msg)
+{
+        struct hsc_client_data *cl_data = hsi_client_drvdata(msg->cl);
+        struct hsc_channel *channel = cl_data->channels + msg->channel;
+        if (test_bit(HSC_CH_READ, &channel->flags)) {
+                hsc_add_tail(channel, msg, &channel->rx_msgs_queue);
+                wake_up(&channel->rx_wait);
+        } else {
+                hsc_add_tail(channel, msg, &channel->free_msgs_list);
+        }
+}
+static void hsc_rx_msg_destructor(struct hsi_msg *msg)
+{
+        msg->status = HSI_STATUS_ERROR;
+        hsc_msg_len_set(msg, 0);
+        hsc_rx_completed(msg);
+}
+static void hsc_tx_completed(struct hsi_msg *msg)
+{
+        struct hsc_client_data *cl_data = hsi_client_drvdata(msg->cl);
+        struct hsc_channel *channel = cl_data->channels + msg->channel;
+        if (test_bit(HSC_CH_WRITE, &channel->flags)) {
+                hsc_add_tail(channel, msg, &channel->tx_msgs_queue);
+                wake_up(&channel->tx_wait);
+        } else {
+                hsc_add_tail(channel, msg, &channel->free_msgs_list);
+        }
+}
+static void hsc_tx_msg_destructor(struct hsi_msg *msg)
+{
+        msg->status = HSI_STATUS_ERROR;
+        hsc_msg_len_set(msg, 0);
+        hsc_tx_completed(msg);
+}
+static void hsc_break_req_destructor(struct hsi_msg *msg)
+{
+        struct hsc_client_data *cl_data = hsi_client_drvdata(msg->cl);
+        hsi_free_msg(msg);
+        clear_bit(HSC_RXBREAK, &cl_data->flags);
+}
+static void hsc_break_received(struct hsi_msg *msg)
+{
+        struct hsc_client_data *cl_data = hsi_client_drvdata(msg->cl);
+        struct hsc_channel *channel = cl_data->channels;
+        int i, ret;
+        /* Broadcast HWBREAK on all channels */
+        for (i = 0; i < HSC_DEVS; i++, channel++) {
+                struct hsi_msg *msg2;
+                if (!test_bit(HSC_CH_READ, &channel->flags))
+                        continue;
+                msg2 = hsc_get_first_msg(channel, &channel->free_msgs_list);
+                if (!msg2)
+                        continue;
+                clear_bit(HSC_CH_READ, &channel->flags);
+                hsc_msg_len_set(msg2, 0);
+                msg2->status = HSI_STATUS_COMPLETED;
+                hsc_add_tail(channel, msg2, &channel->rx_msgs_queue);
+                wake_up(&channel->rx_wait);
+        }
+        hsi_flush(msg->cl);
+        ret = hsi_async_read(msg->cl, msg);
+        if (ret < 0)
+                hsc_break_req_destructor(msg);
+}
+static int hsc_break_request(struct hsi_client *cl)
+{
+        struct hsc_client_data *cl_data = hsi_client_drvdata(cl);
+        struct hsi_msg *msg;
+        int ret;
+        if (test_and_set_bit(HSC_RXBREAK, &cl_data->flags))
+                return -EBUSY;
+        msg = hsi_alloc_msg(0, GFP_KERNEL);
+        if (!msg) {
+                clear_bit(HSC_RXBREAK, &cl_data->flags);
+                return -ENOMEM;
+        }
+        msg->break_frame = 1;
+        msg->complete = hsc_break_received;
+        msg->destructor = hsc_break_req_destructor;
+        ret = hsi_async_read(cl, msg);
+        if (ret < 0)
+                hsc_break_req_destructor(msg);
+        return ret;
+}
+static int hsc_break_send(struct hsi_client *cl)
+{
+        struct hsi_msg *msg;
+        int ret;
+        msg = hsi_alloc_msg(0, GFP_ATOMIC);
+        if (!msg)
+                return -ENOMEM;
+        msg->break_frame = 1;
+        msg->complete = hsi_free_msg;
+        msg->destructor = hsi_free_msg;
+        ret = hsi_async_write(cl, msg);
+        if (ret < 0)
+                hsi_free_msg(msg);
+        return ret;
+}
+static int hsc_rx_set(struct hsi_client *cl, struct hsc_rx_config *rxc)
+{
+        struct hsi_config tmp;
+        int ret;
+        if ((rxc->mode != HSI_MODE_STREAM) && (rxc->mode != HSI_MODE_FRAME))
+                return -EINVAL;
+        if ((rxc->channels == 0) || (rxc->channels > HSC_DEVS))
+                return -EINVAL;
+        if (rxc->channels & (rxc->channels - 1))
+                return -EINVAL;
+        if ((rxc->flow != HSI_FLOW_SYNC) && (rxc->flow != HSI_FLOW_PIPE))
+                return -EINVAL;
+        tmp = cl->rx_cfg;
+        cl->rx_cfg.mode = rxc->mode;
+        cl->rx_cfg.channels = rxc->channels;
+        cl->rx_cfg.flow = rxc->flow;
+        ret = hsi_setup(cl);
+        if (ret < 0) {
+                cl->rx_cfg = tmp;
+                return ret;
+        }
+        if (rxc->mode == HSI_MODE_FRAME)
+                hsc_break_request(cl);
+        return ret;
+}
+static inline void hsc_rx_get(struct hsi_client *cl, struct hsc_rx_config *rxc)
+{
+        rxc->mode = cl->rx_cfg.mode;
+        rxc->channels = cl->rx_cfg.channels;
+        rxc->flow = cl->rx_cfg.flow;
+}
+static int hsc_tx_set(struct hsi_client *cl, struct hsc_tx_config *txc)
+{
+        struct hsi_config tmp;
+        int ret;
+        if ((txc->mode != HSI_MODE_STREAM) && (txc->mode != HSI_MODE_FRAME))
+                return -EINVAL;
+        if ((txc->channels == 0) || (txc->channels > HSC_DEVS))
+                return -EINVAL;
+        if (txc->channels & (txc->channels - 1))
+                return -EINVAL;
+        if ((txc->arb_mode != HSI_ARB_RR) && (txc->arb_mode != HSI_ARB_PRIO))
+                return -EINVAL;
+        tmp = cl->tx_cfg;
+        cl->tx_cfg.mode = txc->mode;
+        cl->tx_cfg.channels = txc->channels;
+        cl->tx_cfg.speed = txc->speed;
+        cl->tx_cfg.arb_mode = txc->arb_mode;
+        ret = hsi_setup(cl);
+        if (ret < 0) {
+                cl->tx_cfg = tmp;
+                return ret;
+        }
+        return ret;
+}
+static inline void hsc_tx_get(struct hsi_client *cl, struct hsc_tx_config *txc)
+{
+        txc->mode = cl->tx_cfg.mode;
+        txc->channels = cl->tx_cfg.channels;
+        txc->speed = cl->tx_cfg.speed;
+        txc->arb_mode = cl->tx_cfg.arb_mode;
+}
+static ssize_t hsc_read(struct file *file, char __user *buf, size_t len,
+                                                loff_t *ppos __maybe_unused)
+{
+        struct hsc_channel *channel = file->private_data;
+        struct hsi_msg *msg;
+        ssize_t ret;
+        if (len == 0)
+                return 0;
+        if (!IS_ALIGNED(len, sizeof(u32)))
+                return -EINVAL;
+        if (len > max_data_size)
+                len = max_data_size;
+        if (channel->ch >= channel->cl->rx_cfg.channels)
+                return -ECHRNG;
+        if (test_and_set_bit(HSC_CH_READ, &channel->flags))
+                return -EBUSY;
+        msg = hsc_get_first_msg(channel, &channel->free_msgs_list);
+        if (!msg) {
+                ret = -ENOSPC;
+                goto out;
+        }
+        hsc_msg_len_set(msg, len);
+        msg->complete = hsc_rx_completed;
+        msg->destructor = hsc_rx_msg_destructor;
+        ret = hsi_async_read(channel->cl, msg);
+        if (ret < 0) {
+                hsc_add_tail(channel, msg, &channel->free_msgs_list);
+                goto out;
+        }
+        ret = wait_event_interruptible(channel->rx_wait,
+                                        !list_empty(&channel->rx_msgs_queue));
+        if (ret < 0) {
+                clear_bit(HSC_CH_READ, &channel->flags);
+                hsi_flush(channel->cl);
+                return -EINTR;
+        }
+        msg = hsc_get_first_msg(channel, &channel->rx_msgs_queue);
+        if (msg) {
+                if (msg->status != HSI_STATUS_ERROR) {
+                        ret = copy_to_user((void __user *)buf,
+                        sg_virt(msg->sgt.sgl), hsc_msg_len_get(msg));
+                        if (ret)
+                                ret = -EFAULT;
+                        else
+                                ret = hsc_msg_len_get(msg);
+                } else {
+                        ret = -EIO;
+                }
+                hsc_add_tail(channel, msg, &channel->free_msgs_list);
+        }
+out:
+        clear_bit(HSC_CH_READ, &channel->flags);
+        return ret;
+}
+static ssize_t hsc_write(struct file *file, const char __user *buf, size_t len,
+                                                loff_t *ppos __maybe_unused)
+{
+        struct hsc_channel *channel = file->private_data;
+        struct hsi_msg *msg;
+        ssize_t ret;
+        if ((len == 0) || !IS_ALIGNED(len, sizeof(u32)))
+                return -EINVAL;
+        if (len > max_data_size)
+                len = max_data_size;
+        if (channel->ch >= channel->cl->tx_cfg.channels)
+                return -ECHRNG;
+        if (test_and_set_bit(HSC_CH_WRITE, &channel->flags))
+                return -EBUSY;
+        msg = hsc_get_first_msg(channel, &channel->free_msgs_list);
+        if (!msg) {
+                clear_bit(HSC_CH_WRITE, &channel->flags);
+                return -ENOSPC;
+        }
+        if (copy_from_user(sg_virt(msg->sgt.sgl), (void __user *)buf, len)) {
+                ret = -EFAULT;
+                goto out;
+        }
+        hsc_msg_len_set(msg, len);
+        msg->complete = hsc_tx_completed;
+        msg->destructor = hsc_tx_msg_destructor;
+        ret = hsi_async_write(channel->cl, msg);
+        if (ret < 0)
+                goto out;
+        ret = wait_event_interruptible(channel->tx_wait,
+                                        !list_empty(&channel->tx_msgs_queue));
+        if (ret < 0) {
+                clear_bit(HSC_CH_WRITE, &channel->flags);
+                hsi_flush(channel->cl);
+                return -EINTR;
+        }
+        msg = hsc_get_first_msg(channel, &channel->tx_msgs_queue);
+        if (msg) {
+                if (msg->status == HSI_STATUS_ERROR)
+                        ret = -EIO;
+                else
+                        ret = hsc_msg_len_get(msg);
+                hsc_add_tail(channel, msg, &channel->free_msgs_list);
+        }
+out:
+        clear_bit(HSC_CH_WRITE, &channel->flags);
+        return ret;
+}
+static long hsc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        struct hsc_channel *channel = file->private_data;
+        unsigned int state;
+        struct hsc_rx_config rxc;
+        struct hsc_tx_config txc;
+        long ret = 0;
+        switch (cmd) {
+        case HSC_RESET:
+                hsi_flush(channel->cl);
+                break;
+        case HSC_SET_PM:
+                if (copy_from_user(&state, (void __user *)arg, sizeof(state)))
+                        return -EFAULT;
+                if (state == HSC_PM_DISABLE) {
+                        if (test_and_set_bit(HSC_CH_WLINE, &channel->flags))
+                                return -EINVAL;
+                        ret = hsi_start_tx(channel->cl);
+                } else if (state == HSC_PM_ENABLE) {
+                        if (!test_and_clear_bit(HSC_CH_WLINE, &channel->flags))
+                                return -EINVAL;
+                        ret = hsi_stop_tx(channel->cl);
+                } else {
+                        ret = -EINVAL;
+                }
+                break;
+        case HSC_SEND_BREAK:
+                return hsc_break_send(channel->cl);
+        case HSC_SET_RX:
+                if (copy_from_user(&rxc, (void __user *)arg, sizeof(rxc)))
+                        return -EFAULT;
+                return hsc_rx_set(channel->cl, &rxc);
+        case HSC_GET_RX:
+                hsc_rx_get(channel->cl, &rxc);
+                if (copy_to_user((void __user *)arg, &rxc, sizeof(rxc)))
+                        return -EFAULT;
+                break;
+        case HSC_SET_TX:
+                if (copy_from_user(&txc, (void __user *)arg, sizeof(txc)))
+                        return -EFAULT;
+                return hsc_tx_set(channel->cl, &txc);
+        case HSC_GET_TX:
+                hsc_tx_get(channel->cl, &txc);
+                if (copy_to_user((void __user *)arg, &txc, sizeof(txc)))
+                        return -EFAULT;
+                break;
+        default:
+                return -ENOIOCTLCMD;
+        }
+        return ret;
+}
+static inline void __hsc_port_release(struct hsc_client_data *cl_data)
+{
+        BUG_ON(cl_data->usecnt == 0);
+        if (--cl_data->usecnt == 0) {
+                hsi_flush(cl_data->cl);
+                hsi_release_port(cl_data->cl);
+        }
+}
+static int hsc_open(struct inode *inode, struct file *file)
+{
+        struct hsc_client_data *cl_data;
+        struct hsc_channel *channel;
+        int ret = 0;
+        pr_debug("open, minor = %d\n", iminor(inode));
+        cl_data = container_of(inode->i_cdev, struct hsc_client_data, cdev);
+        mutex_lock(&cl_data->lock);
+        channel = cl_data->channels + (iminor(inode) & HSC_CH_MASK);
+        if (test_and_set_bit(HSC_CH_OPEN, &channel->flags)) {
+                ret = -EBUSY;
+                goto out;
+        }
+        /*
+         * Check if we have already claimed the port associated to the HSI
+         * client. If not then try to claim it, else increase its refcount
+         */
+        if (cl_data->usecnt == 0) {
+                ret = hsi_claim_port(cl_data->cl, 0);
+                if (ret < 0)
+                        goto out;
+                hsi_setup(cl_data->cl);
+        }
+        cl_data->usecnt++;
+        ret = hsc_msgs_alloc(channel);
+        if (ret < 0) {
+                __hsc_port_release(cl_data);
+                goto out;
+        }
+        file->private_data = channel;
+        mutex_unlock(&cl_data->lock);
+        return ret;
+out:
+        mutex_unlock(&cl_data->lock);
+        return ret;
+}
+static int hsc_release(struct inode *inode __maybe_unused, struct file *file)
+{
+        struct hsc_channel *channel = file->private_data;
+        struct hsc_client_data *cl_data = channel->cl_data;
+        mutex_lock(&cl_data->lock);
+        file->private_data = NULL;
+        if (test_and_clear_bit(HSC_CH_WLINE, &channel->flags))
+                hsi_stop_tx(channel->cl);
+        __hsc_port_release(cl_data);
+        hsc_reset_list(channel, &channel->rx_msgs_queue);
+        hsc_reset_list(channel, &channel->tx_msgs_queue);
+        hsc_reset_list(channel, &channel->free_msgs_list);
+        clear_bit(HSC_CH_READ, &channel->flags);
+        clear_bit(HSC_CH_WRITE, &channel->flags);
+        clear_bit(HSC_CH_OPEN, &channel->flags);
+        wake_up(&channel->rx_wait);
+        wake_up(&channel->tx_wait);
+        mutex_unlock(&cl_data->lock);
+        return 0;
+}
+static const struct file_operations hsc_fops = {
+        .owner          = THIS_MODULE,
+        .read           = hsc_read,
+        .write          = hsc_write,
+        .unlocked_ioctl = hsc_ioctl,
+        .open           = hsc_open,
+        .release        = hsc_release,
+};
+static void __devinit hsc_channel_init(struct hsc_channel *channel)
+{
+        init_waitqueue_head(&channel->rx_wait);
+        init_waitqueue_head(&channel->tx_wait);
+        spin_lock_init(&channel->lock);
+        INIT_LIST_HEAD(&channel->free_msgs_list);
+        INIT_LIST_HEAD(&channel->rx_msgs_queue);
+        INIT_LIST_HEAD(&channel->tx_msgs_queue);
+}
+static int __devinit hsc_probe(struct device *dev)
+{
+        const char devname[] = "hsi_char";
+        struct hsc_client_data *cl_data;
+        struct hsc_channel *channel;
+        struct hsi_client *cl = to_hsi_client(dev);
+        unsigned int hsc_baseminor;
+        dev_t hsc_dev;
+        int ret;
+        int i;
+        cl_data = kzalloc(sizeof(*cl_data), GFP_KERNEL);
+        if (!cl_data) {
+                dev_err(dev, "Could not allocate hsc_client_data\n");
+                return -ENOMEM;
+        }
+        hsc_baseminor = HSC_BASEMINOR(hsi_id(cl), hsi_port_id(cl));
+        if (!hsc_major) {
+                ret = alloc_chrdev_region(&hsc_dev, hsc_baseminor,
+                                                HSC_DEVS, devname);
+                if (ret > 0)
+                        hsc_major = MAJOR(hsc_dev);
+        } else {
+                hsc_dev = MKDEV(hsc_major, hsc_baseminor);
+                ret = register_chrdev_region(hsc_dev, HSC_DEVS, devname);
+        }
+        if (ret < 0) {
+                dev_err(dev, "Device %s allocation failed %d\n",
+                                        hsc_major ? "minor" : "major", ret);
+                goto out1;
+        }
+        mutex_init(&cl_data->lock);
+        hsi_client_set_drvdata(cl, cl_data);
+        cdev_init(&cl_data->cdev, &hsc_fops);
+        cl_data->cdev.owner = THIS_MODULE;
+        cl_data->cl = cl;
+        for (i = 0, channel = cl_data->channels; i < HSC_DEVS; i++, channel++) {
+                hsc_channel_init(channel);
+                channel->ch = i;
+                channel->cl = cl;
+                channel->cl_data = cl_data;
+        }
+        /* 1 hsi client -> N char devices (one for each channel) */
+        ret = cdev_add(&cl_data->cdev, hsc_dev, HSC_DEVS);
+        if (ret) {
+                dev_err(dev, "Could not add char device %d\n", ret);
+                goto out2;
+        }
+        return 0;
+out2:
+        unregister_chrdev_region(hsc_dev, HSC_DEVS);
+out1:
+        kfree(cl_data);
+        return ret;
+}
+static int __devexit hsc_remove(struct device *dev)
+{
+        struct hsi_client *cl = to_hsi_client(dev);
+        struct hsc_client_data *cl_data = hsi_client_drvdata(cl);
+        dev_t hsc_dev = cl_data->cdev.dev;
+        cdev_del(&cl_data->cdev);
+        unregister_chrdev_region(hsc_dev, HSC_DEVS);
+        hsi_client_set_drvdata(cl, NULL);
+        kfree(cl_data);
+        return 0;
+}
+static struct hsi_client_driver hsc_driver = {
+        .driver = {
+                .name   = "hsi_char",
+                .owner  = THIS_MODULE,
+                .probe  = hsc_probe,
+                .remove = __devexit_p(hsc_remove),
+        },
+};
+static int __init hsc_init(void)
+{
+        int ret;
+        if ((max_data_size < 4) || (max_data_size > 0x10000) ||
+                (max_data_size & (max_data_size - 1))) {
+                pr_err("Invalid max read/write data size");
+                return -EINVAL;
+        }
+        ret = hsi_register_client_driver(&hsc_driver);
+        if (ret) {
+                pr_err("Error while registering HSI/SSI driver %d", ret);
+                return ret;
+        }
+        pr_info("HSI/SSI char device loaded\n");
+        return 0;
+}
+module_init(hsc_init);
+static void __exit hsc_exit(void)
+{
+        hsi_unregister_client_driver(&hsc_driver);
+        pr_info("HSI char device removed\n");
+}
+module_exit(hsc_exit);
+MODULE_AUTHOR("Andras Domokos <andras.domokos@nokia.com>");
+MODULE_ALIAS("hsi:hsi_char");
+MODULE_DESCRIPTION("HSI character device");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/hsi/hsi.c b/drivers/hsi/hsi.c
new file mode 100644
index 000000000000..4e2d79b79334
--- /dev/null
+++ b/drivers/hsi/hsi.c
@@ -0,0 +1,494 @@
+/*
+ * HSI core.
+ *
+ * Copyright (C) 2010 Nokia Corporation. All rights reserved.
+ *
+ * Contact: Carlos Chinea <carlos.chinea@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#include <linux/hsi/hsi.h>
+#include <linux/compiler.h>
+#include <linux/rwsem.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/kobject.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include "hsi_core.h"
+static struct device_type hsi_ctrl = {
+        .name   = "hsi_controller",
+};
+static struct device_type hsi_cl = {
+        .name   = "hsi_client",
+};
+static struct device_type hsi_port = {
+        .name   = "hsi_port",
+};
+static ssize_t modalias_show(struct device *dev,
+                        struct device_attribute *a __maybe_unused, char *buf)
+{
+        return sprintf(buf, "hsi:%s\n", dev_name(dev));
+}
+static struct device_attribute hsi_bus_dev_attrs[] = {
+        __ATTR_RO(modalias),
+        __ATTR_NULL,
+};
+static int hsi_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        if (dev->type == &hsi_cl)
+                add_uevent_var(env, "MODALIAS=hsi:%s", dev_name(dev));
+        return 0;
+}
+static int hsi_bus_match(struct device *dev, struct device_driver *driver)
+{
+        return strcmp(dev_name(dev), driver->name) == 0;
+}
+static struct bus_type hsi_bus_type = {
+        .name           = "hsi",
+        .dev_attrs      = hsi_bus_dev_attrs,
+        .match          = hsi_bus_match,
+        .uevent         = hsi_bus_uevent,
+};
+static void hsi_client_release(struct device *dev)
+{
+        kfree(to_hsi_client(dev));
+}
+static void hsi_new_client(struct hsi_port *port, struct hsi_board_info *info)
+{
+        struct hsi_client *cl;
+        unsigned long flags;
+        cl = kzalloc(sizeof(*cl), GFP_KERNEL);
+        if (!cl)
+                return;
+        cl->device.type = &hsi_cl;
+        cl->tx_cfg = info->tx_cfg;
+        cl->rx_cfg = info->rx_cfg;
+        cl->device.bus = &hsi_bus_type;
+        cl->device.parent = &port->device;
+        cl->device.release = hsi_client_release;
+        dev_set_name(&cl->device, info->name);
+        cl->device.platform_data = info->platform_data;
+        spin_lock_irqsave(&port->clock, flags);
+        list_add_tail(&cl->link, &port->clients);
+        spin_unlock_irqrestore(&port->clock, flags);
+        if (info->archdata)
+                cl->device.archdata = *info->archdata;
+        if (device_register(&cl->device) < 0) {
+                pr_err("hsi: failed to register client: %s\n", info->name);
+                kfree(cl);
+        }
+}
+static void hsi_scan_board_info(struct hsi_controller *hsi)
+{
+        struct hsi_cl_info *cl_info;
+        struct hsi_port *p;
+        list_for_each_entry(cl_info, &hsi_board_list, list)
+                if (cl_info->info.hsi_id == hsi->id) {
+                        p = hsi_find_port_num(hsi, cl_info->info.port);
+                        if (!p)
+                                continue;
+                        hsi_new_client(p, &cl_info->info);
+                }
+}
+static int hsi_remove_client(struct device *dev, void *data __maybe_unused)
+{
+        struct hsi_client *cl = to_hsi_client(dev);
+        struct hsi_port *port = to_hsi_port(dev->parent);
+        unsigned long flags;
+        spin_lock_irqsave(&port->clock, flags);
+        list_del(&cl->link);
+        spin_unlock_irqrestore(&port->clock, flags);
+        device_unregister(dev);
+        return 0;
+}
+static int hsi_remove_port(struct device *dev, void *data __maybe_unused)
+{
+        device_for_each_child(dev, NULL, hsi_remove_client);
+        device_unregister(dev);
+        return 0;
+}
+static void hsi_controller_release(struct device *dev __maybe_unused)
+{
+}
+static void hsi_port_release(struct device *dev __maybe_unused)
+{
+}
+/**
+ * hsi_unregister_controller - Unregister an HSI controller
+ * @hsi: The HSI controller to register
+ */
+void hsi_unregister_controller(struct hsi_controller *hsi)
+{
+        device_for_each_child(&hsi->device, NULL, hsi_remove_port);
+        device_unregister(&hsi->device);
+}
+EXPORT_SYMBOL_GPL(hsi_unregister_controller);
+/**
+ * hsi_register_controller - Register an HSI controller and its ports
+ * @hsi: The HSI controller to register
+ *
+ * Returns -errno on failure, 0 on success.
+ */
+int hsi_register_controller(struct hsi_controller *hsi)
+{
+        unsigned int i;
+        int err;
+        hsi->device.type = &hsi_ctrl;
+        hsi->device.bus = &hsi_bus_type;
+        hsi->device.release = hsi_controller_release;
+        err = device_register(&hsi->device);
+        if (err < 0)
+                return err;
+        for (i = 0; i < hsi->num_ports; i++) {
+                hsi->port[i].device.parent = &hsi->device;
+                hsi->port[i].device.bus = &hsi_bus_type;
+                hsi->port[i].device.release = hsi_port_release;
+                hsi->port[i].device.type = &hsi_port;
+                INIT_LIST_HEAD(&hsi->port[i].clients);
+                spin_lock_init(&hsi->port[i].clock);
+                err = device_register(&hsi->port[i].device);
+                if (err < 0)
+                        goto out;
+        }
+        /* Populate HSI bus with HSI clients */
+        hsi_scan_board_info(hsi);
+        return 0;
+out:
+        hsi_unregister_controller(hsi);
+        return err;
+}
+EXPORT_SYMBOL_GPL(hsi_register_controller);
+/**
+ * hsi_register_client_driver - Register an HSI client to the HSI bus
+ * @drv: HSI client driver to register
+ *
+ * Returns -errno on failure, 0 on success.
+ */
+int hsi_register_client_driver(struct hsi_client_driver *drv)
+{
+        drv->driver.bus = &hsi_bus_type;
+        return driver_register(&drv->driver);
+}
+EXPORT_SYMBOL_GPL(hsi_register_client_driver);
+static inline int hsi_dummy_msg(struct hsi_msg *msg __maybe_unused)
+{
+        return 0;
+}
+static inline int hsi_dummy_cl(struct hsi_client *cl __maybe_unused)
+{
+        return 0;
+}
+/**
+ * hsi_alloc_controller - Allocate an HSI controller and its ports
+ * @n_ports: Number of ports on the HSI controller
+ * @flags: Kernel allocation flags
+ *
+ * Return NULL on failure or a pointer to an hsi_controller on success.
+ */
+struct hsi_controller *hsi_alloc_controller(unsigned int n_ports, gfp_t flags)
+{
+        struct hsi_controller   *hsi;
+        struct hsi_port         *port;
+        unsigned int            i;
+        if (!n_ports)
+                return NULL;
+        port = kzalloc(sizeof(*port)*n_ports, flags);
+        if (!port)
+                return NULL;
+        hsi = kzalloc(sizeof(*hsi), flags);
+        if (!hsi)
+                goto out;
+        for (i = 0; i < n_ports; i++) {
+                dev_set_name(&port[i].device, "port%d", i);
+                port[i].num = i;
+                port[i].async = hsi_dummy_msg;
+                port[i].setup = hsi_dummy_cl;
+                port[i].flush = hsi_dummy_cl;
+                port[i].start_tx = hsi_dummy_cl;
+                port[i].stop_tx = hsi_dummy_cl;
+                port[i].release = hsi_dummy_cl;
+                mutex_init(&port[i].lock);
+        }
+        hsi->num_ports = n_ports;
+        hsi->port = port;
+        return hsi;
+out:
+        kfree(port);
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(hsi_alloc_controller);
+/**
+ * hsi_free_controller - Free an HSI controller
+ * @hsi: Pointer to HSI controller
+ */
+void hsi_free_controller(struct hsi_controller *hsi)
+{
+        if (!hsi)
+                return;
+        kfree(hsi->port);
+        kfree(hsi);
+}
+EXPORT_SYMBOL_GPL(hsi_free_controller);
+/**
+ * hsi_free_msg - Free an HSI message
+ * @msg: Pointer to the HSI message
+ *
+ * Client is responsible to free the buffers pointed by the scatterlists.
+ */
+void hsi_free_msg(struct hsi_msg *msg)
+{
+        if (!msg)
+                return;
+        sg_free_table(&msg->sgt);
+        kfree(msg);
+}
+EXPORT_SYMBOL_GPL(hsi_free_msg);
+/**
+ * hsi_alloc_msg - Allocate an HSI message
+ * @nents: Number of memory entries
+ * @flags: Kernel allocation flags
+ *
+ * nents can be 0. This mainly makes sense for read transfer.
+ * In that case, HSI drivers will call the complete callback when
+ * there is data to be read without consuming it.
+ *
+ * Return NULL on failure or a pointer to an hsi_msg on success.
+ */
+struct hsi_msg *hsi_alloc_msg(unsigned int nents, gfp_t flags)
+{
+        struct hsi_msg *msg;
+        int err;
+        msg = kzalloc(sizeof(*msg), flags);
+        if (!msg)
+                return NULL;
+        if (!nents)
+                return msg;
+        err = sg_alloc_table(&msg->sgt, nents, flags);
+        if (unlikely(err)) {
+                kfree(msg);
+                msg = NULL;
+        }
+        return msg;
+}
+EXPORT_SYMBOL_GPL(hsi_alloc_msg);
+/**
+ * hsi_async - Submit an HSI transfer to the controller
+ * @cl: HSI client sending the transfer
+ * @msg: The HSI transfer passed to controller
+ *
+ * The HSI message must have the channel, ttype, complete and destructor
+ * fields set beforehand. If nents > 0 then the client has to initialize
+ * also the scatterlists to point to the buffers to write to or read from.
+ *
+ * HSI controllers relay on pre-allocated buffers from their clients and they
+ * do not allocate buffers on their own.
+ *
+ * Once the HSI message transfer finishes, the HSI controller calls the
+ * complete callback with the status and actual_len fields of the HSI message
+ * updated. The complete callback can be called before returning from
+ * hsi_async.
+ *
+ * Returns -errno on failure or 0 on success
+ */
+int hsi_async(struct hsi_client *cl, struct hsi_msg *msg)
+{
+        struct hsi_port *port = hsi_get_port(cl);
+        if (!hsi_port_claimed(cl))
+                return -EACCES;
+        WARN_ON_ONCE(!msg->destructor || !msg->complete);
+        msg->cl = cl;
+        return port->async(msg);
+}
+EXPORT_SYMBOL_GPL(hsi_async);
+/**
+ * hsi_claim_port - Claim the HSI client's port
+ * @cl: HSI client that wants to claim its port
+ * @share: Flag to indicate if the client wants to share the port or not.
+ *
+ * Returns -errno on failure, 0 on success.
+ */
+int hsi_claim_port(struct hsi_client *cl, unsigned int share)
+{
+        struct hsi_port *port = hsi_get_port(cl);
+        int err = 0;
+        mutex_lock(&port->lock);
+        if ((port->claimed) && (!port->shared || !share)) {
+                err = -EBUSY;
+                goto out;
+        }
+        if (!try_module_get(to_hsi_controller(port->device.parent)->owner)) {
+                err = -ENODEV;
+                goto out;
+        }
+        port->claimed++;
+        port->shared = !!share;
+        cl->pclaimed = 1;
+out:
+        mutex_unlock(&port->lock);
+        return err;
+}
+EXPORT_SYMBOL_GPL(hsi_claim_port);
+/**
+ * hsi_release_port - Release the HSI client's port
+ * @cl: HSI client which previously claimed its port
+ */
+void hsi_release_port(struct hsi_client *cl)
+{
+        struct hsi_port *port = hsi_get_port(cl);
+        mutex_lock(&port->lock);
+        /* Allow HW driver to do some cleanup */
+        port->release(cl);
+        if (cl->pclaimed)
+                port->claimed--;
+        BUG_ON(port->claimed < 0);
+        cl->pclaimed = 0;
+        if (!port->claimed)
+                port->shared = 0;
+        module_put(to_hsi_controller(port->device.parent)->owner);
+        mutex_unlock(&port->lock);
+}
+EXPORT_SYMBOL_GPL(hsi_release_port);
+static int hsi_start_rx(struct hsi_client *cl, void *data __maybe_unused)
+{
+        if (cl->hsi_start_rx)
+                (*cl->hsi_start_rx)(cl);
+        return 0;
+}
+static int hsi_stop_rx(struct hsi_client *cl, void *data __maybe_unused)
+{
+        if (cl->hsi_stop_rx)
+                (*cl->hsi_stop_rx)(cl);
+        return 0;
+}
+static int hsi_port_for_each_client(struct hsi_port *port, void *data,
+                                int (*fn)(struct hsi_client *cl, void *data))
+{
+        struct hsi_client *cl;
+        spin_lock(&port->clock);
+        list_for_each_entry(cl, &port->clients, link) {
+                spin_unlock(&port->clock);
+                (*fn)(cl, data);
+                spin_lock(&port->clock);
+        }
+        spin_unlock(&port->clock);
+        return 0;
+}
+/**
+ * hsi_event -Notifies clients about port events
+ * @port: Port where the event occurred
+ * @event: The event type
+ *
+ * Clients should not be concerned about wake line behavior. However, due
+ * to a race condition in HSI HW protocol, clients need to be notified
+ * about wake line changes, so they can implement a workaround for it.
+ *
+ * Events:
+ * HSI_EVENT_START_RX - Incoming wake line high
+ * HSI_EVENT_STOP_RX - Incoming wake line down
+ */
+void hsi_event(struct hsi_port *port, unsigned int event)
+{
+        int (*fn)(struct hsi_client *cl, void *data);
+        switch (event) {
+        case HSI_EVENT_START_RX:
+                fn = hsi_start_rx;
+                break;
+        case HSI_EVENT_STOP_RX:
+                fn = hsi_stop_rx;
+                break;
+        default:
+                return;
+        }
+        hsi_port_for_each_client(port, NULL, fn);
+}
+EXPORT_SYMBOL_GPL(hsi_event);
+static int __init hsi_init(void)
+{
+        return bus_register(&hsi_bus_type);
+}
+postcore_initcall(hsi_init);
+static void __exit hsi_exit(void)
+{
+        bus_unregister(&hsi_bus_type);
+}
+module_exit(hsi_exit);
+MODULE_AUTHOR("Carlos Chinea <carlos.chinea@nokia.com>");
+MODULE_DESCRIPTION("High-speed Synchronous Serial Interface (HSI) framework");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/hsi/hsi_boardinfo.c b/drivers/hsi/hsi_boardinfo.c
new file mode 100644
index 000000000000..e56bc6da5f98
--- /dev/null
+++ b/drivers/hsi/hsi_boardinfo.c
@@ -0,0 +1,62 @@
+/*
+ * HSI clients registration interface
+ *
+ * Copyright (C) 2010 Nokia Corporation. All rights reserved.
+ *
+ * Contact: Carlos Chinea <carlos.chinea@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#include <linux/hsi/hsi.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include "hsi_core.h"
+/*
+ * hsi_board_list is only used internally by the HSI framework.
+ * No one else is allowed to make use of it.
+ */
+LIST_HEAD(hsi_board_list);
+EXPORT_SYMBOL_GPL(hsi_board_list);
+/**
+ * hsi_register_board_info - Register HSI clients information
+ * @info: Array of HSI clients on the board
+ * @len: Length of the array
+ *
+ * HSI clients are statically declared and registered on board files.
+ *
+ * HSI clients will be automatically registered to the HSI bus once the
+ * controller and the port where the clients wishes to attach are registered
+ * to it.
+ *
+ * Return -errno on failure, 0 on success.
+ */
+int __init hsi_register_board_info(struct hsi_board_info const *info,
+                                                        unsigned int len)
+{
+        struct hsi_cl_info *cl_info;
+        cl_info = kzalloc(sizeof(*cl_info) * len, GFP_KERNEL);
+        if (!cl_info)
+                return -ENOMEM;
+        for (; len; len--, info++, cl_info++) {
+                cl_info->info = *info;
+                list_add_tail(&cl_info->list, &hsi_board_list);
+        }
+        return 0;
+}
diff --git a/drivers/hsi/hsi_core.h b/drivers/hsi/hsi_core.h
new file mode 100644
index 000000000000..ab5c2fb175fd
--- /dev/null
+++ b/drivers/hsi/hsi_core.h
@@ -0,0 +1,35 @@
+/*
+ * HSI framework internal interfaces,
+ *
+ * Copyright (C) 2010 Nokia Corporation. All rights reserved.
+ *
+ * Contact: Carlos Chinea <carlos.chinea@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#ifndef __LINUX_HSI_CORE_H__
+#define __LINUX_HSI_CORE_H__
+#include <linux/hsi/hsi.h>
+struct hsi_cl_info {
+        struct list_head        list;
+        struct hsi_board_info   info;
+};
+extern struct list_head hsi_board_list;
+#endif /* __LINUX_HSI_CORE_H__ */
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 5b32d56dbb4d..8deedc1b9840 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -253,7 +253,8 @@ config SENSORS_K10TEMP
          If you say yes here you get support for the temperature
          sensor(s) inside your CPU. Supported are later revisions of
          the AMD Family 10h and all revisions of the AMD Family 11h,
-          12h (Llano), 14h (Brazos) and 15h (Bulldozer) microarchitectures.
+          12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity)
+          microarchitectures.
          This driver can also be built as a module.  If so, the module
          will be called k10temp.
@@ -425,7 +426,7 @@ config SENSORS_GL520SM
 config SENSORS_GPIO_FAN
        tristate "GPIO fan"
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        help
          If you say yes here you get support for fans connected to GPIO lines.
@@ -883,7 +884,7 @@ source drivers/hwmon/pmbus/Kconfig
 config SENSORS_SHT15
        tristate "Sensiron humidity and temperature sensors. SHT15 and compat."
-        depends on GENERIC_GPIO
+        depends on GPIOLIB
        help
          If you say yes here you get support for the Sensiron SHT10, SHT11,
          SHT15, SHT71, SHT75 humidity and temperature sensors.
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index 554f046bcf20..145f13580ff0 100644
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@ -632,6 +632,7 @@ static int register_ro_attrs(struct acpi_power_meter_resource *resource,
                sensors->dev_attr.show = ro->show;
                sensors->index = ro->index;
+                sysfs_attr_init(&sensors->dev_attr.attr);
                res = device_create_file(dev, &sensors->dev_attr);
                if (res) {
                        sensors->dev_attr.attr.name = NULL;
@@ -661,6 +662,7 @@ static int register_rw_attrs(struct acpi_power_meter_resource *resource,
                sensors->dev_attr.store = rw->set;
                sensors->index = rw->index;
+                sysfs_attr_init(&sensors->dev_attr.attr);
                res = device_create_file(dev, &sensors->dev_attr);
                if (res) {
                        sensors->dev_attr.attr.name = NULL;
diff --git a/drivers/hwmon/ad7314.c b/drivers/hwmon/ad7314.c
index 0e0cfcc36f8d..ce43642ef03e 100644
--- a/drivers/hwmon/ad7314.c
+++ b/drivers/hwmon/ad7314.c
@@ -128,6 +128,7 @@ static int __devinit ad7314_probe(struct spi_device *spi_dev)
                ret = PTR_ERR(chip->hwmon_dev);
                goto error_remove_group;
        }
+        chip->spi_dev = spi_dev;
        return 0;
 error_remove_group:
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index ff37363ea5bc..44e1fd7f3d81 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -233,18 +233,15 @@ static const auto_chan_table_t auto_channel_select_table_adm1030 = {
 * nearest match if no exact match where found.
 */
 static int
-get_fan_auto_nearest(struct adm1031_data *data,
+get_fan_auto_nearest(struct adm1031_data *data, int chan, u8 val, u8 reg)
-                     int chan, u8 val, u8 reg, u8 *new_reg)
 {
        int i;
        int first_match = -1, exact_match = -1;
        u8 other_reg_val =
            (*data->chan_select_table)[FAN_CHAN_FROM_REG(reg)][chan ? 0 : 1];
-        if (val == 0) {
+        if (val == 0)
-                *new_reg = 0;
                return 0;
-        }
        for (i = 0; i < 8; i++) {
                if ((val == (*data->chan_select_table)[i][chan]) &&
@@ -264,13 +261,11 @@ get_fan_auto_nearest(struct adm1031_data *data,
        }
        if (exact_match >= 0)
-                *new_reg = exact_match;
+                return exact_match;
        else if (first_match >= 0)
-                *new_reg = first_match;
+                return first_match;
-        else
-                return -EINVAL;
-        return 0;
+        return -EINVAL;
 }
 static ssize_t show_fan_auto_channel(struct device *dev,
@@ -301,11 +296,12 @@ set_fan_auto_channel(struct device *dev, struct device_attribute *attr,
        mutex_lock(&data->update_lock);
-        ret = get_fan_auto_nearest(data, nr, val, data->conf1, &reg);
+        ret = get_fan_auto_nearest(data, nr, val, data->conf1);
-        if (ret) {
+        if (ret < 0) {
                mutex_unlock(&data->update_lock);
                return ret;
        }
+        reg = ret;
        data->conf1 = FAN_CHAN_TO_REG(reg, data->conf1);
        if ((data->conf1 & ADM1031_CONF1_AUTO_MODE) ^
            (old_fan_mode & ADM1031_CONF1_AUTO_MODE)) {
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index 729499e75210..ece4159bd453 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -276,6 +276,7 @@ static bool duty_mode_enabled(u8 pwm_enable)
                return false;
        default:
                BUG();
+                return true;
        }
 }
@@ -291,6 +292,7 @@ static bool auto_mode_enabled(u8 pwm_enable)
                return true;
        default:
                BUG();
+                return false;
        }
 }
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index aba29d63f195..307bb325dde9 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -33,6 +33,9 @@ static bool force;
 module_param(force, bool, 0444);
 MODULE_PARM_DESC(force, "force loading on processors with erratum 319");
+/* PCI-IDs for Northbridge devices not used anywhere else */
+#define PCI_DEVICE_ID_AMD_15H_M10H_NB_F3        0x1403
 /* CPUID function 0x80000001, ebx */
 #define CPUID_PKGTYPE_MASK      0xf0000000
 #define CPUID_PKGTYPE_F         0x00000000
@@ -210,6 +213,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = {
        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },
        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
+        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_NB_F3) },
        {}
 };
 MODULE_DEVICE_TABLE(pci, k10temp_id_table);
diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c
index 193067e27b6f..de8f7adaccbd 100644
--- a/drivers/hwmon/max6639.c
+++ b/drivers/hwmon/max6639.c
@@ -596,8 +596,10 @@ static int max6639_remove(struct i2c_client *client)
        return 0;
 }
-static int max6639_suspend(struct i2c_client *client, pm_message_t mesg)
+#ifdef CONFIG_PM_SLEEP
+static int max6639_suspend(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
        int data = i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG);
        if (data < 0)
                return data;
@@ -606,8 +608,9 @@ static int max6639_suspend(struct i2c_client *client, pm_message_t mesg)
                        MAX6639_REG_GCONFIG, data | MAX6639_GCONFIG_STANDBY);
 }
-static int max6639_resume(struct i2c_client *client)
+static int max6639_resume(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
        int data = i2c_smbus_read_byte_data(client, MAX6639_REG_GCONFIG);
        if (data < 0)
                return data;
@@ -615,6 +618,7 @@ static int max6639_resume(struct i2c_client *client)
        return i2c_smbus_write_byte_data(client,
                        MAX6639_REG_GCONFIG, data & ~MAX6639_GCONFIG_STANDBY);
 }
+#endif /* CONFIG_PM_SLEEP */
 static const struct i2c_device_id max6639_id[] = {
        {"max6639", 0},
@@ -623,15 +627,18 @@ static const struct i2c_device_id max6639_id[] = {
 MODULE_DEVICE_TABLE(i2c, max6639_id);
+static const struct dev_pm_ops max6639_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(max6639_suspend, max6639_resume)
+};
 static struct i2c_driver max6639_driver = {
        .class = I2C_CLASS_HWMON,
        .driver = {
                   .name = "max6639",
+                   .pm = &max6639_pm_ops,
                   },
        .probe = max6639_probe,
        .remove = max6639_remove,
-        .suspend = max6639_suspend,
-        .resume = max6639_resume,
        .id_table = max6639_id,
        .detect = max6639_detect,
        .address_list = normal_i2c,
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index a25350cf9554..54922ed12978 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -2619,15 +2619,15 @@ static struct platform_driver w83627ehf_driver = {
 static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
                                 struct w83627ehf_sio_data *sio_data)
 {
-        static const char __initdata sio_name_W83627EHF[] = "W83627EHF";
+        static const char sio_name_W83627EHF[] __initconst = "W83627EHF";
-        static const char __initdata sio_name_W83627EHG[] = "W83627EHG";
+        static const char sio_name_W83627EHG[] __initconst = "W83627EHG";
-        static const char __initdata sio_name_W83627DHG[] = "W83627DHG";
+        static const char sio_name_W83627DHG[] __initconst = "W83627DHG";
-        static const char __initdata sio_name_W83627DHG_P[] = "W83627DHG-P";
+        static const char sio_name_W83627DHG_P[] __initconst = "W83627DHG-P";
-        static const char __initdata sio_name_W83627UHG[] = "W83627UHG";
+        static const char sio_name_W83627UHG[] __initconst = "W83627UHG";
-        static const char __initdata sio_name_W83667HG[] = "W83667HG";
+        static const char sio_name_W83667HG[] __initconst = "W83667HG";
-        static const char __initdata sio_name_W83667HG_B[] = "W83667HG-B";
+        static const char sio_name_W83667HG_B[] __initconst = "W83667HG-B";
-        static const char __initdata sio_name_NCT6775[] = "NCT6775F";
+        static const char sio_name_NCT6775[] __initconst = "NCT6775F";
-        static const char __initdata sio_name_NCT6776[] = "NCT6776F";
+        static const char sio_name_NCT6776[] __initconst = "NCT6776F";
        u16 val;
        const char *sio_name;
diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c
index c976285d313e..fa080ebd568f 100644
--- a/drivers/idle/i7300_idle.c
+++ b/drivers/idle/i7300_idle.c
@@ -516,12 +516,6 @@ static struct notifier_block i7300_idle_nb = {
 MODULE_DEVICE_TABLE(pci, pci_tbl);
-int stats_open_generic(struct inode *inode, struct file *fp)
-{
-        fp->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t stats_read_ul(struct file *fp, char __user *ubuf, size_t count,
                                loff_t *off)
 {
@@ -534,7 +528,7 @@ static ssize_t stats_read_ul(struct file *fp, char __user *ubuf, size_t count,
 }
 static const struct file_operations idle_fops = {
-        .open   = stats_open_generic,
+        .open   = simple_open,
        .read   = stats_read_ul,
        .llseek = default_llseek,
 };
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index ae2ec929e52f..a5bee8e2dfce 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2707,7 +2707,8 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist,
 * The exported alloc_coherent function for dma_ops.
 */
 static void *alloc_coherent(struct device *dev, size_t size,
-                            dma_addr_t *dma_addr, gfp_t flag)
+                            dma_addr_t *dma_addr, gfp_t flag,
+                            struct dma_attrs *attrs)
 {
        unsigned long flags;
        void *virt_addr;
@@ -2765,7 +2766,8 @@ out_free:
 * The exported free_coherent function for dma_ops.
 */
 static void free_coherent(struct device *dev, size_t size,
-                          void *virt_addr, dma_addr_t dma_addr)
+                          void *virt_addr, dma_addr_t dma_addr,
+                          struct dma_attrs *attrs)
 {
        unsigned long flags;
        struct protection_domain *domain;
@@ -2846,8 +2848,8 @@ static void __init prealloc_protection_domains(void)
 }
 static struct dma_map_ops amd_iommu_dma_ops = {
-        .alloc_coherent = alloc_coherent,
+        .alloc = alloc_coherent,
-        .free_coherent = free_coherent,
+        .free = free_coherent,
        .map_page = map_page,
        .unmap_page = unmap_page,
        .map_sg = map_sg,
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 132f93b05154..f93d5ac8f81c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2949,7 +2949,8 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
 }
 static void *intel_alloc_coherent(struct device *hwdev, size_t size,
-                                  dma_addr_t *dma_handle, gfp_t flags)
+                                  dma_addr_t *dma_handle, gfp_t flags,
+                                  struct dma_attrs *attrs)
 {
        void *vaddr;
        int order;
@@ -2981,7 +2982,7 @@ static void *intel_alloc_coherent(struct device *hwdev, size_t size,
 }
 static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
-                                dma_addr_t dma_handle)
+                                dma_addr_t dma_handle, struct dma_attrs *attrs)
 {
        int order;
@@ -3126,8 +3127,8 @@ static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
 }
 struct dma_map_ops intel_dma_ops = {
-        .alloc_coherent = intel_alloc_coherent,
+        .alloc = intel_alloc_coherent,
-        .free_coherent = intel_free_coherent,
+        .free = intel_free_coherent,
        .map_sg = intel_map_sg,
        .unmap_sg = intel_unmap_sg,
        .map_page = intel_map_page,
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
index 103dbd92e256..f55fc5dfbadc 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -323,15 +323,9 @@ err_out:
        return count;
 }
-static int debug_open_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 #define DEBUG_FOPS(name)                                                \
        static const struct file_operations debug_##name##_fops = {     \
-                .open = debug_open_generic,                             \
+                .open = simple_open,                                    \
                .read = debug_read_##name,                              \
                .write = debug_write_##name,                            \
                .llseek = generic_file_llseek,                          \
@@ -339,7 +333,7 @@ static int debug_open_generic(struct inode *inode, struct file *file)
 #define DEBUG_FOPS_RO(name)                                             \
        static const struct file_operations debug_##name##_fops = {     \
-                .open = debug_open_generic,                             \
+                .open = simple_open,                                    \
                .read = debug_read_##name,                              \
                .llseek = generic_file_llseek,                          \
        };
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index 05ed4d0cb18b..c0b8c960ee3f 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -891,7 +891,7 @@ open_bchannel(struct fritzcard *fc, struct channel_req *rq)
 {
        struct bchannel         *bch;
-        if (rq->adr.channel > 2)
+        if (rq->adr.channel == 0 || rq->adr.channel > 2)
                return -EINVAL;
        if (rq->protocol == ISDN_P_NONE)
                return -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index d055ae7fa040..e2c83a2d7691 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -1962,7 +1962,7 @@ open_bchannel(struct hfc_pci *hc, struct channel_req *rq)
 {
        struct bchannel         *bch;
-        if (rq->adr.channel > 2)
+        if (rq->adr.channel == 0 || rq->adr.channel > 2)
                return -EINVAL;
        if (rq->protocol == ISDN_P_NONE)
                return -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index 602338734634..8cde2a0538ab 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -486,7 +486,7 @@ open_bchannel(struct hfcsusb *hw, struct channel_req *rq)
 {
        struct bchannel         *bch;
-        if (rq->adr.channel > 2)
+        if (rq->adr.channel == 0 || rq->adr.channel > 2)
                return -EINVAL;
        if (rq->protocol == ISDN_P_NONE)
                return -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index b47e9bed2185..884369f09cad 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -1506,7 +1506,7 @@ open_bchannel(struct ipac_hw *ipac, struct channel_req *rq)
 {
        struct bchannel         *bch;
-        if (rq->adr.channel > 2)
+        if (rq->adr.channel == 0 || rq->adr.channel > 2)
                return -EINVAL;
        if (rq->protocol == ISDN_P_NONE)
                return -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c
index 10446ab404b5..9a6da6edcfa8 100644
--- a/drivers/isdn/hardware/mISDN/mISDNisar.c
+++ b/drivers/isdn/hardware/mISDN/mISDNisar.c
@@ -1670,7 +1670,7 @@ isar_open(struct isar_hw *isar, struct channel_req *rq)
 {
        struct bchannel         *bch;
-        if (rq->adr.channel > 2)
+        if (rq->adr.channel == 0 || rq->adr.channel > 2)
                return -EINVAL;
        if (rq->protocol == ISDN_P_NONE)
                return -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c
index dd6de9f7a8a3..c726e09d0981 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -860,7 +860,7 @@ open_bchannel(struct tiger_hw *card, struct channel_req *rq)
 {
        struct bchannel *bch;
-        if (rq->adr.channel > 2)
+        if (rq->adr.channel == 0 || rq->adr.channel > 2)
                return -EINVAL;
        if (rq->protocol == ISDN_P_NONE)
                return -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 7f1e7ba75cd1..2183357f0799 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -1015,7 +1015,7 @@ open_bchannel(struct w6692_hw *card, struct channel_req *rq)
 {
        struct bchannel *bch;
-        if (rq->adr.channel > 2)
+        if (rq->adr.channel == 0 || rq->adr.channel > 2)
                return -EINVAL;
        if (rq->protocol == ISDN_P_NONE)
                return -EINVAL;
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index b0fcc7d02adb..fa211d80fc0a 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -198,6 +198,7 @@ out:
 static int linear_run (struct mddev *mddev)
 {
        struct linear_conf *conf;
+        int ret;
        if (md_check_no_bitmap(mddev))
                return -EINVAL;
@@ -211,7 +212,13 @@ static int linear_run (struct mddev *mddev)
        blk_queue_merge_bvec(mddev->queue, linear_mergeable_bvec);
        mddev->queue->backing_dev_info.congested_fn = linear_congested;
        mddev->queue->backing_dev_info.congested_data = mddev;
-        return md_integrity_register(mddev);
+        ret =  md_integrity_register(mddev);
+        if (ret) {
+                kfree(conf);
+                mddev->private = NULL;
+        }
+        return ret;
 }
 static int linear_add(struct mddev *mddev, struct md_rdev *rdev)
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 6f31f5596e01..de63a1fc3737 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -407,6 +407,8 @@ static sector_t raid0_size(struct mddev *mddev, sector_t sectors, int raid_disks
        return array_sectors;
 }
+static int raid0_stop(struct mddev *mddev);
 static int raid0_run(struct mddev *mddev)
 {
        struct r0conf *conf;
@@ -454,7 +456,12 @@ static int raid0_run(struct mddev *mddev)
        blk_queue_merge_bvec(mddev->queue, raid0_mergeable_bvec);
        dump_zones(mddev);
-        return md_integrity_register(mddev);
+        ret = md_integrity_register(mddev);
+        if (ret)
+                raid0_stop(mddev);
+        return ret;
 }
 static int raid0_stop(struct mddev *mddev)
@@ -625,6 +632,7 @@ static void *raid0_takeover_raid10(struct mddev *mddev)
 static void *raid0_takeover_raid1(struct mddev *mddev)
 {
        struct r0conf *priv_conf;
+        int chunksect;
        /* Check layout:
         *  - (N - 1) mirror drives must be already faulty
@@ -635,10 +643,25 @@ static void *raid0_takeover_raid1(struct mddev *mddev)
                return ERR_PTR(-EINVAL);
        }
+        /*
+         * a raid1 doesn't have the notion of chunk size, so
+         * figure out the largest suitable size we can use.
+         */
+        chunksect = 64 * 2; /* 64K by default */
+        /* The array must be an exact multiple of chunksize */
+        while (chunksect && (mddev->array_sectors & (chunksect - 1)))
+                chunksect >>= 1;
+        if ((chunksect << 9) < PAGE_SIZE)
+                /* array size does not allow a suitable chunk size */
+                return ERR_PTR(-EINVAL);
        /* Set new parameters */
        mddev->new_level = 0;
        mddev->new_layout = 0;
-        mddev->new_chunk_sectors = 128; /* by default set chunk size to 64k */
+        mddev->new_chunk_sectors = chunksect;
+        mddev->chunk_sectors = chunksect;
        mddev->delta_disks = 1 - mddev->raid_disks;
        mddev->raid_disks = 1;
        /* make sure it will be not marked as dirty */
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 4a40a200d769..d35e4c991e38 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1738,7 +1738,7 @@ static int process_checks(struct r1bio *r1_bio)
                                s = sbio->bi_io_vec[j].bv_page;
                                if (memcmp(page_address(p),
                                           page_address(s),
-                                           PAGE_SIZE))
+                                           sbio->bi_io_vec[j].bv_len))
                                        break;
                        }
                } else
@@ -2386,8 +2386,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp
                int ok = 1;
                for (i = 0 ; i < conf->raid_disks * 2 ; i++)
                        if (r1_bio->bios[i]->bi_end_io == end_sync_write) {
-                                struct md_rdev *rdev =
+                                struct md_rdev *rdev = conf->mirrors[i].rdev;
-                                        rcu_dereference(conf->mirrors[i].rdev);
                                ok = rdev_set_badblocks(rdev, sector_nr,
                                                        min_bad, 0
                                        ) && ok;
@@ -2636,11 +2635,13 @@ static struct r1conf *setup_conf(struct mddev *mddev)
        return ERR_PTR(err);
 }
+static int stop(struct mddev *mddev);
 static int run(struct mddev *mddev)
 {
        struct r1conf *conf;
        int i;
        struct md_rdev *rdev;
+        int ret;
        if (mddev->level != 1) {
                printk(KERN_ERR "md/raid1:%s: raid level not set to mirroring (%d)\n",
@@ -2705,7 +2706,11 @@ static int run(struct mddev *mddev)
                mddev->queue->backing_dev_info.congested_data = mddev;
                blk_queue_merge_bvec(mddev->queue, raid1_mergeable_bvec);
        }
-        return md_integrity_register(mddev);
+        ret =  md_integrity_register(mddev);
+        if (ret)
+                stop(mddev);
+        return ret;
 }
 static int stop(struct mddev *mddev)
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 3540316886f2..fff782189e48 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1821,7 +1821,7 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio)
                        for (j = 0; j < vcnt; j++)
                                if (memcmp(page_address(fbio->bi_io_vec[j].bv_page),
                                           page_address(tbio->bi_io_vec[j].bv_page),
-                                           PAGE_SIZE))
+                                           fbio->bi_io_vec[j].bv_len))
                                        break;
                        if (j == vcnt)
                                continue;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 23ac880bba9a..f351422938e0 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -2471,39 +2471,41 @@ handle_failed_sync(struct r5conf *conf, struct stripe_head *sh,
        int abort = 0;
        int i;
-        md_done_sync(conf->mddev, STRIPE_SECTORS, 0);
        clear_bit(STRIPE_SYNCING, &sh->state);
        s->syncing = 0;
        s->replacing = 0;
        /* There is nothing more to do for sync/check/repair.
+         * Don't even need to abort as that is handled elsewhere
+         * if needed, and not always wanted e.g. if there is a known
+         * bad block here.
         * For recover/replace we need to record a bad block on all
         * non-sync devices, or abort the recovery
         */
-        if (!test_bit(MD_RECOVERY_RECOVER, &conf->mddev->recovery))
+        if (test_bit(MD_RECOVERY_RECOVER, &conf->mddev->recovery)) {
-                return;
+                /* During recovery devices cannot be removed, so
-        /* During recovery devices cannot be removed, so locking and
+                 * locking and refcounting of rdevs is not needed
-         * refcounting of rdevs is not needed
+                 */
-         */
+                for (i = 0; i < conf->raid_disks; i++) {
-        for (i = 0; i < conf->raid_disks; i++) {
+                        struct md_rdev *rdev = conf->disks[i].rdev;
-                struct md_rdev *rdev = conf->disks[i].rdev;
+                        if (rdev
-                if (rdev
+                            && !test_bit(Faulty, &rdev->flags)
-                    && !test_bit(Faulty, &rdev->flags)
+                            && !test_bit(In_sync, &rdev->flags)
-                    && !test_bit(In_sync, &rdev->flags)
+                            && !rdev_set_badblocks(rdev, sh->sector,
-                    && !rdev_set_badblocks(rdev, sh->sector,
+                                                   STRIPE_SECTORS, 0))
-                                           STRIPE_SECTORS, 0))
+                                abort = 1;
-                        abort = 1;
+                        rdev = conf->disks[i].replacement;
-                rdev = conf->disks[i].replacement;
+                        if (rdev
-                if (rdev
+                            && !test_bit(Faulty, &rdev->flags)
-                    && !test_bit(Faulty, &rdev->flags)
+                            && !test_bit(In_sync, &rdev->flags)
-                    && !test_bit(In_sync, &rdev->flags)
+                            && !rdev_set_badblocks(rdev, sh->sector,
-                    && !rdev_set_badblocks(rdev, sh->sector,
+                                                   STRIPE_SECTORS, 0))
-                                           STRIPE_SECTORS, 0))
+                                abort = 1;
-                        abort = 1;
+                }
-        }
+                if (abort)
-        if (abort) {
+                        conf->recovery_disabled =
-                conf->recovery_disabled = conf->mddev->recovery_disabled;
+                                conf->mddev->recovery_disabled;
-                set_bit(MD_RECOVERY_INTR, &conf->mddev->recovery);
        }
+        md_done_sync(conf->mddev, STRIPE_SECTORS, !abort);
 }
 static int want_replace(struct stripe_head *sh, int disk_idx)
@@ -3203,7 +3205,8 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)
                        /* Not in-sync */;
                else if (is_bad) {
                        /* also not in-sync */
-                        if (!test_bit(WriteErrorSeen, &rdev->flags)) {
+                        if (!test_bit(WriteErrorSeen, &rdev->flags) &&
+                            test_bit(R5_UPTODATE, &dev->flags)) {
                                /* treat as in-sync, but with a read error
                                 * which we can now try to correct
                                 */
@@ -3276,12 +3279,14 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)
                /* If there is a failed device being replaced,
                 *     we must be recovering.
                 * else if we are after recovery_cp, we must be syncing
+                 * else if MD_RECOVERY_REQUESTED is set, we also are syncing.
                 * else we can only be replacing
                 * sync and recovery both need to read all devices, and so
                 * use the same flag.
                 */
                if (do_recovery ||
-                    sh->sector >= conf->mddev->recovery_cp)
+                    sh->sector >= conf->mddev->recovery_cp ||
+                    test_bit(MD_RECOVERY_REQUESTED, &(conf->mddev->recovery)))
                        s->syncing = 1;
                else
                        s->replacing = 1;
diff --git a/drivers/mfd/aat2870-core.c b/drivers/mfd/aat2870-core.c
index 3aa36eb5c79b..44a3fdbadef4 100644
--- a/drivers/mfd/aat2870-core.c
+++ b/drivers/mfd/aat2870-core.c
@@ -262,13 +262,6 @@ static ssize_t aat2870_dump_reg(struct aat2870_data *aat2870, char *buf)
        return count;
 }
-static int aat2870_reg_open_file(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t aat2870_reg_read_file(struct file *file, char __user *user_buf,
                                     size_t count, loff_t *ppos)
 {
@@ -330,7 +323,7 @@ static ssize_t aat2870_reg_write_file(struct file *file,
 }
 static const struct file_operations aat2870_reg_fops = {
-        .open = aat2870_reg_open_file,
+        .open = simple_open,
        .read = aat2870_reg_read_file,
        .write = aat2870_reg_write_file,
 };
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 60107ee166fc..1efad20fb175 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -483,12 +483,6 @@ struct ab3100_get_set_reg_priv {
        bool mode;
 };
-static int ab3100_get_set_reg_open_file(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t ab3100_get_set_reg(struct file *file,
                                  const char __user *user_buf,
                                  size_t count, loff_t *ppos)
@@ -583,7 +577,7 @@ static ssize_t ab3100_get_set_reg(struct file *file,
 }
 static const struct file_operations ab3100_get_set_reg_fops = {
-        .open = ab3100_get_set_reg_open_file,
+        .open = simple_open,
        .write = ab3100_get_set_reg,
        .llseek = noop_llseek,
 };
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index 1c034b80d408..6673e578b3e9 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -500,12 +500,6 @@ static ssize_t r_heartbeat_file_write(struct file *file, const char __user *buf,
        return 1;
 }
-static int remote_settings_file_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static int remote_settings_file_close(struct inode *inode, struct file *file)
 {
        return 0;
@@ -600,7 +594,7 @@ static const struct file_operations r_heartbeat_fops = {
 };
 static const struct file_operations remote_settings_fops = {
-        .open =         remote_settings_file_open,
+        .open =         simple_open,
        .release =      remote_settings_file_close,
        .read =         remote_settings_file_read,
        .write =        remote_settings_file_write,
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
index 3f7ad83ed740..3aa9a969b373 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
@@ -134,12 +134,17 @@ static int force_hwbrks;
 static int hwbreaks_ok;
 static int hw_break_val;
 static int hw_break_val2;
+static int cont_instead_of_sstep;
+static unsigned long cont_thread_id;
+static unsigned long sstep_thread_id;
 #if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || defined(CONFIG_SPARC)
 static int arch_needs_sstep_emulation = 1;
 #else
 static int arch_needs_sstep_emulation;
 #endif
+static unsigned long cont_addr;
 static unsigned long sstep_addr;
+static int restart_from_top_after_write;
 static int sstep_state;
 /* Storage for the registers, in GDB format. */
@@ -187,7 +192,8 @@ static int kgdbts_unreg_thread(void *ptr)
         */
        while (!final_ack)
                msleep_interruptible(1500);
+        /* Pause for any other threads to exit after final ack. */
+        msleep_interruptible(1000);
        if (configured)
                kgdb_unregister_io_module(&kgdbts_io_ops);
        configured = 0;
@@ -211,7 +217,7 @@ static unsigned long lookup_addr(char *arg)
        if (!strcmp(arg, "kgdbts_break_test"))
                addr = (unsigned long)kgdbts_break_test;
        else if (!strcmp(arg, "sys_open"))
-                addr = (unsigned long)sys_open;
+                addr = (unsigned long)do_sys_open;
        else if (!strcmp(arg, "do_fork"))
                addr = (unsigned long)do_fork;
        else if (!strcmp(arg, "hw_break_val"))
@@ -283,6 +289,16 @@ static void hw_break_val_write(void)
        hw_break_val++;
 }
+static int get_thread_id_continue(char *put_str, char *arg)
+{
+        char *ptr = &put_str[11];
+        if (put_str[1] != 'T' || put_str[2] != '0')
+                return 1;
+        kgdb_hex2long(&ptr, &cont_thread_id);
+        return 0;
+}
 static int check_and_rewind_pc(char *put_str, char *arg)
 {
        unsigned long addr = lookup_addr(arg);
@@ -299,13 +315,21 @@ static int check_and_rewind_pc(char *put_str, char *arg)
        if (addr + BREAK_INSTR_SIZE == ip)
                offset = -BREAK_INSTR_SIZE;
 #endif
-        if (strcmp(arg, "silent") && ip + offset != addr) {
+        if (arch_needs_sstep_emulation && sstep_addr &&
+            ip + offset == sstep_addr &&
+            ((!strcmp(arg, "sys_open") || !strcmp(arg, "do_fork")))) {
+                /* This is special case for emulated single step */
+                v2printk("Emul: rewind hit single step bp\n");
+                restart_from_top_after_write = 1;
+        } else if (strcmp(arg, "silent") && ip + offset != addr) {
                eprintk("kgdbts: BP mismatch %lx expected %lx\n",
                           ip + offset, addr);
                return 1;
        }
        /* Readjust the instruction pointer if needed */
        ip += offset;
+        cont_addr = ip;
 #ifdef GDB_ADJUSTS_BREAK_OFFSET
        instruction_pointer_set(&kgdbts_regs, ip);
 #endif
@@ -315,6 +339,8 @@ static int check_and_rewind_pc(char *put_str, char *arg)
 static int check_single_step(char *put_str, char *arg)
 {
        unsigned long addr = lookup_addr(arg);
+        static int matched_id;
        /*
         * From an arch indepent point of view the instruction pointer
         * should be on a different instruction
@@ -324,6 +350,29 @@ static int check_single_step(char *put_str, char *arg)
        gdb_regs_to_pt_regs(kgdbts_gdb_regs, &kgdbts_regs);
        v2printk("Singlestep stopped at IP: %lx\n",
                   instruction_pointer(&kgdbts_regs));
+        if (sstep_thread_id != cont_thread_id) {
+                /*
+                 * Ensure we stopped in the same thread id as before, else the
+                 * debugger should continue until the original thread that was
+                 * single stepped is scheduled again, emulating gdb's behavior.
+                 */
+                v2printk("ThrID does not match: %lx\n", cont_thread_id);
+                if (arch_needs_sstep_emulation) {
+                        if (matched_id &&
+                            instruction_pointer(&kgdbts_regs) != addr)
+                                goto continue_test;
+                        matched_id++;
+                        ts.idx -= 2;
+                        sstep_state = 0;
+                        return 0;
+                }
+                cont_instead_of_sstep = 1;
+                ts.idx -= 4;
+                return 0;
+        }
+continue_test:
+        matched_id = 0;
        if (instruction_pointer(&kgdbts_regs) == addr) {
                eprintk("kgdbts: SingleStep failed at %lx\n",
                           instruction_pointer(&kgdbts_regs));
@@ -365,10 +414,40 @@ static int got_break(char *put_str, char *arg)
        return 1;
 }
+static void get_cont_catch(char *arg)
+{
+        /* Always send detach because the test is completed at this point */
+        fill_get_buf("D");
+}
+static int put_cont_catch(char *put_str, char *arg)
+{
+        /* This is at the end of the test and we catch any and all input */
+        v2printk("kgdbts: cleanup task: %lx\n", sstep_thread_id);
+        ts.idx--;
+        return 0;
+}
+static int emul_reset(char *put_str, char *arg)
+{
+        if (strncmp(put_str, "$OK", 3))
+                return 1;
+        if (restart_from_top_after_write) {
+                restart_from_top_after_write = 0;
+                ts.idx = -1;
+        }
+        return 0;
+}
 static void emul_sstep_get(char *arg)
 {
        if (!arch_needs_sstep_emulation) {
-                fill_get_buf(arg);
+                if (cont_instead_of_sstep) {
+                        cont_instead_of_sstep = 0;
+                        fill_get_buf("c");
+                } else {
+                        fill_get_buf(arg);
+                }
                return;
        }
        switch (sstep_state) {
@@ -398,9 +477,11 @@ static void emul_sstep_get(char *arg)
 static int emul_sstep_put(char *put_str, char *arg)
 {
        if (!arch_needs_sstep_emulation) {
-                if (!strncmp(put_str+1, arg, 2))
+                char *ptr = &put_str[11];
-                        return 0;
+                if (put_str[1] != 'T' || put_str[2] != '0')
-                return 1;
+                        return 1;
+                kgdb_hex2long(&ptr, &sstep_thread_id);
+                return 0;
        }
        switch (sstep_state) {
        case 1:
@@ -411,8 +492,7 @@ static int emul_sstep_put(char *put_str, char *arg)
                v2printk("Stopped at IP: %lx\n",
                         instruction_pointer(&kgdbts_regs));
                /* Want to stop at IP + break instruction size by default */
-                sstep_addr = instruction_pointer(&kgdbts_regs) +
+                sstep_addr = cont_addr + BREAK_INSTR_SIZE;
-                        BREAK_INSTR_SIZE;
                break;
        case 2:
                if (strncmp(put_str, "$OK", 3)) {
@@ -424,6 +504,9 @@ static int emul_sstep_put(char *put_str, char *arg)
                if (strncmp(put_str, "$T0", 3)) {
                        eprintk("kgdbts: failed continue sstep\n");
                        return 1;
+                } else {
+                        char *ptr = &put_str[11];
+                        kgdb_hex2long(&ptr, &sstep_thread_id);
                }
                break;
        case 4:
@@ -502,10 +585,10 @@ static struct test_struct bad_read_test[] = {
 static struct test_struct singlestep_break_test[] = {
        { "?", "S0*" }, /* Clear break points */
        { "kgdbts_break_test", "OK", sw_break, }, /* set sw breakpoint */
-        { "c", "T0*", }, /* Continue */
+        { "c", "T0*", NULL, get_thread_id_continue }, /* Continue */
+        { "kgdbts_break_test", "OK", sw_rem_break }, /*remove breakpoint */
        { "g", "kgdbts_break_test", NULL, check_and_rewind_pc },
        { "write", "OK", write_regs }, /* Write registers */
-        { "kgdbts_break_test", "OK", sw_rem_break }, /*remove breakpoint */
        { "s", "T0*", emul_sstep_get, emul_sstep_put }, /* Single step */
        { "g", "kgdbts_break_test", NULL, check_single_step },
        { "kgdbts_break_test", "OK", sw_break, }, /* set sw breakpoint */
@@ -523,16 +606,16 @@ static struct test_struct singlestep_break_test[] = {
 static struct test_struct do_fork_test[] = {
        { "?", "S0*" }, /* Clear break points */
        { "do_fork", "OK", sw_break, }, /* set sw breakpoint */
-        { "c", "T0*", }, /* Continue */
+        { "c", "T0*", NULL, get_thread_id_continue }, /* Continue */
-        { "g", "do_fork", NULL, check_and_rewind_pc }, /* check location */
-        { "write", "OK", write_regs }, /* Write registers */
        { "do_fork", "OK", sw_rem_break }, /*remove breakpoint */
+        { "g", "do_fork", NULL, check_and_rewind_pc }, /* check location */
+        { "write", "OK", write_regs, emul_reset }, /* Write registers */
        { "s", "T0*", emul_sstep_get, emul_sstep_put }, /* Single step */
        { "g", "do_fork", NULL, check_single_step },
        { "do_fork", "OK", sw_break, }, /* set sw breakpoint */
        { "7", "T0*", skip_back_repeat_test }, /* Loop based on repeat_test */
        { "D", "OK", NULL, final_ack_set }, /* detach and unregister I/O */
-        { "", "" },
+        { "", "", get_cont_catch, put_cont_catch },
 };
 /* Test for hitting a breakpoint at sys_open for what ever the number
@@ -541,16 +624,16 @@ static struct test_struct do_fork_test[] = {
 static struct test_struct sys_open_test[] = {
        { "?", "S0*" }, /* Clear break points */
        { "sys_open", "OK", sw_break, }, /* set sw breakpoint */
-        { "c", "T0*", }, /* Continue */
+        { "c", "T0*", NULL, get_thread_id_continue }, /* Continue */
-        { "g", "sys_open", NULL, check_and_rewind_pc }, /* check location */
-        { "write", "OK", write_regs }, /* Write registers */
        { "sys_open", "OK", sw_rem_break }, /*remove breakpoint */
+        { "g", "sys_open", NULL, check_and_rewind_pc }, /* check location */
+        { "write", "OK", write_regs, emul_reset }, /* Write registers */
        { "s", "T0*", emul_sstep_get, emul_sstep_put }, /* Single step */
        { "g", "sys_open", NULL, check_single_step },
        { "sys_open", "OK", sw_break, }, /* set sw breakpoint */
        { "7", "T0*", skip_back_repeat_test }, /* Loop based on repeat_test */
        { "D", "OK", NULL, final_ack_set }, /* detach and unregister I/O */
-        { "", "" },
+        { "", "", get_cont_catch, put_cont_catch },
 };
 /*
@@ -693,8 +776,8 @@ static int run_simple_test(int is_get_char, int chr)
        /* This callback is a put char which is when kgdb sends data to
         * this I/O module.
         */
-        if (ts.tst[ts.idx].get[0] == '\0' &&
+        if (ts.tst[ts.idx].get[0] == '\0' && ts.tst[ts.idx].put[0] == '\0' &&
-                ts.tst[ts.idx].put[0] == '\0') {
+            !ts.tst[ts.idx].get_handler) {
                eprintk("kgdbts: ERROR: beyond end of test on"
                           " '%s' line %i\n", ts.name, ts.idx);
                return 0;
@@ -907,6 +990,17 @@ static void kgdbts_run_tests(void)
        if (ptr)
                sstep_test = simple_strtol(ptr+1, NULL, 10);
+        /* All HW break point tests */
+        if (arch_kgdb_ops.flags & KGDB_HW_BREAKPOINT) {
+                hwbreaks_ok = 1;
+                v1printk("kgdbts:RUN hw breakpoint test\n");
+                run_breakpoint_test(1);
+                v1printk("kgdbts:RUN hw write breakpoint test\n");
+                run_hw_break_test(1);
+                v1printk("kgdbts:RUN access write breakpoint test\n");
+                run_hw_break_test(0);
+        }
        /* required internal KGDB tests */
        v1printk("kgdbts:RUN plant and detach test\n");
        run_plant_and_detach_test(0);
@@ -924,35 +1018,11 @@ static void kgdbts_run_tests(void)
        /* ===Optional tests=== */
-        /* All HW break point tests */
-        if (arch_kgdb_ops.flags & KGDB_HW_BREAKPOINT) {
-                hwbreaks_ok = 1;
-                v1printk("kgdbts:RUN hw breakpoint test\n");
-                run_breakpoint_test(1);
-                v1printk("kgdbts:RUN hw write breakpoint test\n");
-                run_hw_break_test(1);
-                v1printk("kgdbts:RUN access write breakpoint test\n");
-                run_hw_break_test(0);
-        }
        if (nmi_sleep) {
                v1printk("kgdbts:RUN NMI sleep %i seconds test\n", nmi_sleep);
                run_nmi_sleep_test(nmi_sleep);
        }
-#ifdef CONFIG_DEBUG_RODATA
-        /* Until there is an api to write to read-only text segments, use
-         * HW breakpoints for the remainder of any tests, else print a
-         * failure message if hw breakpoints do not work.
-         */
-        if (!(arch_kgdb_ops.flags & KGDB_HW_BREAKPOINT && hwbreaks_ok)) {
-                eprintk("kgdbts: HW breakpoints do not work,"
-                        "skipping remaining tests\n");
-                return;
-        }
-        force_hwbrks = 1;
-#endif /* CONFIG_DEBUG_RODATA */
        /* If the do_fork test is run it will be the last test that is
         * executed because a kernel thread will be spawned at the very
         * end to unregister the debug hooks.
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index eed213a5c8cb..b1809650b7aa 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1623,24 +1623,6 @@ static int mmc_blk_alloc_parts(struct mmc_card *card, struct mmc_blk_data *md)
        return ret;
 }
-static int
-mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card)
-{
-        int err;
-        mmc_claim_host(card->host);
-        err = mmc_set_blocklen(card, 512);
-        mmc_release_host(card->host);
-        if (err) {
-                pr_err("%s: unable to set block size to 512: %d\n",
-                        md->disk->disk_name, err);
-                return -EINVAL;
-        }
-        return 0;
-}
 static void mmc_blk_remove_req(struct mmc_blk_data *md)
 {
        struct mmc_card *card;
@@ -1768,7 +1750,6 @@ static const struct mmc_fixup blk_fixups[] =
 static int mmc_blk_probe(struct mmc_card *card)
 {
        struct mmc_blk_data *md, *part_md;
-        int err;
        char cap_str[10];
        /*
@@ -1781,10 +1762,6 @@ static int mmc_blk_probe(struct mmc_card *card)
        if (IS_ERR(md))
                return PTR_ERR(md);
-        err = mmc_blk_set_blksize(md, card);
-        if (err)
-                goto out;
        string_get_size((u64)get_capacity(md->disk) << 9, STRING_UNITS_2,
                        cap_str, sizeof(cap_str));
        pr_info("%s: %s %s %s %s\n",
@@ -1809,7 +1786,7 @@ static int mmc_blk_probe(struct mmc_card *card)
 out:
        mmc_blk_remove_parts(card, md);
        mmc_blk_remove_req(md);
-        return err;
+        return 0;
 }
 static void mmc_blk_remove(struct mmc_card *card)
@@ -1845,8 +1822,6 @@ static int mmc_blk_resume(struct mmc_card *card)
        struct mmc_blk_data *md = mmc_get_drvdata(card);
        if (md) {
-                mmc_blk_set_blksize(md, card);
                /*
                 * Resume involves the card going into idle state,
                 * so current partition is always the main one.
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 5d011a39dfff..3f606068d552 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -267,6 +267,15 @@ int mmc_add_card(struct mmc_card *card)
 {
        int ret;
        const char *type;
+        const char *uhs_bus_speed_mode = "";
+        static const char *const uhs_speeds[] = {
+                [UHS_SDR12_BUS_SPEED] = "SDR12 ",
+                [UHS_SDR25_BUS_SPEED] = "SDR25 ",
+                [UHS_SDR50_BUS_SPEED] = "SDR50 ",
+                [UHS_SDR104_BUS_SPEED] = "SDR104 ",
+                [UHS_DDR50_BUS_SPEED] = "DDR50 ",
+        };
        dev_set_name(&card->dev, "%s:%04x", mmc_hostname(card->host), card->rca);
@@ -296,6 +305,10 @@ int mmc_add_card(struct mmc_card *card)
                break;
        }
+        if (mmc_sd_card_uhs(card) &&
+                (card->sd_bus_speed < ARRAY_SIZE(uhs_speeds)))
+                uhs_bus_speed_mode = uhs_speeds[card->sd_bus_speed];
        if (mmc_host_is_spi(card->host)) {
                pr_info("%s: new %s%s%s card on SPI\n",
                        mmc_hostname(card->host),
@@ -303,13 +316,13 @@ int mmc_add_card(struct mmc_card *card)
                        mmc_card_ddr_mode(card) ? "DDR " : "",
                        type);
        } else {
-                pr_info("%s: new %s%s%s%s card at address %04x\n",
+                pr_info("%s: new %s%s%s%s%s card at address %04x\n",
                        mmc_hostname(card->host),
                        mmc_card_uhs(card) ? "ultra high speed " :
                        (mmc_card_highspeed(card) ? "high speed " : ""),
                        (mmc_card_hs200(card) ? "HS200 " : ""),
                        mmc_card_ddr_mode(card) ? "DDR " : "",
-                        type, card->rca);
+                        uhs_bus_speed_mode, type, card->rca);
        }
 #ifdef CONFIG_DEBUG_FS
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 14f262e9246d..7474c47b9c08 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -527,10 +527,14 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
                if (data->flags & MMC_DATA_WRITE)
                        /*
-                         * The limit is really 250 ms, but that is
+                         * The MMC spec "It is strongly recommended
-                         * insufficient for some crappy cards.
+                         * for hosts to implement more than 500ms
+                         * timeout value even if the card indicates
+                         * the 250ms maximum busy length."  Even the
+                         * previous value of 300ms is known to be
+                         * insufficient for some cards.
                         */
-                        limit_us = 300000;
+                        limit_us = 3000000;
                else
                        limit_us = 100000;
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 02914d609a91..54df5adc0413 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -695,6 +695,11 @@ static int mmc_select_powerclass(struct mmc_card *card,
                else if (host->ios.clock <= 200000000)
                        index = EXT_CSD_PWR_CL_200_195;
                break;
+        case MMC_VDD_27_28:
+        case MMC_VDD_28_29:
+        case MMC_VDD_29_30:
+        case MMC_VDD_30_31:
+        case MMC_VDD_31_32:
        case MMC_VDD_32_33:
        case MMC_VDD_33_34:
        case MMC_VDD_34_35:
@@ -1111,11 +1116,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                ext_csd_bits = (bus_width == MMC_BUS_WIDTH_8) ?
                                EXT_CSD_BUS_WIDTH_8 : EXT_CSD_BUS_WIDTH_4;
                err = mmc_select_powerclass(card, ext_csd_bits, ext_csd);
-                if (err) {
+                if (err)
-                        pr_err("%s: power class selection to bus width %d failed\n",
+                        pr_warning("%s: power class selection to bus width %d"
-                                mmc_hostname(card->host), 1 << bus_width);
+                                   " failed\n", mmc_hostname(card->host),
-                        goto err;
+                                   1 << bus_width);
-                }
        }
        /*
@@ -1147,10 +1151,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                        err = mmc_select_powerclass(card, ext_csd_bits[idx][0],
                                                    ext_csd);
                        if (err)
-                                pr_err("%s: power class selection to "
+                                pr_warning("%s: power class selection to "
-                                       "bus width %d failed\n",
+                                           "bus width %d failed\n",
-                                       mmc_hostname(card->host),
+                                           mmc_hostname(card->host),
-                                       1 << bus_width);
+                                           1 << bus_width);
                        err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                                         EXT_CSD_BUS_WIDTH,
@@ -1178,10 +1182,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                        err = mmc_select_powerclass(card, ext_csd_bits[idx][1],
                                                    ext_csd);
                        if (err)
-                                pr_err("%s: power class selection to "
+                                pr_warning("%s: power class selection to "
-                                       "bus width %d ddr %d failed\n",
+                                           "bus width %d ddr %d failed\n",
-                                       mmc_hostname(card->host),
+                                           mmc_hostname(card->host),
-                                       1 << bus_width, ddr);
+                                           1 << bus_width, ddr);
                        err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                                         EXT_CSD_BUS_WIDTH,
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 40989e6bb53a..236842ec955a 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -192,9 +192,15 @@ static int sdio_bus_remove(struct device *dev)
        return ret;
 }
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
+static int pm_no_operation(struct device *dev)
+{
+        return 0;
+}
 static const struct dev_pm_ops sdio_bus_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(pm_no_operation, pm_no_operation)
        SET_RUNTIME_PM_OPS(
                pm_generic_runtime_suspend,
                pm_generic_runtime_resume,
@@ -204,11 +210,11 @@ static const struct dev_pm_ops sdio_bus_pm_ops = {
 #define SDIO_PM_OPS_PTR (&sdio_bus_pm_ops)
-#else /* !CONFIG_PM_RUNTIME */
+#else /* !CONFIG_PM */
 #define SDIO_PM_OPS_PTR NULL
-#endif /* !CONFIG_PM_RUNTIME */
+#endif /* !CONFIG_PM */
 static struct bus_type sdio_bus_type = {
        .name           = "sdio",
diff --git a/drivers/mmc/host/atmel-mci-regs.h b/drivers/mmc/host/atmel-mci-regs.h
index 000b3ad0f5ca..787aba1682bb 100644
--- a/drivers/mmc/host/atmel-mci-regs.h
+++ b/drivers/mmc/host/atmel-mci-regs.h
@@ -31,6 +31,7 @@
 # define ATMCI_MR_PDCFBYTE              (  1 << 13)     /* Force Byte Transfer */
 # define ATMCI_MR_PDCPADV               (  1 << 14)     /* Padding Value */
 # define ATMCI_MR_PDCMODE               (  1 << 15)     /* PDC-oriented Mode */
+# define ATMCI_MR_CLKODD(x)             ((x) << 16)     /* LSB of Clock Divider */
 #define ATMCI_DTOR                      0x0008  /* Data Timeout */
 # define ATMCI_DTOCYC(x)                ((x) <<  0)     /* Data Timeout Cycles */
 # define ATMCI_DTOMUL(x)                ((x) <<  4)     /* Data Timeout Multiplier */
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 9819dc09ce08..e94476beca18 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -77,6 +77,7 @@ struct atmel_mci_caps {
        bool    has_cstor_reg;
        bool    has_highspeed;
        bool    has_rwproof;
+        bool    has_odd_clk_div;
 };
 struct atmel_mci_dma {
@@ -482,7 +483,14 @@ err:
 static inline unsigned int atmci_ns_to_clocks(struct atmel_mci *host,
                                        unsigned int ns)
 {
-        return (ns * (host->bus_hz / 1000000) + 999) / 1000;
+        /*
+         * It is easier here to use us instead of ns for the timeout,
+         * it prevents from overflows during calculation.
+         */
+        unsigned int us = DIV_ROUND_UP(ns, 1000);
+        /* Maximum clock frequency is host->bus_hz/2 */
+        return us * (DIV_ROUND_UP(host->bus_hz, 2000000));
 }
 static void atmci_set_timeout(struct atmel_mci *host,
@@ -1127,16 +1135,27 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                }
                /* Calculate clock divider */
-                clkdiv = DIV_ROUND_UP(host->bus_hz, 2 * clock_min) - 1;
+                if (host->caps.has_odd_clk_div) {
-                if (clkdiv > 255) {
+                        clkdiv = DIV_ROUND_UP(host->bus_hz, clock_min) - 2;
-                        dev_warn(&mmc->class_dev,
+                        if (clkdiv > 511) {
-                                "clock %u too slow; using %lu\n",
+                                dev_warn(&mmc->class_dev,
-                                clock_min, host->bus_hz / (2 * 256));
+                                         "clock %u too slow; using %lu\n",
-                        clkdiv = 255;
+                                         clock_min, host->bus_hz / (511 + 2));
+                                clkdiv = 511;
+                        }
+                        host->mode_reg = ATMCI_MR_CLKDIV(clkdiv >> 1)
+                                         | ATMCI_MR_CLKODD(clkdiv & 1);
+                } else {
+                        clkdiv = DIV_ROUND_UP(host->bus_hz, 2 * clock_min) - 1;
+                        if (clkdiv > 255) {
+                                dev_warn(&mmc->class_dev,
+                                         "clock %u too slow; using %lu\n",
+                                         clock_min, host->bus_hz / (2 * 256));
+                                clkdiv = 255;
+                        }
+                        host->mode_reg = ATMCI_MR_CLKDIV(clkdiv);
                }
-                host->mode_reg = ATMCI_MR_CLKDIV(clkdiv);
                /*
                 * WRPROOF and RDPROOF prevent overruns/underruns by
                 * stopping the clock when the FIFO is full/empty.
@@ -2007,35 +2026,35 @@ static void __init atmci_get_cap(struct atmel_mci *host)
                        "version: 0x%x\n", version);
        host->caps.has_dma = 0;
-        host->caps.has_pdc = 0;
+        host->caps.has_pdc = 1;
        host->caps.has_cfg_reg = 0;
        host->caps.has_cstor_reg = 0;
        host->caps.has_highspeed = 0;
        host->caps.has_rwproof = 0;
+        host->caps.has_odd_clk_div = 0;
        /* keep only major version number */
        switch (version & 0xf00) {
-        case 0x100:
-        case 0x200:
-                host->caps.has_pdc = 1;
-                host->caps.has_rwproof = 1;
-                break;
-        case 0x300:
-        case 0x400:
        case 0x500:
+                host->caps.has_odd_clk_div = 1;
+        case 0x400:
+        case 0x300:
 #ifdef CONFIG_AT_HDMAC
                host->caps.has_dma = 1;
 #else
-                host->caps.has_dma = 0;
                dev_info(&host->pdev->dev,
                        "has dma capability but dma engine is not selected, then use pio\n");
 #endif
+                host->caps.has_pdc = 0;
                host->caps.has_cfg_reg = 1;
                host->caps.has_cstor_reg = 1;
                host->caps.has_highspeed = 1;
+        case 0x200:
                host->caps.has_rwproof = 1;
+        case 0x100:
                break;
        default:
+                host->caps.has_pdc = 0;
                dev_warn(&host->pdev->dev,
                                "Unmanaged mci version, set minimum capabilities\n");
                break;
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 47adb161d3ad..5c2b1c10af9c 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1785,7 +1785,7 @@ static inline struct omap_mmc_platform_data
 }
 #endif
-static int __init omap_hsmmc_probe(struct platform_device *pdev)
+static int __devinit omap_hsmmc_probe(struct platform_device *pdev)
 {
        struct omap_mmc_platform_data *pdata = pdev->dev.platform_data;
        struct mmc_host *mmc;
@@ -1818,8 +1818,6 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
        if (res == NULL || irq < 0)
                return -ENXIO;
-        res->start += pdata->reg_offset;
-        res->end += pdata->reg_offset;
        res = request_mem_region(res->start, resource_size(res), pdev->name);
        if (res == NULL)
                return -EBUSY;
@@ -1843,7 +1841,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
        host->dma_ch    = -1;
        host->irq       = irq;
        host->slot_id   = 0;
-        host->mapbase   = res->start;
+        host->mapbase   = res->start + pdata->reg_offset;
        host->base      = ioremap(host->mapbase, SZ_4K);
        host->power_mode = MMC_POWER_OFF;
        host->next_data.cookie = 1;
@@ -1875,8 +1873,6 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
                goto err1;
        }
-        omap_hsmmc_context_save(host);
        if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
                dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
                mmc->caps2 |= MMC_CAP2_NO_MULTI_READ;
@@ -1887,6 +1883,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
        pm_runtime_set_autosuspend_delay(host->dev, MMC_AUTOSUSPEND_DELAY);
        pm_runtime_use_autosuspend(host->dev);
+        omap_hsmmc_context_save(host);
        if (cpu_is_omap2430()) {
                host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
                /*
@@ -2018,8 +2016,7 @@ err_reg:
 err_irq_cd_init:
        free_irq(host->irq, host);
 err_irq:
-        pm_runtime_mark_last_busy(host->dev);
+        pm_runtime_put_sync(host->dev);
-        pm_runtime_put_autosuspend(host->dev);
        pm_runtime_disable(host->dev);
        clk_put(host->fclk);
        if (host->got_dbclk) {
@@ -2037,35 +2034,33 @@ err:
        return ret;
 }
-static int omap_hsmmc_remove(struct platform_device *pdev)
+static int __devexit omap_hsmmc_remove(struct platform_device *pdev)
 {
        struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
        struct resource *res;
-        if (host) {
+        pm_runtime_get_sync(host->dev);
-                pm_runtime_get_sync(host->dev);
+        mmc_remove_host(host->mmc);
-                mmc_remove_host(host->mmc);
+        if (host->use_reg)
-                if (host->use_reg)
+                omap_hsmmc_reg_put(host);
-                        omap_hsmmc_reg_put(host);
+        if (host->pdata->cleanup)
-                if (host->pdata->cleanup)
+                host->pdata->cleanup(&pdev->dev);
-                        host->pdata->cleanup(&pdev->dev);
+        free_irq(host->irq, host);
-                free_irq(host->irq, host);
+        if (mmc_slot(host).card_detect_irq)
-                if (mmc_slot(host).card_detect_irq)
+                free_irq(mmc_slot(host).card_detect_irq, host);
-                        free_irq(mmc_slot(host).card_detect_irq, host);
-                pm_runtime_put_sync(host->dev);
-                pm_runtime_disable(host->dev);
-                clk_put(host->fclk);
-                if (host->got_dbclk) {
-                        clk_disable(host->dbclk);
-                        clk_put(host->dbclk);
-                }
-                mmc_free_host(host->mmc);
+        pm_runtime_put_sync(host->dev);
-                iounmap(host->base);
+        pm_runtime_disable(host->dev);
-                omap_hsmmc_gpio_free(pdev->dev.platform_data);
+        clk_put(host->fclk);
+        if (host->got_dbclk) {
+                clk_disable(host->dbclk);
+                clk_put(host->dbclk);
        }
+        mmc_free_host(host->mmc);
+        iounmap(host->base);
+        omap_hsmmc_gpio_free(pdev->dev.platform_data);
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (res)
                release_mem_region(res->start, resource_size(res));
@@ -2078,49 +2073,45 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
 static int omap_hsmmc_suspend(struct device *dev)
 {
        int ret = 0;
-        struct platform_device *pdev = to_platform_device(dev);
+        struct omap_hsmmc_host *host = dev_get_drvdata(dev);
-        struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
-        if (host && host->suspended)
+        if (!host)
                return 0;
-        if (host) {
+        if (host && host->suspended)
-                pm_runtime_get_sync(host->dev);
+                return 0;
-                host->suspended = 1;
-                if (host->pdata->suspend) {
-                        ret = host->pdata->suspend(&pdev->dev,
-                                                        host->slot_id);
-                        if (ret) {
-                                dev_dbg(mmc_dev(host->mmc),
-                                        "Unable to handle MMC board"
-                                        " level suspend\n");
-                                host->suspended = 0;
-                                return ret;
-                        }
-                }
-                ret = mmc_suspend_host(host->mmc);
+        pm_runtime_get_sync(host->dev);
+        host->suspended = 1;
+        if (host->pdata->suspend) {
+                ret = host->pdata->suspend(dev, host->slot_id);
                if (ret) {
+                        dev_dbg(dev, "Unable to handle MMC board"
+                                        " level suspend\n");
                        host->suspended = 0;
-                        if (host->pdata->resume) {
+                        return ret;
-                                ret = host->pdata->resume(&pdev->dev,
-                                                          host->slot_id);
-                                if (ret)
-                                        dev_dbg(mmc_dev(host->mmc),
-                                                "Unmask interrupt failed\n");
-                        }
-                        goto err;
                }
+        }
+        ret = mmc_suspend_host(host->mmc);
-                if (!(host->mmc->pm_flags & MMC_PM_KEEP_POWER)) {
+        if (ret) {
-                        omap_hsmmc_disable_irq(host);
+                host->suspended = 0;
-                        OMAP_HSMMC_WRITE(host->base, HCTL,
+                if (host->pdata->resume) {
-                                OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
+                        ret = host->pdata->resume(dev, host->slot_id);
+                        if (ret)
+                                dev_dbg(dev, "Unmask interrupt failed\n");
                }
-                if (host->got_dbclk)
+                goto err;
-                        clk_disable(host->dbclk);
+        }
+        if (!(host->mmc->pm_flags & MMC_PM_KEEP_POWER)) {
+                omap_hsmmc_disable_irq(host);
+                OMAP_HSMMC_WRITE(host->base, HCTL,
+                                OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
        }
+        if (host->got_dbclk)
+                clk_disable(host->dbclk);
 err:
        pm_runtime_put_sync(host->dev);
        return ret;
@@ -2130,38 +2121,37 @@ err:
 static int omap_hsmmc_resume(struct device *dev)
 {
        int ret = 0;
-        struct platform_device *pdev = to_platform_device(dev);
+        struct omap_hsmmc_host *host = dev_get_drvdata(dev);
-        struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
+        if (!host)
+                return 0;
        if (host && !host->suspended)
                return 0;
-        if (host) {
+        pm_runtime_get_sync(host->dev);
-                pm_runtime_get_sync(host->dev);
-                if (host->got_dbclk)
+        if (host->got_dbclk)
-                        clk_enable(host->dbclk);
+                clk_enable(host->dbclk);
-                if (!(host->mmc->pm_flags & MMC_PM_KEEP_POWER))
+        if (!(host->mmc->pm_flags & MMC_PM_KEEP_POWER))
-                        omap_hsmmc_conf_bus_power(host);
+                omap_hsmmc_conf_bus_power(host);
-                if (host->pdata->resume) {
+        if (host->pdata->resume) {
-                        ret = host->pdata->resume(&pdev->dev, host->slot_id);
+                ret = host->pdata->resume(dev, host->slot_id);
-                        if (ret)
+                if (ret)
-                                dev_dbg(mmc_dev(host->mmc),
+                        dev_dbg(dev, "Unmask interrupt failed\n");
-                                        "Unmask interrupt failed\n");
+        }
-                }
-                omap_hsmmc_protect_card(host);
+        omap_hsmmc_protect_card(host);
-                /* Notify the core to resume the host */
+        /* Notify the core to resume the host */
-                ret = mmc_resume_host(host->mmc);
+        ret = mmc_resume_host(host->mmc);
-                if (ret == 0)
+        if (ret == 0)
-                        host->suspended = 0;
+                host->suspended = 0;
-                pm_runtime_mark_last_busy(host->dev);
+        pm_runtime_mark_last_busy(host->dev);
-                pm_runtime_put_autosuspend(host->dev);
+        pm_runtime_put_autosuspend(host->dev);
-        }
        return ret;
@@ -2178,7 +2168,7 @@ static int omap_hsmmc_runtime_suspend(struct device *dev)
        host = platform_get_drvdata(to_platform_device(dev));
        omap_hsmmc_context_save(host);
-        dev_dbg(mmc_dev(host->mmc), "disabled\n");
+        dev_dbg(dev, "disabled\n");
        return 0;
 }
@@ -2189,7 +2179,7 @@ static int omap_hsmmc_runtime_resume(struct device *dev)
        host = platform_get_drvdata(to_platform_device(dev));
        omap_hsmmc_context_restore(host);
-        dev_dbg(mmc_dev(host->mmc), "enabled\n");
+        dev_dbg(dev, "enabled\n");
        return 0;
 }
@@ -2202,7 +2192,8 @@ static struct dev_pm_ops omap_hsmmc_dev_pm_ops = {
 };
 static struct platform_driver omap_hsmmc_driver = {
-        .remove         = omap_hsmmc_remove,
+        .probe          = omap_hsmmc_probe,
+        .remove         = __devexit_p(omap_hsmmc_remove),
        .driver         = {
                .name = DRIVER_NAME,
                .owner = THIS_MODULE,
@@ -2211,21 +2202,7 @@ static struct platform_driver omap_hsmmc_driver = {
        },
 };
-static int __init omap_hsmmc_init(void)
+module_platform_driver(omap_hsmmc_driver);
-{
-        /* Register the MMC driver */
-        return platform_driver_probe(&omap_hsmmc_driver, omap_hsmmc_probe);
-}
-static void __exit omap_hsmmc_cleanup(void)
-{
-        /* Unregister MMC driver */
-        platform_driver_unregister(&omap_hsmmc_driver);
-}
-module_init(omap_hsmmc_init);
-module_exit(omap_hsmmc_cleanup);
 MODULE_DESCRIPTION("OMAP High Speed Multimedia Card driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c
index 46fd1fd1b605..177f697b5835 100644
--- a/drivers/mmc/host/sdhci-dove.c
+++ b/drivers/mmc/host/sdhci-dove.c
@@ -20,6 +20,7 @@
 */
 #include <linux/io.h>
+#include <linux/module.h>
 #include <linux/mmc/host.h>
 #include "sdhci-pltfm.h"
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index fbbebe251e01..69ef0beae104 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -1418,8 +1418,6 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
        slots = chip->num_slots;        /* Quirk may have changed this */
-        pci_enable_msi(pdev);
        for (i = 0; i < slots; i++) {
                slot = sdhci_pci_probe_slot(pdev, chip, first_bar, i);
                if (IS_ERR(slot)) {
@@ -1438,8 +1436,6 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
        return 0;
 free:
-        pci_disable_msi(pdev);
        pci_set_drvdata(pdev, NULL);
        kfree(chip);
@@ -1462,8 +1458,6 @@ static void __devexit sdhci_pci_remove(struct pci_dev *pdev)
                for (i = 0; i < chip->num_slots; i++)
                        sdhci_pci_remove_slot(chip->slots[i]);
-                pci_disable_msi(pdev);
                pci_set_drvdata(pdev, NULL);
                kfree(chip);
        }
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index b19e7d435f8d..55a164fcaa15 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -20,6 +20,10 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 #include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/pm.h>
+#include <linux/pm_runtime.h>
 #include <linux/mmc/host.h>
@@ -53,6 +57,18 @@ struct sdhci_s3c {
        struct clk              *clk_bus[MAX_BUS_CLK];
 };
+/**
+ * struct sdhci_s3c_driver_data - S3C SDHCI platform specific driver data
+ * @sdhci_quirks: sdhci host specific quirks.
+ *
+ * Specifies platform specific configuration of sdhci controller.
+ * Note: A structure for driver specific platform data is used for future
+ * expansion of its usage.
+ */
+struct sdhci_s3c_drv_data {
+        unsigned int    sdhci_quirks;
+};
 static inline struct sdhci_s3c *to_s3c(struct sdhci_host *host)
 {
        return sdhci_priv(host);
@@ -132,10 +148,10 @@ static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost,
                return UINT_MAX;
        /*
-         * Clock divider's step is different as 1 from that of host controller
+         * If controller uses a non-standard clock division, find the best clock
-         * when 'clk_type' is S3C_SDHCI_CLK_DIV_EXTERNAL.
+         * speed possible with selected clock source and skip the division.
         */
-        if (ourhost->pdata->clk_type) {
+        if (ourhost->host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
                rate = clk_round_rate(clksrc, wanted);
                return wanted - rate;
        }
@@ -272,6 +288,8 @@ static unsigned int sdhci_cmu_get_min_clock(struct sdhci_host *host)
 static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
 {
        struct sdhci_s3c *ourhost = to_s3c(host);
+        unsigned long timeout;
+        u16 clk = 0;
        /* don't bother if the clock is going off */
        if (clock == 0)
@@ -282,6 +300,25 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
        clk_set_rate(ourhost->clk_bus[ourhost->cur_clk], clock);
        host->clock = clock;
+        clk = SDHCI_CLOCK_INT_EN;
+        sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
+        /* Wait max 20 ms */
+        timeout = 20;
+        while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
+                & SDHCI_CLOCK_INT_STABLE)) {
+                if (timeout == 0) {
+                        printk(KERN_ERR "%s: Internal clock never "
+                                "stabilised.\n", mmc_hostname(host->mmc));
+                        return;
+                }
+                timeout--;
+                mdelay(1);
+        }
+        clk |= SDHCI_CLOCK_CARD_EN;
+        sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
 }
 /**
@@ -382,16 +419,24 @@ static void sdhci_s3c_setup_card_detect_gpio(struct sdhci_s3c *sc)
        }
 }
+static inline struct sdhci_s3c_drv_data *sdhci_s3c_get_driver_data(
+                        struct platform_device *pdev)
+{
+        return (struct sdhci_s3c_drv_data *)
+                        platform_get_device_id(pdev)->driver_data;
+}
 static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
 {
-        struct s3c_sdhci_platdata *pdata = pdev->dev.platform_data;
+        struct s3c_sdhci_platdata *pdata;
+        struct sdhci_s3c_drv_data *drv_data;
        struct device *dev = &pdev->dev;
        struct sdhci_host *host;
        struct sdhci_s3c *sc;
        struct resource *res;
        int ret, irq, ptr, clks;
-        if (!pdata) {
+        if (!pdev->dev.platform_data) {
                dev_err(dev, "no device data specified\n");
                return -ENOENT;
        }
@@ -402,18 +447,20 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
                return irq;
        }
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(dev, "no memory specified\n");
-                return -ENOENT;
-        }
        host = sdhci_alloc_host(dev, sizeof(struct sdhci_s3c));
        if (IS_ERR(host)) {
                dev_err(dev, "sdhci_alloc_host() failed\n");
                return PTR_ERR(host);
        }
+        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata) {
+                ret = -ENOMEM;
+                goto err_io_clk;
+        }
+        memcpy(pdata, pdev->dev.platform_data, sizeof(*pdata));
+        drv_data = sdhci_s3c_get_driver_data(pdev);
        sc = sdhci_priv(host);
        sc->host = host;
@@ -464,15 +511,8 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
                goto err_no_busclks;
        }
-        sc->ioarea = request_mem_region(res->start, resource_size(res),
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-                                        mmc_hostname(host->mmc));
+        host->ioaddr = devm_request_and_ioremap(&pdev->dev, res);
-        if (!sc->ioarea) {
-                dev_err(dev, "failed to reserve register area\n");
-                ret = -ENXIO;
-                goto err_req_regs;
-        }
-        host->ioaddr = ioremap_nocache(res->start, resource_size(res));
        if (!host->ioaddr) {
                dev_err(dev, "failed to map registers\n");
                ret = -ENXIO;
@@ -491,6 +531,8 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
        /* Setup quirks for the controller */
        host->quirks |= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC;
        host->quirks |= SDHCI_QUIRK_NO_HISPD_BIT;
+        if (drv_data)
+                host->quirks |= drv_data->sdhci_quirks;
 #ifndef CONFIG_MMC_SDHCI_S3C_DMA
@@ -518,6 +560,14 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
        if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT)
                host->mmc->caps = MMC_CAP_NONREMOVABLE;
+        switch (pdata->max_width) {
+        case 8:
+                host->mmc->caps |= MMC_CAP_8_BIT_DATA;
+        case 4:
+                host->mmc->caps |= MMC_CAP_4_BIT_DATA;
+                break;
+        }
        if (pdata->pm_caps)
                host->mmc->pm_caps |= pdata->pm_caps;
@@ -531,7 +581,7 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
         * If controller does not have internal clock divider,
         * we can use overriding functions instead of default.
         */
-        if (pdata->clk_type) {
+        if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
                sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
                sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
                sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
@@ -544,10 +594,17 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
        if (pdata->host_caps2)
                host->mmc->caps2 |= pdata->host_caps2;
+        pm_runtime_enable(&pdev->dev);
+        pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
+        pm_runtime_use_autosuspend(&pdev->dev);
+        pm_suspend_ignore_children(&pdev->dev, 1);
        ret = sdhci_add_host(host);
        if (ret) {
                dev_err(dev, "sdhci_add_host() failed\n");
-                goto err_add_host;
+                pm_runtime_forbid(&pdev->dev);
+                pm_runtime_get_noresume(&pdev->dev);
+                goto err_req_regs;
        }
        /* The following two methods of card detection might call
@@ -561,10 +618,6 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
        return 0;
- err_add_host:
-        release_resource(sc->ioarea);
-        kfree(sc->ioarea);
 err_req_regs:
        for (ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
                if (sc->clk_bus[ptr]) {
@@ -601,6 +654,8 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev)
        sdhci_remove_host(host, 1);
+        pm_runtime_disable(&pdev->dev);
        for (ptr = 0; ptr < 3; ptr++) {
                if (sc->clk_bus[ptr]) {
                        clk_disable(sc->clk_bus[ptr]);
@@ -610,18 +665,13 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev)
        clk_disable(sc->clk_io);
        clk_put(sc->clk_io);
-        iounmap(host->ioaddr);
-        release_resource(sc->ioarea);
-        kfree(sc->ioarea);
        sdhci_free_host(host);
        platform_set_drvdata(pdev, NULL);
        return 0;
 }
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int sdhci_s3c_suspend(struct device *dev)
 {
        struct sdhci_host *host = dev_get_drvdata(dev);
@@ -635,10 +685,29 @@ static int sdhci_s3c_resume(struct device *dev)
        return sdhci_resume_host(host);
 }
+#endif
+#ifdef CONFIG_PM_RUNTIME
+static int sdhci_s3c_runtime_suspend(struct device *dev)
+{
+        struct sdhci_host *host = dev_get_drvdata(dev);
+        return sdhci_runtime_suspend_host(host);
+}
+static int sdhci_s3c_runtime_resume(struct device *dev)
+{
+        struct sdhci_host *host = dev_get_drvdata(dev);
+        return sdhci_runtime_resume_host(host);
+}
+#endif
+#ifdef CONFIG_PM
 static const struct dev_pm_ops sdhci_s3c_pmops = {
-        .suspend        = sdhci_s3c_suspend,
+        SET_SYSTEM_SLEEP_PM_OPS(sdhci_s3c_suspend, sdhci_s3c_resume)
-        .resume         = sdhci_s3c_resume,
+        SET_RUNTIME_PM_OPS(sdhci_s3c_runtime_suspend, sdhci_s3c_runtime_resume,
+                           NULL)
 };
 #define SDHCI_S3C_PMOPS (&sdhci_s3c_pmops)
@@ -647,9 +716,31 @@ static const struct dev_pm_ops sdhci_s3c_pmops = {
 #define SDHCI_S3C_PMOPS NULL
 #endif
+#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212)
+static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
+        .sdhci_quirks = SDHCI_QUIRK_NONSTANDARD_CLOCK,
+};
+#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)&exynos4_sdhci_drv_data)
+#else
+#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)NULL)
+#endif
+static struct platform_device_id sdhci_s3c_driver_ids[] = {
+        {
+                .name           = "s3c-sdhci",
+                .driver_data    = (kernel_ulong_t)NULL,
+        }, {
+                .name           = "exynos4-sdhci",
+                .driver_data    = EXYNOS4_SDHCI_DRV_DATA,
+        },
+        { }
+};
+MODULE_DEVICE_TABLE(platform, sdhci_s3c_driver_ids);
 static struct platform_driver sdhci_s3c_driver = {
        .probe          = sdhci_s3c_probe,
        .remove         = __devexit_p(sdhci_s3c_remove),
+        .id_table       = sdhci_s3c_driver_ids,
        .driver         = {
                .owner  = THIS_MODULE,
                .name   = "s3c-sdhci",
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 8262cadfdab7..9aa77f3f04a8 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2782,8 +2782,9 @@ int sdhci_add_host(struct sdhci_host *host)
            mmc_card_is_removable(mmc))
                mmc->caps |= MMC_CAP_NEEDS_POLL;
-        /* UHS-I mode(s) supported by the host controller. */
+        /* Any UHS-I mode in caps implies SDR12 and SDR25 support. */
-        if (host->version >= SDHCI_SPEC_300)
+        if (caps[1] & (SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_SDR50 |
+                       SDHCI_SUPPORT_DDR50))
                mmc->caps |= MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25;
        /* SDR104 supports also implies SDR50 support */
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index aafaf0b6eb1c..724b35e85a26 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -454,7 +454,8 @@ static void sh_mmcif_clock_control(struct sh_mmcif_host *host, unsigned int clk)
                sh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, CLK_SUP_PCLK);
        else
                sh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, CLK_CLEAR &
-                                ((fls(host->clk / clk) - 1) << 16));
+                                ((fls(DIV_ROUND_UP(host->clk,
+                                                   clk) - 1) - 1) << 16));
        sh_mmcif_bitset(host, MMCIF_CE_CLK_CTRL, CLK_ENABLE);
 }
@@ -1297,14 +1298,8 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
        spin_lock_init(&host->lock);
        mmc->ops = &sh_mmcif_ops;
-        mmc->f_max = host->clk;
+        mmc->f_max = host->clk / 2;
-        /* close to 400KHz */
+        mmc->f_min = host->clk / 512;
-        if (mmc->f_max < 51200000)
-                mmc->f_min = mmc->f_max / 128;
-        else if (mmc->f_max < 102400000)
-                mmc->f_min = mmc->f_max / 256;
-        else
-                mmc->f_min = mmc->f_max / 512;
        if (pd->ocr)
                mmc->ocr_avail = pd->ocr;
        mmc->caps = MMC_CAP_MMC_HIGHSPEED;
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index e2cdebf40840..61af9bb560ab 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -386,19 +386,11 @@ out:
        return count;
 }
-static int default_open(struct inode *inode, struct file *file)
-{
-        if (inode->i_private)
-                file->private_data = inode->i_private;
-        return 0;
-}
 /* File operations for all UBI debugfs files */
 static const struct file_operations dfs_fops = {
        .read   = dfs_file_read,
        .write  = dfs_file_write,
-        .open   = default_open,
+        .open   = simple_open,
        .llseek = no_llseek,
        .owner  = THIS_MODULE,
 };
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 0c76186bb9e7..62d2409bb293 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -891,9 +891,15 @@ static void bond_do_fail_over_mac(struct bonding *bond,
        switch (bond->params.fail_over_mac) {
        case BOND_FOM_ACTIVE:
-                if (new_active)
+                if (new_active) {
                        memcpy(bond->dev->dev_addr,  new_active->dev->dev_addr,
                               new_active->dev->addr_len);
+                        write_unlock_bh(&bond->curr_slave_lock);
+                        read_unlock(&bond->lock);
+                        call_netdevice_notifiers(NETDEV_CHANGEADDR, bond->dev);
+                        read_lock(&bond->lock);
+                        write_lock_bh(&bond->curr_slave_lock);
+                }
                break;
        case BOND_FOM_FOLLOW:
                /*
@@ -2028,6 +2034,9 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
        write_unlock_bh(&bond->lock);
        unblock_netpoll_tx();
+        if (bond->slave_cnt == 0)
+                call_netdevice_notifiers(NETDEV_CHANGEADDR, bond->dev);
        bond_compute_features(bond);
        if (!(bond_dev->features & NETIF_F_VLAN_CHALLENGED) &&
            (old_features & NETIF_F_VLAN_CHALLENGED))
@@ -3001,7 +3010,11 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
                                           trans_start + delta_in_ticks)) ||
                            bond->curr_active_slave != slave) {
                                slave->link = BOND_LINK_UP;
-                                bond->current_arp_slave = NULL;
+                                if (bond->current_arp_slave) {
+                                        bond_set_slave_inactive_flags(
+                                                bond->current_arp_slave);
+                                        bond->current_arp_slave = NULL;
+                                }
                                pr_info("%s: link status definitely up for interface %s.\n",
                                        bond->dev->name, slave->dev->name);
@@ -3695,17 +3708,52 @@ static void bond_set_multicast_list(struct net_device *bond_dev)
        read_unlock(&bond->lock);
 }
-static int bond_neigh_setup(struct net_device *dev, struct neigh_parms *parms)
+static int bond_neigh_init(struct neighbour *n)
 {
-        struct bonding *bond = netdev_priv(dev);
+        struct bonding *bond = netdev_priv(n->dev);
        struct slave *slave = bond->first_slave;
+        const struct net_device_ops *slave_ops;
+        struct neigh_parms parms;
+        int ret;
+        if (!slave)
+                return 0;
+        slave_ops = slave->dev->netdev_ops;
+        if (!slave_ops->ndo_neigh_setup)
+                return 0;
+        parms.neigh_setup = NULL;
+        parms.neigh_cleanup = NULL;
+        ret = slave_ops->ndo_neigh_setup(slave->dev, &parms);
+        if (ret)
+                return ret;
+        /*
+         * Assign slave's neigh_cleanup to neighbour in case cleanup is called
+         * after the last slave has been detached.  Assumes that all slaves
+         * utilize the same neigh_cleanup (true at this writing as only user
+         * is ipoib).
+         */
+        n->parms->neigh_cleanup = parms.neigh_cleanup;
+        if (!parms.neigh_setup)
+                return 0;
+        return parms.neigh_setup(n);
+}
+/*
+ * The bonding ndo_neigh_setup is called at init time beofre any
+ * slave exists. So we must declare proxy setup function which will
+ * be used at run time to resolve the actual slave neigh param setup.
+ */
+static int bond_neigh_setup(struct net_device *dev,
+                            struct neigh_parms *parms)
+{
+        parms->neigh_setup   = bond_neigh_init;
-        if (slave) {
-                const struct net_device_ops *slave_ops
-                        = slave->dev->netdev_ops;
-                if (slave_ops->ndo_neigh_setup)
-                        return slave_ops->ndo_neigh_setup(slave->dev, parms);
-        }
        return 0;
 }
diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c
index 96391c36fa74..b71ce9bf0afb 100644
--- a/drivers/net/caif/caif_spi.c
+++ b/drivers/net/caif/caif_spi.c
@@ -127,12 +127,6 @@ static inline void dev_debugfs_rem(struct cfspi *cfspi)
        debugfs_remove(cfspi->dbgfs_dir);
 }
-static int dbgfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t dbgfs_state(struct file *file, char __user *user_buf,
                           size_t count, loff_t *ppos)
 {
@@ -243,13 +237,13 @@ static ssize_t dbgfs_frame(struct file *file, char __user *user_buf,
 }
 static const struct file_operations dbgfs_state_fops = {
-        .open = dbgfs_open,
+        .open = simple_open,
        .read = dbgfs_state,
        .owner = THIS_MODULE
 };
 static const struct file_operations dbgfs_frame_fops = {
-        .open = dbgfs_open,
+        .open = simple_open,
        .read = dbgfs_frame,
        .owner = THIS_MODULE
 };
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index a59cf961a436..f219d38acf58 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -125,6 +125,7 @@
 #include <linux/if.h>
 #include <linux/if_arp.h>
 #include <linux/if_eql.h>
+#include <linux/pkt_sched.h>
 #include <asm/uaccess.h>
@@ -143,7 +144,7 @@ static void eql_timer(unsigned long param)
        equalizer_t *eql = (equalizer_t *) param;
        struct list_head *this, *tmp, *head;
-        spin_lock_bh(&eql->queue.lock);
+        spin_lock(&eql->queue.lock);
        head = &eql->queue.all_slaves;
        list_for_each_safe(this, tmp, head) {
                slave_t *slave = list_entry(this, slave_t, list);
@@ -157,7 +158,7 @@ static void eql_timer(unsigned long param)
                }
        }
-        spin_unlock_bh(&eql->queue.lock);
+        spin_unlock(&eql->queue.lock);
        eql->timer.expires = jiffies + EQL_DEFAULT_RESCHED_IVAL;
        add_timer(&eql->timer);
@@ -341,7 +342,7 @@ static netdev_tx_t eql_slave_xmit(struct sk_buff *skb, struct net_device *dev)
                struct net_device *slave_dev = slave->dev;
                skb->dev = slave_dev;
-                skb->priority = 1;
+                skb->priority = TC_PRIO_FILLER;
                slave->bytes_queued += skb->len;
                dev_queue_xmit(skb);
                dev->stats.tx_packets++;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index e37161f19250..2c9ee552dffc 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1173,6 +1173,13 @@ enum {
 };
+struct bnx2x_prev_path_list {
+        u8 bus;
+        u8 slot;
+        u8 path;
+        struct list_head list;
+};
 struct bnx2x {
        /* Fields used in the tx and intr/napi performance paths
         * are grouped together in the beginning of the structure
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index f1f3ca65667a..4b054812713a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -1721,6 +1721,29 @@ static void bnx2x_squeeze_objects(struct bnx2x *bp)
        } while (0)
 #endif
+bool bnx2x_test_firmware_version(struct bnx2x *bp, bool is_err)
+{
+        /* build FW version dword */
+        u32 my_fw = (BCM_5710_FW_MAJOR_VERSION) +
+                    (BCM_5710_FW_MINOR_VERSION << 8) +
+                    (BCM_5710_FW_REVISION_VERSION << 16) +
+                    (BCM_5710_FW_ENGINEERING_VERSION << 24);
+        /* read loaded FW from chip */
+        u32 loaded_fw = REG_RD(bp, XSEM_REG_PRAM);
+        DP(NETIF_MSG_IFUP, "loaded fw %x, my fw %x\n", loaded_fw, my_fw);
+        if (loaded_fw != my_fw) {
+                if (is_err)
+                        BNX2X_ERR("bnx2x with FW %x was already loaded, which mismatches my %x FW. aborting\n",
+                                  loaded_fw, my_fw);
+                return false;
+        }
+        return true;
+}
 /* must be called with rtnl_lock */
 int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 {
@@ -1815,23 +1838,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                }
                if (load_code != FW_MSG_CODE_DRV_LOAD_COMMON_CHIP &&
                    load_code != FW_MSG_CODE_DRV_LOAD_COMMON) {
-                        /* build FW version dword */
-                        u32 my_fw = (BCM_5710_FW_MAJOR_VERSION) +
-                                        (BCM_5710_FW_MINOR_VERSION << 8) +
-                                        (BCM_5710_FW_REVISION_VERSION << 16) +
-                                        (BCM_5710_FW_ENGINEERING_VERSION << 24);
-                        /* read loaded FW from chip */
-                        u32 loaded_fw = REG_RD(bp, XSEM_REG_PRAM);
-                        DP(BNX2X_MSG_SP, "loaded fw %x, my fw %x",
-                           loaded_fw, my_fw);
                        /* abort nic load if version mismatch */
-                        if (my_fw != loaded_fw) {
+                        if (!bnx2x_test_firmware_version(bp, true)) {
-                                BNX2X_ERR("bnx2x with FW %x already loaded, "
-                                          "which mismatches my %x FW. aborting",
-                                          loaded_fw, my_fw);
                                rc = -EBUSY;
                                LOAD_ERROR_EXIT(bp, load_error2);
                        }
@@ -1866,7 +1874,6 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
                 * bnx2x_periodic_task().
                 */
                smp_mb();
-                queue_delayed_work(bnx2x_wq, &bp->period_task, 0);
        } else
                bp->port.pmf = 0;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index 8b163388659a..5c27454d2ec2 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -431,6 +431,9 @@ void bnx2x_panic_dump(struct bnx2x *bp);
 void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl);
+/* validate currect fw is loaded */
+bool bnx2x_test_firmware_version(struct bnx2x *bp, bool is_err);
 /* dev_close main block */
 int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
index cd6dfa9eaa3a..b9b263323436 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
@@ -25,31 +25,31 @@
        (IRO[149].base + ((funcId) * IRO[149].m1))
 #define CSTORM_IGU_MODE_OFFSET (IRO[157].base)
 #define CSTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \
-        (IRO[315].base + ((pfId) * IRO[315].m1))
-#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
        (IRO[316].base + ((pfId) * IRO[316].m1))
+#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
+        (IRO[317].base + ((pfId) * IRO[317].m1))
 #define CSTORM_ISCSI_EQ_CONS_OFFSET(pfId, iscsiEqId) \
-        (IRO[308].base + ((pfId) * IRO[308].m1) + ((iscsiEqId) * IRO[308].m2))
+        (IRO[309].base + ((pfId) * IRO[309].m1) + ((iscsiEqId) * IRO[309].m2))
 #define CSTORM_ISCSI_EQ_NEXT_EQE_ADDR_OFFSET(pfId, iscsiEqId) \
-        (IRO[310].base + ((pfId) * IRO[310].m1) + ((iscsiEqId) * IRO[310].m2))
+        (IRO[311].base + ((pfId) * IRO[311].m1) + ((iscsiEqId) * IRO[311].m2))
 #define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_OFFSET(pfId, iscsiEqId) \
-        (IRO[309].base + ((pfId) * IRO[309].m1) + ((iscsiEqId) * IRO[309].m2))
+        (IRO[310].base + ((pfId) * IRO[310].m1) + ((iscsiEqId) * IRO[310].m2))
 #define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_VALID_OFFSET(pfId, iscsiEqId) \
-        (IRO[311].base + ((pfId) * IRO[311].m1) + ((iscsiEqId) * IRO[311].m2))
+        (IRO[312].base + ((pfId) * IRO[312].m1) + ((iscsiEqId) * IRO[312].m2))
 #define CSTORM_ISCSI_EQ_PROD_OFFSET(pfId, iscsiEqId) \
-        (IRO[307].base + ((pfId) * IRO[307].m1) + ((iscsiEqId) * IRO[307].m2))
+        (IRO[308].base + ((pfId) * IRO[308].m1) + ((iscsiEqId) * IRO[308].m2))
 #define CSTORM_ISCSI_EQ_SB_INDEX_OFFSET(pfId, iscsiEqId) \
-        (IRO[313].base + ((pfId) * IRO[313].m1) + ((iscsiEqId) * IRO[313].m2))
+        (IRO[314].base + ((pfId) * IRO[314].m1) + ((iscsiEqId) * IRO[314].m2))
 #define CSTORM_ISCSI_EQ_SB_NUM_OFFSET(pfId, iscsiEqId) \
-        (IRO[312].base + ((pfId) * IRO[312].m1) + ((iscsiEqId) * IRO[312].m2))
+        (IRO[313].base + ((pfId) * IRO[313].m1) + ((iscsiEqId) * IRO[313].m2))
 #define CSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \
-        (IRO[314].base + ((pfId) * IRO[314].m1))
+        (IRO[315].base + ((pfId) * IRO[315].m1))
 #define CSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
-        (IRO[306].base + ((pfId) * IRO[306].m1))
+        (IRO[307].base + ((pfId) * IRO[307].m1))
 #define CSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
-        (IRO[305].base + ((pfId) * IRO[305].m1))
+        (IRO[306].base + ((pfId) * IRO[306].m1))
 #define CSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
-        (IRO[304].base + ((pfId) * IRO[304].m1))
+        (IRO[305].base + ((pfId) * IRO[305].m1))
 #define CSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
        (IRO[151].base + ((funcId) * IRO[151].m1))
 #define CSTORM_SP_STATUS_BLOCK_DATA_OFFSET(pfId) \
@@ -96,37 +96,37 @@
 #define TSTORM_FUNC_EN_OFFSET(funcId) \
        (IRO[103].base + ((funcId) * IRO[103].m1))
 #define TSTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \
-        (IRO[271].base + ((pfId) * IRO[271].m1))
-#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \
        (IRO[272].base + ((pfId) * IRO[272].m1))
-#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \
+#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \
        (IRO[273].base + ((pfId) * IRO[273].m1))
-#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \
+#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \
        (IRO[274].base + ((pfId) * IRO[274].m1))
+#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \
+        (IRO[275].base + ((pfId) * IRO[275].m1))
 #define TSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
-        (IRO[270].base + ((pfId) * IRO[270].m1))
+        (IRO[271].base + ((pfId) * IRO[271].m1))
 #define TSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
-        (IRO[269].base + ((pfId) * IRO[269].m1))
+        (IRO[270].base + ((pfId) * IRO[270].m1))
 #define TSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
-        (IRO[268].base + ((pfId) * IRO[268].m1))
+        (IRO[269].base + ((pfId) * IRO[269].m1))
 #define TSTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
-        (IRO[267].base + ((pfId) * IRO[267].m1))
+        (IRO[268].base + ((pfId) * IRO[268].m1))
 #define TSTORM_ISCSI_TCP_LOCAL_ADV_WND_OFFSET(pfId) \
-        (IRO[276].base + ((pfId) * IRO[276].m1))
+        (IRO[277].base + ((pfId) * IRO[277].m1))
 #define TSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \
-        (IRO[263].base + ((pfId) * IRO[263].m1))
-#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
        (IRO[264].base + ((pfId) * IRO[264].m1))
-#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \
+#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
        (IRO[265].base + ((pfId) * IRO[265].m1))
-#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
+#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \
        (IRO[266].base + ((pfId) * IRO[266].m1))
+#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
+        (IRO[267].base + ((pfId) * IRO[267].m1))
 #define TSTORM_MAC_FILTER_CONFIG_OFFSET(pfId) \
        (IRO[202].base + ((pfId) * IRO[202].m1))
 #define TSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
        (IRO[105].base + ((funcId) * IRO[105].m1))
 #define TSTORM_TCP_MAX_CWND_OFFSET(pfId) \
-        (IRO[216].base + ((pfId) * IRO[216].m1))
+        (IRO[217].base + ((pfId) * IRO[217].m1))
 #define TSTORM_VF_TO_PF_OFFSET(funcId) \
        (IRO[104].base + ((funcId) * IRO[104].m1))
 #define USTORM_AGG_DATA_OFFSET (IRO[206].base)
@@ -140,29 +140,29 @@
 #define USTORM_ETH_PAUSE_ENABLED_OFFSET(portId) \
        (IRO[183].base + ((portId) * IRO[183].m1))
 #define USTORM_FCOE_EQ_PROD_OFFSET(pfId) \
-        (IRO[317].base + ((pfId) * IRO[317].m1))
+        (IRO[318].base + ((pfId) * IRO[318].m1))
 #define USTORM_FUNC_EN_OFFSET(funcId) \
        (IRO[178].base + ((funcId) * IRO[178].m1))
 #define USTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \
-        (IRO[281].base + ((pfId) * IRO[281].m1))
-#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
        (IRO[282].base + ((pfId) * IRO[282].m1))
+#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
+        (IRO[283].base + ((pfId) * IRO[283].m1))
 #define USTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \
-        (IRO[286].base + ((pfId) * IRO[286].m1))
+        (IRO[287].base + ((pfId) * IRO[287].m1))
 #define USTORM_ISCSI_GLOBAL_BUF_PHYS_ADDR_OFFSET(pfId) \
-        (IRO[283].base + ((pfId) * IRO[283].m1))
+        (IRO[284].base + ((pfId) * IRO[284].m1))
 #define USTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
-        (IRO[279].base + ((pfId) * IRO[279].m1))
+        (IRO[280].base + ((pfId) * IRO[280].m1))
 #define USTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
-        (IRO[278].base + ((pfId) * IRO[278].m1))
+        (IRO[279].base + ((pfId) * IRO[279].m1))
 #define USTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
-        (IRO[277].base + ((pfId) * IRO[277].m1))
+        (IRO[278].base + ((pfId) * IRO[278].m1))
 #define USTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \
-        (IRO[280].base + ((pfId) * IRO[280].m1))
+        (IRO[281].base + ((pfId) * IRO[281].m1))
 #define USTORM_ISCSI_RQ_BUFFER_SIZE_OFFSET(pfId) \
-        (IRO[284].base + ((pfId) * IRO[284].m1))
-#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
        (IRO[285].base + ((pfId) * IRO[285].m1))
+#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
+        (IRO[286].base + ((pfId) * IRO[286].m1))
 #define USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(pfId) \
        (IRO[182].base + ((pfId) * IRO[182].m1))
 #define USTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
@@ -188,39 +188,39 @@
 #define XSTORM_FUNC_EN_OFFSET(funcId) \
        (IRO[47].base + ((funcId) * IRO[47].m1))
 #define XSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \
-        (IRO[294].base + ((pfId) * IRO[294].m1))
+        (IRO[295].base + ((pfId) * IRO[295].m1))
 #define XSTORM_ISCSI_LOCAL_MAC_ADDR0_OFFSET(pfId) \
-        (IRO[297].base + ((pfId) * IRO[297].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \
        (IRO[298].base + ((pfId) * IRO[298].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \
        (IRO[299].base + ((pfId) * IRO[299].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \
        (IRO[300].base + ((pfId) * IRO[300].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \
        (IRO[301].base + ((pfId) * IRO[301].m1))
-#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \
        (IRO[302].base + ((pfId) * IRO[302].m1))
-#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \
+#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \
        (IRO[303].base + ((pfId) * IRO[303].m1))
+#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \
+        (IRO[304].base + ((pfId) * IRO[304].m1))
 #define XSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
-        (IRO[293].base + ((pfId) * IRO[293].m1))
+        (IRO[294].base + ((pfId) * IRO[294].m1))
 #define XSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
-        (IRO[292].base + ((pfId) * IRO[292].m1))
+        (IRO[293].base + ((pfId) * IRO[293].m1))
 #define XSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
-        (IRO[291].base + ((pfId) * IRO[291].m1))
+        (IRO[292].base + ((pfId) * IRO[292].m1))
 #define XSTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \
-        (IRO[296].base + ((pfId) * IRO[296].m1))
+        (IRO[297].base + ((pfId) * IRO[297].m1))
 #define XSTORM_ISCSI_SQ_SIZE_OFFSET(pfId) \
-        (IRO[295].base + ((pfId) * IRO[295].m1))
+        (IRO[296].base + ((pfId) * IRO[296].m1))
 #define XSTORM_ISCSI_TCP_VARS_ADV_WND_SCL_OFFSET(pfId) \
-        (IRO[290].base + ((pfId) * IRO[290].m1))
+        (IRO[291].base + ((pfId) * IRO[291].m1))
 #define XSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \
-        (IRO[289].base + ((pfId) * IRO[289].m1))
+        (IRO[290].base + ((pfId) * IRO[290].m1))
 #define XSTORM_ISCSI_TCP_VARS_TOS_OFFSET(pfId) \
-        (IRO[288].base + ((pfId) * IRO[288].m1))
+        (IRO[289].base + ((pfId) * IRO[289].m1))
 #define XSTORM_ISCSI_TCP_VARS_TTL_OFFSET(pfId) \
-        (IRO[287].base + ((pfId) * IRO[287].m1))
+        (IRO[288].base + ((pfId) * IRO[288].m1))
 #define XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(pfId) \
        (IRO[44].base + ((pfId) * IRO[44].m1))
 #define XSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index 5d71b7d43237..dbff5915b81a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
@@ -1251,6 +1251,9 @@ struct drv_func_mb {
        #define DRV_MSG_CODE_LINK_STATUS_CHANGED        0x01000000
+        #define DRV_MSG_CODE_INITIATE_FLR               0x02000000
+        #define REQ_BC_VER_4_INITIATE_FLR               0x00070213
        #define BIOS_MSG_CODE_LIC_CHALLENGE             0xff010000
        #define BIOS_MSG_CODE_LIC_RESPONSE              0xff020000
        #define BIOS_MSG_CODE_VIRT_MAC_PRIM             0xff030000
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index beb4cdbdb6e1..ad95324dc042 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -35,7 +35,6 @@
 #define ETH_MAX_PACKET_SIZE             1500
 #define ETH_MAX_JUMBO_PACKET_SIZE       9600
 #define MDIO_ACCESS_TIMEOUT             1000
-#define BMAC_CONTROL_RX_ENABLE          2
 #define WC_LANE_MAX                     4
 #define I2C_SWITCH_WIDTH                2
 #define I2C_BSC0                        0
@@ -1372,7 +1371,14 @@ static void bnx2x_update_pfc_xmac(struct link_params *params,
                pfc1_val |= XMAC_PFC_CTRL_HI_REG_PFC_REFRESH_EN |
                        XMAC_PFC_CTRL_HI_REG_PFC_STATS_EN |
                        XMAC_PFC_CTRL_HI_REG_RX_PFC_EN |
-                        XMAC_PFC_CTRL_HI_REG_TX_PFC_EN;
+                        XMAC_PFC_CTRL_HI_REG_TX_PFC_EN |
+                        XMAC_PFC_CTRL_HI_REG_FORCE_PFC_XON;
+                /* Write pause and PFC registers */
+                REG_WR(bp, xmac_base + XMAC_REG_PAUSE_CTRL, pause_val);
+                REG_WR(bp, xmac_base + XMAC_REG_PFC_CTRL, pfc0_val);
+                REG_WR(bp, xmac_base + XMAC_REG_PFC_CTRL_HI, pfc1_val);
+                pfc1_val &= ~XMAC_PFC_CTRL_HI_REG_FORCE_PFC_XON;
        }
        /* Write pause and PFC registers */
@@ -3649,6 +3655,33 @@ static void bnx2x_ext_phy_update_adv_fc(struct bnx2x_phy *phy,
        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE) {
                bnx2x_cl22_read(bp, phy, 0x4, &ld_pause);
                bnx2x_cl22_read(bp, phy, 0x5, &lp_pause);
+        } else if (CHIP_IS_E3(bp) &&
+                SINGLE_MEDIA_DIRECT(params)) {
+                u8 lane = bnx2x_get_warpcore_lane(phy, params);
+                u16 gp_status, gp_mask;
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_AN_DEVAD, MDIO_WC_REG_GP2_STATUS_GP_2_4,
+                                &gp_status);
+                gp_mask = (MDIO_WC_REG_GP2_STATUS_GP_2_4_CL73_AN_CMPL |
+                           MDIO_WC_REG_GP2_STATUS_GP_2_4_CL37_LP_AN_CAP) <<
+                        lane;
+                if ((gp_status & gp_mask) == gp_mask) {
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_ADV_PAUSE, &ld_pause);
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_LP_AUTO_NEG, &lp_pause);
+                } else {
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_CL37_FC_LD, &ld_pause);
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_CL37_FC_LP, &lp_pause);
+                        ld_pause = ((ld_pause &
+                                     MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH)
+                                    << 3);
+                        lp_pause = ((lp_pause &
+                                     MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH)
+                                    << 3);
+                }
        } else {
                bnx2x_cl45_read(bp, phy,
                                MDIO_AN_DEVAD,
@@ -3699,7 +3732,23 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy,
        u16 val16 = 0, lane, bam37 = 0;
        struct bnx2x *bp = params->bp;
        DP(NETIF_MSG_LINK, "Enable Auto Negotiation for KR\n");
+        /* Set to default registers that may be overriden by 10G force */
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                         MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2, 0x7);
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
+                         MDIO_WC_REG_PAR_DET_10G_CTRL, 0);
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                         MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL, 0);
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                        MDIO_WC_REG_XGXSBLK1_LANECTRL0, 0xff);
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                        MDIO_WC_REG_XGXSBLK1_LANECTRL1, 0x5555);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD,
+                         MDIO_WC_REG_IEEE0BLK_AUTONEGNP, 0x0);
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                         MDIO_WC_REG_RX66_CONTROL, 0x7415);
+        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                         MDIO_WC_REG_SERDESDIGITAL_MISC2, 0x6190);
        /* Disable Autoneg: re-enable it after adv is done. */
        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
                         MDIO_WC_REG_IEEE0BLK_MIICNTL, 0);
@@ -3945,13 +3994,13 @@ static void bnx2x_warpcore_set_10G_XFI(struct bnx2x_phy *phy,
        } else {
                misc1_val |= 0x9;
-                tap_val = ((0x12 << MDIO_WC_REG_TX_FIR_TAP_POST_TAP_OFFSET) |
+                tap_val = ((0x0f << MDIO_WC_REG_TX_FIR_TAP_POST_TAP_OFFSET) |
-                           (0x2d << MDIO_WC_REG_TX_FIR_TAP_MAIN_TAP_OFFSET) |
+                           (0x2b << MDIO_WC_REG_TX_FIR_TAP_MAIN_TAP_OFFSET) |
-                           (0x00 << MDIO_WC_REG_TX_FIR_TAP_PRE_TAP_OFFSET));
+                           (0x02 << MDIO_WC_REG_TX_FIR_TAP_PRE_TAP_OFFSET));
                tx_driver_val =
-                      ((0x02 << MDIO_WC_REG_TX0_TX_DRIVER_POST2_COEFF_OFFSET) |
+                      ((0x03 << MDIO_WC_REG_TX0_TX_DRIVER_POST2_COEFF_OFFSET) |
                       (0x02 << MDIO_WC_REG_TX0_TX_DRIVER_IDRIVER_OFFSET) |
-                       (0x02 << MDIO_WC_REG_TX0_TX_DRIVER_IPRE_DRIVER_OFFSET));
+                       (0x06 << MDIO_WC_REG_TX0_TX_DRIVER_IPRE_DRIVER_OFFSET));
        }
        bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                         MDIO_WC_REG_SERDESDIGITAL_MISC1, misc1_val);
@@ -4369,7 +4418,7 @@ static void bnx2x_warpcore_config_init(struct bnx2x_phy *phy,
                switch (serdes_net_if) {
                case PORT_HW_CFG_NET_SERDES_IF_KR:
                        /* Enable KR Auto Neg */
-                        if (params->loopback_mode == LOOPBACK_NONE)
+                        if (params->loopback_mode != LOOPBACK_EXT)
                                bnx2x_warpcore_enable_AN_KR(phy, params, vars);
                        else {
                                DP(NETIF_MSG_LINK, "Setting KR 10G-Force\n");
@@ -6167,12 +6216,14 @@ int bnx2x_set_led(struct link_params *params,
                tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
                if (params->phy[EXT_PHY1].type ==
-                          PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE)
+                        PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE)
-                        EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp & 0xfff1);
+                        tmp &= ~(EMAC_LED_1000MB_OVERRIDE |
-                else {
+                                EMAC_LED_100MB_OVERRIDE |
-                        EMAC_WR(bp, EMAC_REG_EMAC_LED,
+                                EMAC_LED_10MB_OVERRIDE);
-                                (tmp | EMAC_LED_OVERRIDE));
+                else
-                }
+                        tmp |= EMAC_LED_OVERRIDE;
+                EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp);
                break;
        case LED_MODE_OPER:
@@ -6227,10 +6278,15 @@ int bnx2x_set_led(struct link_params *params,
                                       hw_led_mode);
                } else if ((params->phy[EXT_PHY1].type ==
                            PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE) &&
-                           (mode != LED_MODE_OPER)) {
+                           (mode == LED_MODE_ON)) {
                        REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);
                        tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
-                        EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp | 0x3);
+                        EMAC_WR(bp, EMAC_REG_EMAC_LED, tmp |
+                                EMAC_LED_OVERRIDE | EMAC_LED_1000MB_OVERRIDE);
+                        /* Break here; otherwise, it'll disable the
+                         * intended override.
+                         */
+                        break;
                } else
                        REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4,
                               hw_led_mode);
@@ -6245,13 +6301,9 @@ int bnx2x_set_led(struct link_params *params,
                               LED_BLINK_RATE_VAL_E1X_E2);
                REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_ENA_P0 +
                       port*4, 1);
-                if ((params->phy[EXT_PHY1].type !=
+                tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
-                     PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM54618SE) &&
+                EMAC_WR(bp, EMAC_REG_EMAC_LED,
-                    (mode != LED_MODE_OPER)) {
+                        (tmp & (~EMAC_LED_OVERRIDE)));
-                        tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
-                        EMAC_WR(bp, EMAC_REG_EMAC_LED,
-                                (tmp & (~EMAC_LED_OVERRIDE)));
-                }
                if (CHIP_IS_E1(bp) &&
                    ((speed == SPEED_2500) ||
@@ -6844,6 +6896,12 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                          SINGLE_MEDIA_DIRECT(params)) &&
                         (phy_vars[active_external_phy].fault_detected == 0));
+        /* Update the PFC configuration in case it was changed */
+        if (params->feature_config_flags & FEATURE_CONFIG_PFC_ENABLED)
+                vars->link_status |= LINK_STATUS_PFC_ENABLED;
+        else
+                vars->link_status &= ~LINK_STATUS_PFC_ENABLED;
        if (vars->link_up)
                rc = bnx2x_update_link_up(params, vars, link_10g_plus);
        else
@@ -8031,7 +8089,9 @@ static int bnx2x_verify_sfp_module(struct bnx2x_phy *phy,
        netdev_err(bp->dev,  "Warning: Unqualified SFP+ module detected,"
                              " Port %d from %s part number %s\n",
                         params->port, vendor_name, vendor_pn);
-        phy->flags |= FLAGS_SFP_NOT_APPROVED;
+        if ((val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) !=
+            PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_WARNING_MSG)
+                phy->flags |= FLAGS_SFP_NOT_APPROVED;
        return -EINVAL;
 }
@@ -9091,6 +9151,12 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy,
                tmp2 &= 0xFFEF;
                bnx2x_cl45_write(bp, phy,
                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8727_OPT_CFG_REG, tmp2);
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER,
+                                &tmp2);
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER,
+                                 (tmp2 & 0x7fff));
        }
        return 0;
@@ -9271,12 +9337,11 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
                                 MDIO_PMA_DEVAD, MDIO_PMA_LASI_RXCTRL,
                                 ((1<<5) | (1<<2)));
        }
-        DP(NETIF_MSG_LINK, "Enabling 8727 TX laser if SFP is approved\n");
-        bnx2x_8727_specific_func(phy, params, ENABLE_TX);
+        if (!(phy->flags & FLAGS_SFP_NOT_APPROVED)) {
-        /* If transmitter is disabled, ignore false link up indication */
+                DP(NETIF_MSG_LINK, "Enabling 8727 TX laser\n");
-        bnx2x_cl45_read(bp, phy,
+                bnx2x_sfp_set_transmitter(params, phy, 1);
-                        MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER, &val1);
+        } else {
-        if (val1 & (1<<15)) {
                DP(NETIF_MSG_LINK, "Tx is disabled\n");
                return 0;
        }
@@ -9370,8 +9435,7 @@ static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
                bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD, 0x400f, &fw_ver1);
-                bnx2x_save_spirom_version(bp, port,
+                bnx2x_save_spirom_version(bp, port, fw_ver1 & 0xfff,
-                                ((fw_ver1 & 0xf000)>>5) | (fw_ver1 & 0x7f),
                                phy->ver_addr);
        } else {
                /* For 32-bit registers in 848xx, access via MDIO2ARM i/f. */
@@ -9794,6 +9858,15 @@ static int bnx2x_84833_hw_reset_phy(struct bnx2x_phy *phy,
                                other_shmem_base_addr));
        u32 shmem_base_path[2];
+        /* Work around for 84833 LED failure inside RESET status */
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
+                MDIO_AN_REG_8481_LEGACY_MII_CTRL,
+                MDIO_AN_REG_8481_MII_CTRL_FORCE_1G);
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD,
+                MDIO_AN_REG_8481_1G_100T_EXT_CTRL,
+                MIDO_AN_REG_8481_EXT_CTRL_FORCE_LEDS_OFF);
        shmem_base_path[0] = params->shmem_base;
        shmem_base_path[1] = other_shmem_base_addr;
@@ -10104,7 +10177,7 @@ static void bnx2x_848x3_link_reset(struct bnx2x_phy *phy,
        u8 port;
        u16 val16;
-        if (!(CHIP_IS_E1(bp)))
+        if (!(CHIP_IS_E1x(bp)))
                port = BP_PATH(bp);
        else
                port = params->port;
@@ -10131,7 +10204,7 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
        u16 val;
        u8 port;
-        if (!(CHIP_IS_E1(bp)))
+        if (!(CHIP_IS_E1x(bp)))
                port = BP_PATH(bp);
        else
                port = params->port;
@@ -12050,6 +12123,9 @@ int bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
        bnx2x_emac_init(params, vars);
+        if (params->feature_config_flags & FEATURE_CONFIG_PFC_ENABLED)
+                vars->link_status |= LINK_STATUS_PFC_ENABLED;
        if (params->num_phys == 0) {
                DP(NETIF_MSG_LINK, "No phy found for initialization !!\n");
                return -EINVAL;
@@ -12129,10 +12205,10 @@ int bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
         * Hold it as vars low
         */
         /* clear link led */
+        bnx2x_set_mdio_clk(bp, params->chip_id, port);
        bnx2x_set_led(params, vars, LED_MODE_OFF, 0);
        if (reset_ext_phy) {
-                bnx2x_set_mdio_clk(bp, params->chip_id, port);
                for (phy_index = EXT_PHY1; phy_index < params->num_phys;
                      phy_index++) {
                        if (params->phy[phy_index].link_reset) {
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
index 7ba557a610da..763535ee4832 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
@@ -89,6 +89,8 @@
 #define PFC_BRB_FULL_LB_XON_THRESHOLD                           250
 #define MAXVAL(a, b) (((a) > (b)) ? (a) : (b))
+#define BMAC_CONTROL_RX_ENABLE          2
 /***********************************************************/
 /*                         Structs                         */
 /***********************************************************/
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index f7f9aa807264..e077d2508727 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -52,6 +52,7 @@
 #include <linux/prefetch.h>
 #include <linux/zlib.h>
 #include <linux/io.h>
+#include <linux/semaphore.h>
 #include <linux/stringify.h>
 #include <linux/vmalloc.h>
@@ -211,6 +212,10 @@ static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = {
 MODULE_DEVICE_TABLE(pci, bnx2x_pci_tbl);
+/* Global resources for unloading a previously loaded device */
+#define BNX2X_PREV_WAIT_NEEDED 1
+static DEFINE_SEMAPHORE(bnx2x_prev_sem);
+static LIST_HEAD(bnx2x_prev_list);
 /****************************************************************************
 * General service functions
 ****************************************************************************/
@@ -8812,109 +8817,371 @@ static inline void bnx2x_undi_int_disable(struct bnx2x *bp)
                bnx2x_undi_int_disable_e1h(bp);
 }
-static void __devinit bnx2x_undi_unload(struct bnx2x *bp)
+static void __devinit bnx2x_prev_unload_close_mac(struct bnx2x *bp)
 {
-        u32 val;
+        u32 val, base_addr, offset, mask, reset_reg;
+        bool mac_stopped = false;
+        u8 port = BP_PORT(bp);
-        /* possibly another driver is trying to reset the chip */
+        reset_reg = REG_RD(bp, MISC_REG_RESET_REG_2);
-        bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RESET);
-        /* check if doorbell queue is reset */
+        if (!CHIP_IS_E3(bp)) {
-        if (REG_RD(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET)
+                val = REG_RD(bp, NIG_REG_BMAC0_REGS_OUT_EN + port * 4);
-            & MISC_REGISTERS_RESET_REG_1_RST_DORQ) {
+                mask = MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port;
+                if ((mask & reset_reg) && val) {
+                        u32 wb_data[2];
+                        BNX2X_DEV_INFO("Disable bmac Rx\n");
+                        base_addr = BP_PORT(bp) ? NIG_REG_INGRESS_BMAC1_MEM
+                                                : NIG_REG_INGRESS_BMAC0_MEM;
+                        offset = CHIP_IS_E2(bp) ? BIGMAC2_REGISTER_BMAC_CONTROL
+                                                : BIGMAC_REGISTER_BMAC_CONTROL;
-                /*
+                        /*
-                 * Check if it is the UNDI driver
+                         * use rd/wr since we cannot use dmae. This is safe
+                         * since MCP won't access the bus due to the request
+                         * to unload, and no function on the path can be
+                         * loaded at this time.
+                         */
+                        wb_data[0] = REG_RD(bp, base_addr + offset);
+                        wb_data[1] = REG_RD(bp, base_addr + offset + 0x4);
+                        wb_data[0] &= ~BMAC_CONTROL_RX_ENABLE;
+                        REG_WR(bp, base_addr + offset, wb_data[0]);
+                        REG_WR(bp, base_addr + offset + 0x4, wb_data[1]);
+                }
+                BNX2X_DEV_INFO("Disable emac Rx\n");
+                REG_WR(bp, NIG_REG_NIG_EMAC0_EN + BP_PORT(bp)*4, 0);
+                mac_stopped = true;
+        } else {
+                if (reset_reg & MISC_REGISTERS_RESET_REG_2_XMAC) {
+                        BNX2X_DEV_INFO("Disable xmac Rx\n");
+                        base_addr = BP_PORT(bp) ? GRCBASE_XMAC1 : GRCBASE_XMAC0;
+                        val = REG_RD(bp, base_addr + XMAC_REG_PFC_CTRL_HI);
+                        REG_WR(bp, base_addr + XMAC_REG_PFC_CTRL_HI,
+                               val & ~(1 << 1));
+                        REG_WR(bp, base_addr + XMAC_REG_PFC_CTRL_HI,
+                               val | (1 << 1));
+                        REG_WR(bp, base_addr + XMAC_REG_CTRL, 0);
+                        mac_stopped = true;
+                }
+                mask = MISC_REGISTERS_RESET_REG_2_UMAC0 << port;
+                if (mask & reset_reg) {
+                        BNX2X_DEV_INFO("Disable umac Rx\n");
+                        base_addr = BP_PORT(bp) ? GRCBASE_UMAC1 : GRCBASE_UMAC0;
+                        REG_WR(bp, base_addr + UMAC_REG_COMMAND_CONFIG, 0);
+                        mac_stopped = true;
+                }
+        }
+        if (mac_stopped)
+                msleep(20);
+}
+#define BNX2X_PREV_UNDI_PROD_ADDR(p) (BAR_TSTRORM_INTMEM + 0x1508 + ((p) << 4))
+#define BNX2X_PREV_UNDI_RCQ(val)        ((val) & 0xffff)
+#define BNX2X_PREV_UNDI_BD(val)         ((val) >> 16 & 0xffff)
+#define BNX2X_PREV_UNDI_PROD(rcq, bd)   ((bd) << 16 | (rcq))
+static void __devinit bnx2x_prev_unload_undi_inc(struct bnx2x *bp, u8 port,
+                                                 u8 inc)
+{
+        u16 rcq, bd;
+        u32 tmp_reg = REG_RD(bp, BNX2X_PREV_UNDI_PROD_ADDR(port));
+        rcq = BNX2X_PREV_UNDI_RCQ(tmp_reg) + inc;
+        bd = BNX2X_PREV_UNDI_BD(tmp_reg) + inc;
+        tmp_reg = BNX2X_PREV_UNDI_PROD(rcq, bd);
+        REG_WR(bp, BNX2X_PREV_UNDI_PROD_ADDR(port), tmp_reg);
+        BNX2X_DEV_INFO("UNDI producer [%d] rings bd -> 0x%04x, rcq -> 0x%04x\n",
+                       port, bd, rcq);
+}
+static int __devinit bnx2x_prev_mcp_done(struct bnx2x *bp)
+{
+        u32 rc = bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE, 0);
+        if (!rc) {
+                BNX2X_ERR("MCP response failure, aborting\n");
+                return -EBUSY;
+        }
+        return 0;
+}
+static bool __devinit bnx2x_prev_is_path_marked(struct bnx2x *bp)
+{
+        struct bnx2x_prev_path_list *tmp_list;
+        int rc = false;
+        if (down_trylock(&bnx2x_prev_sem))
+                return false;
+        list_for_each_entry(tmp_list, &bnx2x_prev_list, list) {
+                if (PCI_SLOT(bp->pdev->devfn) == tmp_list->slot &&
+                    bp->pdev->bus->number == tmp_list->bus &&
+                    BP_PATH(bp) == tmp_list->path) {
+                        rc = true;
+                        BNX2X_DEV_INFO("Path %d was already cleaned from previous drivers\n",
+                                       BP_PATH(bp));
+                        break;
+                }
+        }
+        up(&bnx2x_prev_sem);
+        return rc;
+}
+static int __devinit bnx2x_prev_mark_path(struct bnx2x *bp)
+{
+        struct bnx2x_prev_path_list *tmp_list;
+        int rc;
+        tmp_list = (struct bnx2x_prev_path_list *)
+                    kmalloc(sizeof(struct bnx2x_prev_path_list), GFP_KERNEL);
+        if (!tmp_list) {
+                BNX2X_ERR("Failed to allocate 'bnx2x_prev_path_list'\n");
+                return -ENOMEM;
+        }
+        tmp_list->bus = bp->pdev->bus->number;
+        tmp_list->slot = PCI_SLOT(bp->pdev->devfn);
+        tmp_list->path = BP_PATH(bp);
+        rc = down_interruptible(&bnx2x_prev_sem);
+        if (rc) {
+                BNX2X_ERR("Received %d when tried to take lock\n", rc);
+                kfree(tmp_list);
+        } else {
+                BNX2X_DEV_INFO("Marked path [%d] - finished previous unload\n",
+                                BP_PATH(bp));
+                list_add(&tmp_list->list, &bnx2x_prev_list);
+                up(&bnx2x_prev_sem);
+        }
+        return rc;
+}
+static bool __devinit bnx2x_can_flr(struct bnx2x *bp)
+{
+        int pos;
+        u32 cap;
+        struct pci_dev *dev = bp->pdev;
+        pos = pci_pcie_cap(dev);
+        if (!pos)
+                return false;
+        pci_read_config_dword(dev, pos + PCI_EXP_DEVCAP, &cap);
+        if (!(cap & PCI_EXP_DEVCAP_FLR))
+                return false;
+        return true;
+}
+static int __devinit bnx2x_do_flr(struct bnx2x *bp)
+{
+        int i, pos;
+        u16 status;
+        struct pci_dev *dev = bp->pdev;
+        /* probe the capability first */
+        if (bnx2x_can_flr(bp))
+                return -ENOTTY;
+        pos = pci_pcie_cap(dev);
+        if (!pos)
+                return -ENOTTY;
+        /* Wait for Transaction Pending bit clean */
+        for (i = 0; i < 4; i++) {
+                if (i)
+                        msleep((1 << (i - 1)) * 100);
+                pci_read_config_word(dev, pos + PCI_EXP_DEVSTA, &status);
+                if (!(status & PCI_EXP_DEVSTA_TRPND))
+                        goto clear;
+        }
+        dev_err(&dev->dev,
+                "transaction is not cleared; proceeding with reset anyway\n");
+clear:
+        if (bp->common.bc_ver < REQ_BC_VER_4_INITIATE_FLR) {
+                BNX2X_ERR("FLR not supported by BC_VER: 0x%x\n",
+                          bp->common.bc_ver);
+                return -EINVAL;
+        }
+        bnx2x_fw_command(bp, DRV_MSG_CODE_INITIATE_FLR, 0);
+        return 0;
+}
+static int __devinit bnx2x_prev_unload_uncommon(struct bnx2x *bp)
+{
+        int rc;
+        BNX2X_DEV_INFO("Uncommon unload Flow\n");
+        /* Test if previous unload process was already finished for this path */
+        if (bnx2x_prev_is_path_marked(bp))
+                return bnx2x_prev_mcp_done(bp);
+        /* If function has FLR capabilities, and existing FW version matches
+         * the one required, then FLR will be sufficient to clean any residue
+         * left by previous driver
+         */
+        if (bnx2x_test_firmware_version(bp, false) && bnx2x_can_flr(bp))
+                return bnx2x_do_flr(bp);
+        /* Close the MCP request, return failure*/
+        rc = bnx2x_prev_mcp_done(bp);
+        if (!rc)
+                rc = BNX2X_PREV_WAIT_NEEDED;
+        return rc;
+}
+static int __devinit bnx2x_prev_unload_common(struct bnx2x *bp)
+{
+        u32 reset_reg, tmp_reg = 0, rc;
+        /* It is possible a previous function received 'common' answer,
+         * but hasn't loaded yet, therefore creating a scenario of
+         * multiple functions receiving 'common' on the same path.
+         */
+        BNX2X_DEV_INFO("Common unload Flow\n");
+        if (bnx2x_prev_is_path_marked(bp))
+                return bnx2x_prev_mcp_done(bp);
+        reset_reg = REG_RD(bp, MISC_REG_RESET_REG_1);
+        /* Reset should be performed after BRB is emptied */
+        if (reset_reg & MISC_REGISTERS_RESET_REG_1_RST_BRB1) {
+                u32 timer_count = 1000;
+                bool prev_undi = false;
+                /* Close the MAC Rx to prevent BRB from filling up */
+                bnx2x_prev_unload_close_mac(bp);
+                /* Check if the UNDI driver was previously loaded
                 * UNDI driver initializes CID offset for normal bell to 0x7
                 */
-                val = REG_RD(bp, DORQ_REG_NORM_CID_OFST);
+                reset_reg = REG_RD(bp, MISC_REG_RESET_REG_1);
-                if (val == 0x7) {
+                if (reset_reg & MISC_REGISTERS_RESET_REG_1_RST_DORQ) {
-                        u32 reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;
+                        tmp_reg = REG_RD(bp, DORQ_REG_NORM_CID_OFST);
-                        /* save our pf_num */
+                        if (tmp_reg == 0x7) {
-                        int orig_pf_num = bp->pf_num;
+                                BNX2X_DEV_INFO("UNDI previously loaded\n");
-                        int port;
+                                prev_undi = true;
-                        u32 swap_en, swap_val, value;
+                                /* clear the UNDI indication */
+                                REG_WR(bp, DORQ_REG_NORM_CID_OFST, 0);
-                        /* clear the UNDI indication */
-                        REG_WR(bp, DORQ_REG_NORM_CID_OFST, 0);
-                        BNX2X_DEV_INFO("UNDI is active! reset device\n");
-                        /* try unload UNDI on port 0 */
-                        bp->pf_num = 0;
-                        bp->fw_seq =
-                              (SHMEM_RD(bp, func_mb[bp->pf_num].drv_mb_header) &
-                                DRV_MSG_SEQ_NUMBER_MASK);
-                        reset_code = bnx2x_fw_command(bp, reset_code, 0);
-                        /* if UNDI is loaded on the other port */
-                        if (reset_code != FW_MSG_CODE_DRV_UNLOAD_COMMON) {
-                                /* send "DONE" for previous unload */
-                                bnx2x_fw_command(bp,
-                                                 DRV_MSG_CODE_UNLOAD_DONE, 0);
-                                /* unload UNDI on port 1 */
-                                bp->pf_num = 1;
-                                bp->fw_seq =
-                              (SHMEM_RD(bp, func_mb[bp->pf_num].drv_mb_header) &
-                                        DRV_MSG_SEQ_NUMBER_MASK);
-                                reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS;
-                                bnx2x_fw_command(bp, reset_code, 0);
                        }
+                }
+                /* wait until BRB is empty */
+                tmp_reg = REG_RD(bp, BRB1_REG_NUM_OF_FULL_BLOCKS);
+                while (timer_count) {
+                        u32 prev_brb = tmp_reg;
-                        bnx2x_undi_int_disable(bp);
+                        tmp_reg = REG_RD(bp, BRB1_REG_NUM_OF_FULL_BLOCKS);
-                        port = BP_PORT(bp);
+                        if (!tmp_reg)
+                                break;
-                        /* close input traffic and wait for it */
-                        /* Do not rcv packets to BRB */
-                        REG_WR(bp, (port ? NIG_REG_LLH1_BRB1_DRV_MASK :
-                                           NIG_REG_LLH0_BRB1_DRV_MASK), 0x0);
-                        /* Do not direct rcv packets that are not for MCP to
-                         * the BRB */
-                        REG_WR(bp, (port ? NIG_REG_LLH1_BRB1_NOT_MCP :
-                                           NIG_REG_LLH0_BRB1_NOT_MCP), 0x0);
-                        /* clear AEU */
-                        REG_WR(bp, (port ? MISC_REG_AEU_MASK_ATTN_FUNC_1 :
-                                           MISC_REG_AEU_MASK_ATTN_FUNC_0), 0);
-                        msleep(10);
-                        /* save NIG port swap info */
-                        swap_val = REG_RD(bp, NIG_REG_PORT_SWAP);
-                        swap_en = REG_RD(bp, NIG_REG_STRAP_OVERRIDE);
-                        /* reset device */
-                        REG_WR(bp,
-                               GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_CLEAR,
-                               0xd3ffffff);
-                        value = 0x1400;
-                        if (CHIP_IS_E3(bp)) {
-                                value |= MISC_REGISTERS_RESET_REG_2_MSTAT0;
-                                value |= MISC_REGISTERS_RESET_REG_2_MSTAT1;
-                        }
-                        REG_WR(bp,
+                        BNX2X_DEV_INFO("BRB still has 0x%08x\n", tmp_reg);
-                               GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-                               value);
-                        /* take the NIG out of reset and restore swap values */
+                        /* reset timer as long as BRB actually gets emptied */
-                        REG_WR(bp,
+                        if (prev_brb > tmp_reg)
-                               GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,
+                                timer_count = 1000;
-                               MISC_REGISTERS_RESET_REG_1_RST_NIG);
+                        else
-                        REG_WR(bp, NIG_REG_PORT_SWAP, swap_val);
+                                timer_count--;
-                        REG_WR(bp, NIG_REG_STRAP_OVERRIDE, swap_en);
-                        /* send unload done to the MCP */
+                        /* If UNDI resides in memory, manually increment it */
-                        bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE, 0);
+                        if (prev_undi)
+                                bnx2x_prev_unload_undi_inc(bp, BP_PORT(bp), 1);
-                        /* restore our func and fw_seq */
+                        udelay(10);
-                        bp->pf_num = orig_pf_num;
                }
+                if (!timer_count)
+                        BNX2X_ERR("Failed to empty BRB, hope for the best\n");
        }
-        /* now it's safe to release the lock */
+        /* No packets are in the pipeline, path is ready for reset */
-        bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RESET);
+        bnx2x_reset_common(bp);
+        rc = bnx2x_prev_mark_path(bp);
+        if (rc) {
+                bnx2x_prev_mcp_done(bp);
+                return rc;
+        }
+        return bnx2x_prev_mcp_done(bp);
+}
+static int __devinit bnx2x_prev_unload(struct bnx2x *bp)
+{
+        int time_counter = 10;
+        u32 rc, fw, hw_lock_reg, hw_lock_val;
+        BNX2X_DEV_INFO("Entering Previous Unload Flow\n");
+       /* Release previously held locks */
+        hw_lock_reg = (BP_FUNC(bp) <= 5) ?
+                      (MISC_REG_DRIVER_CONTROL_1 + BP_FUNC(bp) * 8) :
+                      (MISC_REG_DRIVER_CONTROL_7 + (BP_FUNC(bp) - 6) * 8);
+        hw_lock_val = (REG_RD(bp, hw_lock_reg));
+        if (hw_lock_val) {
+                if (hw_lock_val & HW_LOCK_RESOURCE_NVRAM) {
+                        BNX2X_DEV_INFO("Release Previously held NVRAM lock\n");
+                        REG_WR(bp, MCP_REG_MCPR_NVM_SW_ARB,
+                               (MCPR_NVM_SW_ARB_ARB_REQ_CLR1 << BP_PORT(bp)));
+                }
+                BNX2X_DEV_INFO("Release Previously held hw lock\n");
+                REG_WR(bp, hw_lock_reg, 0xffffffff);
+        } else
+                BNX2X_DEV_INFO("No need to release hw/nvram locks\n");
+        if (MCPR_ACCESS_LOCK_LOCK & REG_RD(bp, MCP_REG_MCPR_ACCESS_LOCK)) {
+                BNX2X_DEV_INFO("Release previously held alr\n");
+                REG_WR(bp, MCP_REG_MCPR_ACCESS_LOCK, 0);
+        }
+        do {
+                /* Lock MCP using an unload request */
+                fw = bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS, 0);
+                if (!fw) {
+                        BNX2X_ERR("MCP response failure, aborting\n");
+                        rc = -EBUSY;
+                        break;
+                }
+                if (fw == FW_MSG_CODE_DRV_UNLOAD_COMMON) {
+                        rc = bnx2x_prev_unload_common(bp);
+                        break;
+                }
+                /* non-common reply from MCP night require looping */
+                rc = bnx2x_prev_unload_uncommon(bp);
+                if (rc != BNX2X_PREV_WAIT_NEEDED)
+                        break;
+                msleep(20);
+        } while (--time_counter);
+        if (!time_counter || rc) {
+                BNX2X_ERR("Failed unloading previous driver, aborting\n");
+                rc = -EBUSY;
+        }
+        BNX2X_DEV_INFO("Finished Previous Unload Flow [%d]\n", rc);
+        return rc;
 }
 static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)
@@ -10100,8 +10367,16 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
        func = BP_FUNC(bp);
        /* need to reset chip if undi was active */
-        if (!BP_NOMCP(bp))
+        if (!BP_NOMCP(bp)) {
-                bnx2x_undi_unload(bp);
+                /* init fw_seq */
+                bp->fw_seq =
+                        SHMEM_RD(bp, func_mb[BP_FW_MB_IDX(bp)].drv_mb_header) &
+                                                        DRV_MSG_SEQ_NUMBER_MASK;
+                BNX2X_DEV_INFO("fw_seq 0x%08x\n", bp->fw_seq);
+                bnx2x_prev_unload(bp);
+        }
        if (CHIP_REV_IS_FPGA(bp))
                dev_err(&bp->pdev->dev, "FPGA detected\n");
@@ -11431,9 +11706,18 @@ static int __init bnx2x_init(void)
 static void __exit bnx2x_cleanup(void)
 {
+        struct list_head *pos, *q;
        pci_unregister_driver(&bnx2x_pci_driver);
        destroy_workqueue(bnx2x_wq);
+        /* Free globablly allocated resources */
+        list_for_each_safe(pos, q, &bnx2x_prev_list) {
+                struct bnx2x_prev_path_list *tmp =
+                        list_entry(pos, struct bnx2x_prev_path_list, list);
+                list_del(pos);
+                kfree(tmp);
+        }
 }
 void bnx2x_notify_link_changed(struct bnx2x *bp)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
index fd7fb4581849..c25803b9c0ca 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
@@ -987,6 +987,7 @@
 * clear; 1 = set. Data valid only in addresses 0-4. all the rest are zero. */
 #define IGU_REG_WRITE_DONE_PENDING                               0x130480
 #define MCP_A_REG_MCPR_SCRATCH                                   0x3a0000
+#define MCP_REG_MCPR_ACCESS_LOCK                                 0x8009c
 #define MCP_REG_MCPR_CPU_PROGRAM_COUNTER                         0x8501c
 #define MCP_REG_MCPR_GP_INPUTS                                   0x800c0
 #define MCP_REG_MCPR_GP_OENABLE                                  0x800c8
@@ -1686,6 +1687,7 @@
   [10] rst_dbg; [11] rst_misc_core; [12] rst_dbue (UART); [13]
   Pci_resetmdio_n; [14] rst_emac0_hard_core; [15] rst_emac1_hard_core; 16]
   rst_pxp_rq_rd_wr; 31:17] reserved */
+#define MISC_REG_RESET_REG_1                                     0xa580
 #define MISC_REG_RESET_REG_2                                     0xa590
 /* [RW 20] 20 bit GRC address where the scratch-pad of the MCP that is
   shared with the driver resides */
@@ -5352,6 +5354,7 @@
 #define XMAC_CTRL_REG_TX_EN                                      (0x1<<0)
 #define XMAC_PAUSE_CTRL_REG_RX_PAUSE_EN                          (0x1<<18)
 #define XMAC_PAUSE_CTRL_REG_TX_PAUSE_EN                          (0x1<<17)
+#define XMAC_PFC_CTRL_HI_REG_FORCE_PFC_XON                       (0x1<<1)
 #define XMAC_PFC_CTRL_HI_REG_PFC_REFRESH_EN                      (0x1<<0)
 #define XMAC_PFC_CTRL_HI_REG_PFC_STATS_EN                        (0x1<<3)
 #define XMAC_PFC_CTRL_HI_REG_RX_PFC_EN                           (0x1<<4)
@@ -5606,6 +5609,7 @@
 /* [RC 32] Parity register #0 read clear */
 #define XSEM_REG_XSEM_PRTY_STS_CLR_0                             0x280128
 #define XSEM_REG_XSEM_PRTY_STS_CLR_1                             0x280138
+#define MCPR_ACCESS_LOCK_LOCK                                    (1L<<31)
 #define MCPR_NVM_ACCESS_ENABLE_EN                                (1L<<0)
 #define MCPR_NVM_ACCESS_ENABLE_WR_EN                             (1L<<1)
 #define MCPR_NVM_ADDR_NVM_ADDR_VALUE                             (0xffffffL<<0)
@@ -5732,6 +5736,7 @@
 #define MISC_REGISTERS_GPIO_PORT_SHIFT                           4
 #define MISC_REGISTERS_GPIO_SET_POS                              8
 #define MISC_REGISTERS_RESET_REG_1_CLEAR                         0x588
+#define MISC_REGISTERS_RESET_REG_1_RST_BRB1                      (0x1<<0)
 #define MISC_REGISTERS_RESET_REG_1_RST_DORQ                      (0x1<<19)
 #define MISC_REGISTERS_RESET_REG_1_RST_HC                        (0x1<<29)
 #define MISC_REGISTERS_RESET_REG_1_RST_NIG                       (0x1<<7)
@@ -6816,10 +6821,13 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_AN_REG_8481_10GBASE_T_AN_CTRL      0x0020
 #define MDIO_AN_REG_8481_LEGACY_MII_CTRL        0xffe0
+#define MDIO_AN_REG_8481_MII_CTRL_FORCE_1G      0x40
 #define MDIO_AN_REG_8481_LEGACY_MII_STATUS      0xffe1
 #define MDIO_AN_REG_8481_LEGACY_AN_ADV          0xffe4
 #define MDIO_AN_REG_8481_LEGACY_AN_EXPANSION    0xffe6
 #define MDIO_AN_REG_8481_1000T_CTRL             0xffe9
+#define MDIO_AN_REG_8481_1G_100T_EXT_CTRL       0xfff0
+#define MIDO_AN_REG_8481_EXT_CTRL_FORCE_LEDS_OFF        0x0008
 #define MDIO_AN_REG_8481_EXPANSION_REG_RD_RW    0xfff5
 #define MDIO_AN_REG_8481_EXPANSION_REG_ACCESS   0xfff7
 #define MDIO_AN_REG_8481_AUX_CTRL               0xfff8
@@ -6939,6 +6947,10 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_WC_REG_GP2_STATUS_GP_2_2                   0x81d2
 #define MDIO_WC_REG_GP2_STATUS_GP_2_3                   0x81d3
 #define MDIO_WC_REG_GP2_STATUS_GP_2_4                   0x81d4
+#define MDIO_WC_REG_GP2_STATUS_GP_2_4_CL73_AN_CMPL 0x1000
+#define MDIO_WC_REG_GP2_STATUS_GP_2_4_CL37_AN_CMPL 0x0100
+#define MDIO_WC_REG_GP2_STATUS_GP_2_4_CL37_LP_AN_CAP 0x0010
+#define MDIO_WC_REG_GP2_STATUS_GP_2_4_CL37_AN_CAP 0x1
 #define MDIO_WC_REG_UC_INFO_B0_DEAD_TRAP                0x81EE
 #define MDIO_WC_REG_UC_INFO_B1_VERSION                  0x81F0
 #define MDIO_WC_REG_UC_INFO_B1_FIRMWARE_MODE            0x81F2
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index 3f52fadee3ed..513573321625 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -3847,7 +3847,7 @@ static bool bnx2x_credit_pool_get_entry(
                        continue;
                /* If we've got here we are going to find a free entry */
-                for (idx = vec * BNX2X_POOL_VEC_SIZE, i = 0;
+                for (idx = vec * BIT_VEC64_ELEM_SZ, i = 0;
                      i < BIT_VEC64_ELEM_SZ; idx++, i++)
                        if (BIT_VEC64_TEST_BIT(o->pool_mirror, idx)) {
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 4e4bb3875868..062ac333fde6 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -2778,7 +2778,9 @@ static void tg3_power_down_phy(struct tg3 *tp, bool do_low_power)
        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780 &&
-             (tp->phy_flags & TG3_PHYFLG_MII_SERDES)))
+             (tp->phy_flags & TG3_PHYFLG_MII_SERDES)) ||
+            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
+             !tp->pci_fn))
                return;
        if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5784_AX ||
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 05ff076af06d..b126b98065a9 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2000,13 +2000,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
 /*
 * debugfs support
 */
-static int mem_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t mem_read(struct file *file, char __user *buf, size_t count,
                        loff_t *ppos)
 {
@@ -2050,7 +2043,7 @@ static ssize_t mem_read(struct file *file, char __user *buf, size_t count,
 static const struct file_operations mem_debugfs_fops = {
        .owner   = THIS_MODULE,
-        .open    = mem_open,
+        .open    = simple_open,
        .read    = mem_read,
        .llseek  = default_llseek,
 };
diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
index 9eb815941df5..f7f0bf5d037b 100644
--- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c
+++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
@@ -356,13 +356,13 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev)
                if (prop)
                        tbiaddr = *prop;
-        }
-        if (tbiaddr == -1) {
+                if (tbiaddr == -1) {
-                err = -EBUSY;
+                        err = -EBUSY;
-                goto err_free_irqs;
+                        goto err_free_irqs;
-        } else {
+                } else {
-                out_be32(tbipa, tbiaddr);
+                        out_be32(tbipa, tbiaddr);
+                }
        }
        err = of_mdiobus_register(new_bus, np);
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 4e3cd2f8debb..17a46e76123f 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3945,6 +3945,8 @@ static int ucc_geth_probe(struct platform_device* ofdev)
                }
        if (max_speed == SPEED_1000) {
+                unsigned int snums = qe_get_num_of_snums();
                /* configure muram FIFOs for gigabit operation */
                ug_info->uf_info.urfs = UCC_GETH_URFS_GIGA_INIT;
                ug_info->uf_info.urfet = UCC_GETH_URFET_GIGA_INIT;
@@ -3954,11 +3956,11 @@ static int ucc_geth_probe(struct platform_device* ofdev)
                ug_info->uf_info.utftt = UCC_GETH_UTFTT_GIGA_INIT;
                ug_info->numThreadsTx = UCC_GETH_NUM_OF_THREADS_4;
-                /* If QE's snum number is 46 which means we need to support
+                /* If QE's snum number is 46/76 which means we need to support
                 * 4 UECs at 1000Base-T simultaneously, we need to allocate
                 * more Threads to Rx.
                 */
-                if (qe_get_num_of_snums() == 46)
+                if ((snums == 76) || (snums == 46))
                        ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_6;
                else
                        ug_info->numThreadsRx = UCC_GETH_NUM_OF_THREADS_4;
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 0e9aec8f6917..4348b6fd44fa 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -164,6 +164,8 @@ static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
 static bool e1000_vlan_used(struct e1000_adapter *adapter);
 static void e1000_vlan_mode(struct net_device *netdev,
                            netdev_features_t features);
+static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
+                                     bool filter_on);
 static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
 static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
 static void e1000_restore_vlan(struct e1000_adapter *adapter);
@@ -215,7 +217,8 @@ MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-static int debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;
+#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
+static int debug = -1;
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
@@ -979,7 +982,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
        adapter = netdev_priv(netdev);
        adapter->netdev = netdev;
        adapter->pdev = pdev;
-        adapter->msg_enable = (1 << debug) - 1;
+        adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
        adapter->bars = bars;
        adapter->need_ioport = need_ioport;
@@ -1214,7 +1217,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
        if (err)
                goto err_register;
-        e1000_vlan_mode(netdev, netdev->features);
+        e1000_vlan_filter_on_off(adapter, false);
        /* print bus type/speed/width info */
        e_info(probe, "(PCI%s:%dMHz:%d-bit) %pM\n",
@@ -4770,6 +4773,22 @@ static bool e1000_vlan_used(struct e1000_adapter *adapter)
        return false;
 }
+static void __e1000_vlan_mode(struct e1000_adapter *adapter,
+                              netdev_features_t features)
+{
+        struct e1000_hw *hw = &adapter->hw;
+        u32 ctrl;
+        ctrl = er32(CTRL);
+        if (features & NETIF_F_HW_VLAN_RX) {
+                /* enable VLAN tag insert/strip */
+                ctrl |= E1000_CTRL_VME;
+        } else {
+                /* disable VLAN tag insert/strip */
+                ctrl &= ~E1000_CTRL_VME;
+        }
+        ew32(CTRL, ctrl);
+}
 static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
                                     bool filter_on)
 {
@@ -4779,6 +4798,7 @@ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
        if (!test_bit(__E1000_DOWN, &adapter->flags))
                e1000_irq_disable(adapter);
+        __e1000_vlan_mode(adapter, adapter->netdev->features);
        if (filter_on) {
                /* enable VLAN receive filtering */
                rctl = er32(RCTL);
@@ -4799,24 +4819,14 @@ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,
 }
 static void e1000_vlan_mode(struct net_device *netdev,
-        netdev_features_t features)
+                            netdev_features_t features)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
-        struct e1000_hw *hw = &adapter->hw;
-        u32 ctrl;
        if (!test_bit(__E1000_DOWN, &adapter->flags))
                e1000_irq_disable(adapter);
-        ctrl = er32(CTRL);
+        __e1000_vlan_mode(adapter, features);
-        if (features & NETIF_F_HW_VLAN_RX) {
-                /* enable VLAN tag insert/strip */
-                ctrl |= E1000_CTRL_VME;
-        } else {
-                /* disable VLAN tag insert/strip */
-                ctrl &= ~E1000_CTRL_VME;
-        }
-        ew32(CTRL, ctrl);
        if (!test_bit(__E1000_DOWN, &adapter->flags))
                e1000_irq_enable(adapter);
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index 86cdd4793992..b83897f76ee3 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -161,6 +161,12 @@ struct e1000_info;
 /* Time to wait before putting the device into D3 if there's no link (in ms). */
 #define LINK_TIMEOUT            100
+/*
+ * Count for polling __E1000_RESET condition every 10-20msec.
+ * Experimentation has shown the reset can take approximately 210msec.
+ */
+#define E1000_CHECK_RESET_COUNT         25
 #define DEFAULT_RDTR                    0
 #define DEFAULT_RADV                    8
 #define BURST_RDTR                      0x20
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 7152eb11b7b9..19ab2154802c 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -60,6 +60,11 @@
 char e1000e_driver_name[] = "e1000e";
 const char e1000e_driver_version[] = DRV_VERSION;
+#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
+static int debug = -1;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state);
 static const struct e1000_info *e1000_info_tbl[] = {
@@ -1054,6 +1059,13 @@ static void e1000_print_hw_hang(struct work_struct *work)
                ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
                /* execute the writes immediately */
                e1e_flush();
+                /*
+                 * Due to rare timing issues, write to TIDV again to ensure
+                 * the write is successful
+                 */
+                ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
+                /* execute the writes immediately */
+                e1e_flush();
                adapter->tx_hang_recheck = true;
                return;
        }
@@ -3611,6 +3623,16 @@ static void e1000e_flush_descriptors(struct e1000_adapter *adapter)
        /* execute the writes immediately */
        e1e_flush();
+        /*
+         * due to rare timing issues, write to TIDV/RDTR again to ensure the
+         * write is successful
+         */
+        ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
+        ew32(RDTR, adapter->rx_int_delay | E1000_RDTR_FPD);
+        /* execute the writes immediately */
+        e1e_flush();
 }
 static void e1000e_update_stats(struct e1000_adapter *adapter);
@@ -3963,6 +3985,10 @@ static int e1000_close(struct net_device *netdev)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
        struct pci_dev *pdev = adapter->pdev;
+        int count = E1000_CHECK_RESET_COUNT;
+        while (test_bit(__E1000_RESETTING, &adapter->state) && count--)
+                usleep_range(10000, 20000);
        WARN_ON(test_bit(__E1000_RESETTING, &adapter->state));
@@ -5467,6 +5493,11 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake,
        netif_device_detach(netdev);
        if (netif_running(netdev)) {
+                int count = E1000_CHECK_RESET_COUNT;
+                while (test_bit(__E1000_RESETTING, &adapter->state) && count--)
+                        usleep_range(10000, 20000);
                WARN_ON(test_bit(__E1000_RESETTING, &adapter->state));
                e1000e_down(adapter);
                e1000_free_irq(adapter);
@@ -6172,7 +6203,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
        adapter->hw.adapter = adapter;
        adapter->hw.mac.type = ei->mac;
        adapter->max_hw_frame_size = ei->max_hw_frame_size;
-        adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;
+        adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
        mmio_start = pci_resource_start(pdev, 0);
        mmio_len = pci_resource_len(pdev, 0);
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index c4902411d749..5ec31598ee47 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -238,6 +238,11 @@ MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
+#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
+static int debug = -1;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 struct igb_reg_info {
        u32 ofs;
        char *name;
@@ -1893,7 +1898,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
        adapter->pdev = pdev;
        hw = &adapter->hw;
        hw->back = adapter;
-        adapter->msg_enable = NETIF_MSG_DRV | NETIF_MSG_PROBE;
+        adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
        mmio_start = pci_resource_start(pdev, 0);
        mmio_len = pci_resource_len(pdev, 0);
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 217c143686d2..d61ca2a732f0 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -55,6 +55,11 @@ static const char igbvf_driver_string[] =
 static const char igbvf_copyright[] =
                  "Copyright (c) 2009 - 2012 Intel Corporation.";
+#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
+static int debug = -1;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 static int igbvf_poll(struct napi_struct *napi, int budget);
 static void igbvf_reset(struct igbvf_adapter *);
 static void igbvf_set_interrupt_capability(struct igbvf_adapter *);
@@ -2649,7 +2654,7 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
        adapter->flags = ei->flags;
        adapter->hw.back = adapter;
        adapter->hw.mac.type = ei->mac;
-        adapter->msg_enable = (1 << NETIF_MSG_DRV | NETIF_MSG_PROBE) - 1;
+        adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
        /* PCI config space info */
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 82aaa792cbf3..5fce363d810a 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -134,8 +134,8 @@ MODULE_DESCRIPTION("Intel(R) PRO/10GbE Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-#define DEFAULT_DEBUG_LEVEL_SHIFT 3
+#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
-static int debug = DEFAULT_DEBUG_LEVEL_SHIFT;
+static int debug = -1;
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
@@ -442,7 +442,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        adapter->netdev = netdev;
        adapter->pdev = pdev;
        adapter->hw.back = adapter;
-        adapter->msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT);
+        adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
        adapter->hw.hw_addr = pci_ioremap_bar(pdev, BAR_0);
        if (!adapter->hw.hw_addr) {
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 80e26ff30ebf..74e192107f9a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -544,7 +544,7 @@ struct ixgbe_fdir_filter {
        u16 action;
 };
-enum ixbge_state_t {
+enum ixgbe_state_t {
        __IXGBE_TESTING,
        __IXGBE_RESETTING,
        __IXGBE_DOWN,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index dde65f951400..652e4b09546d 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -44,62 +44,94 @@
 #define DCB_NO_HW_CHG   1  /* DCB configuration did not change */
 #define DCB_HW_CHG      2  /* DCB configuration changed, no reset */
-int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
+int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *scfg,
-                       struct ixgbe_dcb_config *dst_dcb_cfg, int tc_max)
+                       struct ixgbe_dcb_config *dcfg, int tc_max)
 {
-        struct tc_configuration *src_tc_cfg = NULL;
+        struct tc_configuration *src = NULL;
-        struct tc_configuration *dst_tc_cfg = NULL;
+        struct tc_configuration *dst = NULL;
-        int i;
+        int i, j;
+        int tx = DCB_TX_CONFIG;
+        int rx = DCB_RX_CONFIG;
+        int changes = 0;
-        if (!src_dcb_cfg || !dst_dcb_cfg)
+        if (!scfg || !dcfg)
-                return -EINVAL;
+                return changes;
        for (i = DCB_PG_ATTR_TC_0; i < tc_max + DCB_PG_ATTR_TC_0; i++) {
-                src_tc_cfg = &src_dcb_cfg->tc_config[i - DCB_PG_ATTR_TC_0];
+                src = &scfg->tc_config[i - DCB_PG_ATTR_TC_0];
-                dst_tc_cfg = &dst_dcb_cfg->tc_config[i - DCB_PG_ATTR_TC_0];
+                dst = &dcfg->tc_config[i - DCB_PG_ATTR_TC_0];
-                dst_tc_cfg->path[DCB_TX_CONFIG].prio_type =
+                if (dst->path[tx].prio_type != src->path[tx].prio_type) {
-                                src_tc_cfg->path[DCB_TX_CONFIG].prio_type;
+                        dst->path[tx].prio_type = src->path[tx].prio_type;
+                        changes |= BIT_PG_TX;
+                }
-                dst_tc_cfg->path[DCB_TX_CONFIG].bwg_id =
+                if (dst->path[tx].bwg_id != src->path[tx].bwg_id) {
-                                src_tc_cfg->path[DCB_TX_CONFIG].bwg_id;
+                        dst->path[tx].bwg_id = src->path[tx].bwg_id;
+                        changes |= BIT_PG_TX;
+                }
-                dst_tc_cfg->path[DCB_TX_CONFIG].bwg_percent =
+                if (dst->path[tx].bwg_percent != src->path[tx].bwg_percent) {
-                                src_tc_cfg->path[DCB_TX_CONFIG].bwg_percent;
+                        dst->path[tx].bwg_percent = src->path[tx].bwg_percent;
+                        changes |= BIT_PG_TX;
+                }
-                dst_tc_cfg->path[DCB_TX_CONFIG].up_to_tc_bitmap =
+                if (dst->path[tx].up_to_tc_bitmap !=
-                                src_tc_cfg->path[DCB_TX_CONFIG].up_to_tc_bitmap;
+                                src->path[tx].up_to_tc_bitmap) {
+                        dst->path[tx].up_to_tc_bitmap =
+                                src->path[tx].up_to_tc_bitmap;
+                        changes |= (BIT_PG_TX | BIT_PFC | BIT_APP_UPCHG);
+                }
-                dst_tc_cfg->path[DCB_RX_CONFIG].prio_type =
+                if (dst->path[rx].prio_type != src->path[rx].prio_type) {
-                                src_tc_cfg->path[DCB_RX_CONFIG].prio_type;
+                        dst->path[rx].prio_type = src->path[rx].prio_type;
+                        changes |= BIT_PG_RX;
+                }
-                dst_tc_cfg->path[DCB_RX_CONFIG].bwg_id =
+                if (dst->path[rx].bwg_id != src->path[rx].bwg_id) {
-                                src_tc_cfg->path[DCB_RX_CONFIG].bwg_id;
+                        dst->path[rx].bwg_id = src->path[rx].bwg_id;
+                        changes |= BIT_PG_RX;
+                }
-                dst_tc_cfg->path[DCB_RX_CONFIG].bwg_percent =
+                if (dst->path[rx].bwg_percent != src->path[rx].bwg_percent) {
-                                src_tc_cfg->path[DCB_RX_CONFIG].bwg_percent;
+                        dst->path[rx].bwg_percent = src->path[rx].bwg_percent;
+                        changes |= BIT_PG_RX;
+                }
-                dst_tc_cfg->path[DCB_RX_CONFIG].up_to_tc_bitmap =
+                if (dst->path[rx].up_to_tc_bitmap !=
-                                src_tc_cfg->path[DCB_RX_CONFIG].up_to_tc_bitmap;
+                                src->path[rx].up_to_tc_bitmap) {
+                        dst->path[rx].up_to_tc_bitmap =
+                                src->path[rx].up_to_tc_bitmap;
+                        changes |= (BIT_PG_RX | BIT_PFC | BIT_APP_UPCHG);
+                }
        }
        for (i = DCB_PG_ATTR_BW_ID_0; i < DCB_PG_ATTR_BW_ID_MAX; i++) {
-                dst_dcb_cfg->bw_percentage[DCB_TX_CONFIG]
+                j = i - DCB_PG_ATTR_BW_ID_0;
-                        [i-DCB_PG_ATTR_BW_ID_0] = src_dcb_cfg->bw_percentage
+                if (dcfg->bw_percentage[tx][j] != scfg->bw_percentage[tx][j]) {
-                                [DCB_TX_CONFIG][i-DCB_PG_ATTR_BW_ID_0];
+                        dcfg->bw_percentage[tx][j] = scfg->bw_percentage[tx][j];
-                dst_dcb_cfg->bw_percentage[DCB_RX_CONFIG]
+                        changes |= BIT_PG_TX;
-                        [i-DCB_PG_ATTR_BW_ID_0] = src_dcb_cfg->bw_percentage
+                }
-                                [DCB_RX_CONFIG][i-DCB_PG_ATTR_BW_ID_0];
+                if (dcfg->bw_percentage[rx][j] != scfg->bw_percentage[rx][j]) {
+                        dcfg->bw_percentage[rx][j] = scfg->bw_percentage[rx][j];
+                        changes |= BIT_PG_RX;
+                }
        }
        for (i = DCB_PFC_UP_ATTR_0; i < DCB_PFC_UP_ATTR_MAX; i++) {
-                dst_dcb_cfg->tc_config[i - DCB_PFC_UP_ATTR_0].dcb_pfc =
+                j = i - DCB_PFC_UP_ATTR_0;
-                        src_dcb_cfg->tc_config[i - DCB_PFC_UP_ATTR_0].dcb_pfc;
+                if (dcfg->tc_config[j].dcb_pfc != scfg->tc_config[j].dcb_pfc) {
+                        dcfg->tc_config[j].dcb_pfc = scfg->tc_config[j].dcb_pfc;
+                        changes |= BIT_PFC;
+                }
        }
-        dst_dcb_cfg->pfc_mode_enable = src_dcb_cfg->pfc_mode_enable;
+        if (dcfg->pfc_mode_enable != scfg->pfc_mode_enable) {
+                dcfg->pfc_mode_enable = scfg->pfc_mode_enable;
+                changes |= BIT_PFC;
+        }
-        return 0;
+        return changes;
 }
 static u8 ixgbe_dcbnl_get_state(struct net_device *netdev)
@@ -179,20 +211,6 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc,
        if (up_map != DCB_ATTR_VALUE_UNDEFINED)
                adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap =
                        up_map;
-        if ((adapter->temp_dcb_cfg.tc_config[tc].path[0].prio_type !=
-             adapter->dcb_cfg.tc_config[tc].path[0].prio_type) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_id !=
-             adapter->dcb_cfg.tc_config[tc].path[0].bwg_id) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_percent !=
-             adapter->dcb_cfg.tc_config[tc].path[0].bwg_percent) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap))
-                adapter->dcb_set_bitmap |= BIT_PG_TX;
-        if (adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap)
-                adapter->dcb_set_bitmap |= BIT_PFC | BIT_APP_UPCHG;
 }
 static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
@@ -201,10 +219,6 @@ static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
        adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] = bw_pct;
-        if (adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] !=
-            adapter->dcb_cfg.bw_percentage[0][bwg_id])
-                adapter->dcb_set_bitmap |= BIT_PG_TX;
 }
 static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
@@ -223,20 +237,6 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
        if (up_map != DCB_ATTR_VALUE_UNDEFINED)
                adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap =
                        up_map;
-        if ((adapter->temp_dcb_cfg.tc_config[tc].path[1].prio_type !=
-             adapter->dcb_cfg.tc_config[tc].path[1].prio_type) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_id !=
-             adapter->dcb_cfg.tc_config[tc].path[1].bwg_id) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_percent !=
-             adapter->dcb_cfg.tc_config[tc].path[1].bwg_percent) ||
-            (adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap))
-                adapter->dcb_set_bitmap |= BIT_PG_RX;
-        if (adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap)
-                adapter->dcb_set_bitmap |= BIT_PFC;
 }
 static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
@@ -245,10 +245,6 @@ static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
        adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] = bw_pct;
-        if (adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] !=
-            adapter->dcb_cfg.bw_percentage[1][bwg_id])
-                adapter->dcb_set_bitmap |= BIT_PG_RX;
 }
 static void ixgbe_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int tc,
@@ -298,10 +294,8 @@ static void ixgbe_dcbnl_set_pfc_cfg(struct net_device *netdev, int priority,
        adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc = setting;
        if (adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc !=
-            adapter->dcb_cfg.tc_config[priority].dcb_pfc) {
+            adapter->dcb_cfg.tc_config[priority].dcb_pfc)
-                adapter->dcb_set_bitmap |= BIT_PFC;
                adapter->temp_dcb_cfg.pfc_mode_enable = true;
-        }
 }
 static void ixgbe_dcbnl_get_pfc_cfg(struct net_device *netdev, int priority,
@@ -336,7 +330,8 @@ static void ixgbe_dcbnl_devreset(struct net_device *dev)
 static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
 {
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
-        int ret, i;
+        int ret = DCB_NO_HW_CHG;
+        int i;
 #ifdef IXGBE_FCOE
        struct dcb_app app = {
                              .selector = DCB_APP_IDTYPE_ETHTYPE,
@@ -355,12 +350,13 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
        /* Fail command if not in CEE mode */
        if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
-                return 1;
+                return ret;
-        ret = ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg, &adapter->dcb_cfg,
+        adapter->dcb_set_bitmap |= ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg,
-                                 MAX_TRAFFIC_CLASS);
+                                                      &adapter->dcb_cfg,
-        if (ret)
+                                                      MAX_TRAFFIC_CLASS);
-                return DCB_NO_HW_CHG;
+        if (!adapter->dcb_set_bitmap)
+                return ret;
        if (adapter->dcb_cfg.pfc_mode_enable) {
                switch (adapter->hw.mac.type) {
@@ -420,6 +416,8 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
                for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)
                        netdev_set_prio_tc_map(netdev, i, prio_tc[i]);
+                ret = DCB_HW_CHG_RST;
        }
        if (adapter->dcb_set_bitmap & BIT_PFC) {
@@ -430,7 +428,8 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
                                     DCB_TX_CONFIG, prio_tc);
                ixgbe_dcb_unpack_pfc(&adapter->dcb_cfg, &pfc_en);
                ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc_en, prio_tc);
-                ret = DCB_HW_CHG;
+                if (ret != DCB_HW_CHG_RST)
+                        ret = DCB_HW_CHG;
        }
        if (adapter->dcb_cfg.pfc_mode_enable)
@@ -531,9 +530,6 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
        struct ixgbe_adapter *adapter = netdev_priv(netdev);
        adapter->temp_dcb_cfg.pfc_mode_enable = state;
-        if (adapter->temp_dcb_cfg.pfc_mode_enable !=
-                adapter->dcb_cfg.pfc_mode_enable)
-                adapter->dcb_set_bitmap |= BIT_PFC;
 }
 /**
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 398fc223cab9..3e26b1f9ac75 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -63,8 +63,8 @@ static char ixgbe_default_device_descr[] =
                              "Intel(R) 10 Gigabit Network Connection";
 #endif
 #define MAJ 3
-#define MIN 6
+#define MIN 8
-#define BUILD 7
+#define BUILD 21
 #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
        __stringify(BUILD) "-k"
 const char ixgbe_driver_version[] = DRV_VERSION;
@@ -141,13 +141,16 @@ module_param(allow_unsupported_sfp, uint, 0);
 MODULE_PARM_DESC(allow_unsupported_sfp,
                 "Allow unsupported and untested SFP+ modules on 82599-based adapters");
+#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
+static int debug = -1;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
 MODULE_DESCRIPTION("Intel(R) 10 Gigabit PCI Express Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-#define DEFAULT_DEBUG_LEVEL_SHIFT 3
 static void ixgbe_service_event_schedule(struct ixgbe_adapter *adapter)
 {
        if (!test_bit(__IXGBE_DOWN, &adapter->state) &&
@@ -6834,7 +6837,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
        adapter->pdev = pdev;
        hw = &adapter->hw;
        hw->back = adapter;
-        adapter->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1;
+        adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
        hw->hw_addr = ioremap(pci_resource_start(pdev, 0),
                              pci_resource_len(pdev, 0));
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 581c65976bb4..307611ae831d 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -91,7 +91,10 @@ MODULE_DESCRIPTION("Intel(R) 82599 Virtual Function Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-#define DEFAULT_DEBUG_LEVEL_SHIFT 3
+#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
+static int debug = -1;
+module_param(debug, int, 0);
+MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 /* forward decls */
 static void ixgbevf_set_itr_msix(struct ixgbevf_q_vector *q_vector);
@@ -3367,7 +3370,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
        adapter->pdev = pdev;
        hw = &adapter->hw;
        hw->back = adapter;
-        adapter->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1;
+        adapter->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
        /*
         * call save state here in standalone driver because it relies on
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 423a1a2a702e..c9b504e2dfc3 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -1767,13 +1767,14 @@ static int sky2_open(struct net_device *dev)
        sky2_hw_up(sky2);
+        /* Enable interrupts from phy/mac for port */
+        imask = sky2_read32(hw, B0_IMSK);
        if (hw->chip_id == CHIP_ID_YUKON_OPT ||
            hw->chip_id == CHIP_ID_YUKON_PRM ||
            hw->chip_id == CHIP_ID_YUKON_OP_2)
                imask |= Y2_IS_PHY_QLNK;        /* enable PHY Quick Link */
-        /* Enable interrupts from phy/mac for port */
-        imask = sky2_read32(hw, B0_IMSK);
        imask |= portirq_msk[port];
        sky2_write32(hw, B0_IMSK, imask);
        sky2_read32(hw, B0_IMSK);
@@ -2468,6 +2469,17 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
        return err;
 }
+static inline bool needs_copy(const struct rx_ring_info *re,
+                              unsigned length)
+{
+#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+        /* Some architectures need the IP header to be aligned */
+        if (!IS_ALIGNED(re->data_addr + ETH_HLEN, sizeof(u32)))
+                return true;
+#endif
+        return length < copybreak;
+}
 /* For small just reuse existing skb for next receive */
 static struct sk_buff *receive_copy(struct sky2_port *sky2,
                                    const struct rx_ring_info *re,
@@ -2598,7 +2610,7 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
                goto error;
 okay:
-        if (length < copybreak)
+        if (needs_copy(re, length))
                skb = receive_copy(sky2, re, length);
        else
                skb = receive_new(sky2, re, length);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 9e2b911a1230..d69fee41f24a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -83,8 +83,9 @@
 #define MLX4_EN_WATCHDOG_TIMEOUT        (15 * HZ)
-#define MLX4_EN_ALLOC_ORDER     2
+/* Use the maximum between 16384 and a single page */
-#define MLX4_EN_ALLOC_SIZE      (PAGE_SIZE << MLX4_EN_ALLOC_ORDER)
+#define MLX4_EN_ALLOC_SIZE      PAGE_ALIGN(16384)
+#define MLX4_EN_ALLOC_ORDER     get_order(MLX4_EN_ALLOC_SIZE)
 #define MLX4_EN_MAX_LRO_DESCRIPTORS     32
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 69444247c20b..6dfc26d85e47 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -1441,7 +1441,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
        }
 #endif
        if (!is_valid_ether_addr(ndev->dev_addr))
-                dev_hw_addr_random(ndev, ndev->dev_addr);
+                eth_hw_addr_random(ndev);
        /* Reset the ethernet controller */
        __lpc_eth_reset(pldat);
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 7b23554f80b6..f54509377efa 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -5810,7 +5810,10 @@ static void __rtl8169_resume(struct net_device *dev)
        rtl_pll_power_up(tp);
+        rtl_lock_work(tp);
+        napi_enable(&tp->napi);
        set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);
+        rtl_unlock_work(tp);
        rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
 }
diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig
index 9755b49bbefb..3fb2355af37e 100644
--- a/drivers/net/ethernet/renesas/Kconfig
+++ b/drivers/net/ethernet/renesas/Kconfig
@@ -7,7 +7,8 @@ config SH_ETH
        depends on SUPERH && \
                (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
                 CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
-                 CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7757)
+                 CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7734 || \
+                 CPU_SUBTYPE_SH7757)
        select CRC32
        select NET_CORE
        select MII
@@ -16,4 +17,4 @@ config SH_ETH
        ---help---
          Renesas SuperH Ethernet device driver.
          This driver supporting CPUs are:
-                - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
+                - SH7619, SH7710, SH7712, SH7724, SH7734, SH7763 and SH7757.
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 8615961c1287..d63e09b29a96 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1,8 +1,8 @@
 /*
 *  SuperH Ethernet device driver
 *
- *  Copyright (C) 2006-2008 Nobuhiro Iwamatsu
+ *  Copyright (C) 2006-2012 Nobuhiro Iwamatsu
- *  Copyright (C) 2008-2009 Renesas Solutions Corp.
+ *  Copyright (C) 2008-2012 Renesas Solutions Corp.
 *
 *  This program is free software; you can redistribute it and/or modify it
 *  under the terms and conditions of the GNU General Public License,
@@ -38,6 +38,7 @@
 #include <linux/slab.h>
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
+#include <linux/clk.h>
 #include <linux/sh_eth.h>
 #include "sh_eth.h"
@@ -279,8 +280,9 @@ static struct sh_eth_cpu_data *sh_eth_get_cpu_data(struct sh_eth_private *mdp)
                return &sh_eth_my_cpu_data;
 }
-#elif defined(CONFIG_CPU_SUBTYPE_SH7763)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7734) || defined(CONFIG_CPU_SUBTYPE_SH7763)
 #define SH_ETH_HAS_TSU  1
+static void sh_eth_reset_hw_crc(struct net_device *ndev);
 static void sh_eth_chip_reset(struct net_device *ndev)
 {
        struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -314,6 +316,9 @@ static void sh_eth_reset(struct net_device *ndev)
        sh_eth_write(ndev, 0x0, RDFAR);
        sh_eth_write(ndev, 0x0, RDFXR);
        sh_eth_write(ndev, 0x0, RDFFR);
+        /* Reset HW CRC register */
+        sh_eth_reset_hw_crc(ndev);
 }
 static void sh_eth_set_duplex(struct net_device *ndev)
@@ -370,8 +375,17 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
        .no_trimd       = 1,
        .no_ade         = 1,
        .tsu            = 1,
+#if defined(CONFIG_CPU_SUBTYPE_SH7734)
+        .hw_crc     = 1,
+#endif
 };
+static void sh_eth_reset_hw_crc(struct net_device *ndev)
+{
+        if (sh_eth_my_cpu_data.hw_crc)
+                sh_eth_write(ndev, 0x0, CSMR);
+}
 #elif defined(CONFIG_CPU_SUBTYPE_SH7619)
 #define SH_ETH_RESET_DEFAULT    1
 static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
@@ -790,7 +804,7 @@ static int sh_eth_dev_init(struct net_device *ndev)
        /* all sh_eth int mask */
        sh_eth_write(ndev, 0, EESIPR);
-#if defined(__LITTLE_ENDIAN__)
+#if defined(__LITTLE_ENDIAN)
        if (mdp->cd->hw_swap)
                sh_eth_write(ndev, EDMR_EL, EDMR);
        else
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index 57dc26261116..0fa14afce23d 100644
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -1,8 +1,8 @@
 /*
 *  SuperH Ethernet device driver
 *
- *  Copyright (C) 2006-2008 Nobuhiro Iwamatsu
+ *  Copyright (C) 2006-2012 Nobuhiro Iwamatsu
- *  Copyright (C) 2008-2011 Renesas Solutions Corp.
+ *  Copyright (C) 2008-2012 Renesas Solutions Corp.
 *
 *  This program is free software; you can redistribute it and/or modify it
 *  under the terms and conditions of the GNU General Public License,
@@ -98,6 +98,8 @@ enum {
        CEECR,
        MAFCR,
        RTRATE,
+        CSMR,
+        RMII_MII,
        /* TSU Absolute address */
        ARSTR,
@@ -172,6 +174,7 @@ static const u16 sh_eth_offset_gigabit[SH_ETH_MAX_REGISTER_OFFSET] = {
        [RMCR]  = 0x0458,
        [RPADIR]        = 0x0460,
        [FCFTR] = 0x0468,
+        [CSMR] = 0x04E4,
        [ECMR]  = 0x0500,
        [ECSR]  = 0x0510,
@@ -200,6 +203,7 @@ static const u16 sh_eth_offset_gigabit[SH_ETH_MAX_REGISTER_OFFSET] = {
        [CERCR] = 0x0768,
        [CEECR] = 0x0770,
        [MAFCR] = 0x0778,
+        [RMII_MII] =  0x0790,
        [ARSTR] = 0x0000,
        [TSU_CTRST]     = 0x0004,
@@ -377,7 +381,7 @@ static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {
 /*
 * Register's bits
 */
-#ifdef CONFIG_CPU_SUBTYPE_SH7763
+#if defined(CONFIG_CPU_SUBTYPE_SH7734) || defined(CONFIG_CPU_SUBTYPE_SH7763)
 /* EDSR */
 enum EDSR_BIT {
        EDSR_ENT = 0x01, EDSR_ENR = 0x02,
@@ -689,7 +693,7 @@ enum TSU_FWSLC_BIT {
 */
 struct sh_eth_txdesc {
        u32 status;             /* TD0 */
-#if defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if defined(__LITTLE_ENDIAN)
        u16 pad0;               /* TD1 */
        u16 buffer_length;      /* TD1 */
 #else
@@ -706,7 +710,7 @@ struct sh_eth_txdesc {
 */
 struct sh_eth_rxdesc {
        u32 status;             /* RD0 */
-#if defined(CONFIG_CPU_LITTLE_ENDIAN)
+#if defined(__LITTLE_ENDIAN)
        u16 frame_length;       /* RD1 */
        u16 buffer_length;      /* RD1 */
 #else
@@ -751,6 +755,7 @@ struct sh_eth_cpu_data {
        unsigned rpadir:1;              /* E-DMAC have RPADIR */
        unsigned no_trimd:1;            /* E-DMAC DO NOT have TRIMD */
        unsigned no_ade:1;      /* E-DMAC DO NOT have ADE bit in EESR */
+        unsigned hw_crc:1;      /* E-DMAC have CSMR */
 };
 struct sh_eth_private {
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index e85ffbd54830..48d56da62f08 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1737,10 +1737,12 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
        struct mac_device_info *mac;
        /* Identify the MAC HW device */
-        if (priv->plat->has_gmac)
+        if (priv->plat->has_gmac) {
+                priv->dev->priv_flags |= IFF_UNICAST_FLT;
                mac = dwmac1000_setup(priv->ioaddr);
-        else
+        } else {
                mac = dwmac100_setup(priv->ioaddr);
+        }
        if (!mac)
                return -ENOMEM;
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
index 261356c2dc99..3d501ec7fad7 100644
--- a/drivers/net/ethernet/tile/tilepro.c
+++ b/drivers/net/ethernet/tile/tilepro.c
@@ -342,6 +342,21 @@ inline int __netio_fastio1(u32 fastio_index, u32 arg0)
 }
+static void tile_net_return_credit(struct tile_net_cpu *info)
+{
+        struct tile_netio_queue *queue = &info->queue;
+        netio_queue_user_impl_t *qup = &queue->__user_part;
+        /* Return four credits after every fourth packet. */
+        if (--qup->__receive_credit_remaining == 0) {
+                u32 interval = qup->__receive_credit_interval;
+                qup->__receive_credit_remaining = interval;
+                __netio_fastio_return_credits(qup->__fastio_index, interval);
+        }
+}
 /*
 * Provide a linux buffer to LIPP.
 */
@@ -433,7 +448,7 @@ static bool tile_net_provide_needed_buffer(struct tile_net_cpu *info,
        struct sk_buff **skb_ptr;
        /* Request 96 extra bytes for alignment purposes. */
-        skb = netdev_alloc_skb(info->napi->dev, len + padding);
+        skb = netdev_alloc_skb(info->napi.dev, len + padding);
        if (skb == NULL)
                return false;
@@ -864,19 +879,11 @@ static bool tile_net_poll_aux(struct tile_net_cpu *info, int index)
                stats->rx_packets++;
                stats->rx_bytes += len;
-                if (small)
-                        info->num_needed_small_buffers++;
-                else
-                        info->num_needed_large_buffers++;
        }
-        /* Return four credits after every fourth packet. */
+        /* ISSUE: It would be nice to defer this until the packet has */
-        if (--qup->__receive_credit_remaining == 0) {
+        /* actually been processed. */
-                u32 interval = qup->__receive_credit_interval;
+        tile_net_return_credit(info);
-                qup->__receive_credit_remaining = interval;
-                __netio_fastio_return_credits(qup->__fastio_index, interval);
-        }
        /* Consume this packet. */
        qup->__packet_receive_read = index2;
@@ -1543,7 +1550,7 @@ static int tile_net_drain_lipp_buffers(struct tile_net_priv *priv)
        /* Drain all the LIPP buffers. */
        while (true) {
-                int buffer;
+                unsigned int buffer;
                /* NOTE: This should never fail. */
                if (hv_dev_pread(priv->hv_devhdl, 0, (HV_VirtAddr)&buffer,
@@ -1707,7 +1714,7 @@ static unsigned int tile_net_tx_frags(lepp_frag_t *frags,
                if (!hash_default) {
                        void *va = pfn_to_kaddr(pfn) + f->page_offset;
                        BUG_ON(PageHighMem(skb_frag_page(f)));
-                        finv_buffer_remote(va, f->size, 0);
+                        finv_buffer_remote(va, skb_frag_size(f), 0);
                }
                cpa = ((phys_addr_t)pfn << PAGE_SHIFT) + f->page_offset;
@@ -1735,8 +1742,8 @@ static unsigned int tile_net_tx_frags(lepp_frag_t *frags,
 * Sometimes, if "sendfile()" requires copying, we will be called with
 * "data" containing the header and payload, with "frags" being empty.
 *
- * In theory, "sh->nr_frags" could be 3, but in practice, it seems
+ * Sometimes, for example when using NFS over TCP, a single segment can
- * that this will never actually happen.
+ * span 3 fragments, which must be handled carefully in LEPP.
 *
 * See "emulate_large_send_offload()" for some reference code, which
 * does not handle checksumming.
@@ -1844,10 +1851,8 @@ static int tile_net_tx_tso(struct sk_buff *skb, struct net_device *dev)
        spin_lock_irqsave(&priv->eq_lock, irqflags);
-        /*
+        /* Handle completions if needed to make room. */
-         * Handle completions if needed to make room.
+        /* NOTE: Return NETDEV_TX_BUSY if there is still no room. */
-         * HACK: Spin until there is sufficient room.
-         */
        if (lepp_num_free_comp_slots(eq) == 0) {
                nolds = tile_net_lepp_grab_comps(eq, olds, wanted, 0);
                if (nolds == 0) {
@@ -1861,6 +1866,7 @@ busy:
        cmd_tail = eq->cmd_tail;
        /* Prepare to advance, detecting full queue. */
+        /* NOTE: Return NETDEV_TX_BUSY if the queue is full. */
        cmd_next = cmd_tail + cmd_size;
        if (cmd_tail < cmd_head && cmd_next >= cmd_head)
                goto busy;
@@ -2023,10 +2029,8 @@ static int tile_net_tx(struct sk_buff *skb, struct net_device *dev)
        spin_lock_irqsave(&priv->eq_lock, irqflags);
-        /*
+        /* Handle completions if needed to make room. */
-         * Handle completions if needed to make room.
+        /* NOTE: Return NETDEV_TX_BUSY if there is still no room. */
-         * HACK: Spin until there is sufficient room.
-         */
        if (lepp_num_free_comp_slots(eq) == 0) {
                nolds = tile_net_lepp_grab_comps(eq, olds, wanted, 0);
                if (nolds == 0) {
@@ -2040,6 +2044,7 @@ busy:
        cmd_tail = eq->cmd_tail;
        /* Copy the commands, or fail. */
+        /* NOTE: Return NETDEV_TX_BUSY if the queue is full. */
        for (i = 0; i < num_frags; i++) {
                /* Prepare to advance, detecting full queue. */
@@ -2261,6 +2266,23 @@ static int tile_net_get_mac(struct net_device *dev)
        return 0;
 }
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void tile_net_netpoll(struct net_device *dev)
+{
+        struct tile_net_priv *priv = netdev_priv(dev);
+        disable_percpu_irq(priv->intr_id);
+        tile_net_handle_ingress_interrupt(priv->intr_id, dev);
+        enable_percpu_irq(priv->intr_id, 0);
+}
+#endif
 static const struct net_device_ops tile_net_ops = {
        .ndo_open = tile_net_open,
        .ndo_stop = tile_net_stop,
@@ -2269,7 +2291,10 @@ static const struct net_device_ops tile_net_ops = {
        .ndo_get_stats = tile_net_get_stats,
        .ndo_change_mtu = tile_net_change_mtu,
        .ndo_tx_timeout = tile_net_tx_timeout,
-        .ndo_set_mac_address = tile_net_set_mac_address
+        .ndo_set_mac_address = tile_net_set_mac_address,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller = tile_net_netpoll,
+#endif
 };
@@ -2409,7 +2434,7 @@ static void tile_net_cleanup(void)
 */
 static int tile_net_init_module(void)
 {
-        pr_info("Tilera IPP Net Driver\n");
+        pr_info("Tilera Network Driver\n");
        tile_net_devs[0] = tile_net_dev_init("xgbe0");
        tile_net_devs[1] = tile_net_dev_init("xgbe1");
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 39b8cf3dafcd..fcfa01f7ceb6 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -503,30 +503,32 @@ static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid);
 static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid);
 static void rhine_restart_tx(struct net_device *dev);
-static void rhine_wait_bit(struct rhine_private *rp, u8 reg, u8 mask, bool high)
+static void rhine_wait_bit(struct rhine_private *rp, u8 reg, u8 mask, bool low)
 {
        void __iomem *ioaddr = rp->base;
        int i;
        for (i = 0; i < 1024; i++) {
-                if (high ^ !!(ioread8(ioaddr + reg) & mask))
+                bool has_mask_bits = !!(ioread8(ioaddr + reg) & mask);
+                if (low ^ has_mask_bits)
                        break;
                udelay(10);
        }
        if (i > 64) {
                netif_dbg(rp, hw, rp->dev, "%s bit wait (%02x/%02x) cycle "
-                          "count: %04d\n", high ? "high" : "low", reg, mask, i);
+                          "count: %04d\n", low ? "low" : "high", reg, mask, i);
        }
 }
 static void rhine_wait_bit_high(struct rhine_private *rp, u8 reg, u8 mask)
 {
-        rhine_wait_bit(rp, reg, mask, true);
+        rhine_wait_bit(rp, reg, mask, false);
 }
 static void rhine_wait_bit_low(struct rhine_private *rp, u8 reg, u8 mask)
 {
-        rhine_wait_bit(rp, reg, mask, false);
+        rhine_wait_bit(rp, reg, mask, true);
 }
 static u32 rhine_get_events(struct rhine_private *rp)
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index a0d1913a58d3..e25067552b20 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -147,7 +147,7 @@ static void sa1100_irda_dma_start(struct sa1100_buf *buf,
        struct dma_async_tx_descriptor *desc;
        struct dma_chan *chan = buf->chan;
-        desc = chan->device->device_prep_slave_sg(chan, &buf->sg, 1, dir,
+        desc = dmaengine_prep_slave_sg(chan, &buf->sg, 1, dir,
                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
        if (desc) {
                desc->callback = cb;
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index 0856e1b7a849..f08c85acf761 100644
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -162,7 +162,8 @@ static int ip101a_g_config_init(struct phy_device *phydev)
        /* Enable Auto Power Saving mode */
        c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS);
        c |= IP101A_G_APS_ON;
-        return c;
+        return phy_write(phydev, IP10XX_SPEC_CTRL_STATUS, c);
 }
 static int ip175c_read_status(struct phy_device *phydev)
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 159da2905fe9..33f8c51968b6 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -235,7 +235,7 @@ struct ppp_net {
 /* Prototypes. */
 static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf,
                        struct file *file, unsigned int cmd, unsigned long arg);
-static void ppp_xmit_process(struct ppp *ppp);
+static int ppp_xmit_process(struct ppp *ppp);
 static void ppp_send_frame(struct ppp *ppp, struct sk_buff *skb);
 static void ppp_push(struct ppp *ppp);
 static void ppp_channel_push(struct channel *pch);
@@ -968,9 +968,9 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev)
        proto = npindex_to_proto[npi];
        put_unaligned_be16(proto, pp);
-        netif_stop_queue(dev);
        skb_queue_tail(&ppp->file.xq, skb);
-        ppp_xmit_process(ppp);
+        if (!ppp_xmit_process(ppp))
+                netif_stop_queue(dev);
        return NETDEV_TX_OK;
 outf:
@@ -1048,10 +1048,11 @@ static void ppp_setup(struct net_device *dev)
 * Called to do any work queued up on the transmit side
 * that can now be done.
 */
-static void
+static int
 ppp_xmit_process(struct ppp *ppp)
 {
        struct sk_buff *skb;
+        int ret = 0;
        ppp_xmit_lock(ppp);
        if (!ppp->closing) {
@@ -1061,10 +1062,13 @@ ppp_xmit_process(struct ppp *ppp)
                        ppp_send_frame(ppp, skb);
                /* If there's no work left to do, tell the core net
                   code that we can accept some more. */
-                if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq))
+                if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq)) {
                        netif_wake_queue(ppp->dev);
+                        ret = 1;
+                }
        }
        ppp_xmit_unlock(ppp);
+        return ret;
 }
 static inline struct sk_buff *
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index a57f05726b57..91d25888a1b9 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -375,8 +375,8 @@ static void rionet_remove(struct rio_dev *rdev)
        struct net_device *ndev = rio_get_drvdata(rdev);
        struct rionet_peer *peer, *tmp;
-        free_pages((unsigned long)rionet_active, rdev->net->hport->sys_size ?
+        free_pages((unsigned long)rionet_active, get_order(sizeof(void *) *
-                                        __fls(sizeof(void *)) + 4 : 0);
+                        RIO_MAX_ROUTE_ENTRIES(rdev->net->hport->sys_size)));
        unregister_netdev(ndev);
        free_netdev(ndev);
@@ -432,15 +432,16 @@ static int rionet_setup_netdev(struct rio_mport *mport, struct net_device *ndev)
        int rc = 0;
        struct rionet_private *rnet;
        u16 device_id;
+        const size_t rionet_active_bytes = sizeof(void *) *
+                                RIO_MAX_ROUTE_ENTRIES(mport->sys_size);
        rionet_active = (struct rio_dev **)__get_free_pages(GFP_KERNEL,
-                        mport->sys_size ? __fls(sizeof(void *)) + 4 : 0);
+                        get_order(rionet_active_bytes));
        if (!rionet_active) {
                rc = -ENOMEM;
                goto out;
        }
-        memset((void *)rionet_active, 0, sizeof(void *) *
+        memset((void *)rionet_active, 0, rionet_active_bytes);
-                                RIO_MAX_ROUTE_ENTRIES(mport->sys_size));
        /* Set up private area */
        rnet = netdev_priv(ndev);
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index 3886b30ed373..3e41b00c6806 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -165,13 +165,13 @@ static void rx_complete(struct urb *req)
                                memcpy(skb_put(skb, 1), page_address(page), 1);
                                skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
                                                page, 1, req->actual_length,
-                                                req->actual_length);
+                                                PAGE_SIZE);
                                page = NULL;
                        }
                } else {
                        skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
                                        page, 0, req->actual_length,
-                                        req->actual_length);
+                                        PAGE_SIZE);
                        page = NULL;
                }
                if (req->actual_length < PAGE_SIZE)
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index 439690be519f..685a4e22c768 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -93,6 +93,7 @@ static int eem_bind(struct usbnet *dev, struct usb_interface *intf)
        /* no jumbogram (16K) support for now */
        dev->net->hard_header_len += EEM_HEAD + ETH_FCS_LEN;
+        dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
        return 0;
 }
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 6dda2fe5b15b..d363b31053da 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -85,32 +85,6 @@
 #define INT_CRERR_CNT           0x06
 #define INT_COL_CNT             0x07
-/* Transmit status register errors */
-#define TSR_ECOL                (1<<5)
-#define TSR_LCOL                (1<<4)
-#define TSR_LOSS_CRS            (1<<3)
-#define TSR_JBR                 (1<<2)
-#define TSR_ERRORS              (TSR_ECOL | TSR_LCOL | TSR_LOSS_CRS | TSR_JBR)
-/* Receive status register errors */
-#define RSR_CRC                 (1<<2)
-#define RSR_FAE                 (1<<1)
-#define RSR_ERRORS              (RSR_CRC | RSR_FAE)
-/* Media status register definitions */
-#define MSR_DUPLEX              (1<<4)
-#define MSR_SPEED               (1<<3)
-#define MSR_LINK                (1<<2)
-/* Interrupt pipe data */
-#define INT_TSR                 0x00
-#define INT_RSR                 0x01
-#define INT_MSR                 0x02
-#define INT_WAKSR               0x03
-#define INT_TXOK_CNT            0x04
-#define INT_RXLOST_CNT          0x05
-#define INT_CRERR_CNT           0x06
-#define INT_COL_CNT             0x07
 #define RTL8150_MTU             1540
 #define RTL8150_TX_TIMEOUT      (HZ)
diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c
index c3197ce0e2ad..34db195fb8b0 100644
--- a/drivers/net/usb/zaurus.c
+++ b/drivers/net/usb/zaurus.c
@@ -337,6 +337,11 @@ static const struct usb_device_id	products [] = {
        .driver_info = ZAURUS_PXA_INFO,
 },
 {
+        /* Motorola Rokr E6 */
+        USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6027, USB_CLASS_COMM,
+                        USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+        .driver_info = (unsigned long) &bogus_mdlm_info,
+}, {
        /* Motorola MOTOMAGX phones */
        USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6425, USB_CLASS_COMM,
                        USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 019da012669f..4de2760c5937 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -625,12 +625,13 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)
        /* This can happen with OOM and indirect buffers. */
        if (unlikely(capacity < 0)) {
-                if (net_ratelimit()) {
+                if (likely(capacity == -ENOMEM)) {
-                        if (likely(capacity == -ENOMEM)) {
+                        if (net_ratelimit()) {
                                dev_warn(&dev->dev,
                                         "TX queue failure: out of memory\n");
                        } else {
-                                dev->stats.tx_fifo_errors++;
+                        dev->stats.tx_fifo_errors++;
+                        if (net_ratelimit())
                                dev_warn(&dev->dev,
                                         "Unexpected TX queue failure: %d\n",
                                         capacity);
diff --git a/drivers/net/wimax/i2400m/debugfs.c b/drivers/net/wimax/i2400m/debugfs.c
index 129ba36bd04d..4b66ab1d0e5c 100644
--- a/drivers/net/wimax/i2400m/debugfs.c
+++ b/drivers/net/wimax/i2400m/debugfs.c
@@ -53,17 +53,6 @@ struct dentry *debugfs_create_netdev_queue_stopped(
                                   &fops_netdev_queue_stopped);
 }
-/*
- * inode->i_private has the @data argument to debugfs_create_file()
- */
-static
-int i2400m_stats_open(struct inode *inode, struct file *filp)
-{
-        filp->private_data = inode->i_private;
-        return 0;
-}
 /*
 * We don't allow partial reads of this file, as then the reader would
 * get weirdly confused data as it is updated.
@@ -117,7 +106,7 @@ ssize_t i2400m_rx_stats_write(struct file *filp, const char __user *buffer,
 static
 const struct file_operations i2400m_rx_stats_fops = {
        .owner =        THIS_MODULE,
-        .open =         i2400m_stats_open,
+        .open =         simple_open,
        .read =         i2400m_rx_stats_read,
        .write =        i2400m_rx_stats_write,
        .llseek =       default_llseek,
@@ -170,7 +159,7 @@ ssize_t i2400m_tx_stats_write(struct file *filp, const char __user *buffer,
 static
 const struct file_operations i2400m_tx_stats_fops = {
        .owner =        THIS_MODULE,
-        .open =         i2400m_stats_open,
+        .open =         simple_open,
        .read =         i2400m_tx_stats_read,
        .write =        i2400m_tx_stats_write,
        .llseek =       default_llseek,
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c
index 63e4b709efa9..1d76ae855f07 100644
--- a/drivers/net/wimax/i2400m/netdev.c
+++ b/drivers/net/wimax/i2400m/netdev.c
@@ -597,7 +597,8 @@ static void i2400m_get_drvinfo(struct net_device *net_dev,
        struct i2400m *i2400m = net_dev_to_i2400m(net_dev);
        strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver) - 1);
-        strncpy(info->fw_version, i2400m->fw_name, sizeof(info->fw_version) - 1);
+        strncpy(info->fw_version,
+                i2400m->fw_name ? : "", sizeof(info->fw_version) - 1);
        if (net_dev->dev.parent)
                strncpy(info->bus_info, dev_name(net_dev->dev.parent),
                        sizeof(info->bus_info) - 1);
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index 2c1b8b687646..29b1e033a10b 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -339,6 +339,23 @@ int i2400mu_bus_reset(struct i2400m *i2400m, enum i2400m_reset_type rt)
        return result;
 }
+static void i2400mu_get_drvinfo(struct net_device *net_dev,
+                                struct ethtool_drvinfo *info)
+{
+        struct i2400m *i2400m = net_dev_to_i2400m(net_dev);
+        struct i2400mu *i2400mu = container_of(i2400m, struct i2400mu, i2400m);
+        struct usb_device *udev = i2400mu->usb_dev;
+        strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver) - 1);
+        strncpy(info->fw_version,
+                i2400m->fw_name ? : "", sizeof(info->fw_version) - 1);
+        usb_make_path(udev, info->bus_info, sizeof(info->bus_info));
+}
+static const struct ethtool_ops i2400mu_ethtool_ops = {
+        .get_drvinfo = i2400mu_get_drvinfo,
+        .get_link = ethtool_op_get_link,
+};
 static
 void i2400mu_netdev_setup(struct net_device *net_dev)
@@ -347,6 +364,7 @@ void i2400mu_netdev_setup(struct net_device *net_dev)
        struct i2400mu *i2400mu = container_of(i2400m, struct i2400mu, i2400m);
        i2400mu_init(i2400mu);
        i2400m_netdev_setup(net_dev);
+        net_dev->ethtool_ops = &i2400mu_ethtool_ops;
 }
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 8c5ce8b0c734..e5e8f45d86ac 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -71,13 +71,6 @@ static unsigned int ath5k_debug;
 module_param_named(debug, ath5k_debug, uint, 0);
-static int ath5k_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 /* debugfs: registers */
 struct reg {
@@ -265,7 +258,7 @@ static ssize_t write_file_beacon(struct file *file,
 static const struct file_operations fops_beacon = {
        .read = read_file_beacon,
        .write = write_file_beacon,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -285,7 +278,7 @@ static ssize_t write_file_reset(struct file *file,
 static const struct file_operations fops_reset = {
        .write = write_file_reset,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = noop_llseek,
 };
@@ -365,7 +358,7 @@ static ssize_t write_file_debug(struct file *file,
 static const struct file_operations fops_debug = {
        .read = read_file_debug,
        .write = write_file_debug,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -477,7 +470,7 @@ static ssize_t write_file_antenna(struct file *file,
 static const struct file_operations fops_antenna = {
        .read = read_file_antenna,
        .write = write_file_antenna,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -532,7 +525,7 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
 static const struct file_operations fops_misc = {
        .read = read_file_misc,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
 };
@@ -647,7 +640,7 @@ static ssize_t write_file_frameerrors(struct file *file,
 static const struct file_operations fops_frameerrors = {
        .read = read_file_frameerrors,
        .write = write_file_frameerrors,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -810,7 +803,7 @@ static ssize_t write_file_ani(struct file *file,
 static const struct file_operations fops_ani = {
        .read = read_file_ani,
        .write = write_file_ani,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -881,7 +874,7 @@ static ssize_t write_file_queue(struct file *file,
 static const struct file_operations fops_queue = {
        .read = read_file_queue,
        .write = write_file_queue,
-        .open = ath5k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index 552adb3f80d0..d01403a263ff 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -217,12 +217,6 @@ void dump_cred_dist_stats(struct htc_target *target)
                   target->credit_info->cur_free_credits);
 }
-static int ath6kl_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 void ath6kl_debug_war(struct ath6kl *ar, enum ath6kl_war war)
 {
        switch (war) {
@@ -263,7 +257,7 @@ static ssize_t read_file_war_stats(struct file *file, char __user *user_buf,
 static const struct file_operations fops_war_stats = {
        .read = read_file_war_stats,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -488,7 +482,7 @@ static ssize_t ath6kl_fwlog_mask_write(struct file *file,
 }
 static const struct file_operations fops_fwlog_mask = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .read = ath6kl_fwlog_mask_read,
        .write = ath6kl_fwlog_mask_write,
        .owner = THIS_MODULE,
@@ -634,7 +628,7 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
 static const struct file_operations fops_tgt_stats = {
        .read = read_file_tgt_stats,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -699,7 +693,7 @@ static ssize_t read_file_credit_dist_stats(struct file *file,
 static const struct file_operations fops_credit_dist_stats = {
        .read = read_file_credit_dist_stats,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -802,7 +796,7 @@ static ssize_t ath6kl_endpoint_stats_write(struct file *file,
 }
 static const struct file_operations fops_endpoint_stats = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .read = ath6kl_endpoint_stats_read,
        .write = ath6kl_endpoint_stats_write,
        .owner = THIS_MODULE,
@@ -875,7 +869,7 @@ static ssize_t ath6kl_regread_write(struct file *file,
 static const struct file_operations fops_diag_reg_read = {
        .read = ath6kl_regread_read,
        .write = ath6kl_regread_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -999,7 +993,7 @@ static ssize_t ath6kl_lrssi_roam_read(struct file *file,
 static const struct file_operations fops_lrssi_roam_threshold = {
        .read = ath6kl_lrssi_roam_read,
        .write = ath6kl_lrssi_roam_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1061,7 +1055,7 @@ static ssize_t ath6kl_regwrite_write(struct file *file,
 static const struct file_operations fops_diag_reg_write = {
        .read = ath6kl_regwrite_read,
        .write = ath6kl_regwrite_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1166,7 +1160,7 @@ static ssize_t ath6kl_roam_table_read(struct file *file, char __user *user_buf,
 static const struct file_operations fops_roam_table = {
        .read = ath6kl_roam_table_read,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1204,7 +1198,7 @@ static ssize_t ath6kl_force_roam_write(struct file *file,
 static const struct file_operations fops_force_roam = {
        .write = ath6kl_force_roam_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1244,7 +1238,7 @@ static ssize_t ath6kl_roam_mode_write(struct file *file,
 static const struct file_operations fops_roam_mode = {
        .write = ath6kl_roam_mode_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1286,7 +1280,7 @@ static ssize_t ath6kl_keepalive_write(struct file *file,
 }
 static const struct file_operations fops_keepalive = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .read = ath6kl_keepalive_read,
        .write = ath6kl_keepalive_write,
        .owner = THIS_MODULE,
@@ -1331,7 +1325,7 @@ static ssize_t ath6kl_disconnect_timeout_write(struct file *file,
 }
 static const struct file_operations fops_disconnect_timeout = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .read = ath6kl_disconnect_timeout_read,
        .write = ath6kl_disconnect_timeout_write,
        .owner = THIS_MODULE,
@@ -1512,7 +1506,7 @@ static ssize_t ath6kl_create_qos_write(struct file *file,
 static const struct file_operations fops_create_qos = {
        .write = ath6kl_create_qos_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1560,7 +1554,7 @@ static ssize_t ath6kl_delete_qos_write(struct file *file,
 static const struct file_operations fops_delete_qos = {
        .write = ath6kl_delete_qos_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1593,7 +1587,7 @@ static ssize_t ath6kl_bgscan_int_write(struct file *file,
 static const struct file_operations fops_bgscan_int = {
        .write = ath6kl_bgscan_int_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1651,7 +1645,7 @@ static ssize_t ath6kl_listen_int_read(struct file *file,
 static const struct file_operations fops_listen_int = {
        .read = ath6kl_listen_int_read,
        .write = ath6kl_listen_int_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1711,7 +1705,7 @@ static ssize_t ath6kl_power_params_write(struct file *file,
 static const struct file_operations fops_power_params = {
        .write = ath6kl_power_params_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index 2f4b48e6fb03..e5cceb077574 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -20,7 +20,6 @@
 /* Common calibration code */
-#define ATH9K_NF_TOO_HIGH       -60
 static int16_t ath9k_hw_get_nf_hist_mid(int16_t *nfCalBuffer)
 {
@@ -346,10 +345,10 @@ static void ath9k_hw_nf_sanitize(struct ath_hw *ah, s16 *nf)
                        "NF calibrated [%s] [chain %d] is %d\n",
                        (i >= 3 ? "ext" : "ctl"), i % 3, nf[i]);
-                if (nf[i] > ATH9K_NF_TOO_HIGH) {
+                if (nf[i] > limit->max) {
                        ath_dbg(common, CALIBRATE,
                                "NF[%d] (%d) > MAX (%d), correcting to MAX\n",
-                                i, nf[i], ATH9K_NF_TOO_HIGH);
+                                i, nf[i], limit->max);
                        nf[i] = limit->max;
                } else if (nf[i] < limit->min) {
                        ath_dbg(common, CALIBRATE,
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 35d1c8e91d1c..ff47b32ecaf4 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -26,11 +26,6 @@
 #define REG_READ_D(_ah, _reg) \
        ath9k_hw_common(_ah)->ops->read((_ah), (_reg))
-static int ath9k_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t ath9k_debugfs_read_buf(struct file *file, char __user *user_buf,
                                      size_t count, loff_t *ppos)
@@ -83,7 +78,7 @@ static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_debug = {
        .read = read_file_debug,
        .write = write_file_debug,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -129,7 +124,7 @@ static ssize_t write_file_tx_chainmask(struct file *file, const char __user *use
 static const struct file_operations fops_tx_chainmask = {
        .read = read_file_tx_chainmask,
        .write = write_file_tx_chainmask,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -172,7 +167,7 @@ static ssize_t write_file_rx_chainmask(struct file *file, const char __user *use
 static const struct file_operations fops_rx_chainmask = {
        .read = read_file_rx_chainmask,
        .write = write_file_rx_chainmask,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -223,7 +218,7 @@ static ssize_t write_file_disable_ani(struct file *file,
 static const struct file_operations fops_disable_ani = {
        .read = read_file_disable_ani,
        .write = write_file_disable_ani,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -324,7 +319,7 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,
 static const struct file_operations fops_dma = {
        .read = read_file_dma,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -446,7 +441,7 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
 static const struct file_operations fops_interrupt = {
        .read = read_file_interrupt,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -852,28 +847,28 @@ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
 static const struct file_operations fops_xmit = {
        .read = read_file_xmit,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
 static const struct file_operations fops_stations = {
        .read = read_file_stations,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
 static const struct file_operations fops_misc = {
        .read = read_file_misc,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
 static const struct file_operations fops_reset = {
        .read = read_file_reset,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1016,7 +1011,7 @@ void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
 static const struct file_operations fops_recv = {
        .read = read_file_recv,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1055,7 +1050,7 @@ static ssize_t write_file_regidx(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_regidx = {
        .read = read_file_regidx,
        .write = write_file_regidx,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1102,7 +1097,7 @@ static ssize_t write_file_regval(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_regval = {
        .read = read_file_regval,
        .write = write_file_regval,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1191,7 +1186,7 @@ static ssize_t read_file_dump_nfcal(struct file *file, char __user *user_buf,
 static const struct file_operations fops_dump_nfcal = {
        .read = read_file_dump_nfcal,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1219,7 +1214,7 @@ static ssize_t read_file_base_eeprom(struct file *file, char __user *user_buf,
 static const struct file_operations fops_base_eeprom = {
        .read = read_file_base_eeprom,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1247,7 +1242,7 @@ static ssize_t read_file_modal_eeprom(struct file *file, char __user *user_buf,
 static const struct file_operations fops_modal_eeprom = {
        .read = read_file_modal_eeprom,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c
index 106d031d834a..4364c103ed33 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_debug.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c
@@ -60,16 +60,9 @@ static ssize_t read_file_dfs(struct file *file, char __user *user_buf,
        return retval;
 }
-static int ath9k_dfs_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static const struct file_operations fops_dfs_stats = {
        .read = read_file_dfs,
-        .open = ath9k_dfs_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
index d3ff33c71aa5..3035deb7a0cd 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
@@ -16,12 +16,6 @@
 #include "htc.h"
-static int ath9k_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t read_file_tgt_int_stats(struct file *file, char __user *user_buf,
                                       size_t count, loff_t *ppos)
 {
@@ -75,7 +69,7 @@ static ssize_t read_file_tgt_int_stats(struct file *file, char __user *user_buf,
 static const struct file_operations fops_tgt_int_stats = {
        .read = read_file_tgt_int_stats,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -145,7 +139,7 @@ static ssize_t read_file_tgt_tx_stats(struct file *file, char __user *user_buf,
 static const struct file_operations fops_tgt_tx_stats = {
        .read = read_file_tgt_tx_stats,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -191,7 +185,7 @@ static ssize_t read_file_tgt_rx_stats(struct file *file, char __user *user_buf,
 static const struct file_operations fops_tgt_rx_stats = {
        .read = read_file_tgt_rx_stats,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -243,7 +237,7 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
 static const struct file_operations fops_xmit = {
        .read = read_file_xmit,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -364,7 +358,7 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
 static const struct file_operations fops_recv = {
        .read = read_file_recv,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -399,7 +393,7 @@ static ssize_t read_file_slot(struct file *file, char __user *user_buf,
 static const struct file_operations fops_slot = {
        .read = read_file_slot,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -446,7 +440,7 @@ static ssize_t read_file_queue(struct file *file, char __user *user_buf,
 static const struct file_operations fops_queue = {
        .read = read_file_queue,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -487,7 +481,7 @@ static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_debug = {
        .read = read_file_debug,
        .write = write_file_debug,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -636,7 +630,7 @@ static ssize_t read_file_base_eeprom(struct file *file, char __user *user_buf,
 static const struct file_operations fops_base_eeprom = {
        .read = read_file_base_eeprom,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -917,7 +911,7 @@ static ssize_t read_file_modal_eeprom(struct file *file, char __user *user_buf,
 static const struct file_operations fops_modal_eeprom = {
        .read = read_file_modal_eeprom,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 60159f4ee532..cb006458fc4b 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -680,7 +680,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
        hw->queues = 4;
        hw->max_rates = 4;
        hw->channel_change_time = 5000;
-        hw->max_listen_interval = 10;
+        hw->max_listen_interval = 1;
        hw->max_rate_tries = 10;
        hw->sta_data_size = sizeof(struct ath_node);
        hw->vif_data_size = sizeof(struct ath_vif);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 38794850f005..215eb2536b1e 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -640,7 +640,7 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
        an->sta = sta;
        an->vif = vif;
-        if (sta->ht_cap.ht_supported) {
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) {
                ath_tx_node_init(sc, an);
                an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
                                     sta->ht_cap.ampdu_factor);
@@ -659,7 +659,7 @@ static void ath_node_detach(struct ath_softc *sc, struct ieee80211_sta *sta)
        an->sta = NULL;
 #endif
-        if (sta->ht_cap.ht_supported)
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
                ath_tx_node_cleanup(sc, an);
 }
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 4f848493fece..08bb45532701 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -1480,12 +1480,6 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,
 #ifdef CONFIG_ATH9K_DEBUGFS
-static int ath9k_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t read_file_rcstat(struct file *file, char __user *user_buf,
                                size_t count, loff_t *ppos)
 {
@@ -1553,7 +1547,7 @@ static ssize_t read_file_rcstat(struct file *file, char __user *user_buf,
 static const struct file_operations fops_rcstat = {
        .read = read_file_rcstat,
-        .open = ath9k_debugfs_open,
+        .open = simple_open,
        .owner = THIS_MODULE
 };
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index f4ae3ba994a8..1c4583c7ff7c 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -1913,13 +1913,13 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                if (sc->rx.frag) {
                        int space = skb->len - skb_tailroom(hdr_skb);
-                        sc->rx.frag = NULL;
                        if (pskb_expand_head(hdr_skb, 0, space, GFP_ATOMIC) < 0) {
                                dev_kfree_skb(skb);
                                goto requeue_drop_frag;
                        }
+                        sc->rx.frag = NULL;
                        skb_copy_from_linear_data(skb, skb_put(hdr_skb, skb->len),
                                                  skb->len);
                        dev_kfree_skb_any(skb);
diff --git a/drivers/net/wireless/ath/carl9170/debug.c b/drivers/net/wireless/ath/carl9170/debug.c
index 3c164226687f..93fe6003a493 100644
--- a/drivers/net/wireless/ath/carl9170/debug.c
+++ b/drivers/net/wireless/ath/carl9170/debug.c
@@ -48,11 +48,6 @@
 #define ADD(buf, off, max, fmt, args...)                                \
        off += snprintf(&buf[off], max - off, fmt, ##args);
-static int carl9170_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 struct carl9170_debugfs_fops {
        unsigned int read_bufsize;
@@ -178,7 +173,7 @@ static const struct carl9170_debugfs_fops carl_debugfs_##name ##_ops = {\
        .attr = _attr,                                                  \
        .req_dev_state = _dstate,                                       \
        .fops = {                                                       \
-                .open   = carl9170_debugfs_open,                        \
+                .open   = simple_open,                                  \
                .read   = carl9170_debugfs_read,                        \
                .write  = carl9170_debugfs_write,                       \
                .owner  = THIS_MODULE                                   \
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
index e751fdee89b2..e807bd930647 100644
--- a/drivers/net/wireless/b43/debugfs.c
+++ b/drivers/net/wireless/b43/debugfs.c
@@ -500,12 +500,6 @@ out:
 #undef fappend
-static int b43_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t b43_debugfs_read(struct file *file, char __user *userbuf,
                                size_t count, loff_t *ppos)
 {
@@ -624,7 +618,7 @@ out_unlock:
                .read   = _read,                                \
                .write  = _write,                               \
                .fops   = {                                     \
-                        .open   = b43_debugfs_open,             \
+                        .open   = simple_open,                  \
                        .read   = b43_debugfs_read,             \
                        .write  = b43_debugfs_write,            \
                        .llseek = generic_file_llseek,          \
diff --git a/drivers/net/wireless/b43legacy/debugfs.c b/drivers/net/wireless/b43legacy/debugfs.c
index 5e28ad0d6d17..1965edb765a2 100644
--- a/drivers/net/wireless/b43legacy/debugfs.c
+++ b/drivers/net/wireless/b43legacy/debugfs.c
@@ -197,12 +197,6 @@ static int restart_write_file(struct b43legacy_wldev *dev, const char *buf, size
 #undef fappend
-static int b43legacy_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t b43legacy_debugfs_read(struct file *file, char __user *userbuf,
                                size_t count, loff_t *ppos)
 {
@@ -331,7 +325,7 @@ out_unlock:
                .read   = _read,                                \
                .write  = _write,                               \
                .fops   = {                                     \
-                        .open   = b43legacy_debugfs_open,               \
+                        .open   = simple_open,                          \
                        .read   = b43legacy_debugfs_read,               \
                        .write  = b43legacy_debugfs_write,              \
                        .llseek = generic_file_llseek,                  \
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 4fcdac63a300..2b022571a859 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11507,9 +11507,9 @@ static int ipw_wdev_init(struct net_device *dev)
                        rc = -ENOMEM;
                        goto out;
                }
-                /* translate geo->bg to a_band.channels */
+                /* translate geo->a to a_band.channels */
                for (i = 0; i < geo->a_channels; i++) {
-                        a_band->channels[i].band = IEEE80211_BAND_2GHZ;
+                        a_band->channels[i].band = IEEE80211_BAND_5GHZ;
                        a_band->channels[i].center_freq = geo->a[i].freq;
                        a_band->channels[i].hw_value = geo->a[i].channel;
                        a_band->channels[i].max_power = geo->a[i].max_power;
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index 0c1209390169..faec40467208 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -2673,8 +2673,6 @@ il3945_bg_restart(struct work_struct *data)
        if (test_and_clear_bit(S_FW_ERROR, &il->status)) {
                mutex_lock(&il->mutex);
-                /* FIXME: vif can be dereferenced */
-                il->vif = NULL;
                il->is_open = 0;
                mutex_unlock(&il->mutex);
                il3945_down(il);
diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/iwlegacy/3945-rs.c
index 70bee1a4d876..4b10157d8686 100644
--- a/drivers/net/wireless/iwlegacy/3945-rs.c
+++ b/drivers/net/wireless/iwlegacy/3945-rs.c
@@ -821,12 +821,6 @@ out:
 }
 #ifdef CONFIG_MAC80211_DEBUGFS
-static int
-il3945_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t
 il3945_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,
@@ -862,7 +856,7 @@ il3945_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,
 static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
        .read = il3945_sta_dbgfs_stats_table_read,
-        .open = il3945_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 17f1c6853182..c46275a92565 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -5652,8 +5652,6 @@ il4965_bg_restart(struct work_struct *data)
        if (test_and_clear_bit(S_FW_ERROR, &il->status)) {
                mutex_lock(&il->mutex);
-                /* FIXME: do we dereference vif without mutex locked ? */
-                il->vif = NULL;
                il->is_open = 0;
                __il4965_down(il);
diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c
index d7e2856e41d3..11ab1247fae1 100644
--- a/drivers/net/wireless/iwlegacy/4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/4965-rs.c
@@ -2518,12 +2518,6 @@ il4965_rs_free_sta(void *il_r, struct ieee80211_sta *sta, void *il_sta)
 }
 #ifdef CONFIG_MAC80211_DEBUGFS
-static int
-il4965_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static void
 il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)
@@ -2695,7 +2689,7 @@ il4965_rs_sta_dbgfs_scale_table_read(struct file *file, char __user *user_buf,
 static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
        .write = il4965_rs_sta_dbgfs_scale_table_write,
        .read = il4965_rs_sta_dbgfs_scale_table_read,
-        .open = il4965_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -2740,7 +2734,7 @@ il4965_rs_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,
 static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
        .read = il4965_rs_sta_dbgfs_stats_table_read,
-        .open = il4965_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -2768,7 +2762,7 @@ il4965_rs_sta_dbgfs_rate_scale_data_read(struct file *file,
 static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {
        .read = il4965_rs_sta_dbgfs_rate_scale_data_read,
-        .open = il4965_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index e5ac04739bcc..eaf249452e51 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -4508,6 +4508,7 @@ il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 {
        struct il_priv *il = hw->priv;
        int err;
+        bool reset;
        mutex_lock(&il->mutex);
        D_MAC80211("enter: type %d, addr %pM\n", vif->type, vif->addr);
@@ -4518,7 +4519,12 @@ il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
                goto out;
        }
-        if (il->vif) {
+        /*
+         * We do not support multiple virtual interfaces, but on hardware reset
+         * we have to add the same interface again.
+         */
+        reset = (il->vif == vif);
+        if (il->vif && !reset) {
                err = -EOPNOTSUPP;
                goto out;
        }
@@ -4528,8 +4534,11 @@ il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        err = il_set_mode(il);
        if (err) {
-                il->vif = NULL;
+                IL_WARN("Fail to set mode %d\n", vif->type);
-                il->iw_mode = NL80211_IFTYPE_STATION;
+                if (!reset) {
+                        il->vif = NULL;
+                        il->iw_mode = NL80211_IFTYPE_STATION;
+                }
        }
 out:
@@ -5279,9 +5288,9 @@ il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                D_MAC80211("BSSID %pM\n", bss_conf->bssid);
                /*
-                 * If there is currently a HW scan going on in the
+                 * If there is currently a HW scan going on in the background,
-                 * background then we need to cancel it else the RXON
+                 * then we need to cancel it, otherwise sometimes we are not
-                 * below/in post_associate will fail.
+                 * able to authenticate (FIXME: why ?)
                 */
                if (il_scan_cancel_timeout(il, 100)) {
                        D_MAC80211("leave - scan abort failed\n");
@@ -5290,14 +5299,10 @@ il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                }
                /* mac80211 only sets assoc when in STATION mode */
-                if (vif->type == NL80211_IFTYPE_ADHOC || bss_conf->assoc) {
+                memcpy(il->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);
-                        memcpy(il->staging.bssid_addr, bss_conf->bssid,
-                               ETH_ALEN);
-                        /* currently needed in a few places */
+                /* FIXME: currently needed in a few places */
-                        memcpy(il->bssid, bss_conf->bssid, ETH_ALEN);
+                memcpy(il->bssid, bss_conf->bssid, ETH_ALEN);
-                } else
-                        il->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
        }
        /*
diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index 229849150aac..eff26501d60a 100644
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -160,18 +160,12 @@ static ssize_t il_dbgfs_##name##_write(struct file *file,              \
                                        const char __user *user_buf,    \
                                        size_t count, loff_t *ppos);
-static int
-il_dbgfs_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 #define DEBUGFS_READ_FILE_OPS(name)                             \
        DEBUGFS_READ_FUNC(name);                                \
 static const struct file_operations il_dbgfs_##name##_ops = {   \
        .read = il_dbgfs_##name##_read,                         \
-        .open = il_dbgfs_open_file_generic,                     \
+        .open = simple_open,                                    \
        .llseek = generic_file_llseek,                          \
 };
@@ -179,7 +173,7 @@ static const struct file_operations il_dbgfs_##name##_ops = {	\
        DEBUGFS_WRITE_FUNC(name);                               \
 static const struct file_operations il_dbgfs_##name##_ops = {   \
        .write = il_dbgfs_##name##_write,                       \
-        .open = il_dbgfs_open_file_generic,                     \
+        .open = simple_open,                                    \
        .llseek = generic_file_llseek,                          \
 };
@@ -189,7 +183,7 @@ static const struct file_operations il_dbgfs_##name##_ops = {	\
 static const struct file_operations il_dbgfs_##name##_ops = {   \
        .write = il_dbgfs_##name##_write,                       \
        .read = il_dbgfs_##name##_read,                         \
-        .open = il_dbgfs_open_file_generic,                     \
+        .open = simple_open,                                    \
        .llseek = generic_file_llseek,                          \
 };
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 53f8c51cfcdb..7e590b349dd7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -3083,11 +3083,6 @@ static void rs_free_sta(void *priv_r, struct ieee80211_sta *sta,
 }
 #ifdef CONFIG_MAC80211_DEBUGFS
-static int open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static void rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
                             u32 *rate_n_flags, int index)
 {
@@ -3226,7 +3221,7 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
 static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
        .write = rs_sta_dbgfs_scale_table_write,
        .read = rs_sta_dbgfs_scale_table_read,
-        .open = open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
 static ssize_t rs_sta_dbgfs_stats_table_read(struct file *file,
@@ -3269,7 +3264,7 @@ static ssize_t rs_sta_dbgfs_stats_table_read(struct file *file,
 static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
        .read = rs_sta_dbgfs_stats_table_read,
-        .open = open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -3295,7 +3290,7 @@ static ssize_t rs_sta_dbgfs_rate_scale_data_read(struct file *file,
 static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {
        .read = rs_sta_dbgfs_rate_scale_data_read,
-        .open = open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index b7b1c04f2fba..2bbaebd99ad4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -84,17 +84,11 @@ static ssize_t iwl_dbgfs_##name##_write(struct file *file,              \
                                        size_t count, loff_t *ppos);
-static int iwl_dbgfs_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 #define DEBUGFS_READ_FILE_OPS(name)                                     \
        DEBUGFS_READ_FUNC(name);                                        \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
        .read = iwl_dbgfs_##name##_read,                                \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
        .llseek = generic_file_llseek,                                  \
 };
@@ -102,7 +96,7 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {          \
        DEBUGFS_WRITE_FUNC(name);                                       \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
        .write = iwl_dbgfs_##name##_write,                              \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
        .llseek = generic_file_llseek,                                  \
 };
@@ -113,7 +107,7 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
        .write = iwl_dbgfs_##name##_write,                              \
        .read = iwl_dbgfs_##name##_read,                                \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
        .llseek = generic_file_llseek,                                  \
 };
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index b4f796c82e1e..4d7b30d3e648 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1898,17 +1898,11 @@ static ssize_t iwl_dbgfs_##name##_write(struct file *file,              \
                                        size_t count, loff_t *ppos);
-static int iwl_dbgfs_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 #define DEBUGFS_READ_FILE_OPS(name)                                     \
        DEBUGFS_READ_FUNC(name);                                        \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
        .read = iwl_dbgfs_##name##_read,                                \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
        .llseek = generic_file_llseek,                                  \
 };
@@ -1916,7 +1910,7 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {		\
        DEBUGFS_WRITE_FUNC(name);                                       \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
        .write = iwl_dbgfs_##name##_write,                              \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
        .llseek = generic_file_llseek,                                  \
 };
@@ -1926,7 +1920,7 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {          \
 static const struct file_operations iwl_dbgfs_##name##_ops = {          \
        .write = iwl_dbgfs_##name##_write,                              \
        .read = iwl_dbgfs_##name##_read,                                \
-        .open = iwl_dbgfs_open_file_generic,                            \
+        .open = simple_open,                                            \
        .llseek = generic_file_llseek,                                  \
 };
diff --git a/drivers/net/wireless/iwmc3200wifi/debugfs.c b/drivers/net/wireless/iwmc3200wifi/debugfs.c
index 87eef5773a02..b6199d124bb9 100644
--- a/drivers/net/wireless/iwmc3200wifi/debugfs.c
+++ b/drivers/net/wireless/iwmc3200wifi/debugfs.c
@@ -99,12 +99,6 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_iwm_dbg_modules,
                        iwm_debugfs_u32_read, iwm_debugfs_dbg_modules_write,
                        "%llu\n");
-static int iwm_generic_open(struct inode *inode, struct file *filp)
-{
-        filp->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t iwm_debugfs_txq_read(struct file *filp, char __user *buffer,
                                   size_t count, loff_t *ppos)
@@ -401,28 +395,28 @@ out:
 static const struct file_operations iwm_debugfs_txq_fops = {
        .owner =        THIS_MODULE,
-        .open =         iwm_generic_open,
+        .open =         simple_open,
        .read =         iwm_debugfs_txq_read,
        .llseek =       default_llseek,
 };
 static const struct file_operations iwm_debugfs_tx_credit_fops = {
        .owner =        THIS_MODULE,
-        .open =         iwm_generic_open,
+        .open =         simple_open,
        .read =         iwm_debugfs_tx_credit_read,
        .llseek =       default_llseek,
 };
 static const struct file_operations iwm_debugfs_rx_ticket_fops = {
        .owner =        THIS_MODULE,
-        .open =         iwm_generic_open,
+        .open =         simple_open,
        .read =         iwm_debugfs_rx_ticket_read,
        .llseek =       default_llseek,
 };
 static const struct file_operations iwm_debugfs_fw_err_fops = {
        .owner =        THIS_MODULE,
-        .open =         iwm_generic_open,
+        .open =         simple_open,
        .read =         iwm_debugfs_fw_err_read,
        .llseek =       default_llseek,
 };
diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c
index 764b40dd24ad..0042f204b07f 100644
--- a/drivers/net/wireless/iwmc3200wifi/sdio.c
+++ b/drivers/net/wireless/iwmc3200wifi/sdio.c
@@ -264,13 +264,6 @@ static int if_sdio_send_chunk(struct iwm_priv *iwm, u8 *buf, int count)
        return ret;
 }
-/* debugfs hooks */
-static int iwm_debugfs_sdio_open(struct inode *inode, struct file *filp)
-{
-        filp->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t iwm_debugfs_sdio_read(struct file *filp, char __user *buffer,
                                     size_t count, loff_t *ppos)
 {
@@ -363,7 +356,7 @@ err:
 static const struct file_operations iwm_debugfs_sdio_fops = {
        .owner =        THIS_MODULE,
-        .open =         iwm_debugfs_sdio_open,
+        .open =         simple_open,
        .read =         iwm_debugfs_sdio_read,
        .llseek =       default_llseek,
 };
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index c192671610fc..a06cc283e23d 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -21,12 +21,6 @@ static char *szStates[] = {
 static void lbs_debug_init(struct lbs_private *priv);
 #endif
-static int open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t write_file_dummy(struct file *file, const char __user *buf,
                                size_t count, loff_t *ppos)
 {
@@ -696,7 +690,7 @@ out_unlock:
 #define FOPS(fread, fwrite) { \
        .owner = THIS_MODULE, \
-        .open = open_file_generic, \
+        .open = simple_open, \
        .read = (fread), \
        .write = (fwrite), \
        .llseek = generic_file_llseek, \
@@ -962,7 +956,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf,
 static const struct file_operations lbs_debug_fops = {
        .owner = THIS_MODULE,
-        .open = open_file_generic,
+        .open = simple_open,
        .write = lbs_debugfs_write,
        .read = lbs_debugfs_read,
        .llseek = default_llseek,
diff --git a/drivers/net/wireless/mwifiex/debugfs.c b/drivers/net/wireless/mwifiex/debugfs.c
index d26a78b6b3c4..1a845074c52a 100644
--- a/drivers/net/wireless/mwifiex/debugfs.c
+++ b/drivers/net/wireless/mwifiex/debugfs.c
@@ -140,18 +140,6 @@ static struct mwifiex_debug_data items[] = {
 static int num_of_items = ARRAY_SIZE(items);
 /*
- * Generic proc file open handler.
- *
- * This function is called every time a file is accessed for read or write.
- */
-static int
-mwifiex_open_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-/*
 * Proc info file read handler.
 *
 * This function is called when the 'info' file is opened for reading.
@@ -676,19 +664,19 @@ done:
 static const struct file_operations mwifiex_dfs_##name##_fops = {       \
        .read = mwifiex_##name##_read,                                  \
        .write = mwifiex_##name##_write,                                \
-        .open = mwifiex_open_generic,                                   \
+        .open = simple_open,                                            \
 };
 #define MWIFIEX_DFS_FILE_READ_OPS(name)                                 \
 static const struct file_operations mwifiex_dfs_##name##_fops = {       \
        .read = mwifiex_##name##_read,                                  \
-        .open = mwifiex_open_generic,                                   \
+        .open = simple_open,                                            \
 };
 #define MWIFIEX_DFS_FILE_WRITE_OPS(name)                                \
 static const struct file_operations mwifiex_dfs_##name##_fops = {       \
        .write = mwifiex_##name##_write,                                \
-        .open = mwifiex_open_generic,                                   \
+        .open = simple_open,                                            \
 };
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index dd6c64ac406e..88e3ad2d1db8 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -1336,6 +1336,10 @@ static void qbuf_scan(struct orinoco_private *priv, void *buf,
        unsigned long flags;
        sd = kmalloc(sizeof(*sd), GFP_ATOMIC);
+        if (!sd) {
+                printk(KERN_ERR "%s: failed to alloc memory\n", __func__);
+                return;
+        }
        sd->buf = buf;
        sd->len = len;
        sd->type = type;
@@ -1353,6 +1357,10 @@ static void qabort_scan(struct orinoco_private *priv)
        unsigned long flags;
        sd = kmalloc(sizeof(*sd), GFP_ATOMIC);
+        if (!sd) {
+                printk(KERN_ERR "%s: failed to alloc memory\n", __func__);
+                return;
+        }
        sd->len = -1; /* Abort */
        spin_lock_irqsave(&priv->scan_lock, flags);
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index cd490abced91..001735f7a661 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -163,7 +163,13 @@ static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
                /* Reschedule urb to read TX status again instantly */
                return true;
-        } else if (rt2800usb_txstatus_pending(rt2x00dev)) {
+        }
+        /* Check if there is any entry that timedout waiting on TX status */
+        if (rt2800usb_txstatus_timeout(rt2x00dev))
+                queue_work(rt2x00dev->workqueue, &rt2x00dev->txdone_work);
+        if (rt2800usb_txstatus_pending(rt2x00dev)) {
                /* Read register after 250 us */
                hrtimer_start(&rt2x00dev->txstatus_timer, ktime_set(0, 250000),
                              HRTIMER_MODE_REL);
@@ -178,7 +184,7 @@ stop_reading:
         * here again if status reading is needed.
         */
        if (rt2800usb_txstatus_pending(rt2x00dev) &&
-            test_and_set_bit(TX_STATUS_READING, &rt2x00dev->flags))
+            !test_and_set_bit(TX_STATUS_READING, &rt2x00dev->flags))
                return true;
        else
                return false;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
index 1eec3a06d1f3..4c016241f340 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
@@ -1893,7 +1893,7 @@ void rtl92c_phy_set_io(struct ieee80211_hw *hw)
                break;
        case IO_CMD_PAUSE_DM_BY_SCAN:
                rtlphy->initgain_backup.xaagccore1 = dm_digtable.cur_igvalue;
-                dm_digtable.cur_igvalue = 0x17;
+                dm_digtable.cur_igvalue = 0x37;
                rtl92c_dm_write_dig(hw);
                break;
        default:
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 34591eeb8376..28fc5fb8057b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
@@ -3077,7 +3077,7 @@ static void rtl92d_phy_set_io(struct ieee80211_hw *hw)
                break;
        case IO_CMD_PAUSE_DM_BY_SCAN:
                rtlphy->initgain_backup.xaagccore1 = de_digtable.cur_igvalue;
-                de_digtable.cur_igvalue = 0x17;
+                de_digtable.cur_igvalue = 0x37;
                rtl92d_dm_write_dig(hw);
                break;
        default:
diff --git a/drivers/net/wireless/wl1251/debugfs.c b/drivers/net/wireless/wl1251/debugfs.c
index 6c274007d200..448da1f8c22f 100644
--- a/drivers/net/wireless/wl1251/debugfs.c
+++ b/drivers/net/wireless/wl1251/debugfs.c
@@ -47,7 +47,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf,	\
                                                                        \
 static const struct file_operations name## _ops = {                     \
        .read = name## _read,                                           \
-        .open = wl1251_open_file_generic,                               \
+        .open = simple_open,                                            \
        .llseek = generic_file_llseek,                                  \
 };
@@ -84,7 +84,7 @@ static ssize_t sub## _ ##name## _read(struct file *file,		\
                                                                        \
 static const struct file_operations sub## _ ##name## _ops = {           \
        .read = sub## _ ##name## _read,                                 \
-        .open = wl1251_open_file_generic,                               \
+        .open = simple_open,                                            \
        .llseek = generic_file_llseek,                                  \
 };
@@ -117,12 +117,6 @@ out:
        mutex_unlock(&wl->mutex);
 }
-static int wl1251_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 DEBUGFS_FWSTATS_FILE(tx, internal_desc_overflow, 20, "%u");
 DEBUGFS_FWSTATS_FILE(rx, out_of_mem, 20, "%u");
@@ -235,7 +229,7 @@ static ssize_t tx_queue_len_read(struct file *file, char __user *userbuf,
 static const struct file_operations tx_queue_len_ops = {
        .read = tx_queue_len_read,
-        .open = wl1251_open_file_generic,
+        .open = simple_open,
        .llseek = generic_file_llseek,
 };
@@ -257,7 +251,7 @@ static ssize_t tx_queue_status_read(struct file *file, char __user *userbuf,
 static const struct file_operations tx_queue_status_ops = {
        .read = tx_queue_status_read,
-        .open = wl1251_open_file_generic,
+        .open = simple_open,
        .llseek = generic_file_llseek,
 };
diff --git a/drivers/net/wireless/wl12xx/debugfs.c b/drivers/net/wireless/wl12xx/debugfs.c
index e1cf72765965..564d49575c94 100644
--- a/drivers/net/wireless/wl12xx/debugfs.c
+++ b/drivers/net/wireless/wl12xx/debugfs.c
@@ -63,7 +63,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf,	\
                                                                        \
 static const struct file_operations name## _ops = {                     \
        .read = name## _read,                                           \
-        .open = wl1271_open_file_generic,                               \
+        .open = simple_open,                                            \
        .llseek = generic_file_llseek,                                  \
 };
@@ -96,7 +96,7 @@ static ssize_t sub## _ ##name## _read(struct file *file,		\
                                                                        \
 static const struct file_operations sub## _ ##name## _ops = {           \
        .read = sub## _ ##name## _read,                                 \
-        .open = wl1271_open_file_generic,                               \
+        .open = simple_open,                                            \
        .llseek = generic_file_llseek,                                  \
 };
@@ -126,12 +126,6 @@ out:
        mutex_unlock(&wl->mutex);
 }
-static int wl1271_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 DEBUGFS_FWSTATS_FILE(tx, internal_desc_overflow, "%u");
 DEBUGFS_FWSTATS_FILE(rx, out_of_mem, "%u");
@@ -243,7 +237,7 @@ static ssize_t tx_queue_len_read(struct file *file, char __user *userbuf,
 static const struct file_operations tx_queue_len_ops = {
        .read = tx_queue_len_read,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -289,7 +283,7 @@ static ssize_t gpio_power_write(struct file *file,
 static const struct file_operations gpio_power_ops = {
        .read = gpio_power_read,
        .write = gpio_power_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -308,7 +302,7 @@ static ssize_t start_recovery_write(struct file *file,
 static const struct file_operations start_recovery_ops = {
        .write = start_recovery_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -372,7 +366,7 @@ out:
 static const struct file_operations dynamic_ps_timeout_ops = {
        .read = dynamic_ps_timeout_read,
        .write = dynamic_ps_timeout_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -441,7 +435,7 @@ out:
 static const struct file_operations forced_ps_ops = {
        .read = forced_ps_read,
        .write = forced_ps_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -483,7 +477,7 @@ static ssize_t split_scan_timeout_write(struct file *file,
 static const struct file_operations split_scan_timeout_ops = {
        .read = split_scan_timeout_read,
        .write = split_scan_timeout_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -566,7 +560,7 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,
 static const struct file_operations driver_state_ops = {
        .read = driver_state_read,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -675,7 +669,7 @@ static ssize_t vifs_state_read(struct file *file, char __user *user_buf,
 static const struct file_operations vifs_state_ops = {
        .read = vifs_state_read,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -733,7 +727,7 @@ static ssize_t dtim_interval_write(struct file *file,
 static const struct file_operations dtim_interval_ops = {
        .read = dtim_interval_read,
        .write = dtim_interval_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -791,7 +785,7 @@ static ssize_t suspend_dtim_interval_write(struct file *file,
 static const struct file_operations suspend_dtim_interval_ops = {
        .read = suspend_dtim_interval_read,
        .write = suspend_dtim_interval_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -849,7 +843,7 @@ static ssize_t beacon_interval_write(struct file *file,
 static const struct file_operations beacon_interval_ops = {
        .read = beacon_interval_read,
        .write = beacon_interval_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -904,7 +898,7 @@ static ssize_t rx_streaming_interval_read(struct file *file,
 static const struct file_operations rx_streaming_interval_ops = {
        .read = rx_streaming_interval_read,
        .write = rx_streaming_interval_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -959,7 +953,7 @@ static ssize_t rx_streaming_always_read(struct file *file,
 static const struct file_operations rx_streaming_always_ops = {
        .read = rx_streaming_always_read,
        .write = rx_streaming_always_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
@@ -1003,7 +997,7 @@ out:
 static const struct file_operations beacon_filtering_ops = {
        .write = beacon_filtering_write,
-        .open = wl1271_open_file_generic,
+        .open = simple_open,
        .llseek = default_llseek,
 };
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 663b32c2e931..0ebbb1906c30 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1965,7 +1965,7 @@ static int __init netif_init(void)
        if (xen_initial_domain())
                return 0;
-        if (!xen_platform_pci_unplug)
+        if (xen_hvm_domain() && !xen_platform_pci_unplug)
                return -ENODEV;
        printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n");
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index ee8fd037bb53..849357c1045c 100644
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -117,25 +117,17 @@ static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_
 }
-static int default_open(struct inode *inode, struct file *filp)
-{
-        if (inode->i_private)
-                filp->private_data = inode->i_private;
-        return 0;
-}
 static const struct file_operations ulong_fops = {
        .read           = ulong_read_file,
        .write          = ulong_write_file,
-        .open           = default_open,
+        .open           = simple_open,
        .llseek         = default_llseek,
 };
 static const struct file_operations ulong_ro_fops = {
        .read           = ulong_read_file,
-        .open           = default_open,
+        .open           = simple_open,
        .llseek         = default_llseek,
 };
@@ -187,7 +179,7 @@ static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t coun
 static const struct file_operations atomic_ro_fops = {
        .read           = atomic_read_file,
-        .open           = default_open,
+        .open           = simple_open,
        .llseek         = default_llseek,
 };
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index fd00ff02ab4d..d6cc62cb4cf7 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -290,6 +290,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev,
                } else {
                        printk(KERN_DEBUG "enable msix get value %x\n",
                                op.value);
+                        err = op.value;
                }
        } else {
                dev_err(&dev->dev, "enable msix get err %x\n", err);
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 17499a55113d..53969af17558 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -138,9 +138,10 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev)
        rdesc->type = REGULATOR_VOLTAGE;
        rdesc->owner = THIS_MODULE;
        sreg->mfd = anatopmfd;
-        ret = of_property_read_u32(np, "reg", &sreg->control_reg);
+        ret = of_property_read_u32(np, "anatop-reg-offset",
+                                   &sreg->control_reg);
        if (ret) {
-                dev_err(dev, "no reg property set\n");
+                dev_err(dev, "no anatop-reg-offset property set\n");
                goto anatop_probe_end;
        }
        ret = of_property_read_u32(np, "anatop-vol-bit-width",
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index c056abd7562a..e70dd382a009 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2992,14 +2992,14 @@ void regulator_unregister(struct regulator_dev *rdev)
        if (rdev == NULL)
                return;
+        if (rdev->supply)
+                regulator_put(rdev->supply);
        mutex_lock(&regulator_list_mutex);
        debugfs_remove_recursive(rdev->debugfs);
        flush_work_sync(&rdev->disable_work.work);
        WARN_ON(rdev->open_count);
        unset_regulator_supplies(rdev);
        list_del(&rdev->list);
-        if (rdev->supply)
-                regulator_put(rdev->supply);
        kfree(rdev->constraints);
        device_unregister(&rdev->dev);
        mutex_unlock(&regulator_list_mutex);
diff --git a/drivers/regulator/fixed-helper.c b/drivers/regulator/fixed-helper.c
index 30d0a15b8949..cacd33c9d042 100644
--- a/drivers/regulator/fixed-helper.c
+++ b/drivers/regulator/fixed-helper.c
@@ -18,7 +18,6 @@ static void regulator_fixed_release(struct device *dev)
 /**
 * regulator_register_fixed - register a no-op fixed regulator
- * @name: supply name
 * @id: platform device id
 * @supplies: consumers for this regulator
 * @num_supplies: number of consumers
@@ -32,7 +31,7 @@ struct platform_device *regulator_register_fixed(int id,
        if (!data)
                return NULL;
-        data->cfg.supply_name = "dummy";
+        data->cfg.supply_name = "fixed-dummy";
        data->cfg.microvolts = 0;
        data->cfg.gpio = -EINVAL;
        data->cfg.enabled_at_boot = 1;
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
index e8cfc99dd8f0..845aa2263b8a 100644
--- a/drivers/regulator/mc13892-regulator.c
+++ b/drivers/regulator/mc13892-regulator.c
@@ -552,7 +552,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
        mc13xxx_lock(mc13892);
        ret = mc13xxx_reg_read(mc13892, MC13892_REVISION, &val);
        if (ret)
-                goto err_free;
+                goto err_unlock;
        /* enable switch auto mode */
        if ((val & 0x0000FFFF) == 0x45d0) {
@@ -562,7 +562,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
                        MC13892_SWITCHERS4_SW1MODE_AUTO |
                        MC13892_SWITCHERS4_SW2MODE_AUTO);
                if (ret)
-                        goto err_free;
+                        goto err_unlock;
                ret = mc13xxx_reg_rmw(mc13892, MC13892_SWITCHERS5,
                        MC13892_SWITCHERS5_SW3MODE_M |
@@ -570,7 +570,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
                        MC13892_SWITCHERS5_SW3MODE_AUTO |
                        MC13892_SWITCHERS5_SW4MODE_AUTO);
                if (ret)
-                        goto err_free;
+                        goto err_unlock;
        }
        mc13xxx_unlock(mc13892);
@@ -612,10 +612,10 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
 err:
        while (--i >= 0)
                regulator_unregister(priv->regulators[i]);
+        return ret;
-err_free:
+err_unlock:
        mc13xxx_unlock(mc13892);
        return ret;
 }
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 58447db15de1..4ca2db059004 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -311,8 +311,7 @@ static int s5m8767_set_voltage(struct regulator_dev *rdev,
        struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);
        const struct s5m_voltage_desc *desc;
        int reg_id = rdev_get_id(rdev);
-        int reg, mask, ret;
+        int sel, reg, mask, ret;
-        int i;
        u8 val;
        switch (reg_id) {
@@ -333,19 +332,20 @@ static int s5m8767_set_voltage(struct regulator_dev *rdev,
        desc = reg_voltage_map[reg_id];
-        i = s5m8767_convert_voltage_to_sel(desc, min_uV, max_uV);
+        sel = s5m8767_convert_voltage_to_sel(desc, min_uV, max_uV);
-        if (i < 0)
+        if (sel < 0)
-                return i;
+                return sel;
        ret = s5m8767_get_voltage_register(rdev, &reg);
        if (ret)
                return ret;
        s5m_reg_read(s5m8767->iodev, reg, &val);
-        val = val & mask;
+        val &= ~mask;
+        val |= sel;
        ret = s5m_reg_write(s5m8767->iodev, reg, val);
-        *selector = i;
+        *selector = sel;
        return ret;
 }
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index 29b615ce3aff..cfc1f16f7771 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -79,6 +79,11 @@ static int tps6586x_ldo_list_voltage(struct regulator_dev *rdev,
                                     unsigned selector)
 {
        struct tps6586x_regulator *info = rdev_get_drvdata(rdev);
+        int rid = rdev_get_id(rdev);
+        /* LDO0 has minimal voltage 1.2V rather than 1.25V */
+        if ((rid == TPS6586X_ID_LDO_0) && (selector == 0))
+                return (info->voltages[0] - 50) * 1000;
        return info->voltages[selector] * 1000;
 }
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 4904a40b0d46..ff810e787eac 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -380,13 +380,15 @@ static int wm831x_buckv_set_current_limit(struct regulator_dev *rdev,
        int i;
        for (i = 0; i < ARRAY_SIZE(wm831x_dcdc_ilim); i++) {
-                if (max_uA <= wm831x_dcdc_ilim[i])
+                if ((min_uA <= wm831x_dcdc_ilim[i]) &&
+                    (wm831x_dcdc_ilim[i] <= max_uA))
                        break;
        }
        if (i == ARRAY_SIZE(wm831x_dcdc_ilim))
                return -EINVAL;
-        return wm831x_set_bits(wm831x, reg, WM831X_DC1_HC_THR_MASK, i);
+        return wm831x_set_bits(wm831x, reg, WM831X_DC1_HC_THR_MASK,
+                               i << WM831X_DC1_HC_THR_SHIFT);
 }
 static int wm831x_buckv_get_current_limit(struct regulator_dev *rdev)
@@ -400,7 +402,8 @@ static int wm831x_buckv_get_current_limit(struct regulator_dev *rdev)
        if (val < 0)
                return val;
-        return wm831x_dcdc_ilim[val & WM831X_DC1_HC_THR_MASK];
+        val = (val & WM831X_DC1_HC_THR_MASK) >> WM831X_DC1_HC_THR_SHIFT;
+        return wm831x_dcdc_ilim[val];
 }
 static struct regulator_ops wm831x_buckv_ops = {
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 634aac3f2d5f..b414e09c5620 100644
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -101,7 +101,7 @@ static int wm831x_isink_set_current(struct regulator_dev *rdev,
        for (i = 0; i < ARRAY_SIZE(wm831x_isinkv_values); i++) {
                int val = wm831x_isinkv_values[i];
-                if (min_uA >= val && val <= max_uA) {
+                if (min_uA <= val && val <= max_uA) {
                        ret = wm831x_set_bits(wm831x, isink->reg,
                                              WM831X_CS1_ISEL_MASK, i);
                        return ret;
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index f1e4ab0f9fda..641e9f6499d1 100644
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -506,22 +506,19 @@ static int wm831x_aldo_set_mode(struct regulator_dev *rdev,
 {
        struct wm831x_ldo *ldo = rdev_get_drvdata(rdev);
        struct wm831x *wm831x = ldo->wm831x;
-        int ctrl_reg = ldo->base + WM831X_LDO_CONTROL;
        int on_reg = ldo->base + WM831X_LDO_ON_CONTROL;
        int ret;
        switch (mode) {
        case REGULATOR_MODE_NORMAL:
-                ret = wm831x_set_bits(wm831x, on_reg,
+                ret = wm831x_set_bits(wm831x, on_reg, WM831X_LDO7_ON_MODE, 0);
-                                      WM831X_LDO7_ON_MODE, 0);
                if (ret < 0)
                        return ret;
                break;
        case REGULATOR_MODE_IDLE:
-                ret = wm831x_set_bits(wm831x, ctrl_reg,
+                ret = wm831x_set_bits(wm831x, on_reg, WM831X_LDO7_ON_MODE,
-                                      WM831X_LDO7_ON_MODE,
                                      WM831X_LDO7_ON_MODE);
                if (ret < 0)
                        return ret;
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
index ab1e183a74b5..05ecfb872319 100644
--- a/drivers/regulator/wm8350-regulator.c
+++ b/drivers/regulator/wm8350-regulator.c
@@ -99,7 +99,7 @@ static int get_isink_val(int min_uA, int max_uA, u16 *setting)
 {
        int i;
-        for (i = ARRAY_SIZE(isink_cur) - 1; i >= 0; i--) {
+        for (i = 0; i < ARRAY_SIZE(isink_cur); i++) {
                if (min_uA <= isink_cur[i] && max_uA >= isink_cur[i]) {
                        *setting = i;
                        return 0;
@@ -186,7 +186,7 @@ static int wm8350_isink_get_current(struct regulator_dev *rdev)
                return 0;
        }
-        return DIV_ROUND_CLOSEST(isink_cur[val], 100);
+        return isink_cur[val];
 }
 /* turn on ISINK followed by DCDC */
@@ -495,25 +495,25 @@ static int wm8350_dcdc_set_suspend_enable(struct regulator_dev *rdev)
                val = wm8350_reg_read(wm8350, WM8350_DCDC1_LOW_POWER)
                        & ~WM8350_DCDC_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC1_LOW_POWER,
-                        wm8350->pmic.dcdc1_hib_mode);
+                        val | wm8350->pmic.dcdc1_hib_mode);
                break;
        case WM8350_DCDC_3:
                val = wm8350_reg_read(wm8350, WM8350_DCDC3_LOW_POWER)
                        & ~WM8350_DCDC_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC3_LOW_POWER,
-                        wm8350->pmic.dcdc3_hib_mode);
+                        val | wm8350->pmic.dcdc3_hib_mode);
                break;
        case WM8350_DCDC_4:
                val = wm8350_reg_read(wm8350, WM8350_DCDC4_LOW_POWER)
                        & ~WM8350_DCDC_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC4_LOW_POWER,
-                        wm8350->pmic.dcdc4_hib_mode);
+                        val | wm8350->pmic.dcdc4_hib_mode);
                break;
        case WM8350_DCDC_6:
                val = wm8350_reg_read(wm8350, WM8350_DCDC6_LOW_POWER)
                        & ~WM8350_DCDC_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC6_LOW_POWER,
-                        wm8350->pmic.dcdc6_hib_mode);
+                        val | wm8350->pmic.dcdc6_hib_mode);
                break;
        case WM8350_DCDC_2:
        case WM8350_DCDC_5:
@@ -535,25 +535,25 @@ static int wm8350_dcdc_set_suspend_disable(struct regulator_dev *rdev)
                val = wm8350_reg_read(wm8350, WM8350_DCDC1_LOW_POWER);
                wm8350->pmic.dcdc1_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC1_LOW_POWER,
-                        WM8350_DCDC_HIB_MODE_DIS);
+                                 val | WM8350_DCDC_HIB_MODE_DIS);
                break;
        case WM8350_DCDC_3:
                val = wm8350_reg_read(wm8350, WM8350_DCDC3_LOW_POWER);
                wm8350->pmic.dcdc3_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC3_LOW_POWER,
-                        WM8350_DCDC_HIB_MODE_DIS);
+                                 val | WM8350_DCDC_HIB_MODE_DIS);
                break;
        case WM8350_DCDC_4:
                val = wm8350_reg_read(wm8350, WM8350_DCDC4_LOW_POWER);
                wm8350->pmic.dcdc4_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC4_LOW_POWER,
-                        WM8350_DCDC_HIB_MODE_DIS);
+                                 val | WM8350_DCDC_HIB_MODE_DIS);
                break;
        case WM8350_DCDC_6:
                val = wm8350_reg_read(wm8350, WM8350_DCDC6_LOW_POWER);
                wm8350->pmic.dcdc6_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC6_LOW_POWER,
-                        WM8350_DCDC_HIB_MODE_DIS);
+                                 val | WM8350_DCDC_HIB_MODE_DIS);
                break;
        case WM8350_DCDC_2:
        case WM8350_DCDC_5:
@@ -575,13 +575,13 @@ static int wm8350_dcdc25_set_suspend_enable(struct regulator_dev *rdev)
                val = wm8350_reg_read(wm8350, WM8350_DCDC2_CONTROL)
                    & ~WM8350_DC2_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC2_CONTROL, val |
-                                 WM8350_DC2_HIB_MODE_ACTIVE);
+                    (WM8350_DC2_HIB_MODE_ACTIVE << WM8350_DC2_HIB_MODE_SHIFT));
                break;
        case WM8350_DCDC_5:
                val = wm8350_reg_read(wm8350, WM8350_DCDC5_CONTROL)
-                    & ~WM8350_DC2_HIB_MODE_MASK;
+                    & ~WM8350_DC5_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC5_CONTROL, val |
-                                 WM8350_DC5_HIB_MODE_ACTIVE);
+                    (WM8350_DC5_HIB_MODE_ACTIVE << WM8350_DC5_HIB_MODE_SHIFT));
                break;
        default:
                return -EINVAL;
@@ -600,13 +600,13 @@ static int wm8350_dcdc25_set_suspend_disable(struct regulator_dev *rdev)
                val = wm8350_reg_read(wm8350, WM8350_DCDC2_CONTROL)
                    & ~WM8350_DC2_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC2_CONTROL, val |
-                                 WM8350_DC2_HIB_MODE_DISABLE);
+                    (WM8350_DC2_HIB_MODE_DISABLE << WM8350_DC2_HIB_MODE_SHIFT));
                break;
        case WM8350_DCDC_5:
                val = wm8350_reg_read(wm8350, WM8350_DCDC5_CONTROL)
-                    & ~WM8350_DC2_HIB_MODE_MASK;
+                    & ~WM8350_DC5_HIB_MODE_MASK;
                wm8350_reg_write(wm8350, WM8350_DCDC5_CONTROL, val |
-                                 WM8350_DC2_HIB_MODE_DISABLE);
+                    (WM8350_DC5_HIB_MODE_DISABLE << WM8350_DC5_HIB_MODE_SHIFT));
                break;
        default:
                return -EINVAL;
@@ -749,7 +749,7 @@ static int wm8350_ldo_set_suspend_disable(struct regulator_dev *rdev)
        /* all LDOs have same mV bits */
        val = wm8350_reg_read(wm8350, volt_reg) & ~WM8350_LDO1_HIB_MODE_MASK;
-        wm8350_reg_write(wm8350, volt_reg, WM8350_LDO1_HIB_MODE_DIS);
+        wm8350_reg_write(wm8350, volt_reg, val | WM8350_LDO1_HIB_MODE_DIS);
        return 0;
 }
diff --git a/drivers/remoteproc/remoteproc_debugfs.c b/drivers/remoteproc/remoteproc_debugfs.c
index 70277a530133..85d31a69e117 100644
--- a/drivers/remoteproc/remoteproc_debugfs.c
+++ b/drivers/remoteproc/remoteproc_debugfs.c
@@ -50,16 +50,9 @@ static ssize_t rproc_trace_read(struct file *filp, char __user *userbuf,
        return simple_read_from_buffer(userbuf, count, ppos, trace->va, len);
 }
-static int rproc_open_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static const struct file_operations trace_rproc_ops = {
        .read = rproc_trace_read,
-        .open = rproc_open_generic,
+        .open = simple_open,
        .llseek = generic_file_llseek,
 };
@@ -94,7 +87,7 @@ static ssize_t rproc_state_read(struct file *filp, char __user *userbuf,
 static const struct file_operations rproc_state_ops = {
        .read = rproc_state_read,
-        .open = rproc_open_generic,
+        .open = simple_open,
        .llseek = generic_file_llseek,
 };
@@ -114,7 +107,7 @@ static ssize_t rproc_name_read(struct file *filp, char __user *userbuf,
 static const struct file_operations rproc_name_ops = {
        .read = rproc_name_read,
-        .open = rproc_open_generic,
+        .open = simple_open,
        .llseek = generic_file_llseek,
 };
diff --git a/drivers/rtc/rtc-88pm860x.c b/drivers/rtc/rtc-88pm860x.c
index afee0e8ae714..feddefc42109 100644
--- a/drivers/rtc/rtc-88pm860x.c
+++ b/drivers/rtc/rtc-88pm860x.c
@@ -72,9 +72,9 @@ static int pm860x_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
        struct pm860x_rtc_info *info = dev_get_drvdata(dev);
        if (enabled)
-                pm860x_set_bits(info->i2c, PM8607_RTC1, ALARM, ALARM);
+                pm860x_set_bits(info->i2c, PM8607_RTC1, ALARM_EN, ALARM_EN);
        else
-                pm860x_set_bits(info->i2c, PM8607_RTC1, ALARM, 0);
+                pm860x_set_bits(info->i2c, PM8607_RTC1, ALARM_EN, 0);
        return 0;
 }
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 5bdf2eecb178..af04b0d6688d 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -997,13 +997,6 @@ lpfc_debugfs_dumpDataDif_write(struct file *file, const char __user *buf,
        return nbytes;
 }
-static int
-lpfc_debugfs_dif_err_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t
 lpfc_debugfs_dif_err_read(struct file *file, char __user *buf,
        size_t nbytes, loff_t *ppos)
@@ -3541,7 +3534,7 @@ static const struct file_operations lpfc_debugfs_op_dumpDif = {
 #undef lpfc_debugfs_op_dif_err
 static const struct file_operations lpfc_debugfs_op_dif_err = {
        .owner =        THIS_MODULE,
-        .open =         lpfc_debugfs_dif_err_open,
+        .open =         simple_open,
        .llseek =       lpfc_debugfs_lseek,
        .read =         lpfc_debugfs_dif_err_read,
        .write =        lpfc_debugfs_dif_err_write,
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index 082458d73ce9..d1a495f64e2d 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -63,12 +63,6 @@ struct chip_data {
 };
 #ifdef CONFIG_DEBUG_FS
-static int spi_show_regs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 #define SPI_REGS_BUFSIZE        1024
 static ssize_t  spi_show_regs(struct file *file, char __user *user_buf,
                                size_t count, loff_t *ppos)
@@ -128,7 +122,7 @@ static ssize_t  spi_show_regs(struct file *file, char __user *user_buf,
 static const struct file_operations mrst_spi_regs_ops = {
        .owner          = THIS_MODULE,
-        .open           = spi_show_regs_open,
+        .open           = simple_open,
        .read           = spi_show_regs,
        .llseek         = default_llseek,
 };
diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h
index 830657908db8..c5eb3c33c3db 100644
--- a/drivers/target/tcm_fc/tcm_fc.h
+++ b/drivers/target/tcm_fc/tcm_fc.h
@@ -122,6 +122,7 @@ struct ft_cmd {
        /* Local sense buffer */
        unsigned char ft_sense_buffer[TRANSPORT_SENSE_BUFFER];
        u32 was_ddp_setup:1;            /* Set only if ddp is setup */
+        u32 aborted:1;                  /* Set if aborted by reset or timeout */
        struct scatterlist *sg;         /* Set only if DDP is setup */
        u32 sg_cnt;                     /* No. of item in scatterlist */
 };
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index 62dec9715ce5..a375f257aabc 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -121,6 +121,8 @@ int ft_queue_status(struct se_cmd *se_cmd)
        struct fc_exch *ep;
        size_t len;
+        if (cmd->aborted)
+                return 0;
        ft_dump_cmd(cmd, __func__);
        ep = fc_seq_exch(cmd->seq);
        lport = ep->lp;
@@ -187,6 +189,8 @@ int ft_write_pending(struct se_cmd *se_cmd)
        ft_dump_cmd(cmd, __func__);
+        if (cmd->aborted)
+                return 0;
        ep = fc_seq_exch(cmd->seq);
        lport = ep->lp;
        fp = fc_frame_alloc(lport, sizeof(*txrdy));
@@ -252,10 +256,10 @@ static void ft_recv_seq(struct fc_seq *sp, struct fc_frame *fp, void *arg)
        struct ft_cmd *cmd = arg;
        struct fc_frame_header *fh;
-        if (IS_ERR(fp)) {
+        if (unlikely(IS_ERR(fp))) {
                /* XXX need to find cmd if queued */
                cmd->seq = NULL;
-                transport_generic_free_cmd(&cmd->se_cmd, 0);
+                cmd->aborted = true;
                return;
        }
@@ -399,6 +403,8 @@ int ft_queue_tm_resp(struct se_cmd *se_cmd)
        struct se_tmr_req *tmr = se_cmd->se_tmr_req;
        enum fcp_resp_rsp_codes code;
+        if (cmd->aborted)
+                return 0;
        switch (tmr->response) {
        case TMR_FUNCTION_COMPLETE:
                code = FCP_TMF_CMPL;
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index f357039349ba..2948dc944619 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -300,6 +300,7 @@ static struct se_portal_group *ft_add_tpg(
 {
        struct ft_lport_acl *lacl;
        struct ft_tpg *tpg;
+        struct workqueue_struct *wq;
        unsigned long index;
        int ret;
@@ -321,18 +322,20 @@ static struct se_portal_group *ft_add_tpg(
        tpg->lport_acl = lacl;
        INIT_LIST_HEAD(&tpg->lun_list);
-        ret = core_tpg_register(&ft_configfs->tf_ops, wwn, &tpg->se_tpg,
+        wq = alloc_workqueue("tcm_fc", 0, 1);
-                                tpg, TRANSPORT_TPG_TYPE_NORMAL);
+        if (!wq) {
-        if (ret < 0) {
                kfree(tpg);
                return NULL;
        }
-        tpg->workqueue = alloc_workqueue("tcm_fc", 0, 1);
+        ret = core_tpg_register(&ft_configfs->tf_ops, wwn, &tpg->se_tpg,
-        if (!tpg->workqueue) {
+                                tpg, TRANSPORT_TPG_TYPE_NORMAL);
+        if (ret < 0) {
+                destroy_workqueue(wq);
                kfree(tpg);
                return NULL;
        }
+        tpg->workqueue = wq;
        mutex_lock(&ft_lport_lock);
        list_add_tail(&tpg->list, &lacl->tpg_list);
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
index 2b693eefac55..dc7c0db26e20 100644
--- a/drivers/target/tcm_fc/tfc_io.c
+++ b/drivers/target/tcm_fc/tfc_io.c
@@ -81,6 +81,8 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
        void *from;
        void *to = NULL;
+        if (cmd->aborted)
+                return 0;
        ep = fc_seq_exch(cmd->seq);
        lport = ep->lp;
        cmd->seq = lport->tt.seq_start_next(cmd->seq);
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c
index a9234ba8f8d5..c4b50af46c44 100644
--- a/drivers/tty/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
@@ -127,11 +127,6 @@ static inline void serial_out(struct uart_hsu_port *up, int offset, int value)
 #define HSU_REGS_BUFSIZE        1024
-static int hsu_show_regs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t port_show_regs(struct file *file, char __user *user_buf,
                                size_t count, loff_t *ppos)
@@ -231,14 +226,14 @@ static ssize_t dma_show_regs(struct file *file, char __user *user_buf,
 static const struct file_operations port_regs_ops = {
        .owner          = THIS_MODULE,
-        .open           = hsu_show_regs_open,
+        .open           = simple_open,
        .read           = port_show_regs,
        .llseek         = default_llseek,
 };
 static const struct file_operations dma_regs_ops = {
        .owner          = THIS_MODULE,
-        .open           = hsu_show_regs_open,
+        .open           = simple_open,
        .read           = dma_show_regs,
        .llseek         = default_llseek,
 };
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index e825460478be..08b9962b8fda 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -304,11 +304,7 @@ static const int trigger_level_1[4] = { 1, 1, 1, 1 };
 #ifdef CONFIG_DEBUG_FS
 #define PCH_REGS_BUFSIZE        1024
-static int pch_show_regs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t port_show_regs(struct file *file, char __user *user_buf,
                                size_t count, loff_t *ppos)
@@ -362,7 +358,7 @@ static ssize_t port_show_regs(struct file *file, char __user *user_buf,
 static const struct file_operations port_regs_ops = {
        .owner          = THIS_MODULE,
-        .open           = pch_show_regs_open,
+        .open           = simple_open,
        .read           = port_show_regs,
        .llseek         = default_llseek,
 };
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index b3b70b0bf85b..babd9470982b 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -1581,7 +1581,7 @@ static int __init sunzilog_init(void)
        if (err)
                goto out_unregister_uart;
-        if (!zilog_irq) {
+        if (zilog_irq) {
                struct uart_sunzilog_port *up = sunzilog_irq_chain;
                err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,
                                  "zs", sunzilog_irq_chain);
@@ -1622,7 +1622,7 @@ static void __exit sunzilog_exit(void)
 {
        platform_driver_unregister(&zs_driver);
-        if (!zilog_irq) {
+        if (zilog_irq) {
                struct uart_sunzilog_port *up = sunzilog_irq_chain;
                /* Disable Interrupts */
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 136e86faa1e1..05728894a88c 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -327,7 +327,7 @@ static void send_sig_all(int sig)
                if (is_global_init(p))
                        continue;
-                force_sig(sig, p);
+                do_send_sig_info(sig, SEND_SIG_FORCED, p, true);
        }
        read_unlock(&tasklist_lock);
 }
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index cefa0c8b5b6a..d2b9af59cba9 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -428,18 +428,10 @@ static loff_t default_file_lseek (struct file *file, loff_t offset, int orig)
        return retval;
 }
-static int default_open (struct inode *inode, struct file *file)
-{
-        if (inode->i_private)
-                file->private_data = inode->i_private;
-        return 0;
-}
 static const struct file_operations default_file_operations = {
        .read =         default_read_file,
        .write =        default_write_file,
-        .open =         default_open,
+        .open =         simple_open,
        .llseek =       default_file_lseek,
 };
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index 85a5cebe96b3..965a6293206a 100644
--- a/drivers/usb/gadget/f_phonet.c
+++ b/drivers/usb/gadget/f_phonet.c
@@ -345,7 +345,7 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req)
                }
                skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page,
-                                skb->len <= 1, req->actual, req->actual);
+                                skb->len <= 1, req->actual, PAGE_SIZE);
                page = NULL;
                if (req->actual < req->length) { /* Last fragment */
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 19f318ababa2..cf14c95a6700 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -13,6 +13,7 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 /* interface and function clocks */
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index fd9109d7eb0e..680e1a31fb87 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -352,7 +352,6 @@ static int debug_async_open(struct inode *, struct file *);
 static int debug_periodic_open(struct inode *, struct file *);
 static int debug_registers_open(struct inode *, struct file *);
 static int debug_async_open(struct inode *, struct file *);
-static int debug_lpm_open(struct inode *, struct file *);
 static ssize_t debug_lpm_read(struct file *file, char __user *user_buf,
                                   size_t count, loff_t *ppos);
 static ssize_t debug_lpm_write(struct file *file, const char __user *buffer,
@@ -385,7 +384,7 @@ static const struct file_operations debug_registers_fops = {
 };
 static const struct file_operations debug_lpm_fops = {
        .owner          = THIS_MODULE,
-        .open           = debug_lpm_open,
+        .open           = simple_open,
        .read           = debug_lpm_read,
        .write          = debug_lpm_write,
        .release        = debug_lpm_close,
@@ -970,12 +969,6 @@ static int debug_registers_open(struct inode *inode, struct file *file)
        return file->private_data ? 0 : -ENOMEM;
 }
-static int debug_lpm_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static int debug_lpm_close(struct inode *inode, struct file *file)
 {
        return 0;
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index db8963f5fbce..09f597ad6e00 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -27,6 +27,10 @@
 #error "CONFIG_ARCH_AT91 must be defined."
 #endif
+#define valid_port(index)       ((index) >= 0 && (index) < AT91_MAX_USBH_PORTS)
+#define at91_for_each_port(index)       \
+                for ((index) = 0; (index) < AT91_MAX_USBH_PORTS; (index)++)
 /* interface and function clocks; sometimes also an AHB clock */
 static struct clk *iclk, *fclk, *hclk;
 static int clocked;
@@ -240,26 +244,26 @@ ohci_at91_start (struct usb_hcd *hcd)
 static void ohci_at91_usb_set_power(struct at91_usbh_data *pdata, int port, int enable)
 {
-        if (port < 0 || port >= 2)
+        if (!valid_port(port))
                return;
        if (!gpio_is_valid(pdata->vbus_pin[port]))
                return;
        gpio_set_value(pdata->vbus_pin[port],
-                       !pdata->vbus_pin_active_low[port] ^ enable);
+                       pdata->vbus_pin_active_low[port] ^ enable);
 }
 static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
 {
-        if (port < 0 || port >= 2)
+        if (!valid_port(port))
                return -EINVAL;
        if (!gpio_is_valid(pdata->vbus_pin[port]))
                return -EINVAL;
        return gpio_get_value(pdata->vbus_pin[port]) ^
-                !pdata->vbus_pin_active_low[port];
+                pdata->vbus_pin_active_low[port];
 }
 /*
@@ -271,9 +275,9 @@ static int ohci_at91_hub_status_data(struct usb_hcd *hcd, char *buf)
        int length = ohci_hub_status_data(hcd, buf);
        int port;
-        for (port = 0; port < ARRAY_SIZE(pdata->overcurrent_pin); port++) {
+        at91_for_each_port(port) {
                if (pdata->overcurrent_changed[port]) {
-                        if (! length)
+                        if (!length)
                                length = 1;
                        buf[0] |= 1 << (port + 1);
                }
@@ -297,11 +301,17 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                "ohci_at91_hub_control(%p,0x%04x,0x%04x,0x%04x,%p,%04x)\n",
                hcd, typeReq, wValue, wIndex, buf, wLength);
+        wIndex--;
        switch (typeReq) {
        case SetPortFeature:
                if (wValue == USB_PORT_FEAT_POWER) {
                        dev_dbg(hcd->self.controller, "SetPortFeat: POWER\n");
-                        ohci_at91_usb_set_power(pdata, wIndex - 1, 1);
+                        if (valid_port(wIndex)) {
+                                ohci_at91_usb_set_power(pdata, wIndex, 1);
+                                ret = 0;
+                        }
                        goto out;
                }
                break;
@@ -312,9 +322,9 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        dev_dbg(hcd->self.controller,
                                "ClearPortFeature: C_OVER_CURRENT\n");
-                        if (wIndex == 1 || wIndex == 2) {
+                        if (valid_port(wIndex)) {
-                                pdata->overcurrent_changed[wIndex-1] = 0;
+                                pdata->overcurrent_changed[wIndex] = 0;
-                                pdata->overcurrent_status[wIndex-1] = 0;
+                                pdata->overcurrent_status[wIndex] = 0;
                        }
                        goto out;
@@ -323,9 +333,8 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        dev_dbg(hcd->self.controller,
                                "ClearPortFeature: OVER_CURRENT\n");
-                        if (wIndex == 1 || wIndex == 2) {
+                        if (valid_port(wIndex))
-                                pdata->overcurrent_status[wIndex-1] = 0;
+                                pdata->overcurrent_status[wIndex] = 0;
-                        }
                        goto out;
@@ -333,15 +342,15 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        dev_dbg(hcd->self.controller,
                                "ClearPortFeature: POWER\n");
-                        if (wIndex == 1 || wIndex == 2) {
+                        if (valid_port(wIndex)) {
-                                ohci_at91_usb_set_power(pdata, wIndex - 1, 0);
+                                ohci_at91_usb_set_power(pdata, wIndex, 0);
                                return 0;
                        }
                }
                break;
        }
-        ret = ohci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
+        ret = ohci_hub_control(hcd, typeReq, wValue, wIndex + 1, buf, wLength);
        if (ret)
                goto out;
@@ -377,18 +386,15 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                dev_dbg(hcd->self.controller, "GetPortStatus(%d)\n", wIndex);
-                if (wIndex == 1 || wIndex == 2) {
+                if (valid_port(wIndex)) {
-                        if (! ohci_at91_usb_get_power(pdata, wIndex-1)) {
+                        if (!ohci_at91_usb_get_power(pdata, wIndex))
                                *data &= ~cpu_to_le32(RH_PS_PPS);
-                        }
-                        if (pdata->overcurrent_changed[wIndex-1]) {
+                        if (pdata->overcurrent_changed[wIndex])
                                *data |= cpu_to_le32(RH_PS_OCIC);
-                        }
-                        if (pdata->overcurrent_status[wIndex-1]) {
+                        if (pdata->overcurrent_status[wIndex])
                                *data |= cpu_to_le32(RH_PS_POCI);
-                        }
                }
        }
@@ -450,14 +456,14 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
        /* From the GPIO notifying the over-current situation, find
         * out the corresponding port */
-        for (port = 0; port < ARRAY_SIZE(pdata->overcurrent_pin); port++) {
+        at91_for_each_port(port) {
                if (gpio_to_irq(pdata->overcurrent_pin[port]) == irq) {
                        gpio = pdata->overcurrent_pin[port];
                        break;
                }
        }
-        if (port == ARRAY_SIZE(pdata->overcurrent_pin)) {
+        if (port == AT91_MAX_USBH_PORTS) {
                dev_err(& pdev->dev, "overcurrent interrupt from unknown GPIO\n");
                return IRQ_HANDLED;
        }
@@ -467,7 +473,7 @@ static irqreturn_t ohci_hcd_at91_overcurrent_irq(int irq, void *data)
        /* When notified of an over-current situation, disable power
           on the corresponding port, and mark this port in
           over-current. */
-        if (! val) {
+        if (!val) {
                ohci_at91_usb_set_power(pdata, port, 0);
                pdata->overcurrent_status[port]  = 1;
                pdata->overcurrent_changed[port] = 1;
@@ -492,7 +498,7 @@ static u64 at91_ohci_dma_mask = DMA_BIT_MASK(32);
 static int __devinit ohci_at91_of_init(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
-        int i, ret, gpio;
+        int i, gpio;
        enum of_gpio_flags flags;
        struct at91_usbh_data   *pdata;
        u32 ports;
@@ -514,48 +520,17 @@ static int __devinit ohci_at91_of_init(struct platform_device *pdev)
        if (!of_property_read_u32(np, "num-ports", &ports))
                pdata->ports = ports;
-        for (i = 0; i < 2; i++) {
+        at91_for_each_port(i) {
                gpio = of_get_named_gpio_flags(np, "atmel,vbus-gpio", i, &flags);
                pdata->vbus_pin[i] = gpio;
                if (!gpio_is_valid(gpio))
                        continue;
                pdata->vbus_pin_active_low[i] = flags & OF_GPIO_ACTIVE_LOW;
-                ret = gpio_request(gpio, "ohci_vbus");
-                if (ret) {
-                        dev_warn(&pdev->dev, "can't request vbus gpio %d", gpio);
-                        continue;
-                }
-                ret = gpio_direction_output(gpio, !(flags & OF_GPIO_ACTIVE_LOW) ^ 1);
-                if (ret)
-                        dev_warn(&pdev->dev, "can't put vbus gpio %d as output %d",
-                                 !(flags & OF_GPIO_ACTIVE_LOW) ^ 1, gpio);
        }
-        for (i = 0; i < 2; i++) {
+        at91_for_each_port(i)
-                gpio = of_get_named_gpio_flags(np, "atmel,oc-gpio", i, &flags);
+                pdata->overcurrent_pin[i] =
-                pdata->overcurrent_pin[i] = gpio;
+                        of_get_named_gpio_flags(np, "atmel,oc-gpio", i, &flags);
-                if (!gpio_is_valid(gpio))
-                        continue;
-                ret = gpio_request(gpio, "ohci_overcurrent");
-                if (ret) {
-                        dev_err(&pdev->dev, "can't request overcurrent gpio %d", gpio);
-                        continue;
-                }
-                ret = gpio_direction_input(gpio);
-                if (ret) {
-                        dev_err(&pdev->dev, "can't configure overcurrent gpio %d as input", gpio);
-                        continue;
-                }
-                ret = request_irq(gpio_to_irq(gpio),
-                                  ohci_hcd_at91_overcurrent_irq,
-                                  IRQF_SHARED, "ohci_overcurrent", pdev);
-                if (ret) {
-                        gpio_free(gpio);
-                        dev_warn(& pdev->dev, "cannot get GPIO IRQ for overcurrent\n");
-                }
-        }
        pdev->dev.platform_data = pdata;
@@ -574,35 +549,69 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
 {
        struct at91_usbh_data   *pdata;
        int                     i;
+        int                     gpio;
+        int                     ret;
-        i = ohci_at91_of_init(pdev);
+        ret = ohci_at91_of_init(pdev);
+        if (ret)
-        if (i)
+                return ret;
-                return i;
        pdata = pdev->dev.platform_data;
        if (pdata) {
-                for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
+                at91_for_each_port(i) {
                        if (!gpio_is_valid(pdata->vbus_pin[i]))
                                continue;
-                        gpio_request(pdata->vbus_pin[i], "ohci_vbus");
+                        gpio = pdata->vbus_pin[i];
+                        ret = gpio_request(gpio, "ohci_vbus");
+                        if (ret) {
+                                dev_err(&pdev->dev,
+                                        "can't request vbus gpio %d\n", gpio);
+                                continue;
+                        }
+                        ret = gpio_direction_output(gpio,
+                                                !pdata->vbus_pin_active_low[i]);
+                        if (ret) {
+                                dev_err(&pdev->dev,
+                                        "can't put vbus gpio %d as output %d\n",
+                                        gpio, !pdata->vbus_pin_active_low[i]);
+                                gpio_free(gpio);
+                                continue;
+                        }
                        ohci_at91_usb_set_power(pdata, i, 1);
                }
-                for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
+                at91_for_each_port(i) {
-                        int ret;
                        if (!gpio_is_valid(pdata->overcurrent_pin[i]))
                                continue;
-                        gpio_request(pdata->overcurrent_pin[i], "ohci_overcurrent");
+                        gpio = pdata->overcurrent_pin[i];
+                        ret = gpio_request(gpio, "ohci_overcurrent");
+                        if (ret) {
+                                dev_err(&pdev->dev,
+                                        "can't request overcurrent gpio %d\n",
+                                        gpio);
+                                continue;
+                        }
+                        ret = gpio_direction_input(gpio);
+                        if (ret) {
+                                dev_err(&pdev->dev,
+                                        "can't configure overcurrent gpio %d as input\n",
+                                        gpio);
+                                gpio_free(gpio);
+                                continue;
+                        }
-                        ret = request_irq(gpio_to_irq(pdata->overcurrent_pin[i]),
+                        ret = request_irq(gpio_to_irq(gpio),
                                          ohci_hcd_at91_overcurrent_irq,
                                          IRQF_SHARED, "ohci_overcurrent", pdev);
                        if (ret) {
-                                gpio_free(pdata->overcurrent_pin[i]);
+                                gpio_free(gpio);
-                                dev_warn(& pdev->dev, "cannot get GPIO IRQ for overcurrent\n");
+                                dev_err(&pdev->dev,
+                                        "can't get gpio IRQ for overcurrent\n");
                        }
                }
        }
@@ -617,14 +626,14 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
        int                     i;
        if (pdata) {
-                for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
+                at91_for_each_port(i) {
                        if (!gpio_is_valid(pdata->vbus_pin[i]))
                                continue;
                        ohci_at91_usb_set_power(pdata, i, 0);
                        gpio_free(pdata->vbus_pin[i]);
                }
-                for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
+                at91_for_each_port(i) {
                        if (!gpio_is_valid(pdata->overcurrent_pin[i]))
                                continue;
                        free_irq(gpio_to_irq(pdata->overcurrent_pin[i]), pdev);
diff --git a/drivers/uwb/uwb-debug.c b/drivers/uwb/uwb-debug.c
index 2eecec0c13c9..6ec45beb7af5 100644
--- a/drivers/uwb/uwb-debug.c
+++ b/drivers/uwb/uwb-debug.c
@@ -159,13 +159,6 @@ static int cmd_ie_rm(struct uwb_rc *rc, struct uwb_dbg_cmd_ie *ie_to_rm)
        return uwb_rc_ie_rm(rc, ie_to_rm->data[0]);
 }
-static int command_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 static ssize_t command_write(struct file *file, const char __user *buf,
                         size_t len, loff_t *off)
 {
@@ -206,7 +199,7 @@ static ssize_t command_write(struct file *file, const char __user *buf,
 }
 static const struct file_operations command_fops = {
-        .open   = command_open,
+        .open   = simple_open,
        .write  = command_write,
        .read   = NULL,
        .llseek = no_llseek,
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 7ed9991fa747..af16884491ed 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -245,6 +245,12 @@ config BACKLIGHT_DA903X
          If you have a LCD backlight connected to the WLED output of DA9030
          or DA9034 WLED output, say Y here to enable this driver.
+config BACKLIGHT_DA9052
+        tristate "Dialog DA9052/DA9053 WLED"
+        depends on PMIC_DA9052
+        help
+          Enable the Backlight Driver for DA9052-BC and DA9053-AA/Bx PMICs.
 config BACKLIGHT_MAX8925
        tristate "Backlight driver for MAX8925"
        depends on MFD_MAX8925
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 8071eb656147..36855ae887d6 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
 obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
 obj-$(CONFIG_BACKLIGHT_PWM)     += pwm_bl.o
 obj-$(CONFIG_BACKLIGHT_DA903X)  += da903x_bl.o
+obj-$(CONFIG_BACKLIGHT_DA9052)  += da9052_bl.o
 obj-$(CONFIG_BACKLIGHT_MAX8925) += max8925_bl.o
 obj-$(CONFIG_BACKLIGHT_APPLE)   += apple_bl.o
 obj-$(CONFIG_BACKLIGHT_TOSA)    += tosa_bl.o
diff --git a/drivers/video/backlight/da9052_bl.c b/drivers/video/backlight/da9052_bl.c
new file mode 100644
index 000000000000..b628d68f5162
--- /dev/null
+++ b/drivers/video/backlight/da9052_bl.c
@@ -0,0 +1,187 @@
+/*
+ * Backlight Driver for Dialog DA9052 PMICs
+ *
+ * Copyright(c) 2012 Dialog Semiconductor Ltd.
+ *
+ * Author: David Dajun Chen <dchen@diasemi.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+#include <linux/backlight.h>
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/da9052/da9052.h>
+#include <linux/mfd/da9052/reg.h>
+#define DA9052_MAX_BRIGHTNESS           0xFF
+enum {
+        DA9052_WLEDS_OFF,
+        DA9052_WLEDS_ON,
+};
+enum {
+        DA9052_TYPE_WLED1,
+        DA9052_TYPE_WLED2,
+        DA9052_TYPE_WLED3,
+};
+static unsigned char wled_bank[] = {
+        DA9052_LED1_CONF_REG,
+        DA9052_LED2_CONF_REG,
+        DA9052_LED3_CONF_REG,
+};
+struct da9052_bl {
+        struct da9052 *da9052;
+        uint brightness;
+        uint state;
+        uint led_reg;
+};
+static int da9052_adjust_wled_brightness(struct da9052_bl *wleds)
+{
+        unsigned char boost_en;
+        unsigned char i_sink;
+        int ret;
+        boost_en = 0x3F;
+        i_sink = 0xFF;
+        if (wleds->state == DA9052_WLEDS_OFF) {
+                boost_en = 0x00;
+                i_sink = 0x00;
+        }
+        ret = da9052_reg_write(wleds->da9052, DA9052_BOOST_REG, boost_en);
+        if (ret < 0)
+                return ret;
+        ret = da9052_reg_write(wleds->da9052, DA9052_LED_CONT_REG, i_sink);
+        if (ret < 0)
+                return ret;
+        ret = da9052_reg_write(wleds->da9052, wled_bank[wleds->led_reg], 0x0);
+        if (ret < 0)
+                return ret;
+        msleep(10);
+        if (wleds->brightness) {
+                ret = da9052_reg_write(wleds->da9052, wled_bank[wleds->led_reg],
+                                       wleds->brightness);
+                if (ret < 0)
+                        return ret;
+        }
+        return 0;
+}
+static int da9052_backlight_update_status(struct backlight_device *bl)
+{
+        int brightness = bl->props.brightness;
+        struct da9052_bl *wleds = bl_get_data(bl);
+        wleds->brightness = brightness;
+        wleds->state = DA9052_WLEDS_ON;
+        return da9052_adjust_wled_brightness(wleds);
+}
+static int da9052_backlight_get_brightness(struct backlight_device *bl)
+{
+        struct da9052_bl *wleds = bl_get_data(bl);
+        return wleds->brightness;
+}
+static const struct backlight_ops da9052_backlight_ops = {
+        .update_status = da9052_backlight_update_status,
+        .get_brightness = da9052_backlight_get_brightness,
+};
+static int da9052_backlight_probe(struct platform_device *pdev)
+{
+        struct backlight_device *bl;
+        struct backlight_properties props;
+        struct da9052_bl *wleds;
+        wleds = devm_kzalloc(&pdev->dev, sizeof(struct da9052_bl), GFP_KERNEL);
+        if (!wleds)
+                return -ENOMEM;
+        wleds->da9052 = dev_get_drvdata(pdev->dev.parent);
+        wleds->brightness = 0;
+        wleds->led_reg = platform_get_device_id(pdev)->driver_data;
+        wleds->state = DA9052_WLEDS_OFF;
+        props.type = BACKLIGHT_RAW;
+        props.max_brightness = DA9052_MAX_BRIGHTNESS;
+        bl = backlight_device_register(pdev->name, wleds->da9052->dev, wleds,
+                                       &da9052_backlight_ops, &props);
+        if (IS_ERR(bl)) {
+                dev_err(&pdev->dev, "Failed to register backlight\n");
+                devm_kfree(&pdev->dev, wleds);
+                return PTR_ERR(bl);
+        }
+        bl->props.max_brightness = DA9052_MAX_BRIGHTNESS;
+        bl->props.brightness = 0;
+        platform_set_drvdata(pdev, bl);
+        return da9052_adjust_wled_brightness(wleds);
+}
+static int da9052_backlight_remove(struct platform_device *pdev)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+        struct da9052_bl *wleds = bl_get_data(bl);
+        wleds->brightness = 0;
+        wleds->state = DA9052_WLEDS_OFF;
+        da9052_adjust_wled_brightness(wleds);
+        backlight_device_unregister(bl);
+        devm_kfree(&pdev->dev, wleds);
+        return 0;
+}
+static struct platform_device_id da9052_wled_ids[] = {
+        {
+                .name           = "da9052-wled1",
+                .driver_data    = DA9052_TYPE_WLED1,
+        },
+        {
+                .name           = "da9052-wled2",
+                .driver_data    = DA9052_TYPE_WLED2,
+        },
+        {
+                .name           = "da9052-wled3",
+                .driver_data    = DA9052_TYPE_WLED3,
+        },
+};
+static struct platform_driver da9052_wled_driver = {
+        .probe          = da9052_backlight_probe,
+        .remove         = da9052_backlight_remove,
+        .id_table       = da9052_wled_ids,
+        .driver = {
+                .name   = "da9052-wled",
+                .owner  = THIS_MODULE,
+        },
+};
+module_platform_driver(da9052_wled_driver);
+MODULE_AUTHOR("David Dajun Chen <dchen@diasemi.com>");
+MODULE_DESCRIPTION("Backlight driver for DA9052 PMIC");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:da9052-backlight");
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index be20b5cbe26c..3a6d5419e3e3 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -229,14 +229,7 @@ static struct locomo_driver poodle_lcd_driver = {
 static int __init locomolcd_init(void)
 {
-        int ret = locomo_driver_register(&poodle_lcd_driver);
+        return locomo_driver_register(&poodle_lcd_driver);
-        if (ret)
-                return ret;
-#ifdef CONFIG_SA1100_COLLIE
-        sa1100fb_lcd_power = locomolcd_power;
-#endif
-        return 0;
 }
 static void __exit locomolcd_exit(void)
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 19e6a2041371..1afb4fba11b4 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -204,7 +204,8 @@ error:
 void *
 xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
-                           dma_addr_t *dma_handle, gfp_t flags)
+                           dma_addr_t *dma_handle, gfp_t flags,
+                           struct dma_attrs *attrs)
 {
        void *ret;
        int order = get_order(size);
@@ -253,7 +254,7 @@ EXPORT_SYMBOL_GPL(xen_swiotlb_alloc_coherent);
 void
 xen_swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
-                          dma_addr_t dev_addr)
+                          dma_addr_t dev_addr, struct dma_attrs *attrs)
 {
        int order = get_order(size);
        phys_addr_t phys;
diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c
index 63616d7453e6..97f5d264c31e 100644
--- a/drivers/xen/xen-pciback/pciback_ops.c
+++ b/drivers/xen/xen-pciback/pciback_ops.c
@@ -234,7 +234,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
        if (dev_data)
                dev_data->ack_intr = 0;
-        return result;
+        return result > 0 ? 0 : result;
 }
 static