Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

317 files changed, 2439 insertions, 6902 deletions

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index ce06149088c5..9dfec48dd4e5 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -196,6 +196,17 @@ static struct lpss_device_desc byt_i2c_dev_desc = {
         .setup = lpss_i2c_setup,
 };
 
+static struct lpss_shared_clock bsw_pwm_clock = {
+        .name = "pwm_clk",
+        .rate = 19200000,
+};
+
+static struct lpss_device_desc bsw_pwm_dev_desc = {
+        .clk_required = true,
+        .save_ctx = true,
+        .shared_clock = &bsw_pwm_clock,
+};
+
 #else
 
 #define LPSS_ADDR(desc) (0UL)
@@ -225,6 +236,12 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = {
         { "INT33B2", },
         { "INT33FC", },
 
+        /* Braswell LPSS devices */
+        { "80862288", LPSS_ADDR(bsw_pwm_dev_desc) },
+        { "8086228A", LPSS_ADDR(byt_uart_dev_desc) },
+        { "8086228E", LPSS_ADDR(byt_spi_dev_desc) },
+        { "808622C1", LPSS_ADDR(byt_i2c_dev_desc) },
+
         { "INT3430", LPSS_ADDR(lpt_dev_desc) },
         { "INT3431", LPSS_ADDR(lpt_dev_desc) },
         { "INT3432", LPSS_ADDR(lpt_i2c_dev_desc) },
diff --git a/drivers/acpi/acpica/nsprepkg.c b/drivers/acpi/acpica/nsprepkg.c
index 68f725839eb6..1b13b921dda9 100644
--- a/drivers/acpi/acpica/nsprepkg.c
+++ b/drivers/acpi/acpica/nsprepkg.c
@@ -316,6 +316,45 @@ acpi_ns_check_package(struct acpi_evaluate_info *info,
                     acpi_ns_check_package_list(info, package, elements, count);
                 break;
 
+        case ACPI_PTYPE2_UUID_PAIR:
+
+                /* The package must contain pairs of (UUID + type) */
+
+                if (count & 1) {
+                        expected_count = count + 1;
+                        goto package_too_small;
+                }
+
+                while (count > 0) {
+                        status = acpi_ns_check_object_type(info, elements,
+                                                           package->ret_info.
+                                                           object_type1, 0);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
+
+                        /* Validate length of the UUID buffer */
+
+                        if ((*elements)->buffer.length != 16) {
+                                ACPI_WARN_PREDEFINED((AE_INFO,
+                                                      info->full_pathname,
+                                                      info->node_flags,
+                                                      "Invalid length for UUID Buffer"));
+                                return (AE_AML_OPERAND_VALUE);
+                        }
+
+                        status = acpi_ns_check_object_type(info, elements + 1,
+                                                           package->ret_info.
+                                                           object_type2, 0);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
+
+                        elements += 2;
+                        count -= 2;
+                }
+                break;
+
         default:
 
                 /* Should not get here if predefined info table is correct */
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index a66ab658abbc..cb6066c809ea 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -197,6 +197,8 @@ static bool advance_transaction(struct acpi_ec *ec)
                                 t->rdata[t->ri++] = acpi_ec_read_data(ec);
                                 if (t->rlen == t->ri) {
                                         t->flags |= ACPI_EC_COMMAND_COMPLETE;
+                                        if (t->command == ACPI_EC_COMMAND_QUERY)
+                                                pr_debug("hardware QR_EC completion\n");
                                         wakeup = true;
                                 }
                         } else
@@ -208,7 +210,20 @@ static bool advance_transaction(struct acpi_ec *ec)
                 }
                 return wakeup;
         } else {
-                if ((status & ACPI_EC_FLAG_IBF) == 0) {
+                /*
+                 * There is firmware refusing to respond QR_EC when SCI_EVT
+                 * is not set, for which case, we complete the QR_EC
+                 * without issuing it to the firmware.
+                 * https://bugzilla.kernel.org/show_bug.cgi?id=86211
+                 */
+                if (!(status & ACPI_EC_FLAG_SCI) &&
+                    (t->command == ACPI_EC_COMMAND_QUERY)) {
+                        t->flags |= ACPI_EC_COMMAND_POLL;
+                        t->rdata[t->ri++] = 0x00;
+                        t->flags |= ACPI_EC_COMMAND_COMPLETE;
+                        pr_debug("software QR_EC completion\n");
+                        wakeup = true;
+                } else if ((status & ACPI_EC_FLAG_IBF) == 0) {
                         acpi_ec_write_cmd(ec, t->command);
                         t->flags |= ACPI_EC_COMMAND_POLL;
                 } else
@@ -288,11 +303,11 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
         /* following two actions should be kept atomic */
         ec->curr = t;
         start_transaction(ec);
-        if (ec->curr->command == ACPI_EC_COMMAND_QUERY)
-                clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
         spin_unlock_irqrestore(&ec->lock, tmp);
         ret = ec_poll(ec);
         spin_lock_irqsave(&ec->lock, tmp);
+        if (ec->curr->command == ACPI_EC_COMMAND_QUERY)
+                clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
         ec->curr = NULL;
         spin_unlock_irqrestore(&ec->lock, tmp);
         return ret;
@@ -1015,6 +1030,10 @@ static struct dmi_system_id ec_dmi_table[] __initdata = {
         DMI_MATCH(DMI_SYS_VENDOR, "Quanta"),
         DMI_MATCH(DMI_PRODUCT_NAME, "TW9/SW9"),}, NULL},
         {
+        ec_flag_msi, "Clevo W350etq", {
+        DMI_MATCH(DMI_SYS_VENDOR, "CLEVO CO."),
+        DMI_MATCH(DMI_PRODUCT_NAME, "W35_37ET"),}, NULL},
+        {
         ec_validate_ecdt, "ASUS hardware", {
         DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL},
         {
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index c96887d5289e..6e6b80eb0bba 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -484,6 +484,10 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
         /* Keep IOAPIC pin configuration when suspending */
         if (dev->dev.power.is_prepared)
                 return;
+#ifdef  CONFIG_PM_RUNTIME
+        if (dev->dev.power.runtime_status == RPM_SUSPENDING)
+                return;
+#endif
 
         entry = acpi_pci_irq_lookup(dev, pin);
         if (!entry)
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 3dca36d4ad26..17f9ec501972 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1071,9 +1071,9 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 
         if (pr->id == 0 && cpuidle_get_driver() == &acpi_idle_driver) {
 
-                cpuidle_pause_and_lock();
                 /* Protect against cpu-hotplug */
                 get_online_cpus();
+                cpuidle_pause_and_lock();
 
                 /* Disable all cpuidle devices */
                 for_each_online_cpu(cpu) {
@@ -1100,8 +1100,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
                                 cpuidle_enable_device(dev);
                         }
                 }
-                put_online_cpus();
                 cpuidle_resume_and_unlock();
+                put_online_cpus();
         }
 
         return 0;
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 0a817ad24f16..3bf7764659a4 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -667,8 +667,14 @@ static ssize_t
 acpi_device_sun_show(struct device *dev, struct device_attribute *attr,
                      char *buf) {
         struct acpi_device *acpi_dev = to_acpi_device(dev);
+        acpi_status status;
+        unsigned long long sun;
+
+        status = acpi_evaluate_integer(acpi_dev->handle, "_SUN", NULL, &sun);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
 
-        return sprintf(buf, "%lu\n", acpi_dev->pnp.sun);
+        return sprintf(buf, "%llu\n", sun);
 }
 static DEVICE_ATTR(sun, 0444, acpi_device_sun_show, NULL);
 
@@ -690,7 +696,6 @@ static int acpi_device_setup_files(struct acpi_device *dev)
 {
         struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
         acpi_status status;
-        unsigned long long sun;
         int result = 0;
 
         /*
@@ -731,14 +736,10 @@ static int acpi_device_setup_files(struct acpi_device *dev)
         if (dev->pnp.unique_id)
                 result = device_create_file(&dev->dev, &dev_attr_uid);
 
-        status = acpi_evaluate_integer(dev->handle, "_SUN", NULL, &sun);
-        if (ACPI_SUCCESS(status)) {
-                dev->pnp.sun = (unsigned long)sun;
+        if (acpi_has_method(dev->handle, "_SUN")) {
                 result = device_create_file(&dev->dev, &dev_attr_sun);
                 if (result)
                         goto end;
-        } else {
-                dev->pnp.sun = (unsigned long)-1;
         }
 
         if (acpi_has_method(dev->handle, "_STA")) {
@@ -922,12 +923,17 @@ static void acpi_device_notify(acpi_handle handle, u32 event, void *data)
         device->driver->ops.notify(device, event);
 }
 
-static acpi_status acpi_device_notify_fixed(void *data)
+static void acpi_device_notify_fixed(void *data)
 {
         struct acpi_device *device = data;
 
         /* Fixed hardware devices have no handles */
         acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
+}
+
+static acpi_status acpi_device_fixed_event(void *data)
+{
+        acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_device_notify_fixed, data);
         return AE_OK;
 }
 
@@ -938,12 +944,12 @@ static int acpi_device_install_notify_handler(struct acpi_device *device)
         if (device->device_type == ACPI_BUS_TYPE_POWER_BUTTON)
                 status =
                     acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
-                                                     acpi_device_notify_fixed,
+                                                     acpi_device_fixed_event,
                                                      device);
         else if (device->device_type == ACPI_BUS_TYPE_SLEEP_BUTTON)
                 status =
                     acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
-                                                     acpi_device_notify_fixed,
+                                                     acpi_device_fixed_event,
                                                      device);
         else
                 status = acpi_install_notify_handler(device->handle,
@@ -960,10 +966,10 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device)
 {
         if (device->device_type == ACPI_BUS_TYPE_POWER_BUTTON)
                 acpi_remove_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
-                                                acpi_device_notify_fixed);
+                                                acpi_device_fixed_event);
         else if (device->device_type == ACPI_BUS_TYPE_SLEEP_BUTTON)
                 acpi_remove_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON,
-                                                acpi_device_notify_fixed);
+                                                acpi_device_fixed_event);
         else
                 acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
                                            acpi_device_notify);
@@ -975,7 +981,7 @@ static int acpi_device_probe(struct device *dev)
         struct acpi_driver *acpi_drv = to_acpi_driver(dev->driver);
         int ret;
 
-        if (acpi_dev->handler)
+        if (acpi_dev->handler && !acpi_is_pnp_device(acpi_dev))
                 return -EINVAL;
 
         if (!acpi_drv->ops.add)
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 826884392e6b..fcbda105616e 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -82,9 +82,9 @@ module_param(allow_duplicates, bool, 0644);
  * For Windows 8 systems: used to decide if video module
  * should skip registering backlight interface of its own.
  */
-static int use_native_backlight_param = 1;
+static int use_native_backlight_param = -1;
 module_param_named(use_native_backlight, use_native_backlight_param, int, 0444);
-static bool use_native_backlight_dmi = false;
+static bool use_native_backlight_dmi = true;
 
 static int register_count;
 static struct mutex video_list_lock;
@@ -417,6 +417,12 @@ static int __init video_set_use_native_backlight(const struct dmi_system_id *d)
         return 0;
 }
 
+static int __init video_disable_native_backlight(const struct dmi_system_id *d)
+{
+        use_native_backlight_dmi = false;
+        return 0;
+}
+
 static struct dmi_system_id video_dmi_table[] __initdata = {
         /*
          * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
@@ -720,6 +726,41 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
                 DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 8780w"),
                 },
         },
+
+        /*
+         * These models have a working acpi_video backlight control, and using
+         * native backlight causes a regression where backlight does not work
+         * when userspace is not handling brightness key events. Disable
+         * native_backlight on these to fix this:
+         * https://bugzilla.kernel.org/show_bug.cgi?id=81691
+         */
+        {
+         .callback = video_disable_native_backlight,
+         .ident = "ThinkPad T420",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T420"),
+                },
+        },
+        {
+         .callback = video_disable_native_backlight,
+         .ident = "ThinkPad T520",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T520"),
+                },
+        },
+
+        /* The native backlight controls do not work on some older machines */
+        {
+         /* https://bugs.freedesktop.org/show_bug.cgi?id=81515 */
+         .callback = video_disable_native_backlight,
+         .ident = "HP ENVY 15 Notebook",
+         .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"),
+                },
+        },
         {}
 };
 
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index a29f8012fb08..a0cc0edafc78 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -305,6 +305,14 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(INTEL, 0x9c85), board_ahci }, /* Wildcat Point-LP RAID */
         { PCI_VDEVICE(INTEL, 0x9c87), board_ahci }, /* Wildcat Point-LP RAID */
         { PCI_VDEVICE(INTEL, 0x9c8f), board_ahci }, /* Wildcat Point-LP RAID */
+        { PCI_VDEVICE(INTEL, 0x8c82), board_ahci }, /* 9 Series AHCI */
+        { PCI_VDEVICE(INTEL, 0x8c83), board_ahci }, /* 9 Series AHCI */
+        { PCI_VDEVICE(INTEL, 0x8c84), board_ahci }, /* 9 Series RAID */
+        { PCI_VDEVICE(INTEL, 0x8c85), board_ahci }, /* 9 Series RAID */
+        { PCI_VDEVICE(INTEL, 0x8c86), board_ahci }, /* 9 Series RAID */
+        { PCI_VDEVICE(INTEL, 0x8c87), board_ahci }, /* 9 Series RAID */
+        { PCI_VDEVICE(INTEL, 0x8c8e), board_ahci }, /* 9 Series RAID */
+        { PCI_VDEVICE(INTEL, 0x8c8f), board_ahci }, /* 9 Series RAID */
 
         /* JMicron 360/1/3/5/6, match class to avoid IDE function */
         { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -442,6 +450,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a),
           .driver_data = board_ahci_yes_fbs },                  /* 88se9172 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9172),
+          .driver_data = board_ahci_yes_fbs },                  /* 88se9182 */
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9182),
           .driver_data = board_ahci_yes_fbs },                  /* 88se9172 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192),
           .driver_data = board_ahci_yes_fbs },                  /* 88se9172 on some Gigabyte */
@@ -1329,6 +1339,18 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         else if (pdev->vendor == 0x1c44 && pdev->device == 0x8000)
                 ahci_pci_bar = AHCI_PCI_BAR_ENMOTUS;
 
+        /*
+         * The JMicron chip 361/363 contains one SATA controller and one
+         * PATA controller,for powering on these both controllers, we must
+         * follow the sequence one by one, otherwise one of them can not be
+         * powered on successfully, so here we disable the async suspend
+         * method for these chips.
+         */
+        if (pdev->vendor == PCI_VENDOR_ID_JMICRON &&
+                (pdev->device == PCI_DEVICE_ID_JMICRON_JMB363 ||
+                pdev->device == PCI_DEVICE_ID_JMICRON_JMB361))
+                device_disable_async_suspend(&pdev->dev);
+
         /* acquire resources */
         rc = pcim_enable_device(pdev);
         if (rc)
diff --git a/drivers/ata/ahci_tegra.c b/drivers/ata/ahci_tegra.c
index f1fef74e503c..032904402c95 100644
--- a/drivers/ata/ahci_tegra.c
+++ b/drivers/ata/ahci_tegra.c
@@ -18,14 +18,17 @@
  */
 
 #include <linux/ahci_platform.h>
-#include <linux/reset.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
+#include <linux/reset.h>
+
+#include <soc/tegra/fuse.h>
 #include <soc/tegra/pmc.h>
+
 #include "ahci.h"
 
 #define SATA_CONFIGURATION_0                            0x180
@@ -180,9 +183,12 @@ static int tegra_ahci_controller_init(struct ahci_host_priv *hpriv)
 
         /* Pad calibration */
 
-        /* FIXME Always use calibration 0. Change this to read the calibration
-         * fuse once the fuse driver has landed. */
-        val = 0;
+        ret = tegra_fuse_readl(FUSE_SATA_CALIB, &val);
+        if (ret) {
+                dev_err(&tegra->pdev->dev,
+                        "failed to read calibration fuse: %d\n", ret);
+                return ret;
+        }
 
         calib = tegra124_pad_calibration[val & FUSE_SATA_CALIB_MASK];
 
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index c6962300b93c..f03aab187f4d 100644
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -78,6 +78,9 @@
 #define CFG_MEM_RAM_SHUTDOWN            0x00000070
 #define BLOCK_MEM_RDY                   0x00000074
 
+/* Max retry for link down */
+#define MAX_LINK_DOWN_RETRY 3
+
 struct xgene_ahci_context {
         struct ahci_host_priv *hpriv;
         struct device *dev;
@@ -145,6 +148,14 @@ static unsigned int xgene_ahci_qc_issue(struct ata_queued_cmd *qc)
         return rc;
 }
 
+static bool xgene_ahci_is_memram_inited(struct xgene_ahci_context *ctx)
+{
+        void __iomem *diagcsr = ctx->csr_diag;
+
+        return (readl(diagcsr + CFG_MEM_RAM_SHUTDOWN) == 0 &&
+                readl(diagcsr + BLOCK_MEM_RDY) == 0xFFFFFFFF);
+}
+
 /**
  * xgene_ahci_read_id - Read ID data from the specified device
  * @dev: device
@@ -229,8 +240,11 @@ static void xgene_ahci_set_phy_cfg(struct xgene_ahci_context *ctx, int channel)
  * and Gen1 (1.5Gbps). Otherwise during long IO stress test, the PHY will
  * report disparity error and etc. In addition, during COMRESET, there can
  * be error reported in the register PORT_SCR_ERR. For SERR_DISPARITY and
- * SERR_10B_8B_ERR, the PHY receiver line must be reseted. The following
- * algorithm is followed to proper configure the hardware PHY during COMRESET:
+ * SERR_10B_8B_ERR, the PHY receiver line must be reseted. Also during long
+ * reboot cycle regression, sometimes the PHY reports link down even if the
+ * device is present because of speed negotiation failure. so need to retry
+ * the COMRESET to get the link up. The following algorithm is followed to
+ * proper configure the hardware PHY during COMRESET:
  *
  * Alg Part 1:
  * 1. Start the PHY at Gen3 speed (default setting)
@@ -246,9 +260,15 @@ static void xgene_ahci_set_phy_cfg(struct xgene_ahci_context *ctx, int channel)
  * Alg Part 2:
  * 1. On link up, if there are any SERR_DISPARITY and SERR_10B_8B_ERR error
  *    reported in the register PORT_SCR_ERR, then reset the PHY receiver line
- * 2. Go to Alg Part 3
+ * 2. Go to Alg Part 4
  *
  * Alg Part 3:
+ * 1. Check the PORT_SCR_STAT to see whether device presence detected but PHY
+ *    communication establishment failed and maximum link down attempts are
+ *    less than Max attempts 3 then goto Alg Part 1.
+ * 2. Go to Alg Part 4.
+ *
+ * Alg Part 4:
  * 1. Clear any pending from register PORT_SCR_ERR.
  *
  * NOTE: For the initial version, we will NOT support Gen1/Gen2. In addition
@@ -267,19 +287,27 @@ static int xgene_ahci_do_hardreset(struct ata_link *link,
         u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
         void __iomem *port_mmio = ahci_port_base(ap);
         struct ata_taskfile tf;
+        int link_down_retry = 0;
         int rc;
-        u32 val;
-
-        /* clear D2H reception area to properly wait for D2H FIS */
-        ata_tf_init(link->device, &tf);
-        tf.command = ATA_BUSY;
-        ata_tf_to_fis(&tf, 0, 0, d2h_fis);
-        rc = sata_link_hardreset(link, timing, deadline, online,
+        u32 val, sstatus;
+
+        do {
+                /* clear D2H reception area to properly wait for D2H FIS */
+                ata_tf_init(link->device, &tf);
+                tf.command = ATA_BUSY;
+                ata_tf_to_fis(&tf, 0, 0, d2h_fis);
+                rc = sata_link_hardreset(link, timing, deadline, online,
                                  ahci_check_ready);
+                if (*online) {
+                        val = readl(port_mmio + PORT_SCR_ERR);
+                        if (val & (SERR_DISPARITY | SERR_10B_8B_ERR))
+                                dev_warn(ctx->dev, "link has error\n");
+                        break;
+                }
 
-        val = readl(port_mmio + PORT_SCR_ERR);
-        if (val & (SERR_DISPARITY | SERR_10B_8B_ERR))
-                dev_warn(ctx->dev, "link has error\n");
+                sata_scr_read(link, SCR_STATUS, &sstatus);
+        } while (link_down_retry++ < MAX_LINK_DOWN_RETRY &&
+                 (sstatus & 0xff) == 0x1);
 
         /* clear all errors if any pending */
         val = readl(port_mmio + PORT_SCR_ERR);
@@ -467,6 +495,11 @@ static int xgene_ahci_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
+        if (xgene_ahci_is_memram_inited(ctx)) {
+                dev_info(dev, "skip clock and PHY initialization\n");
+                goto skip_clk_phy;
+        }
+
         /* Due to errata, HW requires full toggle transition */
         rc = ahci_platform_enable_clks(hpriv);
         if (rc)
@@ -479,7 +512,7 @@ static int xgene_ahci_probe(struct platform_device *pdev)
 
         /* Configure the host controller */
         xgene_ahci_hw_init(hpriv);
-
+skip_clk_phy:
         hpriv->flags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ;
 
         rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info);
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 893e30e9a9ef..ffbe625e6fd2 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -340,6 +340,14 @@ static const struct pci_device_id piix_pci_tbl[] = {
         { 0x8086, 0x0F21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt },
         /* SATA Controller IDE (Coleto Creek) */
         { 0x8086, 0x23a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+        /* SATA Controller IDE (9 Series) */
+        { 0x8086, 0x8c88, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb },
+        /* SATA Controller IDE (9 Series) */
+        { 0x8086, 0x8c89, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb },
+        /* SATA Controller IDE (9 Series) */
+        { 0x8086, 0x8c80, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
+        /* SATA Controller IDE (9 Series) */
+        { 0x8086, 0x8c81, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
 
         { }     /* terminate list */
 };
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 4d1a5d2c4287..47e418b8c8ba 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -143,6 +143,18 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i
         };
         const struct ata_port_info *ppi[] = { &info, NULL };
 
+        /*
+         * The JMicron chip 361/363 contains one SATA controller and one
+         * PATA controller,for powering on these both controllers, we must
+         * follow the sequence one by one, otherwise one of them can not be
+         * powered on successfully, so here we disable the async suspend
+         * method for these chips.
+         */
+        if (pdev->vendor == PCI_VENDOR_ID_JMICRON &&
+                (pdev->device == PCI_DEVICE_ID_JMICRON_JMB363 ||
+                pdev->device == PCI_DEVICE_ID_JMICRON_JMB361))
+                device_disable_async_suspend(&pdev->dev);
+
         return ata_pci_bmdma_init_one(pdev, ppi, &jmicron_sht, NULL, 0);
 }
 
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 7d1326985bee..bfc90b8547f2 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -146,6 +146,9 @@ struct regcache_ops {
         enum regcache_type type;
         int (*init)(struct regmap *map);
         int (*exit)(struct regmap *map);
+#ifdef CONFIG_DEBUG_FS
+        void (*debugfs_init)(struct regmap *map);
+#endif
         int (*read)(struct regmap *map, unsigned int reg, unsigned int *value);
         int (*write)(struct regmap *map, unsigned int reg, unsigned int value);
         int (*sync)(struct regmap *map, unsigned int min, unsigned int max);
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 6a7e4fa12854..f3e8fe0cc650 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -194,10 +194,6 @@ static void rbtree_debugfs_init(struct regmap *map)
 {
         debugfs_create_file("rbtree", 0400, map->debugfs, map, &rbtree_fops);
 }
-#else
-static void rbtree_debugfs_init(struct regmap *map)
-{
-}
 #endif
 
 static int regcache_rbtree_init(struct regmap *map)
@@ -222,8 +218,6 @@ static int regcache_rbtree_init(struct regmap *map)
                         goto err;
         }
 
-        rbtree_debugfs_init(map);
-
         return 0;
 
 err:
@@ -532,6 +526,9 @@ struct regcache_ops regcache_rbtree_ops = {
         .name = "rbtree",
         .init = regcache_rbtree_init,
         .exit = regcache_rbtree_exit,
+#ifdef CONFIG_DEBUG_FS
+        .debugfs_init = rbtree_debugfs_init,
+#endif
         .read = regcache_rbtree_read,
         .write = regcache_rbtree_write,
         .sync = regcache_rbtree_sync,
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 29b4128da0b0..5617da6dc898 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -698,7 +698,7 @@ int regcache_sync_block(struct regmap *map, void *block,
                         unsigned int block_base, unsigned int start,
                         unsigned int end)
 {
-        if (regmap_can_raw_write(map))
+        if (regmap_can_raw_write(map) && !map->use_single_rw)
                 return regcache_sync_block_raw(map, block, cache_present,
                                                block_base, start, end);
         else
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index 45d812c0ea77..65ea7b256b3e 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -538,6 +538,9 @@ void regmap_debugfs_init(struct regmap *map, const char *name)
 
                 next = rb_next(&range_node->node);
         }
+
+        if (map->cache_ops && map->cache_ops->debugfs_init)
+                map->cache_ops->debugfs_init(map);
 }
 
 void regmap_debugfs_exit(struct regmap *map)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 78f43fb2fe84..1cf427bc0d4a 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -109,7 +109,7 @@ bool regmap_readable(struct regmap *map, unsigned int reg)
 
 bool regmap_volatile(struct regmap *map, unsigned int reg)
 {
-        if (!regmap_readable(map, reg))
+        if (!map->format.format_write && !regmap_readable(map, reg))
                 return false;
 
         if (map->volatile_reg)
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index 294a7dd25190..f032ed6dd459 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -282,6 +282,7 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
+        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },  /* 0xA8DB */
         { 0, },
 };
 MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index c7d138eca731..3598110d2cef 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -442,12 +442,15 @@ static int rd_nr;
 int rd_size = CONFIG_BLK_DEV_RAM_SIZE;
 static int max_part;
 static int part_shift;
+static int part_show = 0;
 module_param(rd_nr, int, S_IRUGO);
 MODULE_PARM_DESC(rd_nr, "Maximum number of brd devices");
 module_param(rd_size, int, S_IRUGO);
 MODULE_PARM_DESC(rd_size, "Size of each RAM disk in kbytes.");
 module_param(max_part, int, S_IRUGO);
 MODULE_PARM_DESC(max_part, "Maximum number of partitions per RAM disk");
+module_param(part_show, int, S_IRUGO);
+MODULE_PARM_DESC(part_show, "Control RAM disk visibility in /proc/partitions");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_BLOCKDEV_MAJOR(RAMDISK_MAJOR);
 MODULE_ALIAS("rd");
@@ -501,7 +504,8 @@ static struct brd_device *brd_alloc(int i)
         disk->fops              = &brd_fops;
         disk->private_data      = brd;
         disk->queue             = brd->brd_queue;
-        disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;
+        if (!part_show)
+                disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;
         sprintf(disk->disk_name, "ram%d", i);
         set_capacity(disk, rd_size * 2);
 
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index ab3ea62e5dfc..c4328d9d9981 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1203,7 +1203,6 @@ static struct platform_driver ace_platform_driver = {
         .probe = ace_probe,
         .remove = ace_remove,
         .driver = {
-                .owner = THIS_MODULE,
                 .name = "xsysace",
                 .of_match_table = ace_of_match,
         },
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index dfa4024c448a..d00831c3d731 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -378,7 +378,6 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index)
         /* Should NEVER happen. Return bio error if it does. */
         if (unlikely(ret)) {
                 pr_err("Decompression failed! err=%d, page=%u\n", ret, index);
-                atomic64_inc(&zram->stats.failed_reads);
                 return ret;
         }
 
@@ -547,8 +546,6 @@ out:
                 zcomp_strm_release(zram->comp, zstrm);
         if (is_partial_io(bvec))
                 kfree(uncmem);
-        if (ret)
-                atomic64_inc(&zram->stats.failed_writes);
         return ret;
 }
 
@@ -566,6 +563,13 @@ static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index,
                 ret = zram_bvec_write(zram, bvec, index, offset);
         }
 
+        if (unlikely(ret)) {
+                if (rw == READ)
+                        atomic64_inc(&zram->stats.failed_reads);
+                else
+                        atomic64_inc(&zram->stats.failed_writes);
+        }
+
         return ret;
 }
 
diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
index 5b0afde729cd..e0f725c87cc6 100644
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@ -84,7 +84,7 @@ struct zram_stats {
         atomic64_t compr_data_size;     /* compressed size of pages stored */
         atomic64_t num_reads;   /* failed + successful */
         atomic64_t num_writes;  /* --do-- */
-        atomic64_t failed_reads;        /* should NEVER! happen */
+        atomic64_t failed_reads;        /* can happen when memory is too low */
         atomic64_t failed_writes;       /* can happen when memory is too low */
         atomic64_t invalid_io;  /* non-page-aligned I/O requests */
         atomic64_t notify_free; /* no. of swap slot free notifications */
diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c
index 3266f8ff9311..a60f26400705 100644
--- a/drivers/bus/arm-ccn.c
+++ b/drivers/bus/arm-ccn.c
@@ -586,6 +586,30 @@ static int arm_ccn_pmu_type_eq(u32 a, u32 b)
         return 0;
 }
 
+static void arm_ccn_pmu_event_destroy(struct perf_event *event)
+{
+        struct arm_ccn *ccn = pmu_to_arm_ccn(event->pmu);
+        struct hw_perf_event *hw = &event->hw;
+
+        if (hw->idx == CCN_IDX_PMU_CYCLE_COUNTER) {
+                clear_bit(CCN_IDX_PMU_CYCLE_COUNTER, ccn->dt.pmu_counters_mask);
+        } else {
+                struct arm_ccn_component *source =
+                                ccn->dt.pmu_counters[hw->idx].source;
+
+                if (CCN_CONFIG_TYPE(event->attr.config) == CCN_TYPE_XP &&
+                                CCN_CONFIG_EVENT(event->attr.config) ==
+                                CCN_EVENT_WATCHPOINT)
+                        clear_bit(hw->config_base, source->xp.dt_cmp_mask);
+                else
+                        clear_bit(hw->config_base, source->pmu_events_mask);
+                clear_bit(hw->idx, ccn->dt.pmu_counters_mask);
+        }
+
+        ccn->dt.pmu_counters[hw->idx].source = NULL;
+        ccn->dt.pmu_counters[hw->idx].event = NULL;
+}
+
 static int arm_ccn_pmu_event_init(struct perf_event *event)
 {
         struct arm_ccn *ccn;
@@ -599,6 +623,7 @@ static int arm_ccn_pmu_event_init(struct perf_event *event)
                 return -ENOENT;
 
         ccn = pmu_to_arm_ccn(event->pmu);
+        event->destroy = arm_ccn_pmu_event_destroy;
 
         if (hw->sample_period) {
                 dev_warn(ccn->dev, "Sampling not supported!\n");
@@ -662,7 +687,7 @@ static int arm_ccn_pmu_event_init(struct perf_event *event)
                 }
                 if (e->num_vcs && vc >= e->num_vcs) {
                         dev_warn(ccn->dev, "Invalid vc %d for node/XP %d!\n",
-                                        port, node_xp);
+                                        vc, node_xp);
                         return -EINVAL;
                 }
                 valid = 1;
@@ -731,30 +756,6 @@ static int arm_ccn_pmu_event_init(struct perf_event *event)
         return 0;
 }
 
-static void arm_ccn_pmu_event_free(struct perf_event *event)
-{
-        struct arm_ccn *ccn = pmu_to_arm_ccn(event->pmu);
-        struct hw_perf_event *hw = &event->hw;
-
-        if (hw->idx == CCN_IDX_PMU_CYCLE_COUNTER) {
-                clear_bit(CCN_IDX_PMU_CYCLE_COUNTER, ccn->dt.pmu_counters_mask);
-        } else {
-                struct arm_ccn_component *source =
-                                ccn->dt.pmu_counters[hw->idx].source;
-
-                if (CCN_CONFIG_TYPE(event->attr.config) == CCN_TYPE_XP &&
-                                CCN_CONFIG_EVENT(event->attr.config) ==
-                                CCN_EVENT_WATCHPOINT)
-                        clear_bit(hw->config_base, source->xp.dt_cmp_mask);
-                else
-                        clear_bit(hw->config_base, source->pmu_events_mask);
-                clear_bit(hw->idx, ccn->dt.pmu_counters_mask);
-        }
-
-        ccn->dt.pmu_counters[hw->idx].source = NULL;
-        ccn->dt.pmu_counters[hw->idx].event = NULL;
-}
-
 static u64 arm_ccn_pmu_read_counter(struct arm_ccn *ccn, int idx)
 {
         u64 res;
@@ -1027,8 +1028,6 @@ static int arm_ccn_pmu_event_add(struct perf_event *event, int flags)
 static void arm_ccn_pmu_event_del(struct perf_event *event, int flags)
 {
         arm_ccn_pmu_event_stop(event, PERF_EF_UPDATE);
-
-        arm_ccn_pmu_event_free(event);
 }
 
 static void arm_ccn_pmu_event_read(struct perf_event *event)
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index c5eac949760d..0668b389c516 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -660,6 +660,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
         ICPU(0x3f, core_params),
         ICPU(0x45, core_params),
         ICPU(0x46, core_params),
+        ICPU(0x4c, byt_params),
         ICPU(0x4f, core_params),
         ICPU(0x56, core_params),
         {}
@@ -688,7 +689,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum)
 
         add_timer_on(&cpu->timer, cpunum);
 
-        pr_info("Intel pstate controlling: cpu %d\n", cpunum);
+        pr_debug("Intel pstate controlling: cpu %d\n", cpunum);
 
         return 0;
 }
@@ -707,10 +708,6 @@ static unsigned int intel_pstate_get(unsigned int cpu_num)
 
 static int intel_pstate_set_policy(struct cpufreq_policy *policy)
 {
-        struct cpudata *cpu;
-
-        cpu = all_cpu_data[policy->cpu];
-
         if (!policy->cpuinfo.max_freq)
                 return -ENODEV;
 
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index 9a68225a757e..3f9791f07b8e 100644
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -501,7 +501,7 @@ static int check_mem_type(void __iomem *dmc_reg)
         return val >> 8;
 }
 
-static int __init s5pv210_cpu_init(struct cpufreq_policy *policy)
+static int s5pv210_cpu_init(struct cpufreq_policy *policy)
 {
         unsigned long mem_type;
         int ret;
diff --git a/drivers/cpuidle/cpuidle-big_little.c b/drivers/cpuidle/cpuidle-big_little.c
index 344d79fa3407..ef94c3b81f18 100644
--- a/drivers/cpuidle/cpuidle-big_little.c
+++ b/drivers/cpuidle/cpuidle-big_little.c
@@ -138,25 +138,18 @@ static int bl_enter_powerdown(struct cpuidle_device *dev,
         return idx;
 }
 
-static int __init bl_idle_driver_init(struct cpuidle_driver *drv, int cpu_id)
+static int __init bl_idle_driver_init(struct cpuidle_driver *drv, int part_id)
 {
-        struct cpuinfo_arm *cpu_info;
         struct cpumask *cpumask;
-        unsigned long cpuid;
         int cpu;
 
         cpumask = kzalloc(cpumask_size(), GFP_KERNEL);
         if (!cpumask)
                 return -ENOMEM;
 
-        for_each_possible_cpu(cpu) {
-                cpu_info = &per_cpu(cpu_data, cpu);
-                cpuid = is_smp() ? cpu_info->cpuid : read_cpuid_id();
-
-                /* read cpu id part number */
-                if ((cpuid & 0xFFF0) == cpu_id)
+        for_each_possible_cpu(cpu)
+                if (smp_cpuid_part(cpu) == part_id)
                         cpumask_set_cpu(cpu, cpumask);
-        }
 
         drv->cpumask = cpumask;
 
diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c
index 4222cb2aa96a..7bb9d65d9a2c 100644
--- a/drivers/dma-buf/fence.c
+++ b/drivers/dma-buf/fence.c
@@ -29,7 +29,7 @@
 EXPORT_TRACEPOINT_SYMBOL(fence_annotate_wait_on);
 EXPORT_TRACEPOINT_SYMBOL(fence_emit);
 
-/**
+/*
  * fence context counter: each execution context should have its own
  * fence context, this allows checking if fences belong to the same
  * context or not. One device can have multiple separate contexts,
diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c
index f0a43646a2f3..5abe943e3404 100644
--- a/drivers/firmware/efi/vars.c
+++ b/drivers/firmware/efi/vars.c
@@ -481,7 +481,7 @@ EXPORT_SYMBOL_GPL(efivar_entry_remove);
  */
 static void efivar_entry_list_del_unlock(struct efivar_entry *entry)
 {
-        WARN_ON(!spin_is_locked(&__efivars->lock));
+        lockdep_assert_held(&__efivars->lock);
 
         list_del(&entry->list);
         spin_unlock_irq(&__efivars->lock);
@@ -507,7 +507,7 @@ int __efivar_entry_delete(struct efivar_entry *entry)
         const struct efivar_operations *ops = __efivars->ops;
         efi_status_t status;
 
-        WARN_ON(!spin_is_locked(&__efivars->lock));
+        lockdep_assert_held(&__efivars->lock);
 
         status = ops->set_variable(entry->var.VariableName,
                                    &entry->var.VendorGuid,
@@ -667,7 +667,7 @@ struct efivar_entry *efivar_entry_find(efi_char16_t *name, efi_guid_t guid,
         int strsize1, strsize2;
         bool found = false;
 
-        WARN_ON(!spin_is_locked(&__efivars->lock));
+        lockdep_assert_held(&__efivars->lock);
 
         list_for_each_entry_safe(entry, n, head, list) {
                 strsize1 = ucs2_strsize(name, 1024);
@@ -739,7 +739,7 @@ int __efivar_entry_get(struct efivar_entry *entry, u32 *attributes,
         const struct efivar_operations *ops = __efivars->ops;
         efi_status_t status;
 
-        WARN_ON(!spin_is_locked(&__efivars->lock));
+        lockdep_assert_held(&__efivars->lock);
 
         status = ops->get_variable(entry->var.VariableName,
                                    &entry->var.VendorGuid,
diff --git a/drivers/gpio/devres.c b/drivers/gpio/devres.c
index 41b2f40578d5..954b9f6b0ef8 100644
--- a/drivers/gpio/devres.c
+++ b/drivers/gpio/devres.c
@@ -90,7 +90,7 @@ struct gpio_desc *__must_check __devm_gpiod_get_index(struct device *dev,
         struct gpio_desc **dr;
         struct gpio_desc *desc;
 
-        dr = devres_alloc(devm_gpiod_release, sizeof(struct gpiod_desc *),
+        dr = devres_alloc(devm_gpiod_release, sizeof(struct gpio_desc *),
                           GFP_KERNEL);
         if (!dr)
                 return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpio/gpio-bt8xx.c b/drivers/gpio/gpio-bt8xx.c
index 6557147d9331..7e4c43c18960 100644
--- a/drivers/gpio/gpio-bt8xx.c
+++ b/drivers/gpio/gpio-bt8xx.c
@@ -241,9 +241,6 @@ static void bt8xxgpio_remove(struct pci_dev *pdev)
         bgwrite(~0x0, BT848_INT_STAT);
         bgwrite(0x0, BT848_GPIO_OUT_EN);
 
-        iounmap(bg->mmio);
-        release_mem_region(pci_resource_start(pdev, 0),
-                           pci_resource_len(pdev, 0));
         pci_disable_device(pdev);
 }
 
diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c
index ff9eb911b5e4..fa945ec9ccff 100644
--- a/drivers/gpio/gpio-lynxpoint.c
+++ b/drivers/gpio/gpio-lynxpoint.c
@@ -407,9 +407,27 @@ static int lp_gpio_runtime_resume(struct device *dev)
         return 0;
 }
 
+static int lp_gpio_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct lp_gpio *lg = platform_get_drvdata(pdev);
+        unsigned long reg;
+        int i;
+
+        /* on some hardware suspend clears input sensing, re-enable it here */
+        for (i = 0; i < lg->chip.ngpio; i++) {
+                if (gpiochip_is_requested(&lg->chip, i) != NULL) {
+                        reg = lp_gpio_reg(&lg->chip, i, LP_CONFIG2);
+                        outl(inl(reg) & ~GPINDIS_BIT, reg);
+                }
+        }
+        return 0;
+}
+
 static const struct dev_pm_ops lp_gpio_pm_ops = {
         .runtime_suspend = lp_gpio_runtime_suspend,
         .runtime_resume = lp_gpio_runtime_resume,
+        .resume = lp_gpio_resume,
 };
 
 static const struct acpi_device_id lynxpoint_gpio_acpi_match[] = {
diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c
index c3145f91fda3..31ad5df5dbc9 100644
--- a/drivers/gpio/gpio-zynq.c
+++ b/drivers/gpio/gpio-zynq.c
@@ -95,6 +95,9 @@ struct zynq_gpio {
         struct clk *clk;
 };
 
+static struct irq_chip zynq_gpio_level_irqchip;
+static struct irq_chip zynq_gpio_edge_irqchip;
+
 /**
  * zynq_gpio_get_bank_pin - Get the bank number and pin number within that bank
  * for a given pin in the GPIO device
@@ -410,6 +413,15 @@ static int zynq_gpio_set_irq_type(struct irq_data *irq_data, unsigned int type)
                        gpio->base_addr + ZYNQ_GPIO_INTPOL_OFFSET(bank_num));
         writel_relaxed(int_any,
                        gpio->base_addr + ZYNQ_GPIO_INTANY_OFFSET(bank_num));
+
+        if (type & IRQ_TYPE_LEVEL_MASK) {
+                __irq_set_chip_handler_name_locked(irq_data->irq,
+                        &zynq_gpio_level_irqchip, handle_fasteoi_irq, NULL);
+        } else {
+                __irq_set_chip_handler_name_locked(irq_data->irq,
+                        &zynq_gpio_edge_irqchip, handle_level_irq, NULL);
+        }
+
         return 0;
 }
 
@@ -424,9 +436,21 @@ static int zynq_gpio_set_wake(struct irq_data *data, unsigned int on)
 }
 
 /* irq chip descriptor */
-static struct irq_chip zynq_gpio_irqchip = {
+static struct irq_chip zynq_gpio_level_irqchip = {
         .name           = DRIVER_NAME,
         .irq_enable     = zynq_gpio_irq_enable,
+        .irq_eoi        = zynq_gpio_irq_ack,
+        .irq_mask       = zynq_gpio_irq_mask,
+        .irq_unmask     = zynq_gpio_irq_unmask,
+        .irq_set_type   = zynq_gpio_set_irq_type,
+        .irq_set_wake   = zynq_gpio_set_wake,
+        .flags          = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED,
+};
+
+static struct irq_chip zynq_gpio_edge_irqchip = {
+        .name           = DRIVER_NAME,
+        .irq_enable     = zynq_gpio_irq_enable,
+        .irq_ack        = zynq_gpio_irq_ack,
         .irq_mask       = zynq_gpio_irq_mask,
         .irq_unmask     = zynq_gpio_irq_unmask,
         .irq_set_type   = zynq_gpio_set_irq_type,
@@ -469,10 +493,6 @@ static void zynq_gpio_irqhandler(unsigned int irq, struct irq_desc *desc)
                                                         offset);
                                 generic_handle_irq(gpio_irq);
                         }
-
-                        /* clear IRQ in HW */
-                        writel_relaxed(int_sts, gpio->base_addr +
-                                        ZYNQ_GPIO_INTSTS_OFFSET(bank_num));
                 }
         }
 
@@ -610,14 +630,14 @@ static int zynq_gpio_probe(struct platform_device *pdev)
                 writel_relaxed(ZYNQ_GPIO_IXR_DISABLE_ALL, gpio->base_addr +
                                ZYNQ_GPIO_INTDIS_OFFSET(bank_num));
 
-        ret = gpiochip_irqchip_add(chip, &zynq_gpio_irqchip, 0,
-                                   handle_simple_irq, IRQ_TYPE_NONE);
+        ret = gpiochip_irqchip_add(chip, &zynq_gpio_edge_irqchip, 0,
+                                   handle_level_irq, IRQ_TYPE_NONE);
         if (ret) {
                 dev_err(&pdev->dev, "Failed to add irq chip\n");
                 goto err_rm_gpiochip;
         }
 
-        gpiochip_set_chained_irqchip(chip, &zynq_gpio_irqchip, irq,
+        gpiochip_set_chained_irqchip(chip, &zynq_gpio_edge_irqchip, irq,
                                      zynq_gpio_irqhandler);
 
         pm_runtime_set_active(&pdev->dev);
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 7cfdc2278905..604dbe60bdee 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -307,7 +307,5 @@ void of_gpiochip_add(struct gpio_chip *chip)
 void of_gpiochip_remove(struct gpio_chip *chip)
 {
         gpiochip_remove_pin_ranges(chip);
-
-        if (chip->of_node)
-                of_node_put(chip->of_node);
+        of_node_put(chip->of_node);
 }
diff --git a/drivers/gpu/drm/ast/ast_tables.h b/drivers/gpu/drm/ast/ast_tables.h
index 4c761dcea972..05c01ea85294 100644
--- a/drivers/gpu/drm/ast/ast_tables.h
+++ b/drivers/gpu/drm/ast/ast_tables.h
@@ -99,6 +99,7 @@ static struct ast_vbios_dclk_info dclk_table[] = {
         {0x25, 0x65, 0x80},                                     /* 16: VCLK88.75    */
         {0x77, 0x58, 0x80},                                     /* 17: VCLK119      */
         {0x32, 0x67, 0x80},                                 /* 18: VCLK85_5     */
+        {0x6a, 0x6d, 0x80},                                     /* 19: VCLK97_75        */
 };
 
 static struct ast_vbios_stdtable vbios_stdtable[] = {
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index fa2be249999c..90e773019eac 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -4696,8 +4696,9 @@ int drm_mode_create_dumb_ioctl(struct drm_device *dev,
                 return -EINVAL;
 
         /* overflow checks for 32bit size calculations */
+        /* NOTE: DIV_ROUND_UP() can overflow */
         cpp = DIV_ROUND_UP(args->bpp, 8);
-        if (cpp > 0xffffffffU / args->width)
+        if (!cpp || cpp > 0xffffffffU / args->width)
                 return -EINVAL;
         stride = cpp * args->width;
         if (args->height > 0xffffffffU / stride)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index ec96f9a9724c..e27cdbe9d524 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -494,6 +494,36 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)
         return true;
 }
 
+void intel_hpd_cancel_work(struct drm_i915_private *dev_priv)
+{
+        spin_lock_irq(&dev_priv->irq_lock);
+
+        dev_priv->long_hpd_port_mask = 0;
+        dev_priv->short_hpd_port_mask = 0;
+        dev_priv->hpd_event_bits = 0;
+
+        spin_unlock_irq(&dev_priv->irq_lock);
+
+        cancel_work_sync(&dev_priv->dig_port_work);
+        cancel_work_sync(&dev_priv->hotplug_work);
+        cancel_delayed_work_sync(&dev_priv->hotplug_reenable_work);
+}
+
+static void intel_suspend_encoders(struct drm_i915_private *dev_priv)
+{
+        struct drm_device *dev = dev_priv->dev;
+        struct drm_encoder *encoder;
+
+        drm_modeset_lock_all(dev);
+        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+                struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
+
+                if (intel_encoder->suspend)
+                        intel_encoder->suspend(intel_encoder);
+        }
+        drm_modeset_unlock_all(dev);
+}
+
 static int i915_drm_freeze(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -538,6 +568,9 @@ static int i915_drm_freeze(struct drm_device *dev)
                 flush_delayed_work(&dev_priv->rps.delayed_resume_work);
 
                 intel_runtime_pm_disable_interrupts(dev);
+                intel_hpd_cancel_work(dev_priv);
+
+                intel_suspend_encoders(dev_priv);
 
                 intel_suspend_gt_powersave(dev);
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 4412f6a4383b..7a830eac5ba3 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1458,7 +1458,7 @@ struct drm_i915_private {
                 } hpd_mark;
         } hpd_stats[HPD_NUM_PINS];
         u32 hpd_event_bits;
-        struct timer_list hotplug_reenable_timer;
+        struct delayed_work hotplug_reenable_work;
 
         struct i915_fbc fbc;
         struct i915_drrs drrs;
@@ -2178,6 +2178,7 @@ extern unsigned long i915_mch_val(struct drm_i915_private *dev_priv);
 extern unsigned long i915_gfx_val(struct drm_i915_private *dev_priv);
 extern void i915_update_gfx_val(struct drm_i915_private *dev_priv);
 int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);
+void intel_hpd_cancel_work(struct drm_i915_private *dev_priv);
 
 extern void intel_console_resume(struct work_struct *work);
 
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 390ccc2a3096..0050ee9470f1 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1189,8 +1189,8 @@ static void i915_hotplug_work_func(struct work_struct *work)
           * some connectors */
         if (hpd_disabled) {
                 drm_kms_helper_poll_enable(dev);
-                mod_timer(&dev_priv->hotplug_reenable_timer,
-                          jiffies + msecs_to_jiffies(I915_REENABLE_HOTPLUG_DELAY));
+                mod_delayed_work(system_wq, &dev_priv->hotplug_reenable_work,
+                                 msecs_to_jiffies(I915_REENABLE_HOTPLUG_DELAY));
         }
 
         spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
@@ -1213,11 +1213,6 @@ static void i915_hotplug_work_func(struct work_struct *work)
                 drm_kms_helper_hotplug_event(dev);
 }
 
-static void intel_hpd_irq_uninstall(struct drm_i915_private *dev_priv)
-{
-        del_timer_sync(&dev_priv->hotplug_reenable_timer);
-}
-
 static void ironlake_rps_change_irq_handler(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -3892,8 +3887,6 @@ static void gen8_irq_uninstall(struct drm_device *dev)
         if (!dev_priv)
                 return;
 
-        intel_hpd_irq_uninstall(dev_priv);
-
         gen8_irq_reset(dev);
 }
 
@@ -3908,8 +3901,6 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
 
         I915_WRITE(VLV_MASTER_IER, 0);
 
-        intel_hpd_irq_uninstall(dev_priv);
-
         for_each_pipe(pipe)
                 I915_WRITE(PIPESTAT(pipe), 0xffff);
 
@@ -3988,8 +3979,6 @@ static void ironlake_irq_uninstall(struct drm_device *dev)
         if (!dev_priv)
                 return;
 
-        intel_hpd_irq_uninstall(dev_priv);
-
         ironlake_irq_reset(dev);
 }
 
@@ -4360,8 +4349,6 @@ static void i915_irq_uninstall(struct drm_device * dev)
         struct drm_i915_private *dev_priv = dev->dev_private;
         int pipe;
 
-        intel_hpd_irq_uninstall(dev_priv);
-
         if (I915_HAS_HOTPLUG(dev)) {
                 I915_WRITE(PORT_HOTPLUG_EN, 0);
                 I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
@@ -4598,8 +4585,6 @@ static void i965_irq_uninstall(struct drm_device * dev)
         if (!dev_priv)
                 return;
 
-        intel_hpd_irq_uninstall(dev_priv);
-
         I915_WRITE(PORT_HOTPLUG_EN, 0);
         I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
 
@@ -4615,14 +4600,18 @@ static void i965_irq_uninstall(struct drm_device * dev)
         I915_WRITE(IIR, I915_READ(IIR));
 }
 
-static void intel_hpd_irq_reenable(unsigned long data)
+static void intel_hpd_irq_reenable(struct work_struct *work)
 {
-        struct drm_i915_private *dev_priv = (struct drm_i915_private *)data;
+        struct drm_i915_private *dev_priv =
+                container_of(work, typeof(*dev_priv),
+                             hotplug_reenable_work.work);
         struct drm_device *dev = dev_priv->dev;
         struct drm_mode_config *mode_config = &dev->mode_config;
         unsigned long irqflags;
         int i;
 
+        intel_runtime_pm_get(dev_priv);
+
         spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
         for (i = (HPD_NONE + 1); i < HPD_NUM_PINS; i++) {
                 struct drm_connector *connector;
@@ -4648,6 +4637,8 @@ static void intel_hpd_irq_reenable(unsigned long data)
         if (dev_priv->display.hpd_irq_setup)
                 dev_priv->display.hpd_irq_setup(dev);
         spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
+
+        intel_runtime_pm_put(dev_priv);
 }
 
 void intel_irq_init(struct drm_device *dev)
@@ -4670,8 +4661,8 @@ void intel_irq_init(struct drm_device *dev)
         setup_timer(&dev_priv->gpu_error.hangcheck_timer,
                     i915_hangcheck_elapsed,
                     (unsigned long) dev);
-        setup_timer(&dev_priv->hotplug_reenable_timer, intel_hpd_irq_reenable,
-                    (unsigned long) dev_priv);
+        INIT_DELAYED_WORK(&dev_priv->hotplug_reenable_work,
+                          intel_hpd_irq_reenable);
 
         pm_qos_add_request(&dev_priv->pm_qos, PM_QOS_CPU_DMA_LATENCY, PM_QOS_DEFAULT_VALUE);
 
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index a66955037e4e..eee79e1c3222 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1123,7 +1123,7 @@ init_vbt_defaults(struct drm_i915_private *dev_priv)
         }
 }
 
-static int __init intel_no_opregion_vbt_callback(const struct dmi_system_id *id)
+static int 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",
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 2efaf8e8d9c4..9212e6504e0f 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -699,16 +699,21 @@ intel_crt_detect(struct drm_connector *connector, bool force)
                 goto out;
         }
 
+        drm_modeset_acquire_init(&ctx, 0);
+
         /* for pre-945g platforms use load detect */
         if (intel_get_load_detect_pipe(connector, NULL, &tmp, &ctx)) {
                 if (intel_crt_detect_ddc(connector))
                         status = connector_status_connected;
                 else
                         status = intel_crt_load_detect(crt);
-                intel_release_load_detect_pipe(connector, &tmp, &ctx);
+                intel_release_load_detect_pipe(connector, &tmp);
         } else
                 status = connector_status_unknown;
 
+        drm_modeset_drop_locks(&ctx);
+        drm_modeset_acquire_fini(&ctx);
+
 out:
         intel_display_power_put(dev_priv, power_domain);
         return status;
@@ -799,7 +804,7 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = {
         .destroy = intel_encoder_destroy,
 };
 
-static int __init intel_no_crt_dmi_callback(const struct dmi_system_id *id)
+static int intel_no_crt_dmi_callback(const struct dmi_system_id *id)
 {
         DRM_INFO("Skipping CRT initialization for %s\n", id->ident);
         return 1;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 018fb7222f60..d8324c69fa86 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2233,6 +2233,15 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev,
         if (need_vtd_wa(dev) && alignment < 256 * 1024)
                 alignment = 256 * 1024;
 
+        /*
+         * Global gtt pte registers are special registers which actually forward
+         * writes to a chunk of system memory. Which means that there is no risk
+         * that the register values disappear as soon as we call
+         * intel_runtime_pm_put(), so it is correct to wrap only the
+         * pin/unpin/fence and not more.
+         */
+        intel_runtime_pm_get(dev_priv);
+
         dev_priv->mm.interruptible = false;
         ret = i915_gem_object_pin_to_display_plane(obj, alignment, pipelined);
         if (ret)
@@ -2250,12 +2259,14 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev,
         i915_gem_object_pin_fence(obj);
 
         dev_priv->mm.interruptible = true;
+        intel_runtime_pm_put(dev_priv);
         return 0;
 
 err_unpin:
         i915_gem_object_unpin_from_display_plane(obj);
 err_interruptible:
         dev_priv->mm.interruptible = true;
+        intel_runtime_pm_put(dev_priv);
         return ret;
 }
 
@@ -4188,10 +4199,6 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc)
                 intel_set_pch_fifo_underrun_reporting(dev, pipe, false);
 
         intel_disable_pipe(dev_priv, pipe);
-
-        if (intel_crtc->config.dp_encoder_is_mst)
-                intel_ddi_set_vc_payload_alloc(crtc, false);
-
         ironlake_pfit_disable(intel_crtc);
 
         for_each_encoder_on_crtc(dev, crtc, encoder)
@@ -4256,6 +4263,9 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)
                 intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, false);
         intel_disable_pipe(dev_priv, pipe);
 
+        if (intel_crtc->config.dp_encoder_is_mst)
+                intel_ddi_set_vc_payload_alloc(crtc, false);
+
         intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);
 
         ironlake_pfit_disable(intel_crtc);
@@ -8240,6 +8250,15 @@ static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc,
                         goto fail_locked;
                 }
 
+                /*
+                 * Global gtt pte registers are special registers which actually
+                 * forward writes to a chunk of system memory. Which means that
+                 * there is no risk that the register values disappear as soon
+                 * as we call intel_runtime_pm_put(), so it is correct to wrap
+                 * only the pin/unpin/fence and not more.
+                 */
+                intel_runtime_pm_get(dev_priv);
+
                 /* Note that the w/a also requires 2 PTE of padding following
                  * the bo. We currently fill all unused PTE with the shadow
                  * page and so we should always have valid PTE following the
@@ -8252,16 +8271,20 @@ static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc,
                 ret = i915_gem_object_pin_to_display_plane(obj, alignment, NULL);
                 if (ret) {
                         DRM_DEBUG_KMS("failed to move cursor bo into the GTT\n");
+                        intel_runtime_pm_put(dev_priv);
                         goto fail_locked;
                 }
 
                 ret = i915_gem_object_put_fence(obj);
                 if (ret) {
                         DRM_DEBUG_KMS("failed to release fence for cursor");
+                        intel_runtime_pm_put(dev_priv);
                         goto fail_unpin;
                 }
 
                 addr = i915_gem_obj_ggtt_offset(obj);
+
+                intel_runtime_pm_put(dev_priv);
         } else {
                 int align = IS_I830(dev) ? 16 * 1024 : 256;
                 ret = i915_gem_object_attach_phys(obj, align);
@@ -8462,8 +8485,6 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
                       connector->base.id, connector->name,
                       encoder->base.id, encoder->name);
 
-        drm_modeset_acquire_init(ctx, 0);
-
 retry:
         ret = drm_modeset_lock(&config->connection_mutex, ctx);
         if (ret)
@@ -8502,10 +8523,14 @@ retry:
                 i++;
                 if (!(encoder->possible_crtcs & (1 << i)))
                         continue;
-                if (!possible_crtc->enabled) {
-                        crtc = possible_crtc;
-                        break;
-                }
+                if (possible_crtc->enabled)
+                        continue;
+                /* This can occur when applying the pipe A quirk on resume. */
+                if (to_intel_crtc(possible_crtc)->new_enabled)
+                        continue;
+
+                crtc = possible_crtc;
+                break;
         }
 
         /*
@@ -8574,15 +8599,11 @@ fail_unlock:
                 goto retry;
         }
 
-        drm_modeset_drop_locks(ctx);
-        drm_modeset_acquire_fini(ctx);
-
         return false;
 }
 
 void intel_release_load_detect_pipe(struct drm_connector *connector,
-                                    struct intel_load_detect_pipe *old,
-                                    struct drm_modeset_acquire_ctx *ctx)
+                                    struct intel_load_detect_pipe *old)
 {
         struct intel_encoder *intel_encoder =
                 intel_attached_encoder(connector);
@@ -8606,17 +8627,12 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,
                         drm_framebuffer_unreference(old->release_fb);
                 }
 
-                goto unlock;
                 return;
         }
 
         /* Switch crtc and encoder back off if necessary */
         if (old->dpms_mode != DRM_MODE_DPMS_ON)
                 connector->funcs->dpms(connector, old->dpms_mode);
-
-unlock:
-        drm_modeset_drop_locks(ctx);
-        drm_modeset_acquire_fini(ctx);
 }
 
 static int i9xx_pll_refclk(struct drm_device *dev,
@@ -11700,8 +11716,8 @@ intel_cursor_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
         };
         const struct drm_rect clip = {
                 /* integer pixels */
-                .x2 = intel_crtc->config.pipe_src_w,
-                .y2 = intel_crtc->config.pipe_src_h,
+                .x2 = intel_crtc->active ? intel_crtc->config.pipe_src_w : 0,
+                .y2 = intel_crtc->active ? intel_crtc->config.pipe_src_h : 0,
         };
         bool visible;
         int ret;
@@ -12488,6 +12504,9 @@ static struct intel_quirk intel_quirks[] = {
         /* Acer C720 and C720P Chromebooks (Celeron 2955U) have backlights */
         { 0x0a06, 0x1025, 0x0a11, quirk_backlight_present },
 
+        /* Acer C720 Chromebook (Core i3 4005U) */
+        { 0x0a16, 0x1025, 0x0a11, quirk_backlight_present },
+
         /* Toshiba CB35 Chromebook (Celeron 2955U) */
         { 0x0a06, 0x1179, 0x0a88, quirk_backlight_present },
 
@@ -12659,7 +12678,7 @@ static void intel_enable_pipe_a(struct drm_device *dev)
         struct intel_connector *connector;
         struct drm_connector *crt = NULL;
         struct intel_load_detect_pipe load_detect_temp;
-        struct drm_modeset_acquire_ctx ctx;
+        struct drm_modeset_acquire_ctx *ctx = dev->mode_config.acquire_ctx;
 
         /* We can't just switch on the pipe A, we need to set things up with a
          * proper mode and output configuration. As a gross hack, enable pipe A
@@ -12676,10 +12695,8 @@ static void intel_enable_pipe_a(struct drm_device *dev)
         if (!crt)
                 return;
 
-        if (intel_get_load_detect_pipe(crt, NULL, &load_detect_temp, &ctx))
-                intel_release_load_detect_pipe(crt, &load_detect_temp, &ctx);
-
-
+        if (intel_get_load_detect_pipe(crt, NULL, &load_detect_temp, ctx))
+                intel_release_load_detect_pipe(crt, &load_detect_temp);
 }
 
 static bool
@@ -13112,7 +13129,7 @@ void intel_modeset_cleanup(struct drm_device *dev)
          * experience fancy races otherwise.
          */
         drm_irq_uninstall(dev);
-        cancel_work_sync(&dev_priv->hotplug_work);
+        intel_hpd_cancel_work(dev_priv);
         dev_priv->pm._irqs_disabled = true;
 
         /*
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index ee3942f0b068..81d7681faa63 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3553,6 +3553,9 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
         if (WARN_ON(!intel_encoder->base.crtc))
                 return;
 
+        if (!to_intel_crtc(intel_encoder->base.crtc)->active)
+                return;
+
         /* Try to read receiver status if the link appears to be up */
         if (!intel_dp_get_link_status(intel_dp, link_status)) {
                 return;
@@ -3658,24 +3661,12 @@ ironlake_dp_detect(struct intel_dp *intel_dp)
         return intel_dp_detect_dpcd(intel_dp);
 }
 
-static enum drm_connector_status
-g4x_dp_detect(struct intel_dp *intel_dp)
+static int g4x_digital_port_connected(struct drm_device *dev,
+                                       struct intel_digital_port *intel_dig_port)
 {
-        struct drm_device *dev = intel_dp_to_dev(intel_dp);
         struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
         uint32_t bit;
 
-        /* Can't disconnect eDP, but you can close the lid... */
-        if (is_edp(intel_dp)) {
-                enum drm_connector_status status;
-
-                status = intel_panel_detect(dev);
-                if (status == connector_status_unknown)
-                        status = connector_status_connected;
-                return status;
-        }
-
         if (IS_VALLEYVIEW(dev)) {
                 switch (intel_dig_port->port) {
                 case PORT_B:
@@ -3688,7 +3679,7 @@ g4x_dp_detect(struct intel_dp *intel_dp)
                         bit = PORTD_HOTPLUG_LIVE_STATUS_VLV;
                         break;
                 default:
-                        return connector_status_unknown;
+                        return -EINVAL;
                 }
         } else {
                 switch (intel_dig_port->port) {
@@ -3702,11 +3693,36 @@ g4x_dp_detect(struct intel_dp *intel_dp)
                         bit = PORTD_HOTPLUG_LIVE_STATUS_G4X;
                         break;
                 default:
-                        return connector_status_unknown;
+                        return -EINVAL;
                 }
         }
 
         if ((I915_READ(PORT_HOTPLUG_STAT) & bit) == 0)
+                return 0;
+        return 1;
+}
+
+static enum drm_connector_status
+g4x_dp_detect(struct intel_dp *intel_dp)
+{
+        struct drm_device *dev = intel_dp_to_dev(intel_dp);
+        struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
+        int ret;
+
+        /* Can't disconnect eDP, but you can close the lid... */
+        if (is_edp(intel_dp)) {
+                enum drm_connector_status status;
+
+                status = intel_panel_detect(dev);
+                if (status == connector_status_unknown)
+                        status = connector_status_connected;
+                return status;
+        }
+
+        ret = g4x_digital_port_connected(dev, intel_dig_port);
+        if (ret == -EINVAL)
+                return connector_status_unknown;
+        else if (ret == 0)
                 return connector_status_disconnected;
 
         return intel_dp_detect_dpcd(intel_dp);
@@ -4003,6 +4019,16 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
         kfree(intel_dig_port);
 }
 
+static void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder)
+{
+        struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base);
+
+        if (!is_edp(intel_dp))
+                return;
+
+        edp_panel_vdd_off_sync(intel_dp);
+}
+
 static void intel_dp_encoder_reset(struct drm_encoder *encoder)
 {
         intel_edp_panel_vdd_sanitize(to_intel_encoder(encoder));
@@ -4037,18 +4063,30 @@ bool
 intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 {
         struct intel_dp *intel_dp = &intel_dig_port->dp;
+        struct intel_encoder *intel_encoder = &intel_dig_port->base;
         struct drm_device *dev = intel_dig_port->base.base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        int ret;
+        enum intel_display_power_domain power_domain;
+        bool ret = true;
+
         if (intel_dig_port->base.type != INTEL_OUTPUT_EDP)
                 intel_dig_port->base.type = INTEL_OUTPUT_DISPLAYPORT;
 
         DRM_DEBUG_KMS("got hpd irq on port %d - %s\n", intel_dig_port->port,
                       long_hpd ? "long" : "short");
 
+        power_domain = intel_display_port_power_domain(intel_encoder);
+        intel_display_power_get(dev_priv, power_domain);
+
         if (long_hpd) {
-                if (!ibx_digital_port_connected(dev_priv, intel_dig_port))
-                        goto mst_fail;
+
+                if (HAS_PCH_SPLIT(dev)) {
+                        if (!ibx_digital_port_connected(dev_priv, intel_dig_port))
+                                goto mst_fail;
+                } else {
+                        if (g4x_digital_port_connected(dev, intel_dig_port) != 1)
+                                goto mst_fail;
+                }
 
                 if (!intel_dp_get_dpcd(intel_dp)) {
                         goto mst_fail;
@@ -4061,8 +4099,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 
         } else {
                 if (intel_dp->is_mst) {
-                        ret = intel_dp_check_mst_status(intel_dp);
-                        if (ret == -EINVAL)
+                        if (intel_dp_check_mst_status(intel_dp) == -EINVAL)
                                 goto mst_fail;
                 }
 
@@ -4076,7 +4113,8 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
                         drm_modeset_unlock(&dev->mode_config.connection_mutex);
                 }
         }
-        return false;
+        ret = false;
+        goto put_power;
 mst_fail:
         /* if we were in MST mode, and device is not there get out of MST mode */
         if (intel_dp->is_mst) {
@@ -4084,7 +4122,10 @@ mst_fail:
                 intel_dp->is_mst = false;
                 drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, intel_dp->is_mst);
         }
-        return true;
+put_power:
+        intel_display_power_put(dev_priv, power_domain);
+
+        return ret;
 }
 
 /* Return which DP Port should be selected for Transcoder DP control */
@@ -4722,6 +4763,7 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
         intel_encoder->disable = intel_disable_dp;
         intel_encoder->get_hw_state = intel_dp_get_hw_state;
         intel_encoder->get_config = intel_dp_get_config;
+        intel_encoder->suspend = intel_dp_encoder_suspend;
         if (IS_CHERRYVIEW(dev)) {
                 intel_encoder->pre_pll_enable = chv_dp_pre_pll_enable;
                 intel_encoder->pre_enable = chv_pre_enable_dp;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 4b2664bd5b81..b8c8bbd8e5f9 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -153,6 +153,12 @@ struct intel_encoder {
          * be set correctly before calling this function. */
         void (*get_config)(struct intel_encoder *,
                            struct intel_crtc_config *pipe_config);
+        /*
+         * Called during system suspend after all pending requests for the
+         * encoder are flushed (for example for DP AUX transactions) and
+         * device interrupts are disabled.
+         */
+        void (*suspend)(struct intel_encoder *);
         int crtc_mask;
         enum hpd_pin hpd_pin;
 };
@@ -830,8 +836,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
                                 struct intel_load_detect_pipe *old,
                                 struct drm_modeset_acquire_ctx *ctx);
 void intel_release_load_detect_pipe(struct drm_connector *connector,
-                                    struct intel_load_detect_pipe *old,
-                                    struct drm_modeset_acquire_ctx *ctx);
+                                    struct intel_load_detect_pipe *old);
 int intel_pin_and_fence_fb_obj(struct drm_device *dev,
                                struct drm_i915_gem_object *obj,
                                struct intel_engine_cs *pipelined);
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 881361c0f27e..fdf40267249c 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -538,7 +538,7 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = {
         .destroy = intel_encoder_destroy,
 };
 
-static int __init intel_no_lvds_dmi_callback(const struct dmi_system_id *id)
+static int intel_no_lvds_dmi_callback(const struct dmi_system_id *id)
 {
         DRM_INFO("Skipping LVDS initialization for %s\n", id->ident);
         return 1;
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 59b028f0b1e8..8e374449c6b5 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -801,7 +801,7 @@ static void pch_enable_backlight(struct intel_connector *connector)
 
         cpu_ctl2 = I915_READ(BLC_PWM_CPU_CTL2);
         if (cpu_ctl2 & BLM_PWM_ENABLE) {
-                WARN(1, "cpu backlight already enabled\n");
+                DRM_DEBUG_KMS("cpu backlight already enabled\n");
                 cpu_ctl2 &= ~BLM_PWM_ENABLE;
                 I915_WRITE(BLC_PWM_CPU_CTL2, cpu_ctl2);
         }
@@ -845,7 +845,7 @@ static void i9xx_enable_backlight(struct intel_connector *connector)
 
         ctl = I915_READ(BLC_PWM_CTL);
         if (ctl & BACKLIGHT_DUTY_CYCLE_MASK_PNV) {
-                WARN(1, "backlight already enabled\n");
+                DRM_DEBUG_KMS("backlight already enabled\n");
                 I915_WRITE(BLC_PWM_CTL, 0);
         }
 
@@ -876,7 +876,7 @@ static void i965_enable_backlight(struct intel_connector *connector)
 
         ctl2 = I915_READ(BLC_PWM_CTL2);
         if (ctl2 & BLM_PWM_ENABLE) {
-                WARN(1, "backlight already enabled\n");
+                DRM_DEBUG_KMS("backlight already enabled\n");
                 ctl2 &= ~BLM_PWM_ENABLE;
                 I915_WRITE(BLC_PWM_CTL2, ctl2);
         }
@@ -910,7 +910,7 @@ static void vlv_enable_backlight(struct intel_connector *connector)
 
         ctl2 = I915_READ(VLV_BLC_PWM_CTL2(pipe));
         if (ctl2 & BLM_PWM_ENABLE) {
-                WARN(1, "backlight already enabled\n");
+                DRM_DEBUG_KMS("backlight already enabled\n");
                 ctl2 &= ~BLM_PWM_ENABLE;
                 I915_WRITE(VLV_BLC_PWM_CTL2(pipe), ctl2);
         }
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index e211eef4b7e4..c69d3ce1b3d6 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1311,6 +1311,7 @@ intel_tv_detect(struct drm_connector *connector, bool force)
 {
         struct drm_display_mode mode;
         struct intel_tv *intel_tv = intel_attached_tv(connector);
+        enum drm_connector_status status;
         int type;
 
         DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n",
@@ -1323,16 +1324,24 @@ intel_tv_detect(struct drm_connector *connector, bool force)
                 struct intel_load_detect_pipe tmp;
                 struct drm_modeset_acquire_ctx ctx;
 
+                drm_modeset_acquire_init(&ctx, 0);
+
                 if (intel_get_load_detect_pipe(connector, &mode, &tmp, &ctx)) {
                         type = intel_tv_detect_type(intel_tv, connector);
-                        intel_release_load_detect_pipe(connector, &tmp, &ctx);
+                        intel_release_load_detect_pipe(connector, &tmp);
+                        status = type < 0 ?
+                                connector_status_disconnected :
+                                connector_status_connected;
                 } else
-                        return connector_status_unknown;
+                        status = connector_status_unknown;
+
+                drm_modeset_drop_locks(&ctx);
+                drm_modeset_acquire_fini(&ctx);
         } else
                 return connector->status;
 
-        if (type < 0)
-                return connector_status_disconnected;
+        if (status != connector_status_connected)
+                return status;
 
         intel_tv->type = type;
         intel_tv_find_better_format(connector);
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
index 74cebb51e8c2..c6c80ea28c35 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
@@ -397,6 +397,7 @@ static void mdp4_crtc_prepare(struct drm_crtc *crtc)
         struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
         DBG("%s", mdp4_crtc->name);
         /* make sure we hold a ref to mdp clks while setting up mode: */
+        drm_crtc_vblank_get(crtc);
         mdp4_enable(get_kms(crtc));
         mdp4_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
 }
@@ -407,6 +408,7 @@ static void mdp4_crtc_commit(struct drm_crtc *crtc)
         crtc_flush(crtc);
         /* drop the ref to mdp clk's that we got in prepare: */
         mdp4_disable(get_kms(crtc));
+        drm_crtc_vblank_put(crtc);
 }
 
 static int mdp4_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index b447c01ad89c..26ee80db17af 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -974,12 +974,11 @@ static int msm_pdev_probe(struct platform_device *pdev)
 
         for (i = 0; i < ARRAY_SIZE(devnames); i++) {
                 struct device *dev;
-                int ret;
 
                 dev = bus_find_device_by_name(&platform_bus_type,
                                 NULL, devnames[i]);
                 if (!dev) {
-                        dev_info(master, "still waiting for %s\n", devnames[i]);
+                        dev_info(&pdev->dev, "still waiting for %s\n", devnames[i]);
                         return -EPROBE_DEFER;
                 }
 
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index 9c5221ce391a..ab5bfd2d0ebf 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -143,7 +143,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
         ret = msm_gem_get_iova_locked(fbdev->bo, 0, &paddr);
         if (ret) {
                 dev_err(dev->dev, "failed to get buffer obj iova: %d\n", ret);
-                goto fail;
+                goto fail_unlock;
         }
 
         fbi = framebuffer_alloc(0, dev->dev);
diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c
index 099af483fdf0..7acdaa5688b7 100644
--- a/drivers/gpu/drm/msm/msm_iommu.c
+++ b/drivers/gpu/drm/msm/msm_iommu.c
@@ -27,8 +27,8 @@ struct msm_iommu {
 static int msm_fault_handler(struct iommu_domain *iommu, struct device *dev,
                 unsigned long iova, int flags, void *arg)
 {
-        DBG("*** fault: iova=%08lx, flags=%d", iova, flags);
-        return -ENOSYS;
+        pr_warn_ratelimited("*** fault: iova=%08lx, flags=%d\n", iova, flags);
+        return 0;
 }
 
 static int msm_iommu_attach(struct msm_mmu *mmu, const char **names, int cnt)
diff --git a/drivers/gpu/drm/nouveau/core/core/parent.c b/drivers/gpu/drm/nouveau/core/core/parent.c
index 8701968a9743..30a2911878f8 100644
--- a/drivers/gpu/drm/nouveau/core/core/parent.c
+++ b/drivers/gpu/drm/nouveau/core/core/parent.c
@@ -86,7 +86,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size)
         sclass = nv_parent(parent)->sclass;
         while (sclass) {
                 if (++nr < size)
-                        lclass[nr] = sclass->oclass->handle;
+                        lclass[nr] = sclass->oclass->handle & 0xffff;
                 sclass = sclass->sclass;
         }
 
@@ -96,7 +96,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size)
                 if (engine && (oclass = engine->sclass)) {
                         while (oclass->ofuncs) {
                                 if (++nr < size)
-                                        lclass[nr] = oclass->handle;
+                                        lclass[nr] = oclass->handle & 0xffff;
                                 oclass++;
                         }
                 }
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
index 0013ad0db9ef..f77b7135ee4c 100644
--- a/drivers/gpu/drm/radeon/Makefile
+++ b/drivers/gpu/drm/radeon/Makefile
@@ -76,7 +76,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \
         evergreen.o evergreen_cs.o evergreen_blit_shaders.o \
         evergreen_hdmi.o radeon_trace_points.o ni.o cayman_blit_shaders.o \
         atombios_encoders.o radeon_semaphore.o radeon_sa.o atombios_i2c.o si.o \
-        si_blit_shaders.o radeon_prime.o radeon_uvd.o cik.o cik_blit_shaders.o \
+        si_blit_shaders.o radeon_prime.o cik.o cik_blit_shaders.o \
         r600_dpm.o rs780_dpm.o rv6xx_dpm.o rv770_dpm.o rv730_dpm.o rv740_dpm.o \
         rv770_smc.o cypress_dpm.o btc_dpm.o sumo_dpm.o sumo_smc.o trinity_dpm.o \
         trinity_smc.o ni_dpm.o si_smc.o si_dpm.o kv_smc.o kv_dpm.o ci_smc.o \
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index 022561e28707..d416bb2ff48d 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -869,6 +869,9 @@ static int ci_set_thermal_temperature_range(struct radeon_device *rdev,
         WREG32_SMC(CG_THERMAL_CTRL, tmp);
 #endif
 
+        rdev->pm.dpm.thermal.min_temp = low_temp;
+        rdev->pm.dpm.thermal.max_temp = high_temp;
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index b625646bf3e2..fa9565957f9d 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -3483,7 +3483,7 @@ static void cik_gpu_init(struct radeon_device *rdev)
         u32 mc_shared_chmap, mc_arb_ramcfg;
         u32 hdp_host_path_cntl;
         u32 tmp;
-        int i, j, k;
+        int i, j;
 
         switch (rdev->family) {
         case CHIP_BONAIRE:
@@ -3544,6 +3544,7 @@ static void cik_gpu_init(struct radeon_device *rdev)
                            (rdev->pdev->device == 0x130B) ||
                            (rdev->pdev->device == 0x130E) ||
                            (rdev->pdev->device == 0x1315) ||
+                           (rdev->pdev->device == 0x1318) ||
                            (rdev->pdev->device == 0x131B)) {
                         rdev->config.cik.max_cu_per_sh = 4;
                         rdev->config.cik.max_backends_per_se = 1;
@@ -3672,12 +3673,11 @@ static void cik_gpu_init(struct radeon_device *rdev)
                      rdev->config.cik.max_sh_per_se,
                      rdev->config.cik.max_backends_per_se);
 
+        rdev->config.cik.active_cus = 0;
         for (i = 0; i < rdev->config.cik.max_shader_engines; i++) {
                 for (j = 0; j < rdev->config.cik.max_sh_per_se; j++) {
-                        for (k = 0; k < rdev->config.cik.max_cu_per_sh; k++) {
-                                rdev->config.cik.active_cus +=
-                                        hweight32(cik_get_cu_active_bitmap(rdev, i, j));
-                        }
+                        rdev->config.cik.active_cus +=
+                                hweight32(cik_get_cu_active_bitmap(rdev, i, j));
                 }
         }
 
@@ -3801,7 +3801,7 @@ int cik_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)
         radeon_ring_write(ring, PACKET3(PACKET3_SET_UCONFIG_REG, 1));
         radeon_ring_write(ring, ((scratch - PACKET3_SET_UCONFIG_REG_START) >> 2));
         radeon_ring_write(ring, 0xDEADBEEF);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         for (i = 0; i < rdev->usec_timeout; i++) {
                 tmp = RREG32(scratch);
@@ -3920,6 +3920,17 @@ void cik_fence_compute_ring_emit(struct radeon_device *rdev,
         radeon_ring_write(ring, 0);
 }
 
+/**
+ * cik_semaphore_ring_emit - emit a semaphore on the CP ring
+ *
+ * @rdev: radeon_device pointer
+ * @ring: radeon ring buffer object
+ * @semaphore: radeon semaphore object
+ * @emit_wait: Is this a sempahore wait?
+ *
+ * Emits a semaphore signal/wait packet to the CP ring and prevents the PFP
+ * from running ahead of semaphore waits.
+ */
 bool cik_semaphore_ring_emit(struct radeon_device *rdev,
                              struct radeon_ring *ring,
                              struct radeon_semaphore *semaphore,
@@ -3932,6 +3943,12 @@ bool cik_semaphore_ring_emit(struct radeon_device *rdev,
         radeon_ring_write(ring, lower_32_bits(addr));
         radeon_ring_write(ring, (upper_32_bits(addr) & 0xffff) | sel);
 
+        if (emit_wait && ring->idx == RADEON_RING_TYPE_GFX_INDEX) {
+                /* Prevent the PFP from running ahead of the semaphore wait */
+                radeon_ring_write(ring, PACKET3(PACKET3_PFP_SYNC_ME, 0));
+                radeon_ring_write(ring, 0x0);
+        }
+
         return true;
 }
 
@@ -4004,7 +4021,7 @@ int cik_copy_cpdma(struct radeon_device *rdev,
                 return r;
         }
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         radeon_semaphore_free(rdev, &sem, *fence);
 
         return r;
@@ -4103,7 +4120,7 @@ int cik_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
         ib.ptr[1] = ((scratch - PACKET3_SET_UCONFIG_REG_START) >> 2);
         ib.ptr[2] = 0xDEADBEEF;
         ib.length_dw = 3;
-        r = radeon_ib_schedule(rdev, &ib, NULL);
+        r = radeon_ib_schedule(rdev, &ib, NULL, false);
         if (r) {
                 radeon_scratch_free(rdev, scratch);
                 radeon_ib_free(rdev, &ib);
@@ -4324,7 +4341,7 @@ static int cik_cp_gfx_start(struct radeon_device *rdev)
         radeon_ring_write(ring, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */
         radeon_ring_write(ring, 0x00000010); /* VGT_OUT_DEALLOC_CNTL */
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         return 0;
 }
@@ -5732,20 +5749,17 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev)
         WREG32(0x15D8, 0);
         WREG32(0x15DC, 0);
 
-        /* empty context1-15 */
-        /* FIXME start with 4G, once using 2 level pt switch to full
-         * vm size space
-         */
+        /* restore context1-15 */
         /* set vm size, must be a multiple of 4 */
         WREG32(VM_CONTEXT1_PAGE_TABLE_START_ADDR, 0);
         WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn);
         for (i = 1; i < 16; i++) {
                 if (i < 8)
                         WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
-                               rdev->gart.table_addr >> 12);
+                               rdev->vm_manager.saved_table_addr[i]);
                 else
                         WREG32(VM_CONTEXT8_PAGE_TABLE_BASE_ADDR + ((i - 8) << 2),
-                               rdev->gart.table_addr >> 12);
+                               rdev->vm_manager.saved_table_addr[i]);
         }
 
         /* enable context1-15 */
@@ -5810,6 +5824,17 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev)
  */
 static void cik_pcie_gart_disable(struct radeon_device *rdev)
 {
+        unsigned i;
+
+        for (i = 1; i < 16; ++i) {
+                uint32_t reg;
+                if (i < 8)
+                        reg = VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2);
+                else
+                        reg = VM_CONTEXT8_PAGE_TABLE_BASE_ADDR + ((i - 8) << 2);
+                rdev->vm_manager.saved_table_addr[i] = RREG32(reg);
+        }
+
         /* Disable all tables */
         WREG32(VM_CONTEXT0_CNTL, 0);
         WREG32(VM_CONTEXT1_CNTL, 0);
@@ -5958,14 +5983,14 @@ void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)
 
         /* update SH_MEM_* regs */
         radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
-        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
+        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
                                  WRITE_DATA_DST_SEL(0)));
         radeon_ring_write(ring, SRBM_GFX_CNTL >> 2);
         radeon_ring_write(ring, 0);
         radeon_ring_write(ring, VMID(vm->id));
 
         radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 6));
-        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
+        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
                                  WRITE_DATA_DST_SEL(0)));
         radeon_ring_write(ring, SH_MEM_BASES >> 2);
         radeon_ring_write(ring, 0);
@@ -5976,7 +6001,7 @@ void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)
         radeon_ring_write(ring, 0); /* SH_MEM_APE1_LIMIT */
 
         radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
-        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
+        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
                                  WRITE_DATA_DST_SEL(0)));
         radeon_ring_write(ring, SRBM_GFX_CNTL >> 2);
         radeon_ring_write(ring, 0);
@@ -5987,7 +6012,7 @@ void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)
 
         /* bits 0-15 are the VM contexts0-15 */
         radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
-        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
+        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |
                                  WRITE_DATA_DST_SEL(0)));
         radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2);
         radeon_ring_write(ring, 0);
@@ -9538,6 +9563,9 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)
         int ret, i;
         u16 tmp16;
 
+        if (pci_is_root_bus(rdev->pdev->bus))
+                return;
+
         if (radeon_pcie_gen2 == 0)
                 return;
 
@@ -9764,7 +9792,8 @@ static void cik_program_aspm(struct radeon_device *rdev)
                         if (orig != data)
                                 WREG32_PCIE_PORT(PCIE_LC_LINK_WIDTH_CNTL, data);
 
-                        if (!disable_clkreq) {
+                        if (!disable_clkreq &&
+                            !pci_is_root_bus(rdev->pdev->bus)) {
                                 struct pci_dev *root = rdev->pdev->bus->self;
                                 u32 lnkcap;
 
diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
index bcf480510ac2..192278bc993c 100644
--- a/drivers/gpu/drm/radeon/cik_sdma.c
+++ b/drivers/gpu/drm/radeon/cik_sdma.c
@@ -596,7 +596,7 @@ int cik_copy_dma(struct radeon_device *rdev,
                 return r;
         }
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         radeon_semaphore_free(rdev, &sem, *fence);
 
         return r;
@@ -638,7 +638,7 @@ int cik_sdma_ring_test(struct radeon_device *rdev,
         radeon_ring_write(ring, upper_32_bits(rdev->vram_scratch.gpu_addr));
         radeon_ring_write(ring, 1); /* number of DWs to follow */
         radeon_ring_write(ring, 0xDEADBEEF);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         for (i = 0; i < rdev->usec_timeout; i++) {
                 tmp = readl(ptr);
@@ -695,7 +695,7 @@ int cik_sdma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
         ib.ptr[4] = 0xDEADBEEF;
         ib.length_dw = 5;
 
-        r = radeon_ib_schedule(rdev, &ib, NULL);
+        r = radeon_ib_schedule(rdev, &ib, NULL, false);
         if (r) {
                 radeon_ib_free(rdev, &ib);
                 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 4fedd14e670a..dbca60c7d097 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -2869,7 +2869,7 @@ static int evergreen_cp_start(struct radeon_device *rdev)
         radeon_ring_write(ring, PACKET3_ME_INITIALIZE_DEVICE_ID(1));
         radeon_ring_write(ring, 0);
         radeon_ring_write(ring, 0);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         cp_me = 0xff;
         WREG32(CP_ME_CNTL, cp_me);
@@ -2912,7 +2912,7 @@ static int evergreen_cp_start(struct radeon_device *rdev)
         radeon_ring_write(ring, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */
         radeon_ring_write(ring, 0x00000010); /*  */
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/radeon/evergreen_dma.c b/drivers/gpu/drm/radeon/evergreen_dma.c
index 478caefe0fef..afaba388c36d 100644
--- a/drivers/gpu/drm/radeon/evergreen_dma.c
+++ b/drivers/gpu/drm/radeon/evergreen_dma.c
@@ -155,7 +155,7 @@ int evergreen_copy_dma(struct radeon_device *rdev,
                 return r;
         }
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         radeon_semaphore_free(rdev, &sem, *fence);
 
         return r;
diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c
index 9ef8c38f2d66..8b58e11b64fa 100644
--- a/drivers/gpu/drm/radeon/kv_dpm.c
+++ b/drivers/gpu/drm/radeon/kv_dpm.c
@@ -1438,14 +1438,14 @@ static int kv_update_uvd_dpm(struct radeon_device *rdev, bool gate)
         return kv_enable_uvd_dpm(rdev, !gate);
 }
 
-static u8 kv_get_vce_boot_level(struct radeon_device *rdev)
+static u8 kv_get_vce_boot_level(struct radeon_device *rdev, u32 evclk)
 {
         u8 i;
         struct radeon_vce_clock_voltage_dependency_table *table =
                 &rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table;
 
         for (i = 0; i < table->count; i++) {
-                if (table->entries[i].evclk >= 0) /* XXX */
+                if (table->entries[i].evclk >= evclk)
                         break;
         }
 
@@ -1468,7 +1468,7 @@ static int kv_update_vce_dpm(struct radeon_device *rdev,
                 if (pi->caps_stable_p_state)
                         pi->vce_boot_level = table->count - 1;
                 else
-                        pi->vce_boot_level = kv_get_vce_boot_level(rdev);
+                        pi->vce_boot_level = kv_get_vce_boot_level(rdev, radeon_new_state->evclk);
 
                 ret = kv_copy_bytes_to_smc(rdev,
                                            pi->dpm_table_start +
@@ -2726,7 +2726,10 @@ int kv_dpm_init(struct radeon_device *rdev)
         pi->caps_sclk_ds = true;
         pi->enable_auto_thermal_throttling = true;
         pi->disable_nb_ps3_in_battery = false;
-        pi->bapm_enable = true;
+        if (radeon_bapm == 0)
+                pi->bapm_enable = false;
+        else
+                pi->bapm_enable = true;
         pi->voltage_drop_t = 0;
         pi->caps_sclk_throttle_low_notification = false;
         pi->caps_fps = false; /* true? */
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 327b85f7fd0d..3faee58946dd 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1271,7 +1271,7 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev)
                 WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR + (i << 2), 0);
                 WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR + (i << 2), rdev->vm_manager.max_pfn);
                 WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
-                        rdev->gart.table_addr >> 12);
+                       rdev->vm_manager.saved_table_addr[i]);
         }
 
         /* enable context1-7 */
@@ -1303,6 +1303,13 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev)
 
 static void cayman_pcie_gart_disable(struct radeon_device *rdev)
 {
+        unsigned i;
+
+        for (i = 1; i < 8; ++i) {
+                rdev->vm_manager.saved_table_addr[i] = RREG32(
+                        VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2));
+        }
+
         /* Disable all tables */
         WREG32(VM_CONTEXT0_CNTL, 0);
         WREG32(VM_CONTEXT1_CNTL, 0);
@@ -1505,7 +1512,7 @@ static int cayman_cp_start(struct radeon_device *rdev)
         radeon_ring_write(ring, PACKET3_ME_INITIALIZE_DEVICE_ID(1));
         radeon_ring_write(ring, 0);
         radeon_ring_write(ring, 0);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         cayman_cp_enable(rdev, true);
 
@@ -1547,7 +1554,7 @@ static int cayman_cp_start(struct radeon_device *rdev)
         radeon_ring_write(ring, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */
         radeon_ring_write(ring, 0x00000010); /*  */
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         /* XXX init other rings */
 
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 04b5940b8923..4c5ec44ff328 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -925,7 +925,7 @@ int r100_copy_blit(struct radeon_device *rdev,
         if (fence) {
                 r = radeon_fence_emit(rdev, fence, RADEON_RING_TYPE_GFX_INDEX);
         }
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         return r;
 }
 
@@ -958,7 +958,7 @@ void r100_ring_start(struct radeon_device *rdev, struct radeon_ring *ring)
                           RADEON_ISYNC_ANY3D_IDLE2D |
                           RADEON_ISYNC_WAIT_IDLEGUI |
                           RADEON_ISYNC_CPSCRATCH_IDLEGUI);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 }
 
 
@@ -3638,7 +3638,7 @@ int r100_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)
         }
         radeon_ring_write(ring, PACKET0(scratch, 0));
         radeon_ring_write(ring, 0xDEADBEEF);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         for (i = 0; i < rdev->usec_timeout; i++) {
                 tmp = RREG32(scratch);
                 if (tmp == 0xDEADBEEF) {
@@ -3700,7 +3700,7 @@ int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
         ib.ptr[6] = PACKET2(0);
         ib.ptr[7] = PACKET2(0);
         ib.length_dw = 8;
-        r = radeon_ib_schedule(rdev, &ib, NULL);
+        r = radeon_ib_schedule(rdev, &ib, NULL, false);
         if (r) {
                 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
                 goto free_ib;
diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c
index 58f0473aa73f..67780374a652 100644
--- a/drivers/gpu/drm/radeon/r200.c
+++ b/drivers/gpu/drm/radeon/r200.c
@@ -121,7 +121,7 @@ int r200_copy_dma(struct radeon_device *rdev,
         if (fence) {
                 r = radeon_fence_emit(rdev, fence, RADEON_RING_TYPE_GFX_INDEX);
         }
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         return r;
 }
 
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 75b30338c226..1bc4704034ce 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -295,7 +295,7 @@ void r300_ring_start(struct radeon_device *rdev, struct radeon_ring *ring)
         radeon_ring_write(ring,
                           R300_GEOMETRY_ROUND_NEAREST |
                           R300_COLOR_ROUND_NEAREST);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 }
 
 static void r300_errata(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index 802b19220a21..2828605aef3f 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -219,7 +219,7 @@ static void r420_cp_errata_init(struct radeon_device *rdev)
         radeon_ring_write(ring, PACKET0(R300_CP_RESYNC_ADDR, 1));
         radeon_ring_write(ring, rdev->config.r300.resync_scratch);
         radeon_ring_write(ring, 0xDEADBEEF);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 }
 
 static void r420_cp_errata_fini(struct radeon_device *rdev)
@@ -232,7 +232,7 @@ static void r420_cp_errata_fini(struct radeon_device *rdev)
         radeon_ring_lock(rdev, ring, 8);
         radeon_ring_write(ring, PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
         radeon_ring_write(ring, R300_RB3D_DC_FINISH);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         radeon_scratch_free(rdev, rdev->config.r300.resync_scratch);
 }
 
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index c70a504d96af..e616eb5f6e7a 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1812,7 +1812,6 @@ static void r600_gpu_init(struct radeon_device *rdev)
 {
         u32 tiling_config;
         u32 ramcfg;
-        u32 cc_rb_backend_disable;
         u32 cc_gc_shader_pipe_config;
         u32 tmp;
         int i, j;
@@ -1939,29 +1938,20 @@ static void r600_gpu_init(struct radeon_device *rdev)
         }
         tiling_config |= BANK_SWAPS(1);
 
-        cc_rb_backend_disable = RREG32(CC_RB_BACKEND_DISABLE) & 0x00ff0000;
-        tmp = R6XX_MAX_BACKENDS -
-                r600_count_pipe_bits((cc_rb_backend_disable >> 16) & R6XX_MAX_BACKENDS_MASK);
-        if (tmp < rdev->config.r600.max_backends) {
-                rdev->config.r600.max_backends = tmp;
-        }
-
         cc_gc_shader_pipe_config = RREG32(CC_GC_SHADER_PIPE_CONFIG) & 0x00ffff00;
-        tmp = R6XX_MAX_PIPES -
-                r600_count_pipe_bits((cc_gc_shader_pipe_config >> 8) & R6XX_MAX_PIPES_MASK);
-        if (tmp < rdev->config.r600.max_pipes) {
-                rdev->config.r600.max_pipes = tmp;
-        }
-        tmp = R6XX_MAX_SIMDS -
-                r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R6XX_MAX_SIMDS_MASK);
-        if (tmp < rdev->config.r600.max_simds) {
-                rdev->config.r600.max_simds = tmp;
-        }
         tmp = rdev->config.r600.max_simds -
                 r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R6XX_MAX_SIMDS_MASK);
         rdev->config.r600.active_simds = tmp;
 
         disabled_rb_mask = (RREG32(CC_RB_BACKEND_DISABLE) >> 16) & R6XX_MAX_BACKENDS_MASK;
+        tmp = 0;
+        for (i = 0; i < rdev->config.r600.max_backends; i++)
+                tmp |= (1 << i);
+        /* if all the backends are disabled, fix it up here */
+        if ((disabled_rb_mask & tmp) == tmp) {
+                for (i = 0; i < rdev->config.r600.max_backends; i++)
+                        disabled_rb_mask &= ~(1 << i);
+        }
         tmp = (tiling_config & PIPE_TILING__MASK) >> PIPE_TILING__SHIFT;
         tmp = r6xx_remap_render_backend(rdev, tmp, rdev->config.r600.max_backends,
                                         R6XX_MAX_BACKENDS, disabled_rb_mask);
@@ -2547,7 +2537,7 @@ int r600_cp_start(struct radeon_device *rdev)
         radeon_ring_write(ring, PACKET3_ME_INITIALIZE_DEVICE_ID(1));
         radeon_ring_write(ring, 0);
         radeon_ring_write(ring, 0);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         cp_me = 0xff;
         WREG32(R_0086D8_CP_ME_CNTL, cp_me);
@@ -2683,7 +2673,7 @@ int r600_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)
         radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));
         radeon_ring_write(ring, ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2));
         radeon_ring_write(ring, 0xDEADBEEF);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         for (i = 0; i < rdev->usec_timeout; i++) {
                 tmp = RREG32(scratch);
                 if (tmp == 0xDEADBEEF)
@@ -2753,6 +2743,17 @@ void r600_fence_ring_emit(struct radeon_device *rdev,
         }
 }
 
+/**
+ * r600_semaphore_ring_emit - emit a semaphore on the CP ring
+ *
+ * @rdev: radeon_device pointer
+ * @ring: radeon ring buffer object
+ * @semaphore: radeon semaphore object
+ * @emit_wait: Is this a sempahore wait?
+ *
+ * Emits a semaphore signal/wait packet to the CP ring and prevents the PFP
+ * from running ahead of semaphore waits.
+ */
 bool r600_semaphore_ring_emit(struct radeon_device *rdev,
                               struct radeon_ring *ring,
                               struct radeon_semaphore *semaphore,
@@ -2768,6 +2769,13 @@ bool r600_semaphore_ring_emit(struct radeon_device *rdev,
         radeon_ring_write(ring, lower_32_bits(addr));
         radeon_ring_write(ring, (upper_32_bits(addr) & 0xff) | sel);
 
+        /* PFP_SYNC_ME packet only exists on 7xx+ */
+        if (emit_wait && (rdev->family >= CHIP_RV770)) {
+                /* Prevent the PFP from running ahead of the semaphore wait */
+                radeon_ring_write(ring, PACKET3(PACKET3_PFP_SYNC_ME, 0));
+                radeon_ring_write(ring, 0x0);
+        }
+
         return true;
 }
 
@@ -2845,7 +2853,7 @@ int r600_copy_cpdma(struct radeon_device *rdev,
                 return r;
         }
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         radeon_semaphore_free(rdev, &sem, *fence);
 
         return r;
@@ -3165,7 +3173,7 @@ int r600_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
         ib.ptr[1] = ((scratch - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
         ib.ptr[2] = 0xDEADBEEF;
         ib.length_dw = 3;
-        r = radeon_ib_schedule(rdev, &ib, NULL);
+        r = radeon_ib_schedule(rdev, &ib, NULL, false);
         if (r) {
                 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
                 goto free_ib;
diff --git a/drivers/gpu/drm/radeon/r600_dma.c b/drivers/gpu/drm/radeon/r600_dma.c
index 4969cef44a19..51fd98553eaf 100644
--- a/drivers/gpu/drm/radeon/r600_dma.c
+++ b/drivers/gpu/drm/radeon/r600_dma.c
@@ -261,7 +261,7 @@ int r600_dma_ring_test(struct radeon_device *rdev,
         radeon_ring_write(ring, rdev->vram_scratch.gpu_addr & 0xfffffffc);
         radeon_ring_write(ring, upper_32_bits(rdev->vram_scratch.gpu_addr) & 0xff);
         radeon_ring_write(ring, 0xDEADBEEF);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         for (i = 0; i < rdev->usec_timeout; i++) {
                 tmp = readl(ptr);
@@ -368,7 +368,7 @@ int r600_dma_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
         ib.ptr[3] = 0xDEADBEEF;
         ib.length_dw = 4;
 
-        r = radeon_ib_schedule(rdev, &ib, NULL);
+        r = radeon_ib_schedule(rdev, &ib, NULL, false);
         if (r) {
                 radeon_ib_free(rdev, &ib);
                 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
@@ -493,7 +493,7 @@ int r600_copy_dma(struct radeon_device *rdev,
                 return r;
         }
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         radeon_semaphore_free(rdev, &sem, *fence);
 
         return r;
diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h
index f94e7a9afe75..0c4a7d8d93e0 100644
--- a/drivers/gpu/drm/radeon/r600d.h
+++ b/drivers/gpu/drm/radeon/r600d.h
@@ -1597,6 +1597,7 @@
                  */
 #              define PACKET3_CP_DMA_CMD_SAIC      (1 << 28)
 #              define PACKET3_CP_DMA_CMD_DAIC      (1 << 29)
+#define PACKET3_PFP_SYNC_ME                             0x42 /* r7xx+ only */
 #define PACKET3_SURFACE_SYNC                            0x43
 #              define PACKET3_CB0_DEST_BASE_ENA    (1 << 6)
 #              define PACKET3_FULL_CACHE_ENA       (1 << 20) /* r7xx+ only */
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 9e1732eb402c..5f05b4c84338 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -105,6 +105,7 @@ extern int radeon_vm_size;
 extern int radeon_vm_block_size;
 extern int radeon_deep_color;
 extern int radeon_use_pflipirq;
+extern int radeon_bapm;
 
 /*
  * Copy from radeon_drv.h so we don't have to include both and have conflicting
@@ -914,6 +915,8 @@ struct radeon_vm_manager {
         u64                             vram_base_offset;
         /* is vm enabled? */
         bool                            enabled;
+        /* for hw to save the PD addr on suspend/resume */
+        uint32_t                        saved_table_addr[RADEON_NUM_VM];
 };
 
 /*
@@ -967,7 +970,7 @@ int radeon_ib_get(struct radeon_device *rdev, int ring,
                   unsigned size);
 void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib *ib);
 int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib,
-                       struct radeon_ib *const_ib);
+                       struct radeon_ib *const_ib, bool hdp_flush);
 int radeon_ib_pool_init(struct radeon_device *rdev);
 void radeon_ib_pool_fini(struct radeon_device *rdev);
 int radeon_ib_ring_tests(struct radeon_device *rdev);
@@ -977,8 +980,10 @@ bool radeon_ring_supports_scratch_reg(struct radeon_device *rdev,
 void radeon_ring_free_size(struct radeon_device *rdev, struct radeon_ring *cp);
 int radeon_ring_alloc(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ndw);
 int radeon_ring_lock(struct radeon_device *rdev, struct radeon_ring *cp, unsigned ndw);
-void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *cp);
-void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *cp);
+void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *cp,
+                        bool hdp_flush);
+void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *cp,
+                               bool hdp_flush);
 void radeon_ring_undo(struct radeon_ring *ring);
 void radeon_ring_unlock_undo(struct radeon_device *rdev, struct radeon_ring *cp);
 int radeon_ring_test(struct radeon_device *rdev, struct radeon_ring *cp);
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index ee712c199b25..83f382e8e40e 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -132,7 +132,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
                  * the buffers used for read only, which doubles the range
                  * to 0 to 31. 32 is reserved for the kernel driver.
                  */
-                priority = (r->flags & 0xf) * 2 + !!r->write_domain;
+                priority = (r->flags & RADEON_RELOC_PRIO_MASK) * 2
+                           + !!r->write_domain;
 
                 /* the first reloc of an UVD job is the msg and that must be in
                    VRAM, also but everything into VRAM on AGP cards to avoid
@@ -450,7 +451,7 @@ static int radeon_cs_ib_chunk(struct radeon_device *rdev,
                 radeon_vce_note_usage(rdev);
 
         radeon_cs_sync_rings(parser);
-        r = radeon_ib_schedule(rdev, &parser->ib, NULL);
+        r = radeon_ib_schedule(rdev, &parser->ib, NULL, true);
         if (r) {
                 DRM_ERROR("Failed to schedule IB !\n");
         }
@@ -541,9 +542,9 @@ static int radeon_cs_ib_vm_chunk(struct radeon_device *rdev,
 
         if ((rdev->family >= CHIP_TAHITI) &&
             (parser->chunk_const_ib_idx != -1)) {
-                r = radeon_ib_schedule(rdev, &parser->ib, &parser->const_ib);
+                r = radeon_ib_schedule(rdev, &parser->ib, &parser->const_ib, true);
         } else {
-                r = radeon_ib_schedule(rdev, &parser->ib, NULL);
+                r = radeon_ib_schedule(rdev, &parser->ib, NULL, true);
         }
 
 out:
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index c8ea050c8fa4..6a219bcee66d 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1680,8 +1680,8 @@ int radeon_gpu_reset(struct radeon_device *rdev)
         radeon_save_bios_scratch_regs(rdev);
         /* block TTM */
         resched = ttm_bo_lock_delayed_workqueue(&rdev->mman.bdev);
-        radeon_pm_suspend(rdev);
         radeon_suspend(rdev);
+        radeon_hpd_fini(rdev);
 
         for (i = 0; i < RADEON_NUM_RINGS; ++i) {
                 ring_sizes[i] = radeon_ring_backup(rdev, &rdev->ring[i],
@@ -1726,9 +1726,39 @@ retry:
                 }
         }
 
-        radeon_pm_resume(rdev);
+        if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled) {
+                /* do dpm late init */
+                r = radeon_pm_late_init(rdev);
+                if (r) {
+                        rdev->pm.dpm_enabled = false;
+                        DRM_ERROR("radeon_pm_late_init failed, disabling dpm\n");
+                }
+        } else {
+                /* resume old pm late */
+                radeon_pm_resume(rdev);
+        }
+
+        /* init dig PHYs, disp eng pll */
+        if (rdev->is_atom_bios) {
+                radeon_atom_encoder_init(rdev);
+                radeon_atom_disp_eng_pll_init(rdev);
+                /* turn on the BL */
+                if (rdev->mode_info.bl_encoder) {
+                        u8 bl_level = radeon_get_backlight_level(rdev,
+                                                                 rdev->mode_info.bl_encoder);
+                        radeon_set_backlight_level(rdev, rdev->mode_info.bl_encoder,
+                                                   bl_level);
+                }
+        }
+        /* reset hpd state */
+        radeon_hpd_init(rdev);
+
         drm_helper_resume_force_mode(rdev->ddev);
 
+        /* set the power state here in case we are a PX system or headless */
+        if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled)
+                radeon_pm_compute_clocks(rdev);
+
         ttm_bo_unlock_delayed_workqueue(&rdev->mman.bdev, resched);
         if (r) {
                 /* bad news, how to tell it to userspace ? */
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 092d067f93e1..8df888908833 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -180,6 +180,7 @@ int radeon_vm_size = 8;
 int radeon_vm_block_size = -1;
 int radeon_deep_color = 0;
 int radeon_use_pflipirq = 2;
+int radeon_bapm = -1;
 
 MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
 module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -259,6 +260,9 @@ module_param_named(deep_color, radeon_deep_color, int, 0444);
 MODULE_PARM_DESC(use_pflipirq, "Pflip irqs for pageflip completion (0 = disable, 1 = as fallback, 2 = exclusive (default))");
 module_param_named(use_pflipirq, radeon_use_pflipirq, int, 0444);
 
+MODULE_PARM_DESC(bapm, "BAPM support (1 = enable, 0 = disable, -1 = auto)");
+module_param_named(bapm, radeon_bapm, int, 0444);
+
 static struct pci_device_id pciidlist[] = {
         radeon_PCI_IDS
 };
diff --git a/drivers/gpu/drm/radeon/radeon_ib.c b/drivers/gpu/drm/radeon/radeon_ib.c
index 65b0c213488d..5bf2c0a05827 100644
--- a/drivers/gpu/drm/radeon/radeon_ib.c
+++ b/drivers/gpu/drm/radeon/radeon_ib.c
@@ -107,6 +107,7 @@ void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib *ib)
  * @rdev: radeon_device pointer
  * @ib: IB object to schedule
  * @const_ib: Const IB to schedule (SI only)
+ * @hdp_flush: Whether or not to perform an HDP cache flush
  *
  * Schedule an IB on the associated ring (all asics).
  * Returns 0 on success, error on failure.
@@ -122,7 +123,7 @@ void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib *ib)
  * to SI there was just a DE IB.
  */
 int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib,
-                       struct radeon_ib *const_ib)
+                       struct radeon_ib *const_ib, bool hdp_flush)
 {
         struct radeon_ring *ring = &rdev->ring[ib->ring];
         int r = 0;
@@ -176,7 +177,7 @@ int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib,
         if (ib->vm)
                 radeon_vm_fence(rdev, ib->vm, ib->fence);
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, hdp_flush);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 23314be49480..164898b0010c 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -460,10 +460,6 @@ static ssize_t radeon_get_dpm_state(struct device *dev,
         struct radeon_device *rdev = ddev->dev_private;
         enum radeon_pm_state_type pm = rdev->pm.dpm.user_state;
 
-        if  ((rdev->flags & RADEON_IS_PX) &&
-             (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
-                return snprintf(buf, PAGE_SIZE, "off\n");
-
         return snprintf(buf, PAGE_SIZE, "%s\n",
                         (pm == POWER_STATE_TYPE_BATTERY) ? "battery" :
                         (pm == POWER_STATE_TYPE_BALANCED) ? "balanced" : "performance");
@@ -477,11 +473,6 @@ static ssize_t radeon_set_dpm_state(struct device *dev,
         struct drm_device *ddev = dev_get_drvdata(dev);
         struct radeon_device *rdev = ddev->dev_private;
 
-        /* Can't set dpm state when the card is off */
-        if  ((rdev->flags & RADEON_IS_PX) &&
-             (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
-                return -EINVAL;
-
         mutex_lock(&rdev->pm.mutex);
         if (strncmp("battery", buf, strlen("battery")) == 0)
                 rdev->pm.dpm.user_state = POWER_STATE_TYPE_BATTERY;
@@ -495,7 +486,12 @@ static ssize_t radeon_set_dpm_state(struct device *dev,
                 goto fail;
         }
         mutex_unlock(&rdev->pm.mutex);
-        radeon_pm_compute_clocks(rdev);
+
+        /* Can't set dpm state when the card is off */
+        if (!(rdev->flags & RADEON_IS_PX) ||
+            (ddev->switch_power_state == DRM_SWITCH_POWER_ON))
+                radeon_pm_compute_clocks(rdev);
+
 fail:
         return count;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 5b4e0cf231a0..d65607902537 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -177,16 +177,18 @@ int radeon_ring_lock(struct radeon_device *rdev, struct radeon_ring *ring, unsig
  *
  * @rdev: radeon_device pointer
  * @ring: radeon_ring structure holding ring information
+ * @hdp_flush: Whether or not to perform an HDP cache flush
  *
  * Update the wptr (write pointer) to tell the GPU to
  * execute new commands on the ring buffer (all asics).
  */
-void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring)
+void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring,
+                        bool hdp_flush)
 {
         /* If we are emitting the HDP flush via the ring buffer, we need to
          * do it before padding.
          */
-        if (rdev->asic->ring[ring->idx]->hdp_flush)
+        if (hdp_flush && rdev->asic->ring[ring->idx]->hdp_flush)
                 rdev->asic->ring[ring->idx]->hdp_flush(rdev, ring);
         /* We pad to match fetch size */
         while (ring->wptr & ring->align_mask) {
@@ -196,7 +198,7 @@ void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring)
         /* If we are emitting the HDP flush via MMIO, we need to do it after
          * all CPU writes to VRAM finished.
          */
-        if (rdev->asic->mmio_hdp_flush)
+        if (hdp_flush && rdev->asic->mmio_hdp_flush)
                 rdev->asic->mmio_hdp_flush(rdev);
         radeon_ring_set_wptr(rdev, ring);
 }
@@ -207,12 +209,14 @@ void radeon_ring_commit(struct radeon_device *rdev, struct radeon_ring *ring)
  *
  * @rdev: radeon_device pointer
  * @ring: radeon_ring structure holding ring information
+ * @hdp_flush: Whether or not to perform an HDP cache flush
  *
  * Call radeon_ring_commit() then unlock the ring (all asics).
  */
-void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *ring)
+void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *ring,
+                               bool hdp_flush)
 {
-        radeon_ring_commit(rdev, ring);
+        radeon_ring_commit(rdev, ring, hdp_flush);
         mutex_unlock(&rdev->ring_lock);
 }
 
@@ -372,7 +376,7 @@ int radeon_ring_restore(struct radeon_device *rdev, struct radeon_ring *ring,
                 radeon_ring_write(ring, data[i]);
         }
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         kfree(data);
         return 0;
 }
@@ -400,9 +404,7 @@ int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsig
         /* Allocate ring buffer */
         if (ring->ring_obj == NULL) {
                 r = radeon_bo_create(rdev, ring->ring_size, PAGE_SIZE, true,
-                                     RADEON_GEM_DOMAIN_GTT,
-                                     (rdev->flags & RADEON_IS_PCIE) ?
-                                     RADEON_GEM_GTT_WC : 0,
+                                     RADEON_GEM_DOMAIN_GTT, 0,
                                      NULL, &ring->ring_obj);
                 if (r) {
                         dev_err(rdev->dev, "(%d) ring create failed\n", r);
diff --git a/drivers/gpu/drm/radeon/radeon_semaphore.c b/drivers/gpu/drm/radeon/radeon_semaphore.c
index dbd6bcde92de..56d9fd66d8ae 100644
--- a/drivers/gpu/drm/radeon/radeon_semaphore.c
+++ b/drivers/gpu/drm/radeon/radeon_semaphore.c
@@ -179,7 +179,7 @@ int radeon_semaphore_sync_rings(struct radeon_device *rdev,
                         continue;
                 }
 
-                radeon_ring_commit(rdev, &rdev->ring[i]);
+                radeon_ring_commit(rdev, &rdev->ring[i], false);
                 radeon_fence_note_sync(fence, ring);
 
                 semaphore->gpu_addr += 8;
diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c
index 5adf4207453d..17bc3dced9f1 100644
--- a/drivers/gpu/drm/radeon/radeon_test.c
+++ b/drivers/gpu/drm/radeon/radeon_test.c
@@ -288,7 +288,7 @@ static int radeon_test_create_and_emit_fence(struct radeon_device *rdev,
                         return r;
                 }
                 radeon_fence_emit(rdev, fence, ring->idx);
-                radeon_ring_unlock_commit(rdev, ring);
+                radeon_ring_unlock_commit(rdev, ring, false);
         }
         return 0;
 }
@@ -313,7 +313,7 @@ void radeon_test_ring_sync(struct radeon_device *rdev,
                 goto out_cleanup;
         }
         radeon_semaphore_emit_wait(rdev, ringA->idx, semaphore);
-        radeon_ring_unlock_commit(rdev, ringA);
+        radeon_ring_unlock_commit(rdev, ringA, false);
 
         r = radeon_test_create_and_emit_fence(rdev, ringA, &fence1);
         if (r)
@@ -325,7 +325,7 @@ void radeon_test_ring_sync(struct radeon_device *rdev,
                 goto out_cleanup;
         }
         radeon_semaphore_emit_wait(rdev, ringA->idx, semaphore);
-        radeon_ring_unlock_commit(rdev, ringA);
+        radeon_ring_unlock_commit(rdev, ringA, false);
 
         r = radeon_test_create_and_emit_fence(rdev, ringA, &fence2);
         if (r)
@@ -344,7 +344,7 @@ void radeon_test_ring_sync(struct radeon_device *rdev,
                 goto out_cleanup;
         }
         radeon_semaphore_emit_signal(rdev, ringB->idx, semaphore);
-        radeon_ring_unlock_commit(rdev, ringB);
+        radeon_ring_unlock_commit(rdev, ringB, false);
 
         r = radeon_fence_wait(fence1, false);
         if (r) {
@@ -365,7 +365,7 @@ void radeon_test_ring_sync(struct radeon_device *rdev,
                 goto out_cleanup;
         }
         radeon_semaphore_emit_signal(rdev, ringB->idx, semaphore);
-        radeon_ring_unlock_commit(rdev, ringB);
+        radeon_ring_unlock_commit(rdev, ringB, false);
 
         r = radeon_fence_wait(fence2, false);
         if (r) {
@@ -408,7 +408,7 @@ static void radeon_test_ring_sync2(struct radeon_device *rdev,
                 goto out_cleanup;
         }
         radeon_semaphore_emit_wait(rdev, ringA->idx, semaphore);
-        radeon_ring_unlock_commit(rdev, ringA);
+        radeon_ring_unlock_commit(rdev, ringA, false);
 
         r = radeon_test_create_and_emit_fence(rdev, ringA, &fenceA);
         if (r)
@@ -420,7 +420,7 @@ static void radeon_test_ring_sync2(struct radeon_device *rdev,
                 goto out_cleanup;
         }
         radeon_semaphore_emit_wait(rdev, ringB->idx, semaphore);
-        radeon_ring_unlock_commit(rdev, ringB);
+        radeon_ring_unlock_commit(rdev, ringB, false);
         r = radeon_test_create_and_emit_fence(rdev, ringB, &fenceB);
         if (r)
                 goto out_cleanup;
@@ -442,7 +442,7 @@ static void radeon_test_ring_sync2(struct radeon_device *rdev,
                 goto out_cleanup;
         }
         radeon_semaphore_emit_signal(rdev, ringC->idx, semaphore);
-        radeon_ring_unlock_commit(rdev, ringC);
+        radeon_ring_unlock_commit(rdev, ringC, false);
 
         for (i = 0; i < 30; ++i) {
                 mdelay(100);
@@ -468,7 +468,7 @@ static void radeon_test_ring_sync2(struct radeon_device *rdev,
                 goto out_cleanup;
         }
         radeon_semaphore_emit_signal(rdev, ringC->idx, semaphore);
-        radeon_ring_unlock_commit(rdev, ringC);
+        radeon_ring_unlock_commit(rdev, ringC, false);
 
         mdelay(1000);
 
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
index 6bf55ec85b62..341848a14376 100644
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
@@ -646,7 +646,7 @@ static int radeon_uvd_send_msg(struct radeon_device *rdev,
                 ib.ptr[i] = PACKET2(0);
         ib.length_dw = 16;
 
-        r = radeon_ib_schedule(rdev, &ib, NULL);
+        r = radeon_ib_schedule(rdev, &ib, NULL, false);
         if (r)
                 goto err;
         ttm_eu_fence_buffer_objects(&ticket, &head, ib.fence);
diff --git a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c
index f9b70a43aa52..c7190aadbd89 100644
--- a/drivers/gpu/drm/radeon/radeon_vce.c
+++ b/drivers/gpu/drm/radeon/radeon_vce.c
@@ -368,7 +368,7 @@ int radeon_vce_get_create_msg(struct radeon_device *rdev, int ring,
         for (i = ib.length_dw; i < ib_size_dw; ++i)
                 ib.ptr[i] = 0x0;
 
-        r = radeon_ib_schedule(rdev, &ib, NULL);
+        r = radeon_ib_schedule(rdev, &ib, NULL, false);
         if (r) {
                 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
         }
@@ -425,7 +425,7 @@ int radeon_vce_get_destroy_msg(struct radeon_device *rdev, int ring,
         for (i = ib.length_dw; i < ib_size_dw; ++i)
                 ib.ptr[i] = 0x0;
 
-        r = radeon_ib_schedule(rdev, &ib, NULL);
+        r = radeon_ib_schedule(rdev, &ib, NULL, false);
         if (r) {
                 DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
         }
@@ -715,7 +715,7 @@ int radeon_vce_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)
                 return r;
         }
         radeon_ring_write(ring, VCE_CMD_END);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         for (i = 0; i < rdev->usec_timeout; i++) {
                 if (vce_v1_0_get_rptr(rdev, ring) != rptr)
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index ccae4d9dc3de..088ffdc2f577 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -420,7 +420,7 @@ static int radeon_vm_clear_bo(struct radeon_device *rdev,
         radeon_asic_vm_pad_ib(rdev, &ib);
         WARN_ON(ib.length_dw > 64);
 
-        r = radeon_ib_schedule(rdev, &ib, NULL);
+        r = radeon_ib_schedule(rdev, &ib, NULL, false);
         if (r)
                 goto error;
 
@@ -483,6 +483,10 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
                         /* add a clone of the bo_va to clear the old address */
                         struct radeon_bo_va *tmp;
                         tmp = kzalloc(sizeof(struct radeon_bo_va), GFP_KERNEL);
+                        if (!tmp) {
+                                mutex_unlock(&vm->mutex);
+                                return -ENOMEM;
+                        }
                         tmp->it.start = bo_va->it.start;
                         tmp->it.last = bo_va->it.last;
                         tmp->vm = vm;
@@ -693,7 +697,7 @@ int radeon_vm_update_page_directory(struct radeon_device *rdev,
                 radeon_semaphore_sync_to(ib.semaphore, pd->tbo.sync_obj);
                 radeon_semaphore_sync_to(ib.semaphore, vm->last_id_use);
                 WARN_ON(ib.length_dw > ndw);
-                r = radeon_ib_schedule(rdev, &ib, NULL);
+                r = radeon_ib_schedule(rdev, &ib, NULL, false);
                 if (r) {
                         radeon_ib_free(rdev, &ib);
                         return r;
@@ -957,7 +961,7 @@ int radeon_vm_bo_update(struct radeon_device *rdev,
         WARN_ON(ib.length_dw > ndw);
 
         radeon_semaphore_sync_to(ib.semaphore, vm->fence);
-        r = radeon_ib_schedule(rdev, &ib, NULL);
+        r = radeon_ib_schedule(rdev, &ib, NULL, false);
         if (r) {
                 radeon_ib_free(rdev, &ib);
                 return r;
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 3e21e869015f..8a477bf1fdb3 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -124,7 +124,7 @@ void rv515_ring_start(struct radeon_device *rdev, struct radeon_ring *ring)
         radeon_ring_write(ring, GEOMETRY_ROUND_NEAREST | COLOR_ROUND_NEAREST);
         radeon_ring_write(ring, PACKET0(0x20C8, 0));
         radeon_ring_write(ring, 0);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 }
 
 int rv515_mc_wait_for_idle(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 2983f17ea1b3..d9f5ce715c9b 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -1177,7 +1177,6 @@ static void rv770_gpu_init(struct radeon_device *rdev)
         u32 hdp_host_path_cntl;
         u32 sq_dyn_gpr_size_simd_ab_0;
         u32 gb_tiling_config = 0;
-        u32 cc_rb_backend_disable = 0;
         u32 cc_gc_shader_pipe_config = 0;
         u32 mc_arb_ramcfg;
         u32 db_debug4, tmp;
@@ -1311,21 +1310,7 @@ static void rv770_gpu_init(struct radeon_device *rdev)
                 WREG32(SPI_CONFIG_CNTL, 0);
         }
 
-        cc_rb_backend_disable = RREG32(CC_RB_BACKEND_DISABLE) & 0x00ff0000;
-        tmp = R7XX_MAX_BACKENDS - r600_count_pipe_bits(cc_rb_backend_disable >> 16);
-        if (tmp < rdev->config.rv770.max_backends) {
-                rdev->config.rv770.max_backends = tmp;
-        }
-
         cc_gc_shader_pipe_config = RREG32(CC_GC_SHADER_PIPE_CONFIG) & 0xffffff00;
-        tmp = R7XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config >> 8) & R7XX_MAX_PIPES_MASK);
-        if (tmp < rdev->config.rv770.max_pipes) {
-                rdev->config.rv770.max_pipes = tmp;
-        }
-        tmp = R7XX_MAX_SIMDS - r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R7XX_MAX_SIMDS_MASK);
-        if (tmp < rdev->config.rv770.max_simds) {
-                rdev->config.rv770.max_simds = tmp;
-        }
         tmp = rdev->config.rv770.max_simds -
                 r600_count_pipe_bits((cc_gc_shader_pipe_config >> 16) & R7XX_MAX_SIMDS_MASK);
         rdev->config.rv770.active_simds = tmp;
@@ -1348,6 +1333,14 @@ static void rv770_gpu_init(struct radeon_device *rdev)
         rdev->config.rv770.tiling_npipes = rdev->config.rv770.max_tile_pipes;
 
         disabled_rb_mask = (RREG32(CC_RB_BACKEND_DISABLE) >> 16) & R7XX_MAX_BACKENDS_MASK;
+        tmp = 0;
+        for (i = 0; i < rdev->config.rv770.max_backends; i++)
+                tmp |= (1 << i);
+        /* if all the backends are disabled, fix it up here */
+        if ((disabled_rb_mask & tmp) == tmp) {
+                for (i = 0; i < rdev->config.rv770.max_backends; i++)
+                        disabled_rb_mask &= ~(1 << i);
+        }
         tmp = (gb_tiling_config & PIPE_TILING__MASK) >> PIPE_TILING__SHIFT;
         tmp = r6xx_remap_render_backend(rdev, tmp, rdev->config.rv770.max_backends,
                                         R7XX_MAX_BACKENDS, disabled_rb_mask);
diff --git a/drivers/gpu/drm/radeon/rv770_dma.c b/drivers/gpu/drm/radeon/rv770_dma.c
index bbf2e076ee45..74426ac2bb5c 100644
--- a/drivers/gpu/drm/radeon/rv770_dma.c
+++ b/drivers/gpu/drm/radeon/rv770_dma.c
@@ -90,7 +90,7 @@ int rv770_copy_dma(struct radeon_device *rdev,
                 return r;
         }
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         radeon_semaphore_free(rdev, &sem, *fence);
 
         return r;
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 011779bd2b3d..6bce40847753 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -3057,7 +3057,7 @@ static void si_gpu_init(struct radeon_device *rdev)
         u32 sx_debug_1;
         u32 hdp_host_path_cntl;
         u32 tmp;
-        int i, j, k;
+        int i, j;
 
         switch (rdev->family) {
         case CHIP_TAHITI:
@@ -3255,12 +3255,11 @@ static void si_gpu_init(struct radeon_device *rdev)
                      rdev->config.si.max_sh_per_se,
                      rdev->config.si.max_cu_per_sh);
 
+        rdev->config.si.active_cus = 0;
         for (i = 0; i < rdev->config.si.max_shader_engines; i++) {
                 for (j = 0; j < rdev->config.si.max_sh_per_se; j++) {
-                        for (k = 0; k < rdev->config.si.max_cu_per_sh; k++) {
-                                rdev->config.si.active_cus +=
-                                        hweight32(si_get_cu_active_bitmap(rdev, i, j));
-                        }
+                        rdev->config.si.active_cus +=
+                                hweight32(si_get_cu_active_bitmap(rdev, i, j));
                 }
         }
 
@@ -3541,7 +3540,7 @@ static int si_cp_start(struct radeon_device *rdev)
         radeon_ring_write(ring, PACKET3_BASE_INDEX(CE_PARTITION_BASE));
         radeon_ring_write(ring, 0xc000);
         radeon_ring_write(ring, 0xe000);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         si_cp_enable(rdev, true);
 
@@ -3570,7 +3569,7 @@ static int si_cp_start(struct radeon_device *rdev)
         radeon_ring_write(ring, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */
         radeon_ring_write(ring, 0x00000010); /* VGT_OUT_DEALLOC_CNTL */
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
         for (i = RADEON_RING_TYPE_GFX_INDEX; i <= CAYMAN_RING_TYPE_CP2_INDEX; ++i) {
                 ring = &rdev->ring[i];
@@ -3580,7 +3579,7 @@ static int si_cp_start(struct radeon_device *rdev)
                 radeon_ring_write(ring, PACKET3_COMPUTE(PACKET3_CLEAR_STATE, 0));
                 radeon_ring_write(ring, 0);
 
-                radeon_ring_unlock_commit(rdev, ring);
+                radeon_ring_unlock_commit(rdev, ring, false);
         }
 
         return 0;
@@ -4291,10 +4290,10 @@ static int si_pcie_gart_enable(struct radeon_device *rdev)
         for (i = 1; i < 16; i++) {
                 if (i < 8)
                         WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
-                               rdev->gart.table_addr >> 12);
+                               rdev->vm_manager.saved_table_addr[i]);
                 else
                         WREG32(VM_CONTEXT8_PAGE_TABLE_BASE_ADDR + ((i - 8) << 2),
-                               rdev->gart.table_addr >> 12);
+                               rdev->vm_manager.saved_table_addr[i]);
         }
 
         /* enable context1-15 */
@@ -4326,6 +4325,17 @@ static int si_pcie_gart_enable(struct radeon_device *rdev)
 
 static void si_pcie_gart_disable(struct radeon_device *rdev)
 {
+        unsigned i;
+
+        for (i = 1; i < 16; ++i) {
+                uint32_t reg;
+                if (i < 8)
+                        reg = VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2);
+                else
+                        reg = VM_CONTEXT8_PAGE_TABLE_BASE_ADDR + ((i - 8) << 2);
+                rdev->vm_manager.saved_table_addr[i] = RREG32(reg);
+        }
+
         /* Disable all tables */
         WREG32(VM_CONTEXT0_CNTL, 0);
         WREG32(VM_CONTEXT1_CNTL, 0);
@@ -5028,7 +5038,7 @@ void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)
 
         /* flush hdp cache */
         radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
-        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
+        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(1) |
                                  WRITE_DATA_DST_SEL(0)));
         radeon_ring_write(ring, HDP_MEM_COHERENCY_FLUSH_CNTL >> 2);
         radeon_ring_write(ring, 0);
@@ -5036,7 +5046,7 @@ void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)
 
         /* bits 0-15 are the VM contexts0-15 */
         radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));
-        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |
+        radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(1) |
                                  WRITE_DATA_DST_SEL(0)));
         radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2);
         radeon_ring_write(ring, 0);
@@ -7178,6 +7188,9 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev)
         int ret, i;
         u16 tmp16;
 
+        if (pci_is_root_bus(rdev->pdev->bus))
+                return;
+
         if (radeon_pcie_gen2 == 0)
                 return;
 
@@ -7455,7 +7468,8 @@ static void si_program_aspm(struct radeon_device *rdev)
                         if (orig != data)
                                 WREG32_PIF_PHY1(PB1_PIF_CNTL, data);
 
-                        if (!disable_clkreq) {
+                        if (!disable_clkreq &&
+                            !pci_is_root_bus(rdev->pdev->bus)) {
                                 struct pci_dev *root = rdev->pdev->bus->self;
                                 u32 lnkcap;
 
diff --git a/drivers/gpu/drm/radeon/si_dma.c b/drivers/gpu/drm/radeon/si_dma.c
index 716505129450..7c22baaf94db 100644
--- a/drivers/gpu/drm/radeon/si_dma.c
+++ b/drivers/gpu/drm/radeon/si_dma.c
@@ -275,7 +275,7 @@ int si_copy_dma(struct radeon_device *rdev,
                 return r;
         }
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         radeon_semaphore_free(rdev, &sem, *fence);
 
         return r;
diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c
index 32e50be9c4ac..57f780053b3e 100644
--- a/drivers/gpu/drm/radeon/trinity_dpm.c
+++ b/drivers/gpu/drm/radeon/trinity_dpm.c
@@ -1874,16 +1874,22 @@ int trinity_dpm_init(struct radeon_device *rdev)
         for (i = 0; i < SUMO_MAX_HARDWARE_POWERLEVELS; i++)
                 pi->at[i] = TRINITY_AT_DFLT;
 
-        /* There are stability issues reported on with
-         * bapm enabled when switching between AC and battery
-         * power.  At the same time, some MSI boards hang
-         * if it's not enabled and dpm is enabled.  Just enable
-         * it for MSI boards right now.
-         */
-        if (rdev->pdev->subsystem_vendor == 0x1462)
-                pi->enable_bapm = true;
-        else
+        if (radeon_bapm == -1) {
+                /* There are stability issues reported on with
+                 * bapm enabled when switching between AC and battery
+                 * power.  At the same time, some MSI boards hang
+                 * if it's not enabled and dpm is enabled.  Just enable
+                 * it for MSI boards right now.
+                 */
+                if (rdev->pdev->subsystem_vendor == 0x1462)
+                        pi->enable_bapm = true;
+                else
+                        pi->enable_bapm = false;
+        } else if (radeon_bapm == 0) {
                 pi->enable_bapm = false;
+        } else {
+                pi->enable_bapm = true;
+        }
         pi->enable_nbps_policy = true;
         pi->enable_sclk_ds = true;
         pi->enable_gfx_power_gating = true;
diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/uvd_v1_0.c
index be42c8125203..cda391347286 100644
--- a/drivers/gpu/drm/radeon/uvd_v1_0.c
+++ b/drivers/gpu/drm/radeon/uvd_v1_0.c
@@ -124,7 +124,7 @@ int uvd_v1_0_init(struct radeon_device *rdev)
         radeon_ring_write(ring, PACKET0(UVD_SEMA_CNTL, 0));
         radeon_ring_write(ring, 3);
 
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
 
 done:
         /* lower clocks again */
@@ -331,7 +331,7 @@ int uvd_v1_0_ring_test(struct radeon_device *rdev, struct radeon_ring *ring)
         }
         radeon_ring_write(ring, PACKET0(UVD_CONTEXT_ID, 0));
         radeon_ring_write(ring, 0xDEADBEEF);
-        radeon_ring_unlock_commit(rdev, ring);
+        radeon_ring_unlock_commit(rdev, ring, false);
         for (i = 0; i < rdev->usec_timeout; i++) {
                 tmp = RREG32(UVD_CONTEXT_ID);
                 if (tmp == 0xDEADBEEF)
diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig
index 2d9d4252d598..ae8850f3e63b 100644
--- a/drivers/gpu/drm/sti/Kconfig
+++ b/drivers/gpu/drm/sti/Kconfig
@@ -1,6 +1,7 @@
 config DRM_STI
         tristate "DRM Support for STMicroelectronics SoC stiH41x Series"
         depends on DRM && (SOC_STIH415 || SOC_STIH416 || ARCH_MULTIPLATFORM)
+        select RESET_CONTROLLER
         select DRM_KMS_HELPER
         select DRM_GEM_CMA_HELPER
         select DRM_KMS_CMA_HELPER
diff --git a/drivers/gpu/drm/sti/sti_drm_drv.c b/drivers/gpu/drm/sti/sti_drm_drv.c
index a7cc24917a96..223d93c3a05d 100644
--- a/drivers/gpu/drm/sti/sti_drm_drv.c
+++ b/drivers/gpu/drm/sti/sti_drm_drv.c
@@ -201,8 +201,8 @@ static int sti_drm_platform_probe(struct platform_device *pdev)
         master = platform_device_register_resndata(dev,
                         DRIVER_NAME "__master", -1,
                         NULL, 0, NULL, 0);
-        if (!master)
-                return -EINVAL;
+        if (IS_ERR(master))
+               return PTR_ERR(master);
 
         platform_set_drvdata(pdev, master);
         return 0;
diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
index 72d957f81c05..2ae9a9b73666 100644
--- a/drivers/gpu/drm/sti/sti_hda.c
+++ b/drivers/gpu/drm/sti/sti_hda.c
@@ -730,16 +730,16 @@ static int sti_hda_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
         hda->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
-        if (IS_ERR(hda->regs))
-                return PTR_ERR(hda->regs);
+        if (!hda->regs)
+                return -ENOMEM;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
                         "video-dacs-ctrl");
         if (res) {
                 hda->video_dacs_ctrl = devm_ioremap_nocache(dev, res->start,
                                 resource_size(res));
-                if (IS_ERR(hda->video_dacs_ctrl))
-                        return PTR_ERR(hda->video_dacs_ctrl);
+                if (!hda->video_dacs_ctrl)
+                        return -ENOMEM;
         } else {
                 /* If no existing video-dacs-ctrl resource continue the probe */
                 DRM_DEBUG_DRIVER("No video-dacs-ctrl resource\n");
@@ -770,7 +770,7 @@ static int sti_hda_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id hda_of_match[] = {
+static const struct of_device_id hda_of_match[] = {
         { .compatible = "st,stih416-hda", },
         { .compatible = "st,stih407-hda", },
         { /* end node */ }
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 284e541d970d..ef93156a69c6 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -677,7 +677,7 @@ static const struct component_ops sti_hdmi_ops = {
         .unbind = sti_hdmi_unbind,
 };
 
-static struct of_device_id hdmi_of_match[] = {
+static const struct of_device_id hdmi_of_match[] = {
         {
                 .compatible = "st,stih416-hdmi",
                 .data = &tx3g0c55phy_ops,
@@ -713,8 +713,8 @@ static int sti_hdmi_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
         hdmi->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
-        if (IS_ERR(hdmi->regs))
-                return PTR_ERR(hdmi->regs);
+        if (!hdmi->regs)
+                return -ENOMEM;
 
         if (of_device_is_compatible(np, "st,stih416-hdmi")) {
                 res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -725,8 +725,8 @@ static int sti_hdmi_probe(struct platform_device *pdev)
                 }
                 hdmi->syscfg = devm_ioremap_nocache(dev, res->start,
                                                     resource_size(res));
-                if (IS_ERR(hdmi->syscfg))
-                        return PTR_ERR(hdmi->syscfg);
+                if (!hdmi->syscfg)
+                        return -ENOMEM;
 
         }
 
diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c
index b69e26fee76e..b8afe490356a 100644
--- a/drivers/gpu/drm/sti/sti_tvout.c
+++ b/drivers/gpu/drm/sti/sti_tvout.c
@@ -591,8 +591,8 @@ static int sti_tvout_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
         tvout->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
-        if (IS_ERR(tvout->regs))
-                return PTR_ERR(tvout->regs);
+        if (!tvout->regs)
+                return -ENOMEM;
 
         /* get reset resources */
         tvout->reset = devm_reset_control_get(dev, "tvout");
@@ -624,7 +624,7 @@ static int sti_tvout_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id tvout_of_match[] = {
+static const struct of_device_id tvout_of_match[] = {
         { .compatible = "st,stih416-tvout", },
         { .compatible = "st,stih407-tvout", },
         { /* end node */ }
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 7bfdaa163a33..36b871686d3c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -450,11 +450,11 @@ static int vmw_cmd_res_reloc_add(struct vmw_private *dev_priv,
                                           res,
                                           id_loc - sw_context->buf_start);
         if (unlikely(ret != 0))
-                goto out_err;
+                return ret;
 
         ret = vmw_resource_val_add(sw_context, res, &node);
         if (unlikely(ret != 0))
-                goto out_err;
+                return ret;
 
         if (res_type == vmw_res_context && dev_priv->has_mob &&
             node->first_usage) {
@@ -468,13 +468,13 @@ static int vmw_cmd_res_reloc_add(struct vmw_private *dev_priv,
 
                 ret = vmw_resource_context_res_add(dev_priv, sw_context, res);
                 if (unlikely(ret != 0))
-                        goto out_err;
+                        return ret;
                 node->staged_bindings =
                         kzalloc(sizeof(*node->staged_bindings), GFP_KERNEL);
                 if (node->staged_bindings == NULL) {
                         DRM_ERROR("Failed to allocate context binding "
                                   "information.\n");
-                        goto out_err;
+                        return -ENOMEM;
                 }
                 INIT_LIST_HEAD(&node->staged_bindings->list);
         }
@@ -482,8 +482,7 @@ static int vmw_cmd_res_reloc_add(struct vmw_private *dev_priv,
         if (p_val)
                 *p_val = node;
 
-out_err:
-        return ret;
+        return 0;
 }
 
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
index 6ccd993e26bf..6eae14d2a3f7 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
@@ -180,8 +180,9 @@ void vmw_fifo_release(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
 
         mutex_lock(&dev_priv->hw_mutex);
 
+        vmw_write(dev_priv, SVGA_REG_SYNC, SVGA_SYNC_GENERIC);
         while (vmw_read(dev_priv, SVGA_REG_BUSY) != 0)
-                vmw_write(dev_priv, SVGA_REG_SYNC, SVGA_SYNC_GENERIC);
+                ;
 
         dev_priv->last_read_seqno = ioread32(fifo_mem + SVGA_FIFO_FENCE);
 
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index b7ba82960c79..9bf8637747a5 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -656,7 +656,6 @@ static int logi_dj_raw_event(struct hid_device *hdev,
         struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);
         struct dj_report *dj_report = (struct dj_report *) data;
         unsigned long flags;
-        bool report_processed = false;
 
         dbg_hid("%s, size:%d\n", __func__, size);
 
@@ -683,34 +682,42 @@ static int logi_dj_raw_event(struct hid_device *hdev,
          * device (via hid_input_report() ) and return 1 so hid-core does not do
          * anything else with it.
          */
+
+        /* case 1) */
+        if (data[0] != REPORT_ID_DJ_SHORT)
+                return false;
+
         if ((dj_report->device_index < DJ_DEVICE_INDEX_MIN) ||
             (dj_report->device_index > DJ_DEVICE_INDEX_MAX)) {
-                dev_err(&hdev->dev, "%s: invalid device index:%d\n",
+                /*
+                 * Device index is wrong, bail out.
+                 * This driver can ignore safely the receiver notifications,
+                 * so ignore those reports too.
+                 */
+                if (dj_report->device_index != DJ_RECEIVER_INDEX)
+                        dev_err(&hdev->dev, "%s: invalid device index:%d\n",
                                 __func__, dj_report->device_index);
                 return false;
         }
 
         spin_lock_irqsave(&djrcv_dev->lock, flags);
-        if (dj_report->report_id == REPORT_ID_DJ_SHORT) {
-                switch (dj_report->report_type) {
-                case REPORT_TYPE_NOTIF_DEVICE_PAIRED:
-                case REPORT_TYPE_NOTIF_DEVICE_UNPAIRED:
-                        logi_dj_recv_queue_notification(djrcv_dev, dj_report);
-                        break;
-                case REPORT_TYPE_NOTIF_CONNECTION_STATUS:
-                        if (dj_report->report_params[CONNECTION_STATUS_PARAM_STATUS] ==
-                            STATUS_LINKLOSS) {
-                                logi_dj_recv_forward_null_report(djrcv_dev, dj_report);
-                        }
-                        break;
-                default:
-                        logi_dj_recv_forward_report(djrcv_dev, dj_report);
+        switch (dj_report->report_type) {
+        case REPORT_TYPE_NOTIF_DEVICE_PAIRED:
+        case REPORT_TYPE_NOTIF_DEVICE_UNPAIRED:
+                logi_dj_recv_queue_notification(djrcv_dev, dj_report);
+                break;
+        case REPORT_TYPE_NOTIF_CONNECTION_STATUS:
+                if (dj_report->report_params[CONNECTION_STATUS_PARAM_STATUS] ==
+                    STATUS_LINKLOSS) {
+                        logi_dj_recv_forward_null_report(djrcv_dev, dj_report);
                 }
-                report_processed = true;
+                break;
+        default:
+                logi_dj_recv_forward_report(djrcv_dev, dj_report);
         }
         spin_unlock_irqrestore(&djrcv_dev->lock, flags);
 
-        return report_processed;
+        return true;
 }
 
 static int logi_dj_probe(struct hid_device *hdev,
diff --git a/drivers/hid/hid-logitech-dj.h b/drivers/hid/hid-logitech-dj.h
index 4a4000340ce1..daeb0aa4bee9 100644
--- a/drivers/hid/hid-logitech-dj.h
+++ b/drivers/hid/hid-logitech-dj.h
@@ -27,6 +27,7 @@
 
 #define DJ_MAX_PAIRED_DEVICES                   6
 #define DJ_MAX_NUMBER_NOTIFICATIONS             8
+#define DJ_RECEIVER_INDEX                       0
 #define DJ_DEVICE_INDEX_MIN                     1
 #define DJ_DEVICE_INDEX_MAX                     6
 
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index ecc2cbf300cc..29a74c1efcb8 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -290,6 +290,11 @@ static int magicmouse_raw_event(struct hid_device *hdev,
                 if (size < 4 || ((size - 4) % 9) != 0)
                         return 0;
                 npoints = (size - 4) / 9;
+                if (npoints > 15) {
+                        hid_warn(hdev, "invalid size value (%d) for TRACKPAD_REPORT_ID\n",
+                                        size);
+                        return 0;
+                }
                 msc->ntouches = 0;
                 for (ii = 0; ii < npoints; ii++)
                         magicmouse_emit_touch(msc, ii, data + ii * 9 + 4);
@@ -307,6 +312,11 @@ static int magicmouse_raw_event(struct hid_device *hdev,
                 if (size < 6 || ((size - 6) % 8) != 0)
                         return 0;
                 npoints = (size - 6) / 8;
+                if (npoints > 15) {
+                        hid_warn(hdev, "invalid size value (%d) for MOUSE_REPORT_ID\n",
+                                        size);
+                        return 0;
+                }
                 msc->ntouches = 0;
                 for (ii = 0; ii < npoints; ii++)
                         magicmouse_emit_touch(msc, ii, data + ii * 8 + 6);
diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c
index acbb021065ec..020df3c2e8b4 100644
--- a/drivers/hid/hid-picolcd_core.c
+++ b/drivers/hid/hid-picolcd_core.c
@@ -350,6 +350,12 @@ static int picolcd_raw_event(struct hid_device *hdev,
         if (!data)
                 return 1;
 
+        if (size > 64) {
+                hid_warn(hdev, "invalid size value (%d) for picolcd raw event\n",
+                                size);
+                return 0;
+        }
+
         if (report->id == REPORT_KEY_STATE) {
                 if (data->input_keys)
                         ret = picolcd_raw_keypad(data, report, raw_data+1, size-1);
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index fc6f5d54e7f7..8890870309e4 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -309,6 +309,7 @@ static ssize_t set_convrate(struct device *dev, struct device_attribute *da,
         data->conf |= (resol << DS1621_REG_CONFIG_RESOL_SHIFT);
         i2c_smbus_write_byte_data(client, DS1621_REG_CONF, data->conf);
         data->update_interval = ds1721_convrates[resol];
+        data->zbits = 7 - resol;
         mutex_unlock(&data->update_lock);
 
         return count;
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 79a68999a696..917d54588d95 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -101,6 +101,7 @@ struct at91_twi_dev {
         unsigned twi_cwgr_reg;
         struct at91_twi_pdata *pdata;
         bool use_dma;
+        bool recv_len_abort;
         struct at91_twi_dma dma;
 };
 
@@ -267,12 +268,24 @@ static void at91_twi_read_next_byte(struct at91_twi_dev *dev)
         *dev->buf = at91_twi_read(dev, AT91_TWI_RHR) & 0xff;
         --dev->buf_len;
 
+        /* return if aborting, we only needed to read RHR to clear RXRDY*/
+        if (dev->recv_len_abort)
+                return;
+
         /* handle I2C_SMBUS_BLOCK_DATA */
         if (unlikely(dev->msg->flags & I2C_M_RECV_LEN)) {
-                dev->msg->flags &= ~I2C_M_RECV_LEN;
-                dev->buf_len += *dev->buf;
-                dev->msg->len = dev->buf_len + 1;
-                dev_dbg(dev->dev, "received block length %d\n", dev->buf_len);
+                /* ensure length byte is a valid value */
+                if (*dev->buf <= I2C_SMBUS_BLOCK_MAX && *dev->buf > 0) {
+                        dev->msg->flags &= ~I2C_M_RECV_LEN;
+                        dev->buf_len += *dev->buf;
+                        dev->msg->len = dev->buf_len + 1;
+                        dev_dbg(dev->dev, "received block length %d\n",
+                                         dev->buf_len);
+                } else {
+                        /* abort and send the stop by reading one more byte */
+                        dev->recv_len_abort = true;
+                        dev->buf_len = 1;
+                }
         }
 
         /* send stop if second but last byte has been read */
@@ -421,8 +434,8 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)
                 }
         }
 
-        ret = wait_for_completion_interruptible_timeout(&dev->cmd_complete,
-                                                        dev->adapter.timeout);
+        ret = wait_for_completion_io_timeout(&dev->cmd_complete,
+                                             dev->adapter.timeout);
         if (ret == 0) {
                 dev_err(dev->dev, "controller timed out\n");
                 at91_init_twi_bus(dev);
@@ -444,6 +457,12 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)
                 ret = -EIO;
                 goto error;
         }
+        if (dev->recv_len_abort) {
+                dev_err(dev->dev, "invalid smbus block length recvd\n");
+                ret = -EPROTO;
+                goto error;
+        }
+
         dev_dbg(dev->dev, "transfer complete\n");
 
         return 0;
@@ -500,6 +519,7 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num)
         dev->buf_len = m_start->len;
         dev->buf = m_start->buf;
         dev->msg = m_start;
+        dev->recv_len_abort = false;
 
         ret = at91_do_twi_transfer(dev);
 
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 6dc5ded86f62..2f64273d3f2b 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -746,8 +746,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
         }
         tclk = clk_get_rate(drv_data->clk);
 
-        rc = of_property_read_u32(np, "clock-frequency", &bus_freq);
-        if (rc)
+        if (of_property_read_u32(np, "clock-frequency", &bus_freq))
                 bus_freq = 100000; /* 100kHz by default */
 
         if (!mv64xxx_find_baud_factors(bus_freq, tclk,
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index f3c7139dfa25..1cc146cfc1f3 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -34,6 +34,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
+#include <linux/spinlock.h>
 
 /* register offsets */
 #define ICSCR   0x00    /* slave ctrl */
@@ -95,6 +96,7 @@ struct rcar_i2c_priv {
         struct i2c_msg  *msg;
         struct clk *clk;
 
+        spinlock_t lock;
         wait_queue_head_t wait;
 
         int pos;
@@ -365,20 +367,20 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr)
         struct rcar_i2c_priv *priv = ptr;
         u32 msr;
 
+        /*-------------- spin lock -----------------*/
+        spin_lock(&priv->lock);
+
         msr = rcar_i2c_read(priv, ICMSR);
 
+        /* Only handle interrupts that are currently enabled */
+        msr &= rcar_i2c_read(priv, ICMIER);
+
         /* Arbitration lost */
         if (msr & MAL) {
                 rcar_i2c_flags_set(priv, (ID_DONE | ID_ARBLOST));
                 goto out;
         }
 
-        /* Stop */
-        if (msr & MST) {
-                rcar_i2c_flags_set(priv, ID_DONE);
-                goto out;
-        }
-
         /* Nack */
         if (msr & MNR) {
                 /* go to stop phase */
@@ -388,6 +390,12 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr)
                 goto out;
         }
 
+        /* Stop */
+        if (msr & MST) {
+                rcar_i2c_flags_set(priv, ID_DONE);
+                goto out;
+        }
+
         if (rcar_i2c_is_recv(priv))
                 rcar_i2c_flags_set(priv, rcar_i2c_irq_recv(priv, msr));
         else
@@ -400,6 +408,9 @@ out:
                 wake_up(&priv->wait);
         }
 
+        spin_unlock(&priv->lock);
+        /*-------------- spin unlock -----------------*/
+
         return IRQ_HANDLED;
 }
 
@@ -409,14 +420,21 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
 {
         struct rcar_i2c_priv *priv = i2c_get_adapdata(adap);
         struct device *dev = rcar_i2c_priv_to_dev(priv);
+        unsigned long flags;
         int i, ret, timeout;
 
         pm_runtime_get_sync(dev);
 
+        /*-------------- spin lock -----------------*/
+        spin_lock_irqsave(&priv->lock, flags);
+
         rcar_i2c_init(priv);
         /* start clock */
         rcar_i2c_write(priv, ICCCR, priv->icccr);
 
+        spin_unlock_irqrestore(&priv->lock, flags);
+        /*-------------- spin unlock -----------------*/
+
         ret = rcar_i2c_bus_barrier(priv);
         if (ret < 0)
                 goto out;
@@ -428,6 +446,9 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
                         break;
                 }
 
+                /*-------------- spin lock -----------------*/
+                spin_lock_irqsave(&priv->lock, flags);
+
                 /* init each data */
                 priv->msg       = &msgs[i];
                 priv->pos       = 0;
@@ -437,6 +458,9 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
 
                 ret = rcar_i2c_prepare_msg(priv);
 
+                spin_unlock_irqrestore(&priv->lock, flags);
+                /*-------------- spin unlock -----------------*/
+
                 if (ret < 0)
                         break;
 
@@ -540,6 +564,7 @@ static int rcar_i2c_probe(struct platform_device *pdev)
 
         irq = platform_get_irq(pdev, 0);
         init_waitqueue_head(&priv->wait);
+        spin_lock_init(&priv->lock);
 
         adap = &priv->adap;
         adap->nr = pdev->id;
diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
index 69e11853e8bf..e637c32ae517 100644
--- a/drivers/i2c/busses/i2c-rk3x.c
+++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -323,6 +323,10 @@ static void rk3x_i2c_handle_read(struct rk3x_i2c *i2c, unsigned int ipd)
         /* ack interrupt */
         i2c_writel(i2c, REG_INT_MBRF, REG_IPD);
 
+        /* Can only handle a maximum of 32 bytes at a time */
+        if (len > 32)
+                len = 32;
+
         /* read the data from receive buffer */
         for (i = 0; i < len; ++i) {
                 if (i % 4 == 0)
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index e1e558a3d692..af8256353c7d 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1089,6 +1089,30 @@ static int __mlx4_ib_destroy_flow(struct mlx4_dev *dev, u64 reg_id)
         return err;
 }
 
+static int mlx4_ib_tunnel_steer_add(struct ib_qp *qp, struct ib_flow_attr *flow_attr,
+                                    u64 *reg_id)
+{
+        void *ib_flow;
+        union ib_flow_spec *ib_spec;
+        struct mlx4_dev *dev = to_mdev(qp->device)->dev;
+        int err = 0;
+
+        if (dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)
+                return 0; /* do nothing */
+
+        ib_flow = flow_attr + 1;
+        ib_spec = (union ib_flow_spec *)ib_flow;
+
+        if (ib_spec->type !=  IB_FLOW_SPEC_ETH || flow_attr->num_of_specs != 1)
+                return 0; /* do nothing */
+
+        err = mlx4_tunnel_steer_add(to_mdev(qp->device)->dev, ib_spec->eth.val.dst_mac,
+                                    flow_attr->port, qp->qp_num,
+                                    MLX4_DOMAIN_UVERBS | (flow_attr->priority & 0xff),
+                                    reg_id);
+        return err;
+}
+
 static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp,
                                     struct ib_flow_attr *flow_attr,
                                     int domain)
@@ -1136,6 +1160,12 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp,
                 i++;
         }
 
+        if (i < ARRAY_SIZE(type) && flow_attr->type == IB_FLOW_ATTR_NORMAL) {
+                err = mlx4_ib_tunnel_steer_add(qp, flow_attr, &mflow->reg_id[i]);
+                if (err)
+                        goto err_free;
+        }
+
         return &mflow->ibflow;
 
 err_free:
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 67780452f0cf..efb9eff8906c 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1677,9 +1677,15 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
                 }
         }
 
-        if (qp->ibqp.qp_type == IB_QPT_RAW_PACKET)
+        if (qp->ibqp.qp_type == IB_QPT_RAW_PACKET) {
                 context->pri_path.ackto = (context->pri_path.ackto & 0xf8) |
                                         MLX4_IB_LINK_TYPE_ETH;
+                if (dev->dev->caps.tunnel_offload_mode ==  MLX4_TUNNEL_OFFLOAD_MODE_VXLAN) {
+                        /* set QP to receive both tunneled & non-tunneled packets */
+                        if (!(context->flags & (1 << MLX4_RSS_QPC_FLAG_OFFSET)))
+                                context->srqn = cpu_to_be32(7 << 28);
+                }
+        }
 
         if (ibqp->qp_type == IB_QPT_UD && (new_state == IB_QPS_RTR)) {
                 int is_eth = rdma_port_get_link_layer(
diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index c30204f2fa30..fbe29fcb15c5 100644
--- a/drivers/input/input-mt.c
+++ b/drivers/input/input-mt.c
@@ -236,6 +236,18 @@ void input_mt_report_pointer_emulation(struct input_dev *dev, bool use_count)
 }
 EXPORT_SYMBOL(input_mt_report_pointer_emulation);
 
+static void __input_mt_drop_unused(struct input_dev *dev, struct input_mt *mt)
+{
+        int i;
+
+        for (i = 0; i < mt->num_slots; i++) {
+                if (!input_mt_is_used(mt, &mt->slots[i])) {
+                        input_mt_slot(dev, i);
+                        input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1);
+                }
+        }
+}
+
 /**
  * input_mt_drop_unused() - Inactivate slots not seen in this frame
  * @dev: input device with allocated MT slots
@@ -245,19 +257,11 @@ EXPORT_SYMBOL(input_mt_report_pointer_emulation);
 void input_mt_drop_unused(struct input_dev *dev)
 {
         struct input_mt *mt = dev->mt;
-        int i;
 
-        if (!mt)
-                return;
-
-        for (i = 0; i < mt->num_slots; i++) {
-                if (!input_mt_is_used(mt, &mt->slots[i])) {
-                        input_mt_slot(dev, i);
-                        input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1);
-                }
+        if (mt) {
+                __input_mt_drop_unused(dev, mt);
+                mt->frame++;
         }
-
-        mt->frame++;
 }
 EXPORT_SYMBOL(input_mt_drop_unused);
 
@@ -278,12 +282,14 @@ void input_mt_sync_frame(struct input_dev *dev)
                 return;
 
         if (mt->flags & INPUT_MT_DROP_UNUSED)
-                input_mt_drop_unused(dev);
+                __input_mt_drop_unused(dev, mt);
 
         if ((mt->flags & INPUT_MT_POINTER) && !(mt->flags & INPUT_MT_SEMI_MT))
                 use_count = true;
 
         input_mt_report_pointer_emulation(dev, use_count);
+
+        mt->frame++;
 }
 EXPORT_SYMBOL(input_mt_sync_frame);
 
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index a59a1a64b674..a956b980ee73 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -2234,8 +2234,8 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv)
                 return 0;
         }
 
-        psmouse_info(psmouse,
-                     "Unknown ALPS touchpad: E7=%3ph, EC=%3ph\n", e7, ec);
+        psmouse_dbg(psmouse,
+                    "Likely not an ALPS touchpad: E7=%3ph, EC=%3ph\n", e7, ec);
 
         return -EINVAL;
 }
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index ee2a04d90d20..da51738eb59e 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -18,6 +18,7 @@
 #include <linux/input/mt.h>
 #include <linux/serio.h>
 #include <linux/libps2.h>
+#include <asm/unaligned.h>
 #include "psmouse.h"
 #include "elantech.h"
 
@@ -403,6 +404,68 @@ static void elantech_report_absolute_v2(struct psmouse *psmouse)
         input_sync(dev);
 }
 
+static void elantech_report_trackpoint(struct psmouse *psmouse,
+                                       int packet_type)
+{
+        /*
+         * byte 0:  0   0  sx  sy   0   M   R   L
+         * byte 1:~sx   0   0   0   0   0   0   0
+         * byte 2:~sy   0   0   0   0   0   0   0
+         * byte 3:  0   0 ~sy ~sx   0   1   1   0
+         * byte 4: x7  x6  x5  x4  x3  x2  x1  x0
+         * byte 5: y7  y6  y5  y4  y3  y2  y1  y0
+         *
+         * x and y are written in two's complement spread
+         * over 9 bits with sx/sy the relative top bit and
+         * x7..x0 and y7..y0 the lower bits.
+         * The sign of y is opposite to what the input driver
+         * expects for a relative movement
+         */
+
+        struct elantech_data *etd = psmouse->private;
+        struct input_dev *tp_dev = etd->tp_dev;
+        unsigned char *packet = psmouse->packet;
+        int x, y;
+        u32 t;
+
+        if (dev_WARN_ONCE(&psmouse->ps2dev.serio->dev,
+                          !tp_dev,
+                          psmouse_fmt("Unexpected trackpoint message\n"))) {
+                if (etd->debug == 1)
+                        elantech_packet_dump(psmouse);
+                return;
+        }
+
+        t = get_unaligned_le32(&packet[0]);
+
+        switch (t & ~7U) {
+        case 0x06000030U:
+        case 0x16008020U:
+        case 0x26800010U:
+        case 0x36808000U:
+                x = packet[4] - (int)((packet[1]^0x80) << 1);
+                y = (int)((packet[2]^0x80) << 1) - packet[5];
+
+                input_report_key(tp_dev, BTN_LEFT, packet[0] & 0x01);
+                input_report_key(tp_dev, BTN_RIGHT, packet[0] & 0x02);
+                input_report_key(tp_dev, BTN_MIDDLE, packet[0] & 0x04);
+
+                input_report_rel(tp_dev, REL_X, x);
+                input_report_rel(tp_dev, REL_Y, y);
+
+                input_sync(tp_dev);
+
+                break;
+
+        default:
+                /* Dump unexpected packet sequences if debug=1 (default) */
+                if (etd->debug == 1)
+                        elantech_packet_dump(psmouse);
+
+                break;
+        }
+}
+
 /*
  * Interpret complete data packets and report absolute mode input events for
  * hardware version 3. (12 byte packets for two fingers)
@@ -715,6 +778,8 @@ static int elantech_packet_check_v3(struct psmouse *psmouse)
 
                 if ((packet[0] & 0x0c) == 0x0c && (packet[3] & 0xce) == 0x0c)
                         return PACKET_V3_TAIL;
+                if ((packet[3] & 0x0f) == 0x06)
+                        return PACKET_TRACKPOINT;
         }
 
         return PACKET_UNKNOWN;
@@ -791,14 +856,23 @@ static psmouse_ret_t elantech_process_byte(struct psmouse *psmouse)
 
         case 3:
                 packet_type = elantech_packet_check_v3(psmouse);
-                /* ignore debounce */
-                if (packet_type == PACKET_DEBOUNCE)
-                        return PSMOUSE_FULL_PACKET;
-
-                if (packet_type == PACKET_UNKNOWN)
+                switch (packet_type) {
+                case PACKET_UNKNOWN:
                         return PSMOUSE_BAD_DATA;
 
-                elantech_report_absolute_v3(psmouse, packet_type);
+                case PACKET_DEBOUNCE:
+                        /* ignore debounce */
+                        break;
+
+                case PACKET_TRACKPOINT:
+                        elantech_report_trackpoint(psmouse, packet_type);
+                        break;
+
+                default:
+                        elantech_report_absolute_v3(psmouse, packet_type);
+                        break;
+                }
+
                 break;
 
         case 4:
@@ -1018,8 +1092,10 @@ static int elantech_get_resolution_v4(struct psmouse *psmouse,
  * Asus UX31               0x361f00        20, 15, 0e      clickpad
  * Asus UX32VD             0x361f02        00, 15, 0e      clickpad
  * Avatar AVIU-145A2       0x361f00        ?               clickpad
+ * Fujitsu H730            0x570f00        c0, 14, 0c      3 hw buttons (**)
  * Gigabyte U2442          0x450f01        58, 17, 0c      2 hw buttons
  * Lenovo L430             0x350f02        b9, 15, 0c      2 hw buttons (*)
+ * Lenovo L530             0x350f02        b9, 15, 0c      2 hw buttons (*)
  * Samsung NF210           0x150b00        78, 14, 0a      2 hw buttons
  * Samsung NP770Z5E        0x575f01        10, 15, 0f      clickpad
  * Samsung NP700Z5B        0x361f06        21, 15, 0f      clickpad
@@ -1029,6 +1105,8 @@ static int elantech_get_resolution_v4(struct psmouse *psmouse,
  * Samsung RF710           0x450f00        ?               2 hw buttons
  * System76 Pangolin       0x250f01        ?               2 hw buttons
  * (*) + 3 trackpoint buttons
+ * (**) + 0 trackpoint buttons
+ * Note: Lenovo L430 and Lenovo L430 have the same fw_version/caps
  */
 static void elantech_set_buttonpad_prop(struct psmouse *psmouse)
 {
@@ -1324,6 +1402,10 @@ int elantech_detect(struct psmouse *psmouse, bool set_properties)
  */
 static void elantech_disconnect(struct psmouse *psmouse)
 {
+        struct elantech_data *etd = psmouse->private;
+
+        if (etd->tp_dev)
+                input_unregister_device(etd->tp_dev);
         sysfs_remove_group(&psmouse->ps2dev.serio->dev.kobj,
                            &elantech_attr_group);
         kfree(psmouse->private);
@@ -1438,8 +1520,10 @@ static int elantech_set_properties(struct elantech_data *etd)
 int elantech_init(struct psmouse *psmouse)
 {
         struct elantech_data *etd;
-        int i, error;
+        int i;
+        int error = -EINVAL;
         unsigned char param[3];
+        struct input_dev *tp_dev;
 
         psmouse->private = etd = kzalloc(sizeof(struct elantech_data), GFP_KERNEL);
         if (!etd)
@@ -1498,14 +1582,49 @@ int elantech_init(struct psmouse *psmouse)
                 goto init_fail;
         }
 
+        /* The MSB indicates the presence of the trackpoint */
+        if ((etd->capabilities[0] & 0x80) == 0x80) {
+                tp_dev = input_allocate_device();
+
+                if (!tp_dev) {
+                        error = -ENOMEM;
+                        goto init_fail_tp_alloc;
+                }
+
+                etd->tp_dev = tp_dev;
+                snprintf(etd->tp_phys, sizeof(etd->tp_phys), "%s/input1",
+                        psmouse->ps2dev.serio->phys);
+                tp_dev->phys = etd->tp_phys;
+                tp_dev->name = "Elantech PS/2 TrackPoint";
+                tp_dev->id.bustype = BUS_I8042;
+                tp_dev->id.vendor  = 0x0002;
+                tp_dev->id.product = PSMOUSE_ELANTECH;
+                tp_dev->id.version = 0x0000;
+                tp_dev->dev.parent = &psmouse->ps2dev.serio->dev;
+                tp_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+                tp_dev->relbit[BIT_WORD(REL_X)] =
+                        BIT_MASK(REL_X) | BIT_MASK(REL_Y);
+                tp_dev->keybit[BIT_WORD(BTN_LEFT)] =
+                        BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) |
+                        BIT_MASK(BTN_RIGHT);
+                error = input_register_device(etd->tp_dev);
+                if (error < 0)
+                        goto init_fail_tp_reg;
+        }
+
         psmouse->protocol_handler = elantech_process_byte;
         psmouse->disconnect = elantech_disconnect;
         psmouse->reconnect = elantech_reconnect;
         psmouse->pktsize = etd->hw_version > 1 ? 6 : 4;
 
         return 0;
-
+ init_fail_tp_reg:
+        input_free_device(tp_dev);
+ init_fail_tp_alloc:
+        sysfs_remove_group(&psmouse->ps2dev.serio->dev.kobj,
+                           &elantech_attr_group);
  init_fail:
+        psmouse_reset(psmouse);
         kfree(etd);
-        return -1;
+        return error;
 }
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
index 9e0e2a1f340d..6f3afec02f03 100644
--- a/drivers/input/mouse/elantech.h
+++ b/drivers/input/mouse/elantech.h
@@ -94,6 +94,7 @@
 #define PACKET_V4_HEAD                  0x05
 #define PACKET_V4_MOTION                0x06
 #define PACKET_V4_STATUS                0x07
+#define PACKET_TRACKPOINT               0x08
 
 /*
  * track up to 5 fingers for v4 hardware
@@ -114,6 +115,8 @@ struct finger_pos {
 };
 
 struct elantech_data {
+        struct input_dev *tp_dev;       /* Relative device for trackpoint */
+        char tp_phys[32];
         unsigned char reg_07;
         unsigned char reg_10;
         unsigned char reg_11;
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
index d6aa4c67dbb6..93cb7912703c 100644
--- a/drivers/input/serio/i8042-sparcio.h
+++ b/drivers/input/serio/i8042-sparcio.h
@@ -17,7 +17,6 @@ static int i8042_aux_irq = -1;
 #define I8042_MUX_PHYS_DESC "sparcps2/serio%d"
 
 static void __iomem *kbd_iobase;
-static struct resource *kbd_res;
 
 #define I8042_COMMAND_REG       (kbd_iobase + 0x64UL)
 #define I8042_DATA_REG          (kbd_iobase + 0x60UL)
@@ -44,6 +43,8 @@ static inline void i8042_write_command(int val)
 
 #ifdef CONFIG_PCI
 
+static struct resource *kbd_res;
+
 #define OBP_PS2KBD_NAME1        "kb_ps2"
 #define OBP_PS2KBD_NAME2        "keyboard"
 #define OBP_PS2MS_NAME1         "kdmouse"
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 129729d35478..aa29198fca3e 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -15,10 +15,10 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
+#include <linux/timer.h>
 #include <linux/err.h>
 #include <linux/ctype.h>
 #include <linux/leds.h>
-#include <linux/workqueue.h>
 #include "leds.h"
 
 static struct class *leds_class;
@@ -97,10 +97,9 @@ static const struct attribute_group *led_groups[] = {
         NULL,
 };
 
-static void led_work_function(struct work_struct *ws)
+static void led_timer_function(unsigned long data)
 {
-        struct led_classdev *led_cdev =
-                container_of(ws, struct led_classdev, blink_work.work);
+        struct led_classdev *led_cdev = (void *)data;
         unsigned long brightness;
         unsigned long delay;
 
@@ -144,8 +143,7 @@ static void led_work_function(struct work_struct *ws)
                 }
         }
 
-        queue_delayed_work(system_wq, &led_cdev->blink_work,
-                           msecs_to_jiffies(delay));
+        mod_timer(&led_cdev->blink_timer, jiffies + msecs_to_jiffies(delay));
 }
 
 static void set_brightness_delayed(struct work_struct *ws)
@@ -233,7 +231,9 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 
         INIT_WORK(&led_cdev->set_brightness_work, set_brightness_delayed);
 
-        INIT_DELAYED_WORK(&led_cdev->blink_work, led_work_function);
+        init_timer(&led_cdev->blink_timer);
+        led_cdev->blink_timer.function = led_timer_function;
+        led_cdev->blink_timer.data = (unsigned long)led_cdev;
 
 #ifdef CONFIG_LEDS_TRIGGERS
         led_trigger_set_default(led_cdev);
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index 4bb116867b88..71b40d3bf776 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -16,7 +16,6 @@
 #include <linux/module.h>
 #include <linux/rwsem.h>
 #include <linux/leds.h>
-#include <linux/workqueue.h>
 #include "leds.h"
 
 DECLARE_RWSEM(leds_list_lock);
@@ -52,7 +51,7 @@ static void led_set_software_blink(struct led_classdev *led_cdev,
                 return;
         }
 
-        queue_delayed_work(system_wq, &led_cdev->blink_work, 1);
+        mod_timer(&led_cdev->blink_timer, jiffies + 1);
 }
 
 
@@ -76,7 +75,7 @@ void led_blink_set(struct led_classdev *led_cdev,
                    unsigned long *delay_on,
                    unsigned long *delay_off)
 {
-        cancel_delayed_work_sync(&led_cdev->blink_work);
+        del_timer_sync(&led_cdev->blink_timer);
 
         led_cdev->flags &= ~LED_BLINK_ONESHOT;
         led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;
@@ -91,7 +90,7 @@ void led_blink_set_oneshot(struct led_classdev *led_cdev,
                            int invert)
 {
         if ((led_cdev->flags & LED_BLINK_ONESHOT) &&
-             delayed_work_pending(&led_cdev->blink_work))
+             timer_pending(&led_cdev->blink_timer))
                 return;
 
         led_cdev->flags |= LED_BLINK_ONESHOT;
@@ -108,7 +107,7 @@ EXPORT_SYMBOL(led_blink_set_oneshot);
 
 void led_stop_software_blink(struct led_classdev *led_cdev)
 {
-        cancel_delayed_work_sync(&led_cdev->blink_work);
+        del_timer_sync(&led_cdev->blink_timer);
         led_cdev->blink_delay_on = 0;
         led_cdev->blink_delay_off = 0;
 }
@@ -117,7 +116,7 @@ EXPORT_SYMBOL_GPL(led_stop_software_blink);
 void led_set_brightness(struct led_classdev *led_cdev,
                         enum led_brightness brightness)
 {
-        /* delay brightness setting if need to stop soft-blink work */
+        /* delay brightness setting if need to stop soft-blink timer */
         if (led_cdev->blink_delay_on || led_cdev->blink_delay_off) {
                 led_cdev->delayed_set_value = brightness;
                 schedule_work(&led_cdev->set_brightness_work);
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 2785007e0e46..cd15e0801228 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1688,6 +1688,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         unsigned int key_size, opt_params;
         unsigned long long tmpll;
         int ret;
+        size_t iv_size_padding;
         struct dm_arg_set as;
         const char *opt_string;
         char dummy;
@@ -1724,20 +1725,32 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         cc->dmreq_start = sizeof(struct ablkcipher_request);
         cc->dmreq_start += crypto_ablkcipher_reqsize(any_tfm(cc));
-        cc->dmreq_start = ALIGN(cc->dmreq_start, crypto_tfm_ctx_alignment());
-        cc->dmreq_start += crypto_ablkcipher_alignmask(any_tfm(cc)) &
-                           ~(crypto_tfm_ctx_alignment() - 1);
+        cc->dmreq_start = ALIGN(cc->dmreq_start, __alignof__(struct dm_crypt_request));
+
+        if (crypto_ablkcipher_alignmask(any_tfm(cc)) < CRYPTO_MINALIGN) {
+                /* Allocate the padding exactly */
+                iv_size_padding = -(cc->dmreq_start + sizeof(struct dm_crypt_request))
+                                & crypto_ablkcipher_alignmask(any_tfm(cc));
+        } else {
+                /*
+                 * If the cipher requires greater alignment than kmalloc
+                 * alignment, we don't know the exact position of the
+                 * initialization vector. We must assume worst case.
+                 */
+                iv_size_padding = crypto_ablkcipher_alignmask(any_tfm(cc));
+        }
 
         cc->req_pool = mempool_create_kmalloc_pool(MIN_IOS, cc->dmreq_start +
-                        sizeof(struct dm_crypt_request) + cc->iv_size);
+                        sizeof(struct dm_crypt_request) + iv_size_padding + cc->iv_size);
         if (!cc->req_pool) {
                 ti->error = "Cannot allocate crypt request mempool";
                 goto bad;
         }
 
         cc->per_bio_data_size = ti->per_bio_data_size =
-                                sizeof(struct dm_crypt_io) + cc->dmreq_start +
-                                sizeof(struct dm_crypt_request) + cc->iv_size;
+                ALIGN(sizeof(struct dm_crypt_io) + cc->dmreq_start +
+                      sizeof(struct dm_crypt_request) + iv_size_padding + cc->iv_size,
+                      ARCH_KMALLOC_MINALIGN);
 
         cc->page_pool = mempool_create_page_pool(MIN_POOL_PAGES, 0);
         if (!cc->page_pool) {
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index ce48aa72bb42..bde2fc072410 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -1754,7 +1754,7 @@ static int ab8500_probe(struct platform_device *pdev)
         if (ret)
                 return ret;
 
-#if CONFIG_DEBUG_FS
+#ifdef CONFIG_DEBUG_FS
         /* Pass to debugfs */
         ab8500_debug_resources[0].start = ab8500->irq;
         ab8500_debug_resources[0].end = ab8500->irq;
diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
index b44f0203983b..6bdb78c2ac77 100644
--- a/drivers/mfd/htc-i2cpld.c
+++ b/drivers/mfd/htc-i2cpld.c
@@ -404,7 +404,7 @@ static int htcpld_register_chip_i2c(
         }
 
         i2c_set_clientdata(client, chip);
-        snprintf(client->name, I2C_NAME_SIZE, "Chip_0x%d", client->addr);
+        snprintf(client->name, I2C_NAME_SIZE, "Chip_0x%x", client->addr);
         chip->client = client;
 
         /* Reset the chip */
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 33a9234b701c..83dab2f0a50e 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -647,7 +647,7 @@ static int usbhs_omap_probe(struct platform_device *pdev)
                 default:
                         omap->nports = OMAP3_HS_USB_PORTS;
                         dev_dbg(dev,
-                         "USB HOST Rev:0x%d not recognized, assuming %d ports\n",
+                         "USB HOST Rev:0x%x not recognized, assuming %d ports\n",
                          omap->usbhs_rev, omap->nports);
                         break;
                 }
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 3bc969a5916b..4d3ff3771491 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -724,24 +724,24 @@ static struct twl4030_script *omap3_idle_scripts[] = {
  * above.
  */
 static struct twl4030_resconfig omap3_idle_rconfig[] = {
-        TWL_REMAP_SLEEP(RES_VAUX1, DEV_GRP_NULL, 0, 0),
-        TWL_REMAP_SLEEP(RES_VAUX2, DEV_GRP_NULL, 0, 0),
-        TWL_REMAP_SLEEP(RES_VAUX3, DEV_GRP_NULL, 0, 0),
-        TWL_REMAP_SLEEP(RES_VAUX4, DEV_GRP_NULL, 0, 0),
-        TWL_REMAP_SLEEP(RES_VMMC1, DEV_GRP_NULL, 0, 0),
-        TWL_REMAP_SLEEP(RES_VMMC2, DEV_GRP_NULL, 0, 0),
+        TWL_REMAP_SLEEP(RES_VAUX1, TWL4030_RESCONFIG_UNDEF, 0, 0),
+        TWL_REMAP_SLEEP(RES_VAUX2, TWL4030_RESCONFIG_UNDEF, 0, 0),
+        TWL_REMAP_SLEEP(RES_VAUX3, TWL4030_RESCONFIG_UNDEF, 0, 0),
+        TWL_REMAP_SLEEP(RES_VAUX4, TWL4030_RESCONFIG_UNDEF, 0, 0),
+        TWL_REMAP_SLEEP(RES_VMMC1, TWL4030_RESCONFIG_UNDEF, 0, 0),
+        TWL_REMAP_SLEEP(RES_VMMC2, TWL4030_RESCONFIG_UNDEF, 0, 0),
         TWL_REMAP_OFF(RES_VPLL1, DEV_GRP_P1, 3, 1),
         TWL_REMAP_SLEEP(RES_VPLL2, DEV_GRP_P1, 0, 0),
-        TWL_REMAP_SLEEP(RES_VSIM, DEV_GRP_NULL, 0, 0),
-        TWL_REMAP_SLEEP(RES_VDAC, DEV_GRP_NULL, 0, 0),
+        TWL_REMAP_SLEEP(RES_VSIM, TWL4030_RESCONFIG_UNDEF, 0, 0),
+        TWL_REMAP_SLEEP(RES_VDAC, TWL4030_RESCONFIG_UNDEF, 0, 0),
         TWL_REMAP_SLEEP(RES_VINTANA1, TWL_DEV_GRP_P123, 1, 2),
         TWL_REMAP_SLEEP(RES_VINTANA2, TWL_DEV_GRP_P123, 0, 2),
         TWL_REMAP_SLEEP(RES_VINTDIG, TWL_DEV_GRP_P123, 1, 2),
         TWL_REMAP_SLEEP(RES_VIO, TWL_DEV_GRP_P123, 2, 2),
         TWL_REMAP_OFF(RES_VDD1, DEV_GRP_P1, 4, 1),
         TWL_REMAP_OFF(RES_VDD2, DEV_GRP_P1, 3, 1),
-        TWL_REMAP_SLEEP(RES_VUSB_1V5, DEV_GRP_NULL, 0, 0),
-        TWL_REMAP_SLEEP(RES_VUSB_1V8, DEV_GRP_NULL, 0, 0),
+        TWL_REMAP_SLEEP(RES_VUSB_1V5, TWL4030_RESCONFIG_UNDEF, 0, 0),
+        TWL_REMAP_SLEEP(RES_VUSB_1V8, TWL4030_RESCONFIG_UNDEF, 0, 0),
         TWL_REMAP_SLEEP(RES_VUSB_3V1, TWL_DEV_GRP_P123, 0, 0),
         /* Resource #20 USB charge pump skipped */
         TWL_REMAP_SLEEP(RES_REGEN, TWL_DEV_GRP_P123, 2, 1),
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 324e1de93687..2da05c0e113d 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -601,6 +601,7 @@ int mei_cl_connect(struct mei_cl *cl, struct file *file)
                 cl->timer_count = MEI_CONNECT_TIMEOUT;
                 list_add_tail(&cb->list, &dev->ctrl_rd_list.list);
         } else {
+                cl->state = MEI_FILE_INITIALIZING;
                 list_add_tail(&cb->list, &dev->ctrl_wr_list.list);
         }
 
diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/nfc.c
index 3095fc514a65..5ccc23bc7690 100644
--- a/drivers/misc/mei/nfc.c
+++ b/drivers/misc/mei/nfc.c
@@ -342,9 +342,10 @@ static int mei_nfc_send(struct mei_cl_device *cldev, u8 *buf, size_t length)
         ndev = (struct mei_nfc_dev *) cldev->priv_data;
         dev = ndev->cl->dev;
 
+        err = -ENOMEM;
         mei_buf = kzalloc(length + MEI_NFC_HEADER_SIZE, GFP_KERNEL);
         if (!mei_buf)
-                return -ENOMEM;
+                goto out;
 
         hdr = (struct mei_nfc_hci_hdr *) mei_buf;
         hdr->cmd = MEI_NFC_CMD_HCI_SEND;
@@ -354,12 +355,9 @@ static int mei_nfc_send(struct mei_cl_device *cldev, u8 *buf, size_t length)
         hdr->data_size = length;
 
         memcpy(mei_buf + MEI_NFC_HEADER_SIZE, buf, length);
-
         err = __mei_cl_send(ndev->cl, mei_buf, length + MEI_NFC_HEADER_SIZE);
         if (err < 0)
-                return err;
-
-        kfree(mei_buf);
+                goto out;
 
         if (!wait_event_interruptible_timeout(ndev->send_wq,
                                 ndev->recv_req_id == ndev->req_id, HZ)) {
@@ -368,7 +366,8 @@ static int mei_nfc_send(struct mei_cl_device *cldev, u8 *buf, size_t length)
         } else {
                 ndev->req_id++;
         }
-
+out:
+        kfree(mei_buf);
         return err;
 }
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 5a4bfe33112a..46c4643b7a07 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1434,6 +1434,10 @@ static int cfi_amdstd_otp_walk(struct mtd_info *mtd, loff_t from, size_t len,
 
                                 mutex_lock(&chip->mutex);
                                 ret = get_chip(map, chip, base, FL_LOCKING);
+                                if (ret) {
+                                        mutex_unlock(&chip->mutex);
+                                        return ret;
+                                }
 
                                 /* Enter lock register command */
                                 cfi_send_gen_cmd(0xAA, cfi->addr_unlock1,
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index f0ed92e210a1..5967b385141b 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -931,7 +931,7 @@ static int omap_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
         u32 val;
 
         val = readl(info->reg.gpmc_ecc_config);
-        if (((val >> ECC_CONFIG_CS_SHIFT)  & ~CS_MASK) != info->gpmc_cs)
+        if (((val >> ECC_CONFIG_CS_SHIFT) & CS_MASK) != info->gpmc_cs)
                 return -EINVAL;
 
         /* read ecc result */
@@ -1794,9 +1794,12 @@ static int omap_nand_probe(struct platform_device *pdev)
         }
 
         /* populate MTD interface based on ECC scheme */
-        nand_chip->ecc.layout   = &omap_oobinfo;
         ecclayout               = &omap_oobinfo;
         switch (info->ecc_opt) {
+        case OMAP_ECC_HAM1_CODE_SW:
+                nand_chip->ecc.mode = NAND_ECC_SOFT;
+                break;
+
         case OMAP_ECC_HAM1_CODE_HW:
                 pr_info("nand: using OMAP_ECC_HAM1_CODE_HW\n");
                 nand_chip->ecc.mode             = NAND_ECC_HW;
@@ -1848,7 +1851,7 @@ static int omap_nand_probe(struct platform_device *pdev)
                 nand_chip->ecc.priv             = nand_bch_init(mtd,
                                                         nand_chip->ecc.size,
                                                         nand_chip->ecc.bytes,
-                                                        &nand_chip->ecc.layout);
+                                                        &ecclayout);
                 if (!nand_chip->ecc.priv) {
                         pr_err("nand: error: unable to use s/w BCH library\n");
                         err = -EINVAL;
@@ -1923,7 +1926,7 @@ static int omap_nand_probe(struct platform_device *pdev)
                 nand_chip->ecc.priv             = nand_bch_init(mtd,
                                                         nand_chip->ecc.size,
                                                         nand_chip->ecc.bytes,
-                                                        &nand_chip->ecc.layout);
+                                                        &ecclayout);
                 if (!nand_chip->ecc.priv) {
                         pr_err("nand: error: unable to use s/w BCH library\n");
                         err = -EINVAL;
@@ -2012,6 +2015,9 @@ static int omap_nand_probe(struct platform_device *pdev)
                 goto return_error;
         }
 
+        if (info->ecc_opt == OMAP_ECC_HAM1_CODE_SW)
+                goto scan_tail;
+
         /* all OOB bytes from oobfree->offset till end off OOB are free */
         ecclayout->oobfree->length = mtd->oobsize - ecclayout->oobfree->offset;
         /* check if NAND device's OOB is enough to store ECC signatures */
@@ -2021,7 +2027,9 @@ static int omap_nand_probe(struct platform_device *pdev)
                 err = -EINVAL;
                 goto return_error;
         }
+        nand_chip->ecc.layout = ecclayout;
 
+scan_tail:
         /* second phase scan */
         if (nand_scan_tail(mtd)) {
                 err = -ENXIO;
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 059c7414e303..3fe45c705933 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -2177,10 +2177,10 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
                         vp->tx_ring[entry].frag[i+1].addr =
-                                        cpu_to_le32(pci_map_single(
-                                                VORTEX_PCI(vp),
-                                                (void *)skb_frag_address(frag),
-                                                skb_frag_size(frag), PCI_DMA_TODEVICE));
+                                        cpu_to_le32(skb_frag_dma_map(
+                                                &VORTEX_PCI(vp)->dev,
+                                                frag,
+                                                frag->page_offset, frag->size, DMA_TO_DEVICE));
 
                         if (i == skb_shinfo(skb)->nr_frags-1)
                                         vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(skb_frag_size(frag)|LAST_FRAG);
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index 23578dfee249..3005155e412b 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -123,6 +123,12 @@ static inline void greth_enable_tx(struct greth_private *greth)
         GRETH_REGORIN(greth->regs->control, GRETH_TXEN);
 }
 
+static inline void greth_enable_tx_and_irq(struct greth_private *greth)
+{
+        wmb(); /* BDs must been written to memory before enabling TX */
+        GRETH_REGORIN(greth->regs->control, GRETH_TXEN | GRETH_TXI);
+}
+
 static inline void greth_disable_tx(struct greth_private *greth)
 {
         GRETH_REGANDIN(greth->regs->control, ~GRETH_TXEN);
@@ -447,29 +453,30 @@ out:
         return err;
 }
 
+static inline u16 greth_num_free_bds(u16 tx_last, u16 tx_next)
+{
+        if (tx_next < tx_last)
+                return (tx_last - tx_next) - 1;
+        else
+                return GRETH_TXBD_NUM - (tx_next - tx_last) - 1;
+}
 
 static netdev_tx_t
 greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
 {
         struct greth_private *greth = netdev_priv(dev);
         struct greth_bd *bdp;
-        u32 status = 0, dma_addr, ctrl;
+        u32 status, dma_addr;
         int curr_tx, nr_frags, i, err = NETDEV_TX_OK;
         unsigned long flags;
+        u16 tx_last;
 
         nr_frags = skb_shinfo(skb)->nr_frags;
+        tx_last = greth->tx_last;
+        rmb(); /* tx_last is updated by the poll task */
 
-        /* Clean TX Ring */
-        greth_clean_tx_gbit(dev);
-
-        if (greth->tx_free < nr_frags + 1) {
-                spin_lock_irqsave(&greth->devlock, flags);/*save from poll/irq*/
-                ctrl = GRETH_REGLOAD(greth->regs->control);
-                /* Enable TX IRQ only if not already in poll() routine */
-                if (ctrl & GRETH_RXI)
-                        GRETH_REGSAVE(greth->regs->control, ctrl | GRETH_TXI);
+        if (greth_num_free_bds(tx_last, greth->tx_next) < nr_frags + 1) {
                 netif_stop_queue(dev);
-                spin_unlock_irqrestore(&greth->devlock, flags);
                 err = NETDEV_TX_BUSY;
                 goto out;
         }
@@ -488,6 +495,8 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
         /* Linear buf */
         if (nr_frags != 0)
                 status = GRETH_TXBD_MORE;
+        else
+                status = GRETH_BD_IE;
 
         if (skb->ip_summed == CHECKSUM_PARTIAL)
                 status |= GRETH_TXBD_CSALL;
@@ -545,14 +554,12 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
 
         /* Enable the descriptor chain by enabling the first descriptor */
         bdp = greth->tx_bd_base + greth->tx_next;
-        greth_write_bd(&bdp->stat, greth_read_bd(&bdp->stat) | GRETH_BD_EN);
-        greth->tx_next = curr_tx;
-        greth->tx_free -= nr_frags + 1;
-
-        wmb();
+        greth_write_bd(&bdp->stat,
+                       greth_read_bd(&bdp->stat) | GRETH_BD_EN);
 
         spin_lock_irqsave(&greth->devlock, flags); /*save from poll/irq*/
-        greth_enable_tx(greth);
+        greth->tx_next = curr_tx;
+        greth_enable_tx_and_irq(greth);
         spin_unlock_irqrestore(&greth->devlock, flags);
 
         return NETDEV_TX_OK;
@@ -648,7 +655,6 @@ static void greth_clean_tx(struct net_device *dev)
         if (greth->tx_free > 0) {
                 netif_wake_queue(dev);
         }
-
 }
 
 static inline void greth_update_tx_stats(struct net_device *dev, u32 stat)
@@ -670,20 +676,22 @@ static void greth_clean_tx_gbit(struct net_device *dev)
 {
         struct greth_private *greth;
         struct greth_bd *bdp, *bdp_last_frag;
-        struct sk_buff *skb;
+        struct sk_buff *skb = NULL;
         u32 stat;
         int nr_frags, i;
+        u16 tx_last;
 
         greth = netdev_priv(dev);
+        tx_last = greth->tx_last;
 
-        while (greth->tx_free < GRETH_TXBD_NUM) {
+        while (tx_last != greth->tx_next) {
 
-                skb = greth->tx_skbuff[greth->tx_last];
+                skb = greth->tx_skbuff[tx_last];
 
                 nr_frags = skb_shinfo(skb)->nr_frags;
 
                 /* We only clean fully completed SKBs */
-                bdp_last_frag = greth->tx_bd_base + SKIP_TX(greth->tx_last, nr_frags);
+                bdp_last_frag = greth->tx_bd_base + SKIP_TX(tx_last, nr_frags);
 
                 GRETH_REGSAVE(greth->regs->status, GRETH_INT_TE | GRETH_INT_TX);
                 mb();
@@ -692,14 +700,14 @@ static void greth_clean_tx_gbit(struct net_device *dev)
                 if (stat & GRETH_BD_EN)
                         break;
 
-                greth->tx_skbuff[greth->tx_last] = NULL;
+                greth->tx_skbuff[tx_last] = NULL;
 
                 greth_update_tx_stats(dev, stat);
                 dev->stats.tx_bytes += skb->len;
 
-                bdp = greth->tx_bd_base + greth->tx_last;
+                bdp = greth->tx_bd_base + tx_last;
 
-                greth->tx_last = NEXT_TX(greth->tx_last);
+                tx_last = NEXT_TX(tx_last);
 
                 dma_unmap_single(greth->dev,
                                  greth_read_bd(&bdp->addr),
@@ -708,21 +716,26 @@ static void greth_clean_tx_gbit(struct net_device *dev)
 
                 for (i = 0; i < nr_frags; i++) {
                         skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-                        bdp = greth->tx_bd_base + greth->tx_last;
+                        bdp = greth->tx_bd_base + tx_last;
 
                         dma_unmap_page(greth->dev,
                                        greth_read_bd(&bdp->addr),
                                        skb_frag_size(frag),
                                        DMA_TO_DEVICE);
 
-                        greth->tx_last = NEXT_TX(greth->tx_last);
+                        tx_last = NEXT_TX(tx_last);
                 }
-                greth->tx_free += nr_frags+1;
                 dev_kfree_skb(skb);
         }
+        if (skb) { /* skb is set only if the above while loop was entered */
+                wmb();
+                greth->tx_last = tx_last;
 
-        if (netif_queue_stopped(dev) && (greth->tx_free > (MAX_SKB_FRAGS+1)))
-                netif_wake_queue(dev);
+                if (netif_queue_stopped(dev) &&
+                    (greth_num_free_bds(tx_last, greth->tx_next) >
+                    (MAX_SKB_FRAGS+1)))
+                        netif_wake_queue(dev);
+        }
 }
 
 static int greth_rx(struct net_device *dev, int limit)
@@ -965,16 +978,12 @@ static int greth_poll(struct napi_struct *napi, int budget)
         greth = container_of(napi, struct greth_private, napi);
 
 restart_txrx_poll:
-        if (netif_queue_stopped(greth->netdev)) {
-                if (greth->gbit_mac)
-                        greth_clean_tx_gbit(greth->netdev);
-                else
-                        greth_clean_tx(greth->netdev);
-        }
-
         if (greth->gbit_mac) {
+                greth_clean_tx_gbit(greth->netdev);
                 work_done += greth_rx_gbit(greth->netdev, budget - work_done);
         } else {
+                if (netif_queue_stopped(greth->netdev))
+                        greth_clean_tx(greth->netdev);
                 work_done += greth_rx(greth->netdev, budget - work_done);
         }
 
@@ -983,7 +992,8 @@ restart_txrx_poll:
                 spin_lock_irqsave(&greth->devlock, flags);
 
                 ctrl = GRETH_REGLOAD(greth->regs->control);
-                if (netif_queue_stopped(greth->netdev)) {
+                if ((greth->gbit_mac && (greth->tx_last != greth->tx_next)) ||
+                    (!greth->gbit_mac && netif_queue_stopped(greth->netdev))) {
                         GRETH_REGSAVE(greth->regs->control,
                                         ctrl | GRETH_TXI | GRETH_RXI);
                         mask = GRETH_INT_RX | GRETH_INT_RE |
diff --git a/drivers/net/ethernet/aeroflex/greth.h b/drivers/net/ethernet/aeroflex/greth.h
index 232a622a85b7..ae16ac94daf8 100644
--- a/drivers/net/ethernet/aeroflex/greth.h
+++ b/drivers/net/ethernet/aeroflex/greth.h
@@ -107,7 +107,7 @@ struct greth_private {
 
         u16 tx_next;
         u16 tx_last;
-        u16 tx_free;
+        u16 tx_free; /* only used on 10/100Mbit */
         u16 rx_cur;
 
         struct greth_regs *regs;        /* Address of controller registers. */
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c b/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c
index 978f9ec961ae..76479d04b903 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c
@@ -271,8 +271,8 @@ static ssize_t xpcs_reg_value_read(struct file *filp, char __user *buffer,
         struct xgbe_prv_data *pdata = filp->private_data;
         unsigned int value;
 
-        value = pdata->hw_if.read_mmd_regs(pdata, pdata->debugfs_xpcs_mmd,
-                                           pdata->debugfs_xpcs_reg);
+        value = XMDIO_READ(pdata, pdata->debugfs_xpcs_mmd,
+                           pdata->debugfs_xpcs_reg);
 
         return xgbe_common_read(buffer, count, ppos, value);
 }
@@ -289,8 +289,8 @@ static ssize_t xpcs_reg_value_write(struct file *filp,
         if (len < 0)
                 return len;
 
-        pdata->hw_if.write_mmd_regs(pdata, pdata->debugfs_xpcs_mmd,
-                                    pdata->debugfs_xpcs_reg, value);
+        XMDIO_WRITE(pdata, pdata->debugfs_xpcs_mmd, pdata->debugfs_xpcs_reg,
+                    value);
 
         return len;
 }
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index 3be98e505001..9da3a03e8c07 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -347,7 +347,7 @@ static int xgbe_disable_tx_flow_control(struct xgbe_prv_data *pdata)
 
         /* Clear MAC flow control */
         max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES;
-        q_count = min_t(unsigned int, pdata->rx_q_count, max_q_count);
+        q_count = min_t(unsigned int, pdata->tx_q_count, max_q_count);
         reg = MAC_Q0TFCR;
         for (i = 0; i < q_count; i++) {
                 reg_val = XGMAC_IOREAD(pdata, reg);
@@ -372,7 +372,7 @@ static int xgbe_enable_tx_flow_control(struct xgbe_prv_data *pdata)
 
         /* Set MAC flow control */
         max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES;
-        q_count = min_t(unsigned int, pdata->rx_q_count, max_q_count);
+        q_count = min_t(unsigned int, pdata->tx_q_count, max_q_count);
         reg = MAC_Q0TFCR;
         for (i = 0; i < q_count; i++) {
                 reg_val = XGMAC_IOREAD(pdata, reg);
@@ -508,8 +508,8 @@ static void xgbe_enable_mac_interrupts(struct xgbe_prv_data *pdata)
         XGMAC_IOWRITE(pdata, MAC_IER, mac_ier);
 
         /* Enable all counter interrupts */
-        XGMAC_IOWRITE_BITS(pdata, MMC_RIER, ALL_INTERRUPTS, 0xff);
-        XGMAC_IOWRITE_BITS(pdata, MMC_TIER, ALL_INTERRUPTS, 0xff);
+        XGMAC_IOWRITE_BITS(pdata, MMC_RIER, ALL_INTERRUPTS, 0xffffffff);
+        XGMAC_IOWRITE_BITS(pdata, MMC_TIER, ALL_INTERRUPTS, 0xffffffff);
 }
 
 static int xgbe_set_gmii_speed(struct xgbe_prv_data *pdata)
@@ -1632,6 +1632,9 @@ static int xgbe_flush_tx_queues(struct xgbe_prv_data *pdata)
 {
         unsigned int i, count;
 
+        if (XGMAC_GET_BITS(pdata->hw_feat.version, MAC_VR, SNPSVER) < 0x21)
+                return 0;
+
         for (i = 0; i < pdata->tx_q_count; i++)
                 XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_TQOMR, FTQ, 1);
 
@@ -1702,8 +1705,8 @@ static void xgbe_config_mtl_mode(struct xgbe_prv_data *pdata)
         XGMAC_IOWRITE_BITS(pdata, MTL_OMR, RAA, MTL_RAA_SP);
 }
 
-static unsigned int xgbe_calculate_per_queue_fifo(unsigned long fifo_size,
-                                                  unsigned char queue_count)
+static unsigned int xgbe_calculate_per_queue_fifo(unsigned int fifo_size,
+                                                  unsigned int queue_count)
 {
         unsigned int q_fifo_size = 0;
         enum xgbe_mtl_fifo_size p_fifo = XGMAC_MTL_FIFO_SIZE_256;
@@ -1747,6 +1750,10 @@ static unsigned int xgbe_calculate_per_queue_fifo(unsigned long fifo_size,
                 q_fifo_size = XGBE_FIFO_SIZE_KB(256);
                 break;
         }
+
+        /* The configured value is not the actual amount of fifo RAM */
+        q_fifo_size = min_t(unsigned int, XGBE_FIFO_MAX, q_fifo_size);
+
         q_fifo_size = q_fifo_size / queue_count;
 
         /* Set the queue fifo size programmable value */
@@ -1946,6 +1953,32 @@ static void xgbe_config_vlan_support(struct xgbe_prv_data *pdata)
                 xgbe_disable_rx_vlan_stripping(pdata);
 }
 
+static u64 xgbe_mmc_read(struct xgbe_prv_data *pdata, unsigned int reg_lo)
+{
+        bool read_hi;
+        u64 val;
+
+        switch (reg_lo) {
+        /* These registers are always 64 bit */
+        case MMC_TXOCTETCOUNT_GB_LO:
+        case MMC_TXOCTETCOUNT_G_LO:
+        case MMC_RXOCTETCOUNT_GB_LO:
+        case MMC_RXOCTETCOUNT_G_LO:
+                read_hi = true;
+                break;
+
+        default:
+                read_hi = false;
+        };
+
+        val = XGMAC_IOREAD(pdata, reg_lo);
+
+        if (read_hi)
+                val |= ((u64)XGMAC_IOREAD(pdata, reg_lo + 4) << 32);
+
+        return val;
+}
+
 static void xgbe_tx_mmc_int(struct xgbe_prv_data *pdata)
 {
         struct xgbe_mmc_stats *stats = &pdata->mmc_stats;
@@ -1953,75 +1986,75 @@ static void xgbe_tx_mmc_int(struct xgbe_prv_data *pdata)
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXOCTETCOUNT_GB))
                 stats->txoctetcount_gb +=
-                        XGMAC_IOREAD(pdata, MMC_TXOCTETCOUNT_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXFRAMECOUNT_GB))
                 stats->txframecount_gb +=
-                        XGMAC_IOREAD(pdata, MMC_TXFRAMECOUNT_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXBROADCASTFRAMES_G))
                 stats->txbroadcastframes_g +=
-                        XGMAC_IOREAD(pdata, MMC_TXBROADCASTFRAMES_G_LO);
+                        xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_G_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXMULTICASTFRAMES_G))
                 stats->txmulticastframes_g +=
-                        XGMAC_IOREAD(pdata, MMC_TXMULTICASTFRAMES_G_LO);
+                        xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_G_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX64OCTETS_GB))
                 stats->tx64octets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_TX64OCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_TX64OCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX65TO127OCTETS_GB))
                 stats->tx65to127octets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_TX65TO127OCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_TX65TO127OCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX128TO255OCTETS_GB))
                 stats->tx128to255octets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_TX128TO255OCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_TX128TO255OCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX256TO511OCTETS_GB))
                 stats->tx256to511octets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_TX256TO511OCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_TX256TO511OCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX512TO1023OCTETS_GB))
                 stats->tx512to1023octets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_TX512TO1023OCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_TX512TO1023OCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TX1024TOMAXOCTETS_GB))
                 stats->tx1024tomaxoctets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_TX1024TOMAXOCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_TX1024TOMAXOCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXUNICASTFRAMES_GB))
                 stats->txunicastframes_gb +=
-                        XGMAC_IOREAD(pdata, MMC_TXUNICASTFRAMES_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_TXUNICASTFRAMES_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXMULTICASTFRAMES_GB))
                 stats->txmulticastframes_gb +=
-                        XGMAC_IOREAD(pdata, MMC_TXMULTICASTFRAMES_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXBROADCASTFRAMES_GB))
                 stats->txbroadcastframes_g +=
-                        XGMAC_IOREAD(pdata, MMC_TXBROADCASTFRAMES_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXUNDERFLOWERROR))
                 stats->txunderflowerror +=
-                        XGMAC_IOREAD(pdata, MMC_TXUNDERFLOWERROR_LO);
+                        xgbe_mmc_read(pdata, MMC_TXUNDERFLOWERROR_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXOCTETCOUNT_G))
                 stats->txoctetcount_g +=
-                        XGMAC_IOREAD(pdata, MMC_TXOCTETCOUNT_G_LO);
+                        xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_G_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXFRAMECOUNT_G))
                 stats->txframecount_g +=
-                        XGMAC_IOREAD(pdata, MMC_TXFRAMECOUNT_G_LO);
+                        xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_G_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXPAUSEFRAMES))
                 stats->txpauseframes +=
-                        XGMAC_IOREAD(pdata, MMC_TXPAUSEFRAMES_LO);
+                        xgbe_mmc_read(pdata, MMC_TXPAUSEFRAMES_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_TISR, TXVLANFRAMES_G))
                 stats->txvlanframes_g +=
-                        XGMAC_IOREAD(pdata, MMC_TXVLANFRAMES_G_LO);
+                        xgbe_mmc_read(pdata, MMC_TXVLANFRAMES_G_LO);
 }
 
 static void xgbe_rx_mmc_int(struct xgbe_prv_data *pdata)
@@ -2031,95 +2064,95 @@ static void xgbe_rx_mmc_int(struct xgbe_prv_data *pdata)
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXFRAMECOUNT_GB))
                 stats->rxframecount_gb +=
-                        XGMAC_IOREAD(pdata, MMC_RXFRAMECOUNT_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_RXFRAMECOUNT_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOCTETCOUNT_GB))
                 stats->rxoctetcount_gb +=
-                        XGMAC_IOREAD(pdata, MMC_RXOCTETCOUNT_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOCTETCOUNT_G))
                 stats->rxoctetcount_g +=
-                        XGMAC_IOREAD(pdata, MMC_RXOCTETCOUNT_G_LO);
+                        xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_G_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXBROADCASTFRAMES_G))
                 stats->rxbroadcastframes_g +=
-                        XGMAC_IOREAD(pdata, MMC_RXBROADCASTFRAMES_G_LO);
+                        xgbe_mmc_read(pdata, MMC_RXBROADCASTFRAMES_G_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXMULTICASTFRAMES_G))
                 stats->rxmulticastframes_g +=
-                        XGMAC_IOREAD(pdata, MMC_RXMULTICASTFRAMES_G_LO);
+                        xgbe_mmc_read(pdata, MMC_RXMULTICASTFRAMES_G_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXCRCERROR))
                 stats->rxcrcerror +=
-                        XGMAC_IOREAD(pdata, MMC_RXCRCERROR_LO);
+                        xgbe_mmc_read(pdata, MMC_RXCRCERROR_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXRUNTERROR))
                 stats->rxrunterror +=
-                        XGMAC_IOREAD(pdata, MMC_RXRUNTERROR);
+                        xgbe_mmc_read(pdata, MMC_RXRUNTERROR);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXJABBERERROR))
                 stats->rxjabbererror +=
-                        XGMAC_IOREAD(pdata, MMC_RXJABBERERROR);
+                        xgbe_mmc_read(pdata, MMC_RXJABBERERROR);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXUNDERSIZE_G))
                 stats->rxundersize_g +=
-                        XGMAC_IOREAD(pdata, MMC_RXUNDERSIZE_G);
+                        xgbe_mmc_read(pdata, MMC_RXUNDERSIZE_G);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOVERSIZE_G))
                 stats->rxoversize_g +=
-                        XGMAC_IOREAD(pdata, MMC_RXOVERSIZE_G);
+                        xgbe_mmc_read(pdata, MMC_RXOVERSIZE_G);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX64OCTETS_GB))
                 stats->rx64octets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_RX64OCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_RX64OCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX65TO127OCTETS_GB))
                 stats->rx65to127octets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_RX65TO127OCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_RX65TO127OCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX128TO255OCTETS_GB))
                 stats->rx128to255octets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_RX128TO255OCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_RX128TO255OCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX256TO511OCTETS_GB))
                 stats->rx256to511octets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_RX256TO511OCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_RX256TO511OCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX512TO1023OCTETS_GB))
                 stats->rx512to1023octets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_RX512TO1023OCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_RX512TO1023OCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RX1024TOMAXOCTETS_GB))
                 stats->rx1024tomaxoctets_gb +=
-                        XGMAC_IOREAD(pdata, MMC_RX1024TOMAXOCTETS_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_RX1024TOMAXOCTETS_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXUNICASTFRAMES_G))
                 stats->rxunicastframes_g +=
-                        XGMAC_IOREAD(pdata, MMC_RXUNICASTFRAMES_G_LO);
+                        xgbe_mmc_read(pdata, MMC_RXUNICASTFRAMES_G_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXLENGTHERROR))
                 stats->rxlengtherror +=
-                        XGMAC_IOREAD(pdata, MMC_RXLENGTHERROR_LO);
+                        xgbe_mmc_read(pdata, MMC_RXLENGTHERROR_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXOUTOFRANGETYPE))
                 stats->rxoutofrangetype +=
-                        XGMAC_IOREAD(pdata, MMC_RXOUTOFRANGETYPE_LO);
+                        xgbe_mmc_read(pdata, MMC_RXOUTOFRANGETYPE_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXPAUSEFRAMES))
                 stats->rxpauseframes +=
-                        XGMAC_IOREAD(pdata, MMC_RXPAUSEFRAMES_LO);
+                        xgbe_mmc_read(pdata, MMC_RXPAUSEFRAMES_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXFIFOOVERFLOW))
                 stats->rxfifooverflow +=
-                        XGMAC_IOREAD(pdata, MMC_RXFIFOOVERFLOW_LO);
+                        xgbe_mmc_read(pdata, MMC_RXFIFOOVERFLOW_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXVLANFRAMES_GB))
                 stats->rxvlanframes_gb +=
-                        XGMAC_IOREAD(pdata, MMC_RXVLANFRAMES_GB_LO);
+                        xgbe_mmc_read(pdata, MMC_RXVLANFRAMES_GB_LO);
 
         if (XGMAC_GET_BITS(mmc_isr, MMC_RISR, RXWATCHDOGERROR))
                 stats->rxwatchdogerror +=
-                        XGMAC_IOREAD(pdata, MMC_RXWATCHDOGERROR);
+                        xgbe_mmc_read(pdata, MMC_RXWATCHDOGERROR);
 }
 
 static void xgbe_read_mmc_stats(struct xgbe_prv_data *pdata)
@@ -2130,127 +2163,127 @@ static void xgbe_read_mmc_stats(struct xgbe_prv_data *pdata)
         XGMAC_IOWRITE_BITS(pdata, MMC_CR, MCF, 1);
 
         stats->txoctetcount_gb +=
-                XGMAC_IOREAD(pdata, MMC_TXOCTETCOUNT_GB_LO);
+                xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_GB_LO);
 
         stats->txframecount_gb +=
-                XGMAC_IOREAD(pdata, MMC_TXFRAMECOUNT_GB_LO);
+                xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_GB_LO);
 
         stats->txbroadcastframes_g +=
-                XGMAC_IOREAD(pdata, MMC_TXBROADCASTFRAMES_G_LO);
+                xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_G_LO);
 
         stats->txmulticastframes_g +=
-                XGMAC_IOREAD(pdata, MMC_TXMULTICASTFRAMES_G_LO);
+                xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_G_LO);
 
         stats->tx64octets_gb +=
-                XGMAC_IOREAD(pdata, MMC_TX64OCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_TX64OCTETS_GB_LO);
 
         stats->tx65to127octets_gb +=
-                XGMAC_IOREAD(pdata, MMC_TX65TO127OCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_TX65TO127OCTETS_GB_LO);
 
         stats->tx128to255octets_gb +=
-                XGMAC_IOREAD(pdata, MMC_TX128TO255OCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_TX128TO255OCTETS_GB_LO);
 
         stats->tx256to511octets_gb +=
-                XGMAC_IOREAD(pdata, MMC_TX256TO511OCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_TX256TO511OCTETS_GB_LO);
 
         stats->tx512to1023octets_gb +=
-                XGMAC_IOREAD(pdata, MMC_TX512TO1023OCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_TX512TO1023OCTETS_GB_LO);
 
         stats->tx1024tomaxoctets_gb +=
-                XGMAC_IOREAD(pdata, MMC_TX1024TOMAXOCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_TX1024TOMAXOCTETS_GB_LO);
 
         stats->txunicastframes_gb +=
-                XGMAC_IOREAD(pdata, MMC_TXUNICASTFRAMES_GB_LO);
+                xgbe_mmc_read(pdata, MMC_TXUNICASTFRAMES_GB_LO);
 
         stats->txmulticastframes_gb +=
-                XGMAC_IOREAD(pdata, MMC_TXMULTICASTFRAMES_GB_LO);
+                xgbe_mmc_read(pdata, MMC_TXMULTICASTFRAMES_GB_LO);
 
         stats->txbroadcastframes_g +=
-                XGMAC_IOREAD(pdata, MMC_TXBROADCASTFRAMES_GB_LO);
+                xgbe_mmc_read(pdata, MMC_TXBROADCASTFRAMES_GB_LO);
 
         stats->txunderflowerror +=
-                XGMAC_IOREAD(pdata, MMC_TXUNDERFLOWERROR_LO);
+                xgbe_mmc_read(pdata, MMC_TXUNDERFLOWERROR_LO);
 
         stats->txoctetcount_g +=
-                XGMAC_IOREAD(pdata, MMC_TXOCTETCOUNT_G_LO);
+                xgbe_mmc_read(pdata, MMC_TXOCTETCOUNT_G_LO);
 
         stats->txframecount_g +=
-                XGMAC_IOREAD(pdata, MMC_TXFRAMECOUNT_G_LO);
+                xgbe_mmc_read(pdata, MMC_TXFRAMECOUNT_G_LO);
 
         stats->txpauseframes +=
-                XGMAC_IOREAD(pdata, MMC_TXPAUSEFRAMES_LO);
+                xgbe_mmc_read(pdata, MMC_TXPAUSEFRAMES_LO);
 
         stats->txvlanframes_g +=
-                XGMAC_IOREAD(pdata, MMC_TXVLANFRAMES_G_LO);
+                xgbe_mmc_read(pdata, MMC_TXVLANFRAMES_G_LO);
 
         stats->rxframecount_gb +=
-                XGMAC_IOREAD(pdata, MMC_RXFRAMECOUNT_GB_LO);
+                xgbe_mmc_read(pdata, MMC_RXFRAMECOUNT_GB_LO);
 
         stats->rxoctetcount_gb +=
-                XGMAC_IOREAD(pdata, MMC_RXOCTETCOUNT_GB_LO);
+                xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_GB_LO);
 
         stats->rxoctetcount_g +=
-                XGMAC_IOREAD(pdata, MMC_RXOCTETCOUNT_G_LO);
+                xgbe_mmc_read(pdata, MMC_RXOCTETCOUNT_G_LO);
 
         stats->rxbroadcastframes_g +=
-                XGMAC_IOREAD(pdata, MMC_RXBROADCASTFRAMES_G_LO);
+                xgbe_mmc_read(pdata, MMC_RXBROADCASTFRAMES_G_LO);
 
         stats->rxmulticastframes_g +=
-                XGMAC_IOREAD(pdata, MMC_RXMULTICASTFRAMES_G_LO);
+                xgbe_mmc_read(pdata, MMC_RXMULTICASTFRAMES_G_LO);
 
         stats->rxcrcerror +=
-                XGMAC_IOREAD(pdata, MMC_RXCRCERROR_LO);
+                xgbe_mmc_read(pdata, MMC_RXCRCERROR_LO);
 
         stats->rxrunterror +=
-                XGMAC_IOREAD(pdata, MMC_RXRUNTERROR);
+                xgbe_mmc_read(pdata, MMC_RXRUNTERROR);
 
         stats->rxjabbererror +=
-                XGMAC_IOREAD(pdata, MMC_RXJABBERERROR);
+                xgbe_mmc_read(pdata, MMC_RXJABBERERROR);
 
         stats->rxundersize_g +=
-                XGMAC_IOREAD(pdata, MMC_RXUNDERSIZE_G);
+                xgbe_mmc_read(pdata, MMC_RXUNDERSIZE_G);
 
         stats->rxoversize_g +=
-                XGMAC_IOREAD(pdata, MMC_RXOVERSIZE_G);
+                xgbe_mmc_read(pdata, MMC_RXOVERSIZE_G);
 
         stats->rx64octets_gb +=
-                XGMAC_IOREAD(pdata, MMC_RX64OCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_RX64OCTETS_GB_LO);
 
         stats->rx65to127octets_gb +=
-                XGMAC_IOREAD(pdata, MMC_RX65TO127OCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_RX65TO127OCTETS_GB_LO);
 
         stats->rx128to255octets_gb +=
-                XGMAC_IOREAD(pdata, MMC_RX128TO255OCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_RX128TO255OCTETS_GB_LO);
 
         stats->rx256to511octets_gb +=
-                XGMAC_IOREAD(pdata, MMC_RX256TO511OCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_RX256TO511OCTETS_GB_LO);
 
         stats->rx512to1023octets_gb +=
-                XGMAC_IOREAD(pdata, MMC_RX512TO1023OCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_RX512TO1023OCTETS_GB_LO);
 
         stats->rx1024tomaxoctets_gb +=
-                XGMAC_IOREAD(pdata, MMC_RX1024TOMAXOCTETS_GB_LO);
+                xgbe_mmc_read(pdata, MMC_RX1024TOMAXOCTETS_GB_LO);
 
         stats->rxunicastframes_g +=
-                XGMAC_IOREAD(pdata, MMC_RXUNICASTFRAMES_G_LO);
+                xgbe_mmc_read(pdata, MMC_RXUNICASTFRAMES_G_LO);
 
         stats->rxlengtherror +=
-                XGMAC_IOREAD(pdata, MMC_RXLENGTHERROR_LO);
+                xgbe_mmc_read(pdata, MMC_RXLENGTHERROR_LO);
 
         stats->rxoutofrangetype +=
-                XGMAC_IOREAD(pdata, MMC_RXOUTOFRANGETYPE_LO);
+                xgbe_mmc_read(pdata, MMC_RXOUTOFRANGETYPE_LO);
 
         stats->rxpauseframes +=
-                XGMAC_IOREAD(pdata, MMC_RXPAUSEFRAMES_LO);
+                xgbe_mmc_read(pdata, MMC_RXPAUSEFRAMES_LO);
 
         stats->rxfifooverflow +=
-                XGMAC_IOREAD(pdata, MMC_RXFIFOOVERFLOW_LO);
+                xgbe_mmc_read(pdata, MMC_RXFIFOOVERFLOW_LO);
 
         stats->rxvlanframes_gb +=
-                XGMAC_IOREAD(pdata, MMC_RXVLANFRAMES_GB_LO);
+                xgbe_mmc_read(pdata, MMC_RXVLANFRAMES_GB_LO);
 
         stats->rxwatchdogerror +=
-                XGMAC_IOREAD(pdata, MMC_RXWATCHDOGERROR);
+                xgbe_mmc_read(pdata, MMC_RXWATCHDOGERROR);
 
         /* Un-freeze counters */
         XGMAC_IOWRITE_BITS(pdata, MMC_CR, MCF, 0);
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 847da66d1548..29554992215a 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -360,6 +360,8 @@ void xgbe_get_all_hw_features(struct xgbe_prv_data *pdata)
 
         memset(hw_feat, 0, sizeof(*hw_feat));
 
+        hw_feat->version = XGMAC_IOREAD(pdata, MAC_VR);
+
         /* Hardware feature register 0 */
         hw_feat->gmii        = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, GMIISEL);
         hw_feat->vlhash      = XGMAC_GET_BITS(mac_hfr0, MAC_HWF0R, VLHASH);
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
index 2289526b6f1c..49508ec98b72 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
@@ -361,15 +361,16 @@ static void xgbe_get_drvinfo(struct net_device *netdev,
                              struct ethtool_drvinfo *drvinfo)
 {
         struct xgbe_prv_data *pdata = netdev_priv(netdev);
+        struct xgbe_hw_features *hw_feat = &pdata->hw_feat;
 
         strlcpy(drvinfo->driver, XGBE_DRV_NAME, sizeof(drvinfo->driver));
         strlcpy(drvinfo->version, XGBE_DRV_VERSION, sizeof(drvinfo->version));
         strlcpy(drvinfo->bus_info, dev_name(pdata->dev),
                 sizeof(drvinfo->bus_info));
         snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d.%d.%d",
-                 XGMAC_IOREAD_BITS(pdata, MAC_VR, USERVER),
-                 XGMAC_IOREAD_BITS(pdata, MAC_VR, DEVID),
-                 XGMAC_IOREAD_BITS(pdata, MAC_VR, SNPSVER));
+                 XGMAC_GET_BITS(hw_feat->version, MAC_VR, USERVER),
+                 XGMAC_GET_BITS(hw_feat->version, MAC_VR, DEVID),
+                 XGMAC_GET_BITS(hw_feat->version, MAC_VR, SNPSVER));
         drvinfo->n_stats = XGBE_STATS_COUNT;
 }
 
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
index 984161d4ffc9..f5a8fa03921a 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
@@ -171,7 +171,7 @@ static struct xgbe_channel *xgbe_alloc_rings(struct xgbe_prv_data *pdata)
                 }
 
                 if (i < pdata->rx_ring_count) {
-                        spin_lock_init(&tx_ring->lock);
+                        spin_lock_init(&rx_ring->lock);
                         channel->rx_ring = rx_ring++;
                 }
 
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
index 84fe34ce5571..789957d43a13 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
@@ -182,6 +182,7 @@
 #define XGMAC_DRIVER_CONTEXT    1
 #define XGMAC_IOCTL_CONTEXT     2
 
+#define XGBE_FIFO_MAX           81920
 #define XGBE_FIFO_SIZE_B(x)     (x)
 #define XGBE_FIFO_SIZE_KB(x)    (x * 1024)
 
@@ -524,6 +525,9 @@ struct xgbe_desc_if {
  * or configurations are present in the device.
  */
 struct xgbe_hw_features {
+        /* HW Version */
+        unsigned int version;
+
         /* HW Feature Register0 */
         unsigned int gmii;              /* 1000 Mbps support */
         unsigned int vlhash;            /* VLAN Hash Filter */
diff --git a/drivers/net/ethernet/apm/xgene/Kconfig b/drivers/net/ethernet/apm/xgene/Kconfig
index 616dff6d3f5f..f4054d242f3c 100644
--- a/drivers/net/ethernet/apm/xgene/Kconfig
+++ b/drivers/net/ethernet/apm/xgene/Kconfig
@@ -1,5 +1,6 @@
 config NET_XGENE
         tristate "APM X-Gene SoC Ethernet Driver"
+        depends on HAS_DMA
         select PHYLIB
         help
           This is the Ethernet driver for the on-chip ethernet interface on the
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index a5ea416133a8..c3e260c21734 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -84,7 +84,7 @@ config BNX2
 
 config CNIC
         tristate "QLogic CNIC support"
-        depends on PCI
+        depends on PCI && (IPV6 || IPV6=n)
         select BNX2
         select UIO
         ---help---
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index 5579d4bdbaac..3e0621acdf05 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
@@ -2233,7 +2233,12 @@ struct shmem2_region {
         u32 reserved3;                          /* Offset 0x14C */
         u32 reserved4;                          /* Offset 0x150 */
         u32 link_attr_sync[PORT_MAX];           /* Offset 0x154 */
-        #define LINK_ATTR_SYNC_KR2_ENABLE       (1<<0)
+        #define LINK_ATTR_SYNC_KR2_ENABLE       0x00000001
+        #define LINK_SFP_EEPROM_COMP_CODE_MASK  0x0000ff00
+        #define LINK_SFP_EEPROM_COMP_CODE_SHIFT          8
+        #define LINK_SFP_EEPROM_COMP_CODE_SR    0x00001000
+        #define LINK_SFP_EEPROM_COMP_CODE_LR    0x00002000
+        #define LINK_SFP_EEPROM_COMP_CODE_LRM   0x00004000
 
         u32 reserved5[2];
         u32 reserved6[PORT_MAX];
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 53fb4fa61b40..549549eaf580 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -154,15 +154,22 @@ typedef int (*read_sfp_module_eeprom_func_p)(struct bnx2x_phy *phy,
                          LINK_STATUS_LINK_PARTNER_ASYMMETRIC_PAUSE)
 
 #define SFP_EEPROM_CON_TYPE_ADDR                0x2
+        #define SFP_EEPROM_CON_TYPE_VAL_UNKNOWN 0x0
         #define SFP_EEPROM_CON_TYPE_VAL_LC      0x7
         #define SFP_EEPROM_CON_TYPE_VAL_COPPER  0x21
         #define SFP_EEPROM_CON_TYPE_VAL_RJ45    0x22
 
 
-#define SFP_EEPROM_COMP_CODE_ADDR               0x3
-        #define SFP_EEPROM_COMP_CODE_SR_MASK    (1<<4)
-        #define SFP_EEPROM_COMP_CODE_LR_MASK    (1<<5)
-        #define SFP_EEPROM_COMP_CODE_LRM_MASK   (1<<6)
+#define SFP_EEPROM_10G_COMP_CODE_ADDR           0x3
+        #define SFP_EEPROM_10G_COMP_CODE_SR_MASK        (1<<4)
+        #define SFP_EEPROM_10G_COMP_CODE_LR_MASK        (1<<5)
+        #define SFP_EEPROM_10G_COMP_CODE_LRM_MASK       (1<<6)
+
+#define SFP_EEPROM_1G_COMP_CODE_ADDR            0x6
+        #define SFP_EEPROM_1G_COMP_CODE_SX      (1<<0)
+        #define SFP_EEPROM_1G_COMP_CODE_LX      (1<<1)
+        #define SFP_EEPROM_1G_COMP_CODE_CX      (1<<2)
+        #define SFP_EEPROM_1G_COMP_CODE_BASE_T  (1<<3)
 
 #define SFP_EEPROM_FC_TX_TECH_ADDR              0x8
         #define SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_PASSIVE 0x4
@@ -3633,8 +3640,8 @@ static void bnx2x_warpcore_enable_AN_KR2(struct bnx2x_phy *phy,
                                  reg_set[i].val);
 
         /* Start KR2 work-around timer which handles BCM8073 link-parner */
-        vars->link_attr_sync |= LINK_ATTR_SYNC_KR2_ENABLE;
-        bnx2x_update_link_attr(params, vars->link_attr_sync);
+        params->link_attr_sync |= LINK_ATTR_SYNC_KR2_ENABLE;
+        bnx2x_update_link_attr(params, params->link_attr_sync);
 }
 
 static void bnx2x_disable_kr2(struct link_params *params,
@@ -3666,8 +3673,8 @@ static void bnx2x_disable_kr2(struct link_params *params,
         for (i = 0; i < ARRAY_SIZE(reg_set); i++)
                 bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg,
                                  reg_set[i].val);
-        vars->link_attr_sync &= ~LINK_ATTR_SYNC_KR2_ENABLE;
-        bnx2x_update_link_attr(params, vars->link_attr_sync);
+        params->link_attr_sync &= ~LINK_ATTR_SYNC_KR2_ENABLE;
+        bnx2x_update_link_attr(params, params->link_attr_sync);
 
         vars->check_kr2_recovery_cnt = CHECK_KR2_RECOVERY_CNT;
 }
@@ -4810,7 +4817,7 @@ void bnx2x_link_status_update(struct link_params *params,
                                         ~FEATURE_CONFIG_PFC_ENABLED;
 
         if (SHMEM2_HAS(bp, link_attr_sync))
-                vars->link_attr_sync = SHMEM2_RD(bp,
+                params->link_attr_sync = SHMEM2_RD(bp,
                                                  link_attr_sync[params->port]);
 
         DP(NETIF_MSG_LINK, "link_status 0x%x  phy_link_up %x int_mask 0x%x\n",
@@ -8057,21 +8064,24 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
 {
         struct bnx2x *bp = params->bp;
         u32 sync_offset = 0, phy_idx, media_types;
-        u8 gport, val[2], check_limiting_mode = 0;
+        u8 val[SFP_EEPROM_FC_TX_TECH_ADDR + 1], check_limiting_mode = 0;
         *edc_mode = EDC_MODE_LIMITING;
         phy->media_type = ETH_PHY_UNSPECIFIED;
         /* First check for copper cable */
         if (bnx2x_read_sfp_module_eeprom(phy,
                                          params,
                                          I2C_DEV_ADDR_A0,
-                                         SFP_EEPROM_CON_TYPE_ADDR,
-                                         2,
+                                         0,
+                                         SFP_EEPROM_FC_TX_TECH_ADDR + 1,
                                          (u8 *)val) != 0) {
                 DP(NETIF_MSG_LINK, "Failed to read from SFP+ module EEPROM\n");
                 return -EINVAL;
         }
-
-        switch (val[0]) {
+        params->link_attr_sync &= ~LINK_SFP_EEPROM_COMP_CODE_MASK;
+        params->link_attr_sync |= val[SFP_EEPROM_10G_COMP_CODE_ADDR] <<
+                LINK_SFP_EEPROM_COMP_CODE_SHIFT;
+        bnx2x_update_link_attr(params, params->link_attr_sync);
+        switch (val[SFP_EEPROM_CON_TYPE_ADDR]) {
         case SFP_EEPROM_CON_TYPE_VAL_COPPER:
         {
                 u8 copper_module_type;
@@ -8079,17 +8089,7 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
                 /* Check if its active cable (includes SFP+ module)
                  * of passive cable
                  */
-                if (bnx2x_read_sfp_module_eeprom(phy,
-                                               params,
-                                               I2C_DEV_ADDR_A0,
-                                               SFP_EEPROM_FC_TX_TECH_ADDR,
-                                               1,
-                                               &copper_module_type) != 0) {
-                        DP(NETIF_MSG_LINK,
-                                "Failed to read copper-cable-type"
-                                " from SFP+ EEPROM\n");
-                        return -EINVAL;
-                }
+                copper_module_type = val[SFP_EEPROM_FC_TX_TECH_ADDR];
 
                 if (copper_module_type &
                     SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_ACTIVE) {
@@ -8115,16 +8115,18 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
                 }
                 break;
         }
+        case SFP_EEPROM_CON_TYPE_VAL_UNKNOWN:
         case SFP_EEPROM_CON_TYPE_VAL_LC:
         case SFP_EEPROM_CON_TYPE_VAL_RJ45:
                 check_limiting_mode = 1;
-                if ((val[1] & (SFP_EEPROM_COMP_CODE_SR_MASK |
-                               SFP_EEPROM_COMP_CODE_LR_MASK |
-                               SFP_EEPROM_COMP_CODE_LRM_MASK)) == 0) {
+                if ((val[SFP_EEPROM_10G_COMP_CODE_ADDR] &
+                     (SFP_EEPROM_10G_COMP_CODE_SR_MASK |
+                      SFP_EEPROM_10G_COMP_CODE_LR_MASK |
+                      SFP_EEPROM_10G_COMP_CODE_LRM_MASK)) == 0) {
                         DP(NETIF_MSG_LINK, "1G SFP module detected\n");
-                        gport = params->port;
                         phy->media_type = ETH_PHY_SFP_1G_FIBER;
                         if (phy->req_line_speed != SPEED_1000) {
+                                u8 gport = params->port;
                                 phy->req_line_speed = SPEED_1000;
                                 if (!CHIP_IS_E1x(bp)) {
                                         gport = BP_PATH(bp) +
@@ -8134,6 +8136,12 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
                                            "Warning: Link speed was forced to 1000Mbps. Current SFP module in port %d is not compliant with 10G Ethernet\n",
                                            gport);
                         }
+                        if (val[SFP_EEPROM_1G_COMP_CODE_ADDR] &
+                            SFP_EEPROM_1G_COMP_CODE_BASE_T) {
+                                bnx2x_sfp_set_transmitter(params, phy, 0);
+                                msleep(40);
+                                bnx2x_sfp_set_transmitter(params, phy, 1);
+                        }
                 } else {
                         int idx, cfg_idx = 0;
                         DP(NETIF_MSG_LINK, "10G Optic module detected\n");
@@ -8149,7 +8157,7 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
                 break;
         default:
                 DP(NETIF_MSG_LINK, "Unable to determine module type 0x%x !!!\n",
-                         val[0]);
+                         val[SFP_EEPROM_CON_TYPE_ADDR]);
                 return -EINVAL;
         }
         sync_offset = params->shmem_base +
@@ -13507,7 +13515,7 @@ static void bnx2x_check_kr2_wa(struct link_params *params,
 
         sigdet = bnx2x_warpcore_get_sigdet(phy, params);
         if (!sigdet) {
-                if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
+                if (!(params->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
                         bnx2x_kr2_recovery(params, vars, phy);
                         DP(NETIF_MSG_LINK, "No sigdet\n");
                 }
@@ -13525,7 +13533,7 @@ static void bnx2x_check_kr2_wa(struct link_params *params,
 
         /* CL73 has not begun yet */
         if (base_page == 0) {
-                if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
+                if (!(params->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
                         bnx2x_kr2_recovery(params, vars, phy);
                         DP(NETIF_MSG_LINK, "No BP\n");
                 }
@@ -13541,7 +13549,7 @@ static void bnx2x_check_kr2_wa(struct link_params *params,
                             ((next_page & 0xe0) == 0x20))));
 
         /* In case KR2 is already disabled, check if we need to re-enable it */
-        if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
+        if (!(params->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE)) {
                 if (!not_kr2_device) {
                         DP(NETIF_MSG_LINK, "BP=0x%x, NP=0x%x\n", base_page,
                            next_page);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
index 389f5f8cb0a3..d9cce4c3899b 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
@@ -323,6 +323,9 @@ struct link_params {
 #define LINK_FLAGS_INT_DISABLED         (1<<0)
 #define PHY_INITIALIZED         (1<<1)
         u32 lfa_base;
+
+        /* The same definitions as the shmem2 parameter */
+        u32 link_attr_sync;
 };
 
 /* Output parameters */
@@ -364,8 +367,6 @@ struct link_vars {
         u8 rx_tx_asic_rst;
         u8 turn_to_run_wc_rt;
         u16 rsrv2;
-        /* The same definitions as the shmem2 parameter */
-        u32 link_attr_sync;
 };
 
 /***********************************************************/
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 93132d8fec67..32e2444ab5e1 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -6868,6 +6868,37 @@ static void bnx2x__common_init_phy(struct bnx2x *bp)
         bnx2x_release_phy_lock(bp);
 }
 
+static void bnx2x_config_endianity(struct bnx2x *bp, u32 val)
+{
+        REG_WR(bp, PXP2_REG_RQ_QM_ENDIAN_M, val);
+        REG_WR(bp, PXP2_REG_RQ_TM_ENDIAN_M, val);
+        REG_WR(bp, PXP2_REG_RQ_SRC_ENDIAN_M, val);
+        REG_WR(bp, PXP2_REG_RQ_CDU_ENDIAN_M, val);
+        REG_WR(bp, PXP2_REG_RQ_DBG_ENDIAN_M, val);
+
+        /* make sure this value is 0 */
+        REG_WR(bp, PXP2_REG_RQ_HC_ENDIAN_M, 0);
+
+        REG_WR(bp, PXP2_REG_RD_QM_SWAP_MODE, val);
+        REG_WR(bp, PXP2_REG_RD_TM_SWAP_MODE, val);
+        REG_WR(bp, PXP2_REG_RD_SRC_SWAP_MODE, val);
+        REG_WR(bp, PXP2_REG_RD_CDURD_SWAP_MODE, val);
+}
+
+static void bnx2x_set_endianity(struct bnx2x *bp)
+{
+#ifdef __BIG_ENDIAN
+        bnx2x_config_endianity(bp, 1);
+#else
+        bnx2x_config_endianity(bp, 0);
+#endif
+}
+
+static void bnx2x_reset_endianity(struct bnx2x *bp)
+{
+        bnx2x_config_endianity(bp, 0);
+}
+
 /**
  * bnx2x_init_hw_common - initialize the HW at the COMMON phase.
  *
@@ -6934,23 +6965,7 @@ static int bnx2x_init_hw_common(struct bnx2x *bp)
 
         bnx2x_init_block(bp, BLOCK_PXP2, PHASE_COMMON);
         bnx2x_init_pxp(bp);
-
-#ifdef __BIG_ENDIAN
-        REG_WR(bp, PXP2_REG_RQ_QM_ENDIAN_M, 1);
-        REG_WR(bp, PXP2_REG_RQ_TM_ENDIAN_M, 1);
-        REG_WR(bp, PXP2_REG_RQ_SRC_ENDIAN_M, 1);
-        REG_WR(bp, PXP2_REG_RQ_CDU_ENDIAN_M, 1);
-        REG_WR(bp, PXP2_REG_RQ_DBG_ENDIAN_M, 1);
-        /* make sure this value is 0 */
-        REG_WR(bp, PXP2_REG_RQ_HC_ENDIAN_M, 0);
-
-/*      REG_WR(bp, PXP2_REG_RD_PBF_SWAP_MODE, 1); */
-        REG_WR(bp, PXP2_REG_RD_QM_SWAP_MODE, 1);
-        REG_WR(bp, PXP2_REG_RD_TM_SWAP_MODE, 1);
-        REG_WR(bp, PXP2_REG_RD_SRC_SWAP_MODE, 1);
-        REG_WR(bp, PXP2_REG_RD_CDURD_SWAP_MODE, 1);
-#endif
-
+        bnx2x_set_endianity(bp);
         bnx2x_ilt_init_page_size(bp, INITOP_SET);
 
         if (CHIP_REV_IS_FPGA(bp) && CHIP_IS_E1H(bp))
@@ -13440,9 +13455,15 @@ static void __bnx2x_remove(struct pci_dev *pdev,
         bnx2x_iov_remove_one(bp);
 
         /* Power on: we can't let PCI layer write to us while we are in D3 */
-        if (IS_PF(bp))
+        if (IS_PF(bp)) {
                 bnx2x_set_power_state(bp, PCI_D0);
 
+                /* Set endianity registers to reset values in case next driver
+                 * boots in different endianty environment.
+                 */
+                bnx2x_reset_endianity(bp);
+        }
+
         /* Disable MSI/MSI-X */
         bnx2x_disable_msi(bp);
 
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index eef63a8508e6..23f23c97c2ad 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -31,7 +31,7 @@
 #include <linux/if_vlan.h>
 #include <linux/prefetch.h>
 #include <linux/random.h>
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#if IS_ENABLED(CONFIG_VLAN_8021Q)
 #define BCM_VLAN 1
 #endif
 #include <net/ip.h>
@@ -3685,7 +3685,7 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr,
 static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr,
                              struct dst_entry **dst)
 {
-#if defined(CONFIG_IPV6) || (defined(CONFIG_IPV6_MODULE) && defined(MODULE))
+#if IS_ENABLED(CONFIG_IPV6)
         struct flowi6 fl6;
 
         memset(&fl6, 0, sizeof(fl6));
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 3ac5d23454a8..cb77ae93d89a 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -11617,6 +11617,12 @@ static int tg3_open(struct net_device *dev)
         struct tg3 *tp = netdev_priv(dev);
         int err;
 
+        if (tp->pcierr_recovery) {
+                netdev_err(dev, "Failed to open device. PCI error recovery "
+                           "in progress\n");
+                return -EAGAIN;
+        }
+
         if (tp->fw_needed) {
                 err = tg3_request_firmware(tp);
                 if (tg3_asic_rev(tp) == ASIC_REV_57766) {
@@ -11674,6 +11680,12 @@ static int tg3_close(struct net_device *dev)
 {
         struct tg3 *tp = netdev_priv(dev);
 
+        if (tp->pcierr_recovery) {
+                netdev_err(dev, "Failed to close device. PCI error recovery "
+                           "in progress\n");
+                return -EAGAIN;
+        }
+
         tg3_ptp_fini(tp);
 
         tg3_stop(tp);
@@ -17561,6 +17573,7 @@ static int tg3_init_one(struct pci_dev *pdev,
         tp->rx_mode = TG3_DEF_RX_MODE;
         tp->tx_mode = TG3_DEF_TX_MODE;
         tp->irq_sync = 1;
+        tp->pcierr_recovery = false;
 
         if (tg3_debug > 0)
                 tp->msg_enable = tg3_debug;
@@ -18071,6 +18084,8 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev,
 
         rtnl_lock();
 
+        tp->pcierr_recovery = true;
+
         /* We probably don't have netdev yet */
         if (!netdev || !netif_running(netdev))
                 goto done;
@@ -18195,6 +18210,7 @@ static void tg3_io_resume(struct pci_dev *pdev)
         tg3_phy_start(tp);
 
 done:
+        tp->pcierr_recovery = false;
         rtnl_unlock();
 }
 
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index 461accaf0aa4..31c9f8295953 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -3407,6 +3407,7 @@ struct tg3 {
 
         struct device                   *hwmon_dev;
         bool                            link_up;
+        bool                            pcierr_recovery;
 };
 
 /* Accessor macros for chip and asic attributes
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index ff8cae5e2535..ffc92a41d75b 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -2506,7 +2506,7 @@ bnad_tso_prepare(struct bnad *bnad, struct sk_buff *skb)
          * For TSO, the TCP checksum field is seeded with pseudo-header sum
          * excluding the length field.
          */
-        if (skb->protocol == htons(ETH_P_IP)) {
+        if (vlan_get_protocol(skb) == htons(ETH_P_IP)) {
                 struct iphdr *iph = ip_hdr(skb);
 
                 /* Do we really need these? */
@@ -2870,12 +2870,13 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb,
                 }
 
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                        __be16 net_proto = vlan_get_protocol(skb);
                         u8 proto = 0;
 
-                        if (skb->protocol == htons(ETH_P_IP))
+                        if (net_proto == htons(ETH_P_IP))
                                 proto = ip_hdr(skb)->protocol;
 #ifdef NETIF_F_IPV6_CSUM
-                        else if (skb->protocol == htons(ETH_P_IPV6)) {
+                        else if (net_proto == htons(ETH_P_IPV6)) {
                                 /* nexthdr may not be TCP immediately. */
                                 proto = ipv6_hdr(skb)->nexthdr;
                         }
diff --git a/drivers/net/ethernet/calxeda/Kconfig b/drivers/net/ethernet/calxeda/Kconfig
index 184a063bed5f..07d2201530d2 100644
--- a/drivers/net/ethernet/calxeda/Kconfig
+++ b/drivers/net/ethernet/calxeda/Kconfig
@@ -1,6 +1,7 @@
 config NET_CALXEDA_XGMAC
         tristate "Calxeda 1G/10G XGMAC Ethernet driver"
         depends on HAS_IOMEM && HAS_DMA
+        depends on ARCH_HIGHBANK || COMPILE_TEST
         select CRC32
         help
           This is the driver for the XGMAC Ethernet IP block found on Calxeda
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 18fb9c61d7ba..8c34811a1128 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -1253,7 +1253,9 @@ freeout:	t4_free_sge_resources(adap);
                         goto freeout;
         }
 
-        t4_write_reg(adap, MPS_TRC_RSS_CONTROL,
+        t4_write_reg(adap, is_t4(adap->params.chip) ?
+                                MPS_TRC_RSS_CONTROL :
+                                MPS_T5_TRC_RSS_CONTROL,
                      RSSCONTROL(netdev2pinfo(adap->port[0])->tx_chan) |
                      QUEUENUMBER(s->ethrxq[0].rspq.abs_id));
         return 0;
@@ -1761,7 +1763,8 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
                 0xd004, 0xd03c,
                 0xdfc0, 0xdfe0,
                 0xe000, 0xea7c,
-                0xf000, 0x11190,
+                0xf000, 0x11110,
+                0x11118, 0x11190,
                 0x19040, 0x1906c,
                 0x19078, 0x19080,
                 0x1908c, 0x19124,
@@ -1968,7 +1971,8 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
                 0xd004, 0xd03c,
                 0xdfc0, 0xdfe0,
                 0xe000, 0x11088,
-                0x1109c, 0x1117c,
+                0x1109c, 0x11110,
+                0x11118, 0x1117c,
                 0x11190, 0x11204,
                 0x19040, 0x1906c,
                 0x19078, 0x19080,
@@ -5955,7 +5959,8 @@ static int adap_init0(struct adapter *adap)
                 params[3] = FW_PARAM_PFVF(CQ_END);
                 params[4] = FW_PARAM_PFVF(OCQ_START);
                 params[5] = FW_PARAM_PFVF(OCQ_END);
-                ret = t4_query_params(adap, 0, 0, 0, 6, params, val);
+                ret = t4_query_params(adap, adap->mbox, adap->fn, 0, 6, params,
+                                      val);
                 if (ret < 0)
                         goto bye;
                 adap->vres.qp.start = val[0];
@@ -5967,7 +5972,8 @@ static int adap_init0(struct adapter *adap)
 
                 params[0] = FW_PARAM_DEV(MAXORDIRD_QP);
                 params[1] = FW_PARAM_DEV(MAXIRD_ADAPTER);
-                ret = t4_query_params(adap, 0, 0, 0, 2, params, val);
+                ret = t4_query_params(adap, adap->mbox, adap->fn, 0, 2, params,
+                                      val);
                 if (ret < 0) {
                         adap->params.max_ordird_qp = 8;
                         adap->params.max_ird_adapter = 32 * adap->tids.ntids;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index a853133d8db8..41d04462b72e 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -168,6 +168,34 @@ void t4_hw_pci_read_cfg4(struct adapter *adap, int reg, u32 *val)
 }
 
 /*
+ * t4_report_fw_error - report firmware error
+ * @adap: the adapter
+ *
+ * The adapter firmware can indicate error conditions to the host.
+ * If the firmware has indicated an error, print out the reason for
+ * the firmware error.
+ */
+static void t4_report_fw_error(struct adapter *adap)
+{
+        static const char *const reason[] = {
+                "Crash",                        /* PCIE_FW_EVAL_CRASH */
+                "During Device Preparation",    /* PCIE_FW_EVAL_PREP */
+                "During Device Configuration",  /* PCIE_FW_EVAL_CONF */
+                "During Device Initialization", /* PCIE_FW_EVAL_INIT */
+                "Unexpected Event",             /* PCIE_FW_EVAL_UNEXPECTEDEVENT */
+                "Insufficient Airflow",         /* PCIE_FW_EVAL_OVERHEAT */
+                "Device Shutdown",              /* PCIE_FW_EVAL_DEVICESHUTDOWN */
+                "Reserved",                     /* reserved */
+        };
+        u32 pcie_fw;
+
+        pcie_fw = t4_read_reg(adap, MA_PCIE_FW);
+        if (pcie_fw & FW_PCIE_FW_ERR)
+                dev_err(adap->pdev_dev, "Firmware reports adapter error: %s\n",
+                        reason[FW_PCIE_FW_EVAL_GET(pcie_fw)]);
+}
+
+/*
  * Get the reply to a mailbox command and store it in @rpl in big-endian order.
  */
 static void get_mbox_rpl(struct adapter *adap, __be64 *rpl, int nflit,
@@ -300,6 +328,7 @@ int t4_wr_mbox_meat(struct adapter *adap, int mbox, const void *cmd, int size,
         dump_mbox(adap, mbox, data_reg);
         dev_err(adap->pdev_dev, "command %#x in mailbox %d timed out\n",
                 *(const u8 *)cmd, mbox);
+        t4_report_fw_error(adap);
         return -ETIMEDOUT;
 }
 
@@ -566,6 +595,7 @@ int t4_memory_rw(struct adapter *adap, int win, int mtype, u32 addr,
 #define VPD_BASE           0x400
 #define VPD_BASE_OLD       0
 #define VPD_LEN            1024
+#define CHELSIO_VPD_UNIQUE_ID 0x82
 
 /**
  *      t4_seeprom_wp - enable/disable EEPROM write protection
@@ -603,7 +633,14 @@ int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
         ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(u32), vpd);
         if (ret < 0)
                 goto out;
-        addr = *vpd == 0x82 ? VPD_BASE : VPD_BASE_OLD;
+
+        /* The VPD shall have a unique identifier specified by the PCI SIG.
+         * For chelsio adapters, the identifier is 0x82. The first byte of a VPD
+         * shall be CHELSIO_VPD_UNIQUE_ID (0x82). The VPD programming software
+         * is expected to automatically put this entry at the
+         * beginning of the VPD.
+         */
+        addr = *vpd == CHELSIO_VPD_UNIQUE_ID ? VPD_BASE : VPD_BASE_OLD;
 
         ret = pci_read_vpd(adapter->pdev, addr, VPD_LEN, vpd);
         if (ret < 0)
@@ -667,6 +704,7 @@ int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
         i = pci_vpd_info_field_size(vpd + sn - PCI_VPD_INFO_FLD_HDR_SIZE);
         memcpy(p->sn, vpd + sn, min(i, SERNUM_LEN));
         strim(p->sn);
+        i = pci_vpd_info_field_size(vpd + pn - PCI_VPD_INFO_FLD_HDR_SIZE);
         memcpy(p->pn, vpd + pn, min(i, PN_LEN));
         strim(p->pn);
 
@@ -1394,15 +1432,18 @@ static void pcie_intr_handler(struct adapter *adapter)
 
         int fat;
 
-        fat = t4_handle_intr_status(adapter,
-                                    PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
-                                    sysbus_intr_info) +
-              t4_handle_intr_status(adapter,
-                                    PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
-                                    pcie_port_intr_info) +
-              t4_handle_intr_status(adapter, PCIE_INT_CAUSE,
-                                    is_t4(adapter->params.chip) ?
-                                    pcie_intr_info : t5_pcie_intr_info);
+        if (is_t4(adapter->params.chip))
+                fat = t4_handle_intr_status(adapter,
+                                            PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
+                                            sysbus_intr_info) +
+                        t4_handle_intr_status(adapter,
+                                              PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
+                                              pcie_port_intr_info) +
+                        t4_handle_intr_status(adapter, PCIE_INT_CAUSE,
+                                              pcie_intr_info);
+        else
+                fat = t4_handle_intr_status(adapter, PCIE_INT_CAUSE,
+                                            t5_pcie_intr_info);
 
         if (fat)
                 t4_fatal_err(adapter);
@@ -1521,6 +1562,9 @@ static void cim_intr_handler(struct adapter *adapter)
 
         int fat;
 
+        if (t4_read_reg(adapter, MA_PCIE_FW) & FW_PCIE_FW_ERR)
+                t4_report_fw_error(adapter);
+
         fat = t4_handle_intr_status(adapter, CIM_HOST_INT_CAUSE,
                                     cim_intr_info) +
               t4_handle_intr_status(adapter, CIM_HOST_UPACC_INT_CAUSE,
@@ -1768,10 +1812,16 @@ static void ma_intr_handler(struct adapter *adap)
 {
         u32 v, status = t4_read_reg(adap, MA_INT_CAUSE);
 
-        if (status & MEM_PERR_INT_CAUSE)
+        if (status & MEM_PERR_INT_CAUSE) {
                 dev_alert(adap->pdev_dev,
                           "MA parity error, parity status %#x\n",
                           t4_read_reg(adap, MA_PARITY_ERROR_STATUS));
+                if (is_t5(adap->params.chip))
+                        dev_alert(adap->pdev_dev,
+                                  "MA parity error, parity status %#x\n",
+                                  t4_read_reg(adap,
+                                              MA_PARITY_ERROR_STATUS2));
+        }
         if (status & MEM_WRAP_INT_CAUSE) {
                 v = t4_read_reg(adap, MA_INT_WRAP_STATUS);
                 dev_alert(adap->pdev_dev, "MA address wrap-around error by "
@@ -2733,12 +2783,16 @@ retry:
         /*
          * Issue the HELLO command to the firmware.  If it's not successful
          * but indicates that we got a "busy" or "timeout" condition, retry
-         * the HELLO until we exhaust our retry limit.
+         * the HELLO until we exhaust our retry limit.  If we do exceed our
+         * retry limit, check to see if the firmware left us any error
+         * information and report that if so.
          */
         ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
         if (ret < 0) {
                 if ((ret == -EBUSY || ret == -ETIMEDOUT) && retries-- > 0)
                         goto retry;
+                if (t4_read_reg(adap, MA_PCIE_FW) & FW_PCIE_FW_ERR)
+                        t4_report_fw_error(adap);
                 return ret;
         }
 
@@ -3742,6 +3796,7 @@ int t4_handle_fw_rpl(struct adapter *adap, const __be64 *rpl)
                         lc->link_ok = link_ok;
                         lc->speed = speed;
                         lc->fc = fc;
+                        lc->supported = be16_to_cpu(p->u.info.pcap);
                         t4_os_link_changed(adap, port, link_ok);
                 }
                 if (mod != pi->mod_type) {
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
index e3146e83df20..39fb325474f7 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
@@ -511,6 +511,7 @@
 #define  MEM_WRAP_CLIENT_NUM_GET(x) (((x) & MEM_WRAP_CLIENT_NUM_MASK) >> MEM_WRAP_CLIENT_NUM_SHIFT)
 #define MA_PCIE_FW 0x30b8
 #define MA_PARITY_ERROR_STATUS 0x77f4
+#define MA_PARITY_ERROR_STATUS2 0x7804
 
 #define MA_EXT_MEMORY1_BAR 0x7808
 #define EDC_0_BASE_ADDR 0x7900
@@ -959,6 +960,7 @@
 #define  TRCMULTIFILTER     0x00000001U
 
 #define MPS_TRC_RSS_CONTROL 0x9808
+#define MPS_T5_TRC_RSS_CONTROL 0xa00c
 #define  RSSCONTROL_MASK    0x00ff0000U
 #define  RSSCONTROL_SHIFT   16
 #define  RSSCONTROL(x)      ((x) << RSSCONTROL_SHIFT)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
index 5f2729ebadbe..3409756a85b9 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
@@ -2228,6 +2228,10 @@ struct fw_debug_cmd {
 #define FW_PCIE_FW_MASTER(x)     ((x) << FW_PCIE_FW_MASTER_SHIFT)
 #define FW_PCIE_FW_MASTER_GET(x) (((x) >> FW_PCIE_FW_MASTER_SHIFT) & \
                                  FW_PCIE_FW_MASTER_MASK)
+#define FW_PCIE_FW_EVAL_MASK   0x7
+#define FW_PCIE_FW_EVAL_SHIFT  24
+#define FW_PCIE_FW_EVAL_GET(x) (((x) >> FW_PCIE_FW_EVAL_SHIFT) & \
+                                 FW_PCIE_FW_EVAL_MASK)
 
 struct fw_hdr {
         u8 ver;
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index a0b418e007a0..566b17db135a 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -1994,7 +1994,7 @@ static void xmit_common(struct sk_buff *skb, struct ehea_swqe *swqe)
 {
         swqe->tx_control |= EHEA_SWQE_IMM_DATA_PRESENT | EHEA_SWQE_CRC;
 
-        if (skb->protocol != htons(ETH_P_IP))
+        if (vlan_get_protocol(skb) != htons(ETH_P_IP))
                 return;
 
         if (skb->ip_summed == CHECKSUM_PARTIAL)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index cbc330b301cd..ad3d5d12173f 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -2674,7 +2674,8 @@ set_itr_now:
 #define E1000_TX_FLAGS_VLAN_SHIFT       16
 
 static int e1000_tso(struct e1000_adapter *adapter,
-                     struct e1000_tx_ring *tx_ring, struct sk_buff *skb)
+                     struct e1000_tx_ring *tx_ring, struct sk_buff *skb,
+                     __be16 protocol)
 {
         struct e1000_context_desc *context_desc;
         struct e1000_buffer *buffer_info;
@@ -2692,7 +2693,7 @@ static int e1000_tso(struct e1000_adapter *adapter,
 
                 hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
                 mss = skb_shinfo(skb)->gso_size;
-                if (skb->protocol == htons(ETH_P_IP)) {
+                if (protocol == htons(ETH_P_IP)) {
                         struct iphdr *iph = ip_hdr(skb);
                         iph->tot_len = 0;
                         iph->check = 0;
@@ -2702,7 +2703,7 @@ static int e1000_tso(struct e1000_adapter *adapter,
                                                                  0);
                         cmd_length = E1000_TXD_CMD_IP;
                         ipcse = skb_transport_offset(skb) - 1;
-                } else if (skb->protocol == htons(ETH_P_IPV6)) {
+                } else if (skb_is_gso_v6(skb)) {
                         ipv6_hdr(skb)->payload_len = 0;
                         tcp_hdr(skb)->check =
                                 ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
@@ -2745,7 +2746,8 @@ static int e1000_tso(struct e1000_adapter *adapter,
 }
 
 static bool e1000_tx_csum(struct e1000_adapter *adapter,
-                          struct e1000_tx_ring *tx_ring, struct sk_buff *skb)
+                          struct e1000_tx_ring *tx_ring, struct sk_buff *skb,
+                          __be16 protocol)
 {
         struct e1000_context_desc *context_desc;
         struct e1000_buffer *buffer_info;
@@ -2756,7 +2758,7 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter,
         if (skb->ip_summed != CHECKSUM_PARTIAL)
                 return false;
 
-        switch (skb->protocol) {
+        switch (protocol) {
         case cpu_to_be16(ETH_P_IP):
                 if (ip_hdr(skb)->protocol == IPPROTO_TCP)
                         cmd_len |= E1000_TXD_CMD_TCP;
@@ -3097,6 +3099,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
         int count = 0;
         int tso;
         unsigned int f;
+        __be16 protocol = vlan_get_protocol(skb);
 
         /* This goes back to the question of how to logically map a Tx queue
          * to a flow.  Right now, performance is impacted slightly negatively
@@ -3210,7 +3213,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
 
         first = tx_ring->next_to_use;
 
-        tso = e1000_tso(adapter, tx_ring, skb);
+        tso = e1000_tso(adapter, tx_ring, skb, protocol);
         if (tso < 0) {
                 dev_kfree_skb_any(skb);
                 return NETDEV_TX_OK;
@@ -3220,10 +3223,10 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                 if (likely(hw->mac_type != e1000_82544))
                         tx_ring->last_tx_tso = true;
                 tx_flags |= E1000_TX_FLAGS_TSO;
-        } else if (likely(e1000_tx_csum(adapter, tx_ring, skb)))
+        } else if (likely(e1000_tx_csum(adapter, tx_ring, skb, protocol)))
                 tx_flags |= E1000_TX_FLAGS_CSUM;
 
-        if (likely(skb->protocol == htons(ETH_P_IP)))
+        if (protocol == htons(ETH_P_IP))
                 tx_flags |= E1000_TX_FLAGS_IPV4;
 
         if (unlikely(skb->no_fcs))
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 65c3aef2bd36..247335d2c7ec 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5164,7 +5164,8 @@ link_up:
 #define E1000_TX_FLAGS_VLAN_MASK        0xffff0000
 #define E1000_TX_FLAGS_VLAN_SHIFT       16
 
-static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
+static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb,
+                     __be16 protocol)
 {
         struct e1000_context_desc *context_desc;
         struct e1000_buffer *buffer_info;
@@ -5183,7 +5184,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
 
         hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
         mss = skb_shinfo(skb)->gso_size;
-        if (skb->protocol == htons(ETH_P_IP)) {
+        if (protocol == htons(ETH_P_IP)) {
                 struct iphdr *iph = ip_hdr(skb);
                 iph->tot_len = 0;
                 iph->check = 0;
@@ -5231,7 +5232,8 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
         return 1;
 }
 
-static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb)
+static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb,
+                          __be16 protocol)
 {
         struct e1000_adapter *adapter = tx_ring->adapter;
         struct e1000_context_desc *context_desc;
@@ -5239,16 +5241,10 @@ static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb)
         unsigned int i;
         u8 css;
         u32 cmd_len = E1000_TXD_CMD_DEXT;
-        __be16 protocol;
 
         if (skb->ip_summed != CHECKSUM_PARTIAL)
                 return false;
 
-        if (skb->protocol == cpu_to_be16(ETH_P_8021Q))
-                protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
-        else
-                protocol = skb->protocol;
-
         switch (protocol) {
         case cpu_to_be16(ETH_P_IP):
                 if (ip_hdr(skb)->protocol == IPPROTO_TCP)
@@ -5546,6 +5542,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
         int count = 0;
         int tso;
         unsigned int f;
+        __be16 protocol = vlan_get_protocol(skb);
 
         if (test_bit(__E1000_DOWN, &adapter->state)) {
                 dev_kfree_skb_any(skb);
@@ -5620,7 +5617,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
 
         first = tx_ring->next_to_use;
 
-        tso = e1000_tso(tx_ring, skb);
+        tso = e1000_tso(tx_ring, skb, protocol);
         if (tso < 0) {
                 dev_kfree_skb_any(skb);
                 return NETDEV_TX_OK;
@@ -5628,14 +5625,14 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
 
         if (tso)
                 tx_flags |= E1000_TX_FLAGS_TSO;
-        else if (e1000_tx_csum(tx_ring, skb))
+        else if (e1000_tx_csum(tx_ring, skb, protocol))
                 tx_flags |= E1000_TX_FLAGS_CSUM;
 
         /* Old method was to assume IPv4 packet by default if TSO was enabled.
          * 82571 hardware supports TSO capabilities for IPv6 as well...
          * no longer assume, we must.
          */
-        if (skb->protocol == htons(ETH_P_IP))
+        if (protocol == htons(ETH_P_IP))
                 tx_flags |= E1000_TX_FLAGS_IPV4;
 
         if (unlikely(skb->no_fcs))
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index b60f16381229..be039dd6114d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2323,7 +2323,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
                 goto out_drop;
 
         /* obtain protocol of skb */
-        protocol = skb->protocol;
+        protocol = vlan_get_protocol(skb);
 
         /* record the location of the first descriptor for this packet */
         first = &tx_ring->tx_bi[tx_ring->next_to_use];
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 50cf5b8d0e15..04c7c1557a0c 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1599,7 +1599,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
                 goto out_drop;
 
         /* obtain protocol of skb */
-        protocol = skb->protocol;
+        protocol = vlan_get_protocol(skb);
 
         /* record the location of the first descriptor for this packet */
         first = &tx_ring->tx_bi[tx_ring->next_to_use];
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index c9f1d1b7ef37..ade067de1689 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -20,6 +20,7 @@
 #include <linux/mbus.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/if_vlan.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
 #include <linux/io.h>
@@ -1371,15 +1372,16 @@ static u32 mvneta_skb_tx_csum(struct mvneta_port *pp, struct sk_buff *skb)
 {
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 int ip_hdr_len = 0;
+                __be16 l3_proto = vlan_get_protocol(skb);
                 u8 l4_proto;
 
-                if (skb->protocol == htons(ETH_P_IP)) {
+                if (l3_proto == htons(ETH_P_IP)) {
                         struct iphdr *ip4h = ip_hdr(skb);
 
                         /* Calculate IPv4 checksum and L4 checksum */
                         ip_hdr_len = ip4h->ihl;
                         l4_proto = ip4h->protocol;
-                } else if (skb->protocol == htons(ETH_P_IPV6)) {
+                } else if (l3_proto == htons(ETH_P_IPV6)) {
                         struct ipv6hdr *ip6h = ipv6_hdr(skb);
 
                         /* Read l4_protocol from one of IPv6 extra headers */
@@ -1390,7 +1392,7 @@ static u32 mvneta_skb_tx_csum(struct mvneta_port *pp, struct sk_buff *skb)
                         return MVNETA_TX_L4_CSUM_NOT;
 
                 return mvneta_txq_desc_csum(skb_network_offset(skb),
-                                skb->protocol, ip_hdr_len, l4_proto);
+                                            l3_proto, ip_hdr_len, l4_proto);
         }
 
         return MVNETA_TX_L4_CSUM_NOT;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index bb536aa613f4..abddcf8c40aa 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -474,39 +474,12 @@ static int mlx4_en_tunnel_steer_add(struct mlx4_en_priv *priv, unsigned char *ad
                                     int qpn, u64 *reg_id)
 {
         int err;
-        struct mlx4_spec_list spec_eth_outer = { {NULL} };
-        struct mlx4_spec_list spec_vxlan     = { {NULL} };
-        struct mlx4_spec_list spec_eth_inner = { {NULL} };
-
-        struct mlx4_net_trans_rule rule = {
-                .queue_mode = MLX4_NET_TRANS_Q_FIFO,
-                .exclusive = 0,
-                .allow_loopback = 1,
-                .promisc_mode = MLX4_FS_REGULAR,
-                .priority = MLX4_DOMAIN_NIC,
-        };
-
-        __be64 mac_mask = cpu_to_be64(MLX4_MAC_MASK << 16);
 
         if (priv->mdev->dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)
                 return 0; /* do nothing */
 
-        rule.port = priv->port;
-        rule.qpn = qpn;
-        INIT_LIST_HEAD(&rule.list);
-
-        spec_eth_outer.id = MLX4_NET_TRANS_RULE_ID_ETH;
-        memcpy(spec_eth_outer.eth.dst_mac, addr, ETH_ALEN);
-        memcpy(spec_eth_outer.eth.dst_mac_msk, &mac_mask, ETH_ALEN);
-
-        spec_vxlan.id = MLX4_NET_TRANS_RULE_ID_VXLAN;    /* any vxlan header */
-        spec_eth_inner.id = MLX4_NET_TRANS_RULE_ID_ETH;  /* any inner eth header */
-
-        list_add_tail(&spec_eth_outer.list, &rule.list);
-        list_add_tail(&spec_vxlan.list,     &rule.list);
-        list_add_tail(&spec_eth_inner.list, &rule.list);
-
-        err = mlx4_flow_attach(priv->mdev->dev, &rule, reg_id);
+        err = mlx4_tunnel_steer_add(priv->mdev->dev, addr, priv->port, qpn,
+                                    MLX4_DOMAIN_NIC, reg_id);
         if (err) {
                 en_err(priv, "failed to add vxlan steering rule, err %d\n", err);
                 return err;
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index d80e7a6fac74..ca0f98c95105 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -1020,6 +1020,44 @@ int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id)
 }
 EXPORT_SYMBOL_GPL(mlx4_flow_detach);
 
+int mlx4_tunnel_steer_add(struct mlx4_dev *dev, unsigned char *addr,
+                          int port, int qpn, u16 prio, u64 *reg_id)
+{
+        int err;
+        struct mlx4_spec_list spec_eth_outer = { {NULL} };
+        struct mlx4_spec_list spec_vxlan     = { {NULL} };
+        struct mlx4_spec_list spec_eth_inner = { {NULL} };
+
+        struct mlx4_net_trans_rule rule = {
+                .queue_mode = MLX4_NET_TRANS_Q_FIFO,
+                .exclusive = 0,
+                .allow_loopback = 1,
+                .promisc_mode = MLX4_FS_REGULAR,
+        };
+
+        __be64 mac_mask = cpu_to_be64(MLX4_MAC_MASK << 16);
+
+        rule.port = port;
+        rule.qpn = qpn;
+        rule.priority = prio;
+        INIT_LIST_HEAD(&rule.list);
+
+        spec_eth_outer.id = MLX4_NET_TRANS_RULE_ID_ETH;
+        memcpy(spec_eth_outer.eth.dst_mac, addr, ETH_ALEN);
+        memcpy(spec_eth_outer.eth.dst_mac_msk, &mac_mask, ETH_ALEN);
+
+        spec_vxlan.id = MLX4_NET_TRANS_RULE_ID_VXLAN;    /* any vxlan header */
+        spec_eth_inner.id = MLX4_NET_TRANS_RULE_ID_ETH;  /* any inner eth header */
+
+        list_add_tail(&spec_eth_outer.list, &rule.list);
+        list_add_tail(&spec_vxlan.list,     &rule.list);
+        list_add_tail(&spec_eth_inner.list, &rule.list);
+
+        err = mlx4_flow_attach(dev, &rule, reg_id);
+        return err;
+}
+EXPORT_SYMBOL(mlx4_tunnel_steer_add);
+
 int mlx4_FLOW_STEERING_IB_UC_QP_RANGE(struct mlx4_dev *dev, u32 min_range_qpn,
                                       u32 max_range_qpn)
 {
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c
index 5020fd47825d..2f12c88c66ab 100644
--- a/drivers/net/ethernet/moxa/moxart_ether.c
+++ b/drivers/net/ethernet/moxa/moxart_ether.c
@@ -206,7 +206,7 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget)
         int rx_head = priv->rx_head;
         int rx = 0;
 
-        while (1) {
+        while (rx < budget) {
                 desc = priv->rx_desc_base + (RX_REG_DESC_SIZE * rx_head);
                 desc0 = readl(desc + RX_REG_OFFSET_DESC0);
 
@@ -218,7 +218,7 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget)
                         net_dbg_ratelimited("packet error\n");
                         priv->stats.rx_dropped++;
                         priv->stats.rx_errors++;
-                        continue;
+                        goto rx_next;
                 }
 
                 len = desc0 & RX_DESC0_FRAME_LEN_MASK;
@@ -226,13 +226,19 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget)
                 if (len > RX_BUF_SIZE)
                         len = RX_BUF_SIZE;
 
-                skb = build_skb(priv->rx_buf[rx_head], priv->rx_buf_size);
+                dma_sync_single_for_cpu(&ndev->dev,
+                                        priv->rx_mapping[rx_head],
+                                        priv->rx_buf_size, DMA_FROM_DEVICE);
+                skb = netdev_alloc_skb_ip_align(ndev, len);
+
                 if (unlikely(!skb)) {
-                        net_dbg_ratelimited("build_skb failed\n");
+                        net_dbg_ratelimited("netdev_alloc_skb_ip_align failed\n");
                         priv->stats.rx_dropped++;
                         priv->stats.rx_errors++;
+                        goto rx_next;
                 }
 
+                memcpy(skb->data, priv->rx_buf[rx_head], len);
                 skb_put(skb, len);
                 skb->protocol = eth_type_trans(skb, ndev);
                 napi_gro_receive(&priv->napi, skb);
@@ -244,18 +250,15 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget)
                 if (desc0 & RX_DESC0_MULTICAST)
                         priv->stats.multicast++;
 
+rx_next:
                 writel(RX_DESC0_DMA_OWN, desc + RX_REG_OFFSET_DESC0);
 
                 rx_head = RX_NEXT(rx_head);
                 priv->rx_head = rx_head;
-
-                if (rx >= budget)
-                        break;
         }
 
         if (rx < budget) {
-                napi_gro_flush(napi, false);
-                __napi_complete(napi);
+                napi_complete(napi);
         }
 
         priv->reg_imr |= RPKT_FINISH_M;
@@ -346,10 +349,12 @@ static int moxart_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                 len = ETH_ZLEN;
         }
 
-        txdes1 = readl(desc + TX_REG_OFFSET_DESC1);
-        txdes1 |= TX_DESC1_LTS | TX_DESC1_FTS;
-        txdes1 &= ~(TX_DESC1_FIFO_COMPLETE | TX_DESC1_INTR_COMPLETE);
-        txdes1 |= (len & TX_DESC1_BUF_SIZE_MASK);
+        dma_sync_single_for_device(&ndev->dev, priv->tx_mapping[tx_head],
+                                   priv->tx_buf_size, DMA_TO_DEVICE);
+
+        txdes1 = TX_DESC1_LTS | TX_DESC1_FTS | (len & TX_DESC1_BUF_SIZE_MASK);
+        if (tx_head == TX_DESC_NUM_MASK)
+                txdes1 |= TX_DESC1_END;
         writel(txdes1, desc + TX_REG_OFFSET_DESC1);
         writel(TX_DESC0_DMA_OWN, desc + TX_REG_OFFSET_DESC0);
 
@@ -465,8 +470,7 @@ static int moxart_mac_probe(struct platform_device *pdev)
         spin_lock_init(&priv->txlock);
 
         priv->tx_buf_size = TX_BUF_SIZE;
-        priv->rx_buf_size = RX_BUF_SIZE +
-                            SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
+        priv->rx_buf_size = RX_BUF_SIZE;
 
         priv->tx_desc_base = dma_alloc_coherent(NULL, TX_REG_DESC_SIZE *
                                                 TX_DESC_NUM, &priv->tx_base,
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 8706c0dbd0c3..a44a03c45014 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -1220,6 +1220,9 @@ static int lpc_eth_open(struct net_device *ndev)
 
         __lpc_eth_clock_enable(pldat, true);
 
+        /* Suspended PHY makes LPC ethernet core block, so resume now */
+        phy_resume(pldat->phy_dev);
+
         /* Reset and initialize */
         __lpc_eth_reset(pldat);
         __lpc_eth_init(pldat);
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 188626e2a861..3e96f269150d 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -2556,6 +2556,7 @@ static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr)
 
         if (skb_is_gso(skb)) {
                 int err;
+                __be16 l3_proto = vlan_get_protocol(skb);
 
                 err = skb_cow_head(skb, 0);
                 if (err < 0)
@@ -2572,7 +2573,7 @@ static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr)
                                 << OB_MAC_TRANSPORT_HDR_SHIFT);
                 mac_iocb_ptr->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
                 mac_iocb_ptr->flags2 |= OB_MAC_TSO_IOCB_LSO;
-                if (likely(skb->protocol == htons(ETH_P_IP))) {
+                if (likely(l3_proto == htons(ETH_P_IP))) {
                         struct iphdr *iph = ip_hdr(skb);
                         iph->check = 0;
                         mac_iocb_ptr->flags1 |= OB_MAC_TSO_IOCB_IP4;
@@ -2580,7 +2581,7 @@ static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr)
                                                                  iph->daddr, 0,
                                                                  IPPROTO_TCP,
                                                                  0);
-                } else if (skb->protocol == htons(ETH_P_IPV6)) {
+                } else if (l3_proto == htons(ETH_P_IPV6)) {
                         mac_iocb_ptr->flags1 |= OB_MAC_TSO_IOCB_IP6;
                         tcp_hdr(skb)->check =
                             ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig
index 9e757c792d84..196e98a2d93b 100644
--- a/drivers/net/ethernet/renesas/Kconfig
+++ b/drivers/net/ethernet/renesas/Kconfig
@@ -5,6 +5,7 @@
 config SH_ETH
         tristate "Renesas SuperH Ethernet support"
         depends on HAS_DMA
+        depends on ARCH_SHMOBILE || SUPERH || COMPILE_TEST
         select CRC32
         select MII
         select MDIO_BITBANG
diff --git a/drivers/net/ethernet/stmicro/stmmac/chain_mode.c b/drivers/net/ethernet/stmicro/stmmac/chain_mode.c
index c553f6b5a913..cf28daba4346 100644
--- a/drivers/net/ethernet/stmicro/stmmac/chain_mode.c
+++ b/drivers/net/ethernet/stmicro/stmmac/chain_mode.c
@@ -28,7 +28,7 @@
 
 #include "stmmac.h"
 
-static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
+static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
 {
         struct stmmac_priv *priv = (struct stmmac_priv *)p;
         unsigned int txsize = priv->dma_tx_size;
@@ -47,7 +47,9 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
 
         desc->des2 = dma_map_single(priv->device, skb->data,
                                     bmax, DMA_TO_DEVICE);
-        priv->tx_skbuff_dma[entry] = desc->des2;
+        if (dma_mapping_error(priv->device, desc->des2))
+                return -1;
+        priv->tx_skbuff_dma[entry].buf = desc->des2;
         priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum, STMMAC_CHAIN_MODE);
 
         while (len != 0) {
@@ -59,7 +61,9 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
                         desc->des2 = dma_map_single(priv->device,
                                                     (skb->data + bmax * i),
                                                     bmax, DMA_TO_DEVICE);
-                        priv->tx_skbuff_dma[entry] = desc->des2;
+                        if (dma_mapping_error(priv->device, desc->des2))
+                                return -1;
+                        priv->tx_skbuff_dma[entry].buf = desc->des2;
                         priv->hw->desc->prepare_tx_desc(desc, 0, bmax, csum,
                                                         STMMAC_CHAIN_MODE);
                         priv->hw->desc->set_tx_owner(desc);
@@ -69,7 +73,9 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
                         desc->des2 = dma_map_single(priv->device,
                                                     (skb->data + bmax * i), len,
                                                     DMA_TO_DEVICE);
-                        priv->tx_skbuff_dma[entry] = desc->des2;
+                        if (dma_mapping_error(priv->device, desc->des2))
+                                return -1;
+                        priv->tx_skbuff_dma[entry].buf = desc->des2;
                         priv->hw->desc->prepare_tx_desc(desc, 0, len, csum,
                                                         STMMAC_CHAIN_MODE);
                         priv->hw->desc->set_tx_owner(desc);
diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index de507c32036c..593e6c4144a7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -220,10 +220,10 @@ enum dma_irq_status {
         handle_tx = 0x8,
 };
 
-#define CORE_IRQ_TX_PATH_IN_LPI_MODE    (1 << 1)
-#define CORE_IRQ_TX_PATH_EXIT_LPI_MODE  (1 << 2)
-#define CORE_IRQ_RX_PATH_IN_LPI_MODE    (1 << 3)
-#define CORE_IRQ_RX_PATH_EXIT_LPI_MODE  (1 << 4)
+#define CORE_IRQ_TX_PATH_IN_LPI_MODE    (1 << 0)
+#define CORE_IRQ_TX_PATH_EXIT_LPI_MODE  (1 << 1)
+#define CORE_IRQ_RX_PATH_IN_LPI_MODE    (1 << 2)
+#define CORE_IRQ_RX_PATH_EXIT_LPI_MODE  (1 << 3)
 
 #define CORE_PCS_ANE_COMPLETE           (1 << 5)
 #define CORE_PCS_LINK_STATUS            (1 << 6)
@@ -287,7 +287,7 @@ struct dma_features {
 
 /* Default LPI timers */
 #define STMMAC_DEFAULT_LIT_LS   0x3E8
-#define STMMAC_DEFAULT_TWT_LS   0x0
+#define STMMAC_DEFAULT_TWT_LS   0x1E
 
 #define STMMAC_CHAIN_MODE       0x1
 #define STMMAC_RING_MODE        0x2
@@ -425,7 +425,7 @@ struct stmmac_mode_ops {
         void (*init) (void *des, dma_addr_t phy_addr, unsigned int size,
                       unsigned int extend_desc);
         unsigned int (*is_jumbo_frm) (int len, int ehn_desc);
-        unsigned int (*jumbo_frm) (void *priv, struct sk_buff *skb, int csum);
+        int (*jumbo_frm)(void *priv, struct sk_buff *skb, int csum);
         int (*set_16kib_bfsize)(int mtu);
         void (*init_desc3)(struct dma_desc *p);
         void (*refill_desc3) (void *priv, struct dma_desc *p);
@@ -445,6 +445,7 @@ struct mac_device_info {
         int multicast_filter_bins;
         int unicast_filter_entries;
         int mcast_bits_log2;
+        unsigned int rx_csum;
 };
 
 struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr, int mcbins,
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
index 71b5419256c1..64d8f56a9c17 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
@@ -153,7 +153,7 @@ enum inter_frame_gap {
 #define GMAC_CONTROL_RE         0x00000004      /* Receiver Enable */
 
 #define GMAC_CORE_INIT (GMAC_CONTROL_JD | GMAC_CONTROL_PS | GMAC_CONTROL_ACS | \
-                        GMAC_CONTROL_BE)
+                        GMAC_CONTROL_BE | GMAC_CONTROL_DCRS)
 
 /* GMAC Frame Filter defines */
 #define GMAC_FRAME_FILTER_PR    0x00000001      /* Promiscuous Mode */
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index d8ef18786a1c..5efe60ea6526 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -58,7 +58,11 @@ static int dwmac1000_rx_ipc_enable(struct mac_device_info *hw)
         void __iomem *ioaddr = hw->pcsr;
         u32 value = readl(ioaddr + GMAC_CONTROL);
 
-        value |= GMAC_CONTROL_IPC;
+        if (hw->rx_csum)
+                value |= GMAC_CONTROL_IPC;
+        else
+                value &= ~GMAC_CONTROL_IPC;
+
         writel(value, ioaddr + GMAC_CONTROL);
 
         value = readl(ioaddr + GMAC_CONTROL);
diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc.h b/drivers/net/ethernet/stmicro/stmmac/mmc.h
index 8607488cbcfc..192c2491330b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/mmc.h
+++ b/drivers/net/ethernet/stmicro/stmmac/mmc.h
@@ -68,7 +68,7 @@ struct stmmac_counters {
         unsigned int mmc_rx_octetcount_g;
         unsigned int mmc_rx_broadcastframe_g;
         unsigned int mmc_rx_multicastframe_g;
-        unsigned int mmc_rx_crc_errror;
+        unsigned int mmc_rx_crc_error;
         unsigned int mmc_rx_align_error;
         unsigned int mmc_rx_run_error;
         unsigned int mmc_rx_jabber_error;
diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
index 50617c5a0bdb..08c483bd2ec7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
@@ -196,7 +196,7 @@ void dwmac_mmc_read(void __iomem *ioaddr, struct stmmac_counters *mmc)
         mmc->mmc_rx_octetcount_g += readl(ioaddr + MMC_RX_OCTETCOUNT_G);
         mmc->mmc_rx_broadcastframe_g += readl(ioaddr + MMC_RX_BROADCASTFRAME_G);
         mmc->mmc_rx_multicastframe_g += readl(ioaddr + MMC_RX_MULTICASTFRAME_G);
-        mmc->mmc_rx_crc_errror += readl(ioaddr + MMC_RX_CRC_ERRROR);
+        mmc->mmc_rx_crc_error += readl(ioaddr + MMC_RX_CRC_ERRROR);
         mmc->mmc_rx_align_error += readl(ioaddr + MMC_RX_ALIGN_ERROR);
         mmc->mmc_rx_run_error += readl(ioaddr + MMC_RX_RUN_ERROR);
         mmc->mmc_rx_jabber_error += readl(ioaddr + MMC_RX_JABBER_ERROR);
diff --git a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
index 650a4be6bce5..5dd50c6cda5b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
+++ b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c
@@ -28,7 +28,7 @@
 
 #include "stmmac.h"
 
-static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
+static int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
 {
         struct stmmac_priv *priv = (struct stmmac_priv *)p;
         unsigned int txsize = priv->dma_tx_size;
@@ -53,7 +53,10 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
 
                 desc->des2 = dma_map_single(priv->device, skb->data,
                                             bmax, DMA_TO_DEVICE);
-                priv->tx_skbuff_dma[entry] = desc->des2;
+                if (dma_mapping_error(priv->device, desc->des2))
+                        return -1;
+
+                priv->tx_skbuff_dma[entry].buf = desc->des2;
                 desc->des3 = desc->des2 + BUF_SIZE_4KiB;
                 priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum,
                                                 STMMAC_RING_MODE);
@@ -68,7 +71,9 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
 
                 desc->des2 = dma_map_single(priv->device, skb->data + bmax,
                                             len, DMA_TO_DEVICE);
-                priv->tx_skbuff_dma[entry] = desc->des2;
+                if (dma_mapping_error(priv->device, desc->des2))
+                        return -1;
+                priv->tx_skbuff_dma[entry].buf = desc->des2;
                 desc->des3 = desc->des2 + BUF_SIZE_4KiB;
                 priv->hw->desc->prepare_tx_desc(desc, 0, len, csum,
                                                 STMMAC_RING_MODE);
@@ -77,7 +82,9 @@ static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)
         } else {
                 desc->des2 = dma_map_single(priv->device, skb->data,
                                             nopaged_len, DMA_TO_DEVICE);
-                priv->tx_skbuff_dma[entry] = desc->des2;
+                if (dma_mapping_error(priv->device, desc->des2))
+                        return -1;
+                priv->tx_skbuff_dma[entry].buf = desc->des2;
                 desc->des3 = desc->des2 + BUF_SIZE_4KiB;
                 priv->hw->desc->prepare_tx_desc(desc, 1, nopaged_len, csum,
                                                 STMMAC_RING_MODE);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index ca01035634a7..58097c0e2ad5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -34,6 +34,11 @@
 #include <linux/ptp_clock_kernel.h>
 #include <linux/reset.h>
 
+struct stmmac_tx_info {
+        dma_addr_t buf;
+        bool map_as_page;
+};
+
 struct stmmac_priv {
         /* Frequently used values are kept adjacent for cache effect */
         struct dma_extended_desc *dma_etx ____cacheline_aligned_in_smp;
@@ -45,7 +50,7 @@ struct stmmac_priv {
         u32 tx_count_frames;
         u32 tx_coal_frames;
         u32 tx_coal_timer;
-        dma_addr_t *tx_skbuff_dma;
+        struct stmmac_tx_info *tx_skbuff_dma;
         dma_addr_t dma_tx_phy;
         int tx_coalesce;
         int hwts_tx_en;
@@ -105,6 +110,8 @@ struct stmmac_priv {
         struct ptp_clock *ptp_clock;
         struct ptp_clock_info ptp_clock_ops;
         unsigned int default_addend;
+        struct clk *clk_ptp_ref;
+        unsigned int clk_ptp_rate;
         u32 adv_ts;
         int use_riwt;
         int irq_wake;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index 493fe693e675..3a08a1f78c73 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -175,7 +175,7 @@ static const struct stmmac_stats stmmac_mmc[] = {
         STMMAC_MMC_STAT(mmc_rx_octetcount_g),
         STMMAC_MMC_STAT(mmc_rx_broadcastframe_g),
         STMMAC_MMC_STAT(mmc_rx_multicastframe_g),
-        STMMAC_MMC_STAT(mmc_rx_crc_errror),
+        STMMAC_MMC_STAT(mmc_rx_crc_error),
         STMMAC_MMC_STAT(mmc_rx_align_error),
         STMMAC_MMC_STAT(mmc_rx_run_error),
         STMMAC_MMC_STAT(mmc_rx_jabber_error),
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 8fcc64c37ff1..9dbb02d9d9c2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -275,6 +275,7 @@ static void stmmac_eee_ctrl_timer(unsigned long arg)
  */
 bool stmmac_eee_init(struct stmmac_priv *priv)
 {
+        char *phy_bus_name = priv->plat->phy_bus_name;
         bool ret = false;
 
         /* Using PCS we cannot dial with the phy registers at this stage
@@ -284,6 +285,10 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
             (priv->pcs == STMMAC_PCS_RTBI))
                 goto out;
 
+        /* Never init EEE in case of a switch is attached */
+        if (phy_bus_name && (!strcmp(phy_bus_name, "fixed")))
+                goto out;
+
         /* MAC core supports the EEE feature. */
         if (priv->dma_cap.eee) {
                 int tx_lpi_timer = priv->tx_lpi_timer;
@@ -316,10 +321,9 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
                         priv->hw->mac->set_eee_timer(priv->hw,
                                                      STMMAC_DEFAULT_LIT_LS,
                                                      tx_lpi_timer);
-                } else
-                        /* Set HW EEE according to the speed */
-                        priv->hw->mac->set_eee_pls(priv->hw,
-                                                   priv->phydev->link);
+                }
+                /* Set HW EEE according to the speed */
+                priv->hw->mac->set_eee_pls(priv->hw, priv->phydev->link);
 
                 pr_debug("stmmac: Energy-Efficient Ethernet initialized\n");
 
@@ -603,16 +607,16 @@ static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr)
                 /* calculate default added value:
                  * formula is :
                  * addend = (2^32)/freq_div_ratio;
-                 * where, freq_div_ratio = STMMAC_SYSCLOCK/50MHz
-                 * hence, addend = ((2^32) * 50MHz)/STMMAC_SYSCLOCK;
-                 * NOTE: STMMAC_SYSCLOCK should be >= 50MHz to
+                 * where, freq_div_ratio = clk_ptp_ref_i/50MHz
+                 * hence, addend = ((2^32) * 50MHz)/clk_ptp_ref_i;
+                 * NOTE: clk_ptp_ref_i should be >= 50MHz to
                  *       achive 20ns accuracy.
                  *
                  * 2^x * y == (y << x), hence
                  * 2^32 * 50000000 ==> (50000000 << 32)
                  */
                 temp = (u64) (50000000ULL << 32);
-                priv->default_addend = div_u64(temp, STMMAC_SYSCLOCK);
+                priv->default_addend = div_u64(temp, priv->clk_ptp_rate);
                 priv->hw->ptp->config_addend(priv->ioaddr,
                                              priv->default_addend);
 
@@ -638,6 +642,16 @@ static int stmmac_init_ptp(struct stmmac_priv *priv)
         if (!(priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp))
                 return -EOPNOTSUPP;
 
+        /* Fall-back to main clock in case of no PTP ref is passed */
+        priv->clk_ptp_ref = devm_clk_get(priv->device, "clk_ptp_ref");
+        if (IS_ERR(priv->clk_ptp_ref)) {
+                priv->clk_ptp_rate = clk_get_rate(priv->stmmac_clk);
+                priv->clk_ptp_ref = NULL;
+        } else {
+                clk_prepare_enable(priv->clk_ptp_ref);
+                priv->clk_ptp_rate = clk_get_rate(priv->clk_ptp_ref);
+        }
+
         priv->adv_ts = 0;
         if (priv->dma_cap.atime_stamp && priv->extend_desc)
                 priv->adv_ts = 1;
@@ -657,6 +671,8 @@ static int stmmac_init_ptp(struct stmmac_priv *priv)
 
 static void stmmac_release_ptp(struct stmmac_priv *priv)
 {
+        if (priv->clk_ptp_ref)
+                clk_disable_unprepare(priv->clk_ptp_ref);
         stmmac_ptp_unregister(priv);
 }
 
@@ -1061,7 +1077,8 @@ static int init_dma_desc_rings(struct net_device *dev)
                 else
                         p = priv->dma_tx + i;
                 p->des2 = 0;
-                priv->tx_skbuff_dma[i] = 0;
+                priv->tx_skbuff_dma[i].buf = 0;
+                priv->tx_skbuff_dma[i].map_as_page = false;
                 priv->tx_skbuff[i] = NULL;
         }
 
@@ -1100,17 +1117,24 @@ static void dma_free_tx_skbufs(struct stmmac_priv *priv)
                 else
                         p = priv->dma_tx + i;
 
-                if (priv->tx_skbuff_dma[i]) {
-                        dma_unmap_single(priv->device,
-                                         priv->tx_skbuff_dma[i],
-                                         priv->hw->desc->get_tx_len(p),
-                                         DMA_TO_DEVICE);
-                        priv->tx_skbuff_dma[i] = 0;
+                if (priv->tx_skbuff_dma[i].buf) {
+                        if (priv->tx_skbuff_dma[i].map_as_page)
+                                dma_unmap_page(priv->device,
+                                               priv->tx_skbuff_dma[i].buf,
+                                               priv->hw->desc->get_tx_len(p),
+                                               DMA_TO_DEVICE);
+                        else
+                                dma_unmap_single(priv->device,
+                                                 priv->tx_skbuff_dma[i].buf,
+                                                 priv->hw->desc->get_tx_len(p),
+                                                 DMA_TO_DEVICE);
                 }
 
                 if (priv->tx_skbuff[i] != NULL) {
                         dev_kfree_skb_any(priv->tx_skbuff[i]);
                         priv->tx_skbuff[i] = NULL;
+                        priv->tx_skbuff_dma[i].buf = 0;
+                        priv->tx_skbuff_dma[i].map_as_page = false;
                 }
         }
 }
@@ -1131,7 +1155,8 @@ static int alloc_dma_desc_resources(struct stmmac_priv *priv)
         if (!priv->rx_skbuff)
                 goto err_rx_skbuff;
 
-        priv->tx_skbuff_dma = kmalloc_array(txsize, sizeof(dma_addr_t),
+        priv->tx_skbuff_dma = kmalloc_array(txsize,
+                                            sizeof(*priv->tx_skbuff_dma),
                                             GFP_KERNEL);
         if (!priv->tx_skbuff_dma)
                 goto err_tx_skbuff_dma;
@@ -1293,12 +1318,19 @@ static void stmmac_tx_clean(struct stmmac_priv *priv)
                         pr_debug("%s: curr %d, dirty %d\n", __func__,
                                  priv->cur_tx, priv->dirty_tx);
 
-                if (likely(priv->tx_skbuff_dma[entry])) {
-                        dma_unmap_single(priv->device,
-                                         priv->tx_skbuff_dma[entry],
-                                         priv->hw->desc->get_tx_len(p),
-                                         DMA_TO_DEVICE);
-                        priv->tx_skbuff_dma[entry] = 0;
+                if (likely(priv->tx_skbuff_dma[entry].buf)) {
+                        if (priv->tx_skbuff_dma[entry].map_as_page)
+                                dma_unmap_page(priv->device,
+                                               priv->tx_skbuff_dma[entry].buf,
+                                               priv->hw->desc->get_tx_len(p),
+                                               DMA_TO_DEVICE);
+                        else
+                                dma_unmap_single(priv->device,
+                                                 priv->tx_skbuff_dma[entry].buf,
+                                                 priv->hw->desc->get_tx_len(p),
+                                                 DMA_TO_DEVICE);
+                        priv->tx_skbuff_dma[entry].buf = 0;
+                        priv->tx_skbuff_dma[entry].map_as_page = false;
                 }
                 priv->hw->mode->clean_desc3(priv, p);
 
@@ -1637,6 +1669,13 @@ static int stmmac_hw_setup(struct net_device *dev)
         /* Initialize the MAC Core */
         priv->hw->mac->core_init(priv->hw, dev->mtu);
 
+        ret = priv->hw->mac->rx_ipc(priv->hw);
+        if (!ret) {
+                pr_warn(" RX IPC Checksum Offload disabled\n");
+                priv->plat->rx_coe = STMMAC_RX_COE_NONE;
+                priv->hw->rx_csum = 0;
+        }
+
         /* Enable the MAC Rx/Tx */
         stmmac_set_mac(priv->ioaddr, true);
 
@@ -1887,12 +1926,16 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
         if (likely(!is_jumbo)) {
                 desc->des2 = dma_map_single(priv->device, skb->data,
                                             nopaged_len, DMA_TO_DEVICE);
-                priv->tx_skbuff_dma[entry] = desc->des2;
+                if (dma_mapping_error(priv->device, desc->des2))
+                        goto dma_map_err;
+                priv->tx_skbuff_dma[entry].buf = desc->des2;
                 priv->hw->desc->prepare_tx_desc(desc, 1, nopaged_len,
                                                 csum_insertion, priv->mode);
         } else {
                 desc = first;
                 entry = priv->hw->mode->jumbo_frm(priv, skb, csum_insertion);
+                if (unlikely(entry < 0))
+                        goto dma_map_err;
         }
 
         for (i = 0; i < nfrags; i++) {
@@ -1908,7 +1951,11 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
 
                 desc->des2 = skb_frag_dma_map(priv->device, frag, 0, len,
                                               DMA_TO_DEVICE);
-                priv->tx_skbuff_dma[entry] = desc->des2;
+                if (dma_mapping_error(priv->device, desc->des2))
+                        goto dma_map_err; /* should reuse desc w/o issues */
+
+                priv->tx_skbuff_dma[entry].buf = desc->des2;
+                priv->tx_skbuff_dma[entry].map_as_page = true;
                 priv->hw->desc->prepare_tx_desc(desc, 0, len, csum_insertion,
                                                 priv->mode);
                 wmb();
@@ -1975,7 +2022,12 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
         priv->hw->dma->enable_dma_transmission(priv->ioaddr);
 
         spin_unlock(&priv->tx_lock);
+        return NETDEV_TX_OK;
 
+dma_map_err:
+        dev_err(priv->device, "Tx dma map failed\n");
+        dev_kfree_skb(skb);
+        priv->dev->stats.tx_dropped++;
         return NETDEV_TX_OK;
 }
 
@@ -2028,7 +2080,12 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv)
                         priv->rx_skbuff_dma[entry] =
                             dma_map_single(priv->device, skb->data, bfsize,
                                            DMA_FROM_DEVICE);
-
+                        if (dma_mapping_error(priv->device,
+                                              priv->rx_skbuff_dma[entry])) {
+                                dev_err(priv->device, "Rx dma map failed\n");
+                                dev_kfree_skb(skb);
+                                break;
+                        }
                         p->des2 = priv->rx_skbuff_dma[entry];
 
                         priv->hw->mode->refill_desc3(priv, p);
@@ -2055,7 +2112,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
         unsigned int entry = priv->cur_rx % rxsize;
         unsigned int next_entry;
         unsigned int count = 0;
-        int coe = priv->plat->rx_coe;
+        int coe = priv->hw->rx_csum;
 
         if (netif_msg_rx_status(priv)) {
                 pr_debug("%s: descriptor ring:\n", __func__);
@@ -2276,8 +2333,7 @@ static netdev_features_t stmmac_fix_features(struct net_device *dev,
 
         if (priv->plat->rx_coe == STMMAC_RX_COE_NONE)
                 features &= ~NETIF_F_RXCSUM;
-        else if (priv->plat->rx_coe == STMMAC_RX_COE_TYPE1)
-                features &= ~NETIF_F_IPV6_CSUM;
+
         if (!priv->plat->tx_coe)
                 features &= ~NETIF_F_ALL_CSUM;
 
@@ -2292,6 +2348,24 @@ static netdev_features_t stmmac_fix_features(struct net_device *dev,
         return features;
 }
 
+static int stmmac_set_features(struct net_device *netdev,
+                               netdev_features_t features)
+{
+        struct stmmac_priv *priv = netdev_priv(netdev);
+
+        /* Keep the COE Type in case of csum is supporting */
+        if (features & NETIF_F_RXCSUM)
+                priv->hw->rx_csum = priv->plat->rx_coe;
+        else
+                priv->hw->rx_csum = 0;
+        /* No check needed because rx_coe has been set before and it will be
+         * fixed in case of issue.
+         */
+        priv->hw->mac->rx_ipc(priv->hw);
+
+        return 0;
+}
+
 /**
  *  stmmac_interrupt - main ISR
  *  @irq: interrupt number.
@@ -2572,6 +2646,7 @@ static const struct net_device_ops stmmac_netdev_ops = {
         .ndo_stop = stmmac_release,
         .ndo_change_mtu = stmmac_change_mtu,
         .ndo_fix_features = stmmac_fix_features,
+        .ndo_set_features = stmmac_set_features,
         .ndo_set_rx_mode = stmmac_set_rx_mode,
         .ndo_tx_timeout = stmmac_tx_timeout,
         .ndo_do_ioctl = stmmac_ioctl,
@@ -2592,7 +2667,6 @@ static const struct net_device_ops stmmac_netdev_ops = {
  */
 static int stmmac_hw_init(struct stmmac_priv *priv)
 {
-        int ret;
         struct mac_device_info *mac;
 
         /* Identify the MAC HW device */
@@ -2649,15 +2723,11 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
         /* To use alternate (extended) or normal descriptor structures */
         stmmac_selec_desc_mode(priv);
 
-        ret = priv->hw->mac->rx_ipc(priv->hw);
-        if (!ret) {
-                pr_warn(" RX IPC Checksum Offload not configured.\n");
-                priv->plat->rx_coe = STMMAC_RX_COE_NONE;
-        }
-
-        if (priv->plat->rx_coe)
+        if (priv->plat->rx_coe) {
+                priv->hw->rx_csum = priv->plat->rx_coe;
                 pr_info(" RX Checksum Offload Engine supported (type %d)\n",
                         priv->plat->rx_coe);
+        }
         if (priv->plat->tx_coe)
                 pr_info(" TX Checksum insertion supported\n");
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
index b7ad3565566c..c5ee79d8a8c5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
@@ -206,6 +206,7 @@ void stmmac_ptp_unregister(struct stmmac_priv *priv)
 {
         if (priv->ptp_clock) {
                 ptp_clock_unregister(priv->ptp_clock);
+                priv->ptp_clock = NULL;
                 pr_debug("Removed PTP HW clock successfully on %s\n",
                          priv->dev->name);
         }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
index 3dbc047622fa..4535df37c227 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
@@ -25,8 +25,6 @@
 #ifndef __STMMAC_PTP_H__
 #define __STMMAC_PTP_H__
 
-#define STMMAC_SYSCLOCK 62500000
-
 /* IEEE 1588 PTP register offsets */
 #define PTP_TCR         0x0700  /* Timestamp Control Reg */
 #define PTP_SSIR        0x0704  /* Sub-Second Increment Reg */
diff --git a/drivers/net/fddi/skfp/h/skfbi.h b/drivers/net/fddi/skfp/h/skfbi.h
index c1ba26c06d73..3de2f0d15fe2 100644
--- a/drivers/net/fddi/skfp/h/skfbi.h
+++ b/drivers/net/fddi/skfp/h/skfbi.h
@@ -147,11 +147,6 @@
 #define PCI_MEM64BIT    (2<<1)       /* Base addr anywhere in 64 Bit range */
 #define PCI_MEMSPACE    0x00000001L  /* Bit 0:  Memory Space Indic. */
 
-/*      PCI_BASE_2ND    32 bit  2nd Base address */
-#define PCI_IOBASE      0xffffff00L  /* Bit 31..8:  I/O Base address */
-#define PCI_IOSIZE      0x000000fcL  /* Bit 7..2:   I/O Size Requirements */
-#define PCI_IOSPACE     0x00000001L  /* Bit 0:      I/O Space Indicator */
-
 /*      PCI_SUB_VID     16 bit  Subsystem Vendor ID */
 /*      PCI_SUB_ID      16 bit  Subsystem ID */
 
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 932190e04d08..1dfffdc9dfc3 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -1040,31 +1040,31 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable)
                 /* First check if the EEE ability is supported */
                 eee_cap = phy_read_mmd_indirect(phydev, MDIO_PCS_EEE_ABLE,
                                                 MDIO_MMD_PCS, phydev->addr);
-                if (eee_cap < 0)
-                        return eee_cap;
+                if (eee_cap <= 0)
+                        goto eee_exit_err;
 
                 cap = mmd_eee_cap_to_ethtool_sup_t(eee_cap);
                 if (!cap)
-                        return -EPROTONOSUPPORT;
+                        goto eee_exit_err;
 
                 /* Check which link settings negotiated and verify it in
                  * the EEE advertising registers.
                  */
                 eee_lp = phy_read_mmd_indirect(phydev, MDIO_AN_EEE_LPABLE,
                                                MDIO_MMD_AN, phydev->addr);
-                if (eee_lp < 0)
-                        return eee_lp;
+                if (eee_lp <= 0)
+                        goto eee_exit_err;
 
                 eee_adv = phy_read_mmd_indirect(phydev, MDIO_AN_EEE_ADV,
                                                 MDIO_MMD_AN, phydev->addr);
-                if (eee_adv < 0)
-                        return eee_adv;
+                if (eee_adv <= 0)
+                        goto eee_exit_err;
 
                 adv = mmd_eee_adv_to_ethtool_adv_t(eee_adv);
                 lp = mmd_eee_adv_to_ethtool_adv_t(eee_lp);
                 idx = phy_find_setting(phydev->speed, phydev->duplex);
                 if (!(lp & adv & settings[idx].setting))
-                        return -EPROTONOSUPPORT;
+                        goto eee_exit_err;
 
                 if (clk_stop_enable) {
                         /* Configure the PHY to stop receiving xMII
@@ -1084,7 +1084,7 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable)
 
                 return 0; /* EEE supported */
         }
-
+eee_exit_err:
         return -EPROTONOSUPPORT;
 }
 EXPORT_SYMBOL(phy_init_eee);
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index d6e90c72c257..6dfcbf523936 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -2056,7 +2056,6 @@ vmxnet3_set_mc(struct net_device *netdev)
                 if (!netdev_mc_empty(netdev)) {
                         new_table = vmxnet3_copy_mc(netdev);
                         if (new_table) {
-                                new_mode |= VMXNET3_RXM_MCAST;
                                 rxConf->mfTableLen = cpu_to_le16(
                                         netdev_mc_count(netdev) * ETH_ALEN);
                                 new_table_pa = dma_map_single(
@@ -2064,15 +2063,18 @@ vmxnet3_set_mc(struct net_device *netdev)
                                                         new_table,
                                                         rxConf->mfTableLen,
                                                         PCI_DMA_TODEVICE);
+                        }
+
+                        if (new_table_pa) {
+                                new_mode |= VMXNET3_RXM_MCAST;
                                 rxConf->mfTablePA = cpu_to_le64(new_table_pa);
                         } else {
-                                netdev_info(netdev, "failed to copy mcast list"
-                                            ", setting ALL_MULTI\n");
+                                netdev_info(netdev,
+                                            "failed to copy mcast list, setting ALL_MULTI\n");
                                 new_mode |= VMXNET3_RXM_ALL_MULTI;
                         }
                 }
 
-
         if (!(new_mode & VMXNET3_RXM_MCAST)) {
                 rxConf->mfTableLen = 0;
                 rxConf->mfTablePA = 0;
@@ -2091,11 +2093,10 @@ vmxnet3_set_mc(struct net_device *netdev)
                                VMXNET3_CMD_UPDATE_MAC_FILTERS);
         spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
-        if (new_table) {
+        if (new_table_pa)
                 dma_unmap_single(&adapter->pdev->dev, new_table_pa,
                                  rxConf->mfTableLen, PCI_DMA_TODEVICE);
-                kfree(new_table);
-        }
+        kfree(new_table);
 }
 
 void
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 29ee77f2c97f..3759479f959a 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -69,10 +69,10 @@
 /*
  * Version numbers
  */
-#define VMXNET3_DRIVER_VERSION_STRING   "1.2.0.0-k"
+#define VMXNET3_DRIVER_VERSION_STRING   "1.2.1.0-k"
 
 /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
-#define VMXNET3_DRIVER_VERSION_NUM      0x01020000
+#define VMXNET3_DRIVER_VERSION_NUM      0x01020100
 
 #if defined(CONFIG_PCI_MSI)
         /* RSS only makes sense if MSI-X is supported. */
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 334c2ece855a..da92bfa76b7c 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -2423,8 +2423,6 @@ static void at76_delete_device(struct at76_priv *priv)
 
         kfree_skb(priv->rx_skb);
 
-        usb_put_dev(priv->udev);
-
         at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/ieee80211_hw",
                  __func__);
         ieee80211_free_hw(priv->hw);
@@ -2558,6 +2556,7 @@ static void at76_disconnect(struct usb_interface *interface)
 
         wiphy_info(priv->hw->wiphy, "disconnecting\n");
         at76_delete_device(priv);
+        usb_put_dev(priv->udev);
         dev_info(&interface->dev, "disconnected\n");
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/spectral.c b/drivers/net/wireless/ath/ath9k/spectral.c
index 5fe29b9f8fa2..8f68426ca653 100644
--- a/drivers/net/wireless/ath/ath9k/spectral.c
+++ b/drivers/net/wireless/ath/ath9k/spectral.c
@@ -253,7 +253,7 @@ static ssize_t write_file_spec_scan_ctl(struct file *file,
 
         if (strncmp("trigger", buf, 7) == 0) {
                 ath9k_spectral_scan_trigger(sc->hw);
-        } else if (strncmp("background", buf, 9) == 0) {
+        } else if (strncmp("background", buf, 10) == 0) {
                 ath9k_spectral_scan_config(sc->hw, SPECTRAL_BACKGROUND);
                 ath_dbg(common, CONFIG, "spectral scan: background mode enabled\n");
         } else if (strncmp("chanscan", buf, 8) == 0) {
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 6451d2b6abcf..824f5e287783 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -51,7 +51,6 @@ config IWLWIFI_LEDS
 
 config IWLDVM
         tristate "Intel Wireless WiFi DVM Firmware support"
-        depends on m
         default IWLWIFI
         help
           This is the driver that supports the DVM firmware which is
@@ -60,7 +59,6 @@ config IWLDVM
 
 config IWLMVM
         tristate "Intel Wireless WiFi MVM Firmware support"
-        depends on m
         help
           This is the driver that supports the MVM firmware which is
           currently only available for 7260 and 3160 devices.
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index 6dc5dd3ced44..ed50de6362ed 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -1068,6 +1068,13 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         /* recalculate basic rates */
         iwl_calc_basic_rates(priv, ctx);
 
+        /*
+         * force CTS-to-self frames protection if RTS-CTS is not preferred
+         * one aggregation protection method
+         */
+        if (!priv->hw_params.use_rts_for_aggregation)
+                ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
+
         if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||
             !(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))
                 ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
@@ -1473,6 +1480,11 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
         else
                 ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
 
+        if (bss_conf->use_cts_prot)
+                ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
+        else
+                ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;
+
         memcpy(ctx->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);
 
         if (vif->type == NL80211_IFTYPE_AP ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
index 48730064da73..d67a37a786aa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
@@ -67,8 +67,8 @@
 #include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL7260_UCODE_API_MAX   9
-#define IWL3160_UCODE_API_MAX   9
+#define IWL7260_UCODE_API_MAX   10
+#define IWL3160_UCODE_API_MAX   10
 
 /* Oldest version we won't warn about */
 #define IWL7260_UCODE_API_OK    9
diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c b/drivers/net/wireless/iwlwifi/iwl-8000.c
index 44b19e015102..e93c6972290b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-8000.c
@@ -67,7 +67,7 @@
 #include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL8000_UCODE_API_MAX   9
+#define IWL8000_UCODE_API_MAX   10
 
 /* Oldest version we won't warn about */
 #define IWL8000_UCODE_API_OK    8
diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
index 33da3dfcfa4f..d4bd550f505c 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -101,7 +101,7 @@ static bool halbtc_legacy(struct rtl_priv *adapter)
 
         bool is_legacy = false;
 
-        if ((mac->mode == WIRELESS_MODE_B) || (mac->mode == WIRELESS_MODE_B))
+        if ((mac->mode == WIRELESS_MODE_B) || (mac->mode == WIRELESS_MODE_G))
                 is_legacy = true;
 
         return is_legacy;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index 361435f8608a..1ac6383e7947 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -317,6 +317,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = {
         {RTL_USB_DEVICE(0x0bda, 0x5088, rtl92cu_hal_cfg)}, /*Thinkware-CC&C*/
         {RTL_USB_DEVICE(0x0df6, 0x0052, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/
         {RTL_USB_DEVICE(0x0df6, 0x005c, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/
+        {RTL_USB_DEVICE(0x0df6, 0x0070, rtl92cu_hal_cfg)}, /*Sitecom - 150N */
         {RTL_USB_DEVICE(0x0df6, 0x0077, rtl92cu_hal_cfg)}, /*Sitecom-WLA2100V2*/
         {RTL_USB_DEVICE(0x0eb0, 0x9071, rtl92cu_hal_cfg)}, /*NO Brand - Etop*/
         {RTL_USB_DEVICE(0x4856, 0x0091, rtl92cu_hal_cfg)}, /*NetweeN - Feixun*/
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index e29e15dca86e..f379689dde30 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -576,6 +576,9 @@ int xenvif_connect(struct xenvif_queue *queue, unsigned long tx_ring_ref,
         init_waitqueue_head(&queue->dealloc_wq);
         atomic_set(&queue->inflight_packets, 0);
 
+        netif_napi_add(queue->vif->dev, &queue->napi, xenvif_poll,
+                        XENVIF_NAPI_WEIGHT);
+
         if (tx_evtchn == rx_evtchn) {
                 /* feature-split-event-channels == 0 */
                 err = bind_interdomain_evtchn_to_irqhandler(
@@ -629,9 +632,6 @@ int xenvif_connect(struct xenvif_queue *queue, unsigned long tx_ring_ref,
         wake_up_process(queue->task);
         wake_up_process(queue->dealloc_task);
 
-        netif_napi_add(queue->vif->dev, &queue->napi, xenvif_poll,
-                        XENVIF_NAPI_WEIGHT);
-
         return 0;
 
 err_rx_unbind:
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 8922c376456a..90f5ccacce4b 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -56,7 +56,7 @@ config PCI_HOST_GENERIC
           controller, such as the one emulated by kvmtool.
 
 config PCIE_SPEAR13XX
-        tristate "STMicroelectronics SPEAr PCIe controller"
+        bool "STMicroelectronics SPEAr PCIe controller"
         depends on ARCH_SPEAR13XX
         select PCIEPORTBUS
         select PCIE_DW
diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c
index a53a689a2bfa..8c6fd8d4dd3c 100644
--- a/drivers/pinctrl/nomadik/pinctrl-abx500.c
+++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c
@@ -620,8 +620,7 @@ static void abx500_gpio_dbg_show_one(struct seq_file *s,
         } else
                 seq_printf(s, " %-9s", chip->get(chip, offset) ? "hi" : "lo");
 
-        if (pctldev)
-                mode = abx500_get_mode(pctldev, chip, offset);
+        mode = abx500_get_mode(pctldev, chip, offset);
 
         seq_printf(s, " %s", (mode < 0) ? "unknown" : modes[mode]);
 
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index af1ba4fc150d..60464a2648aa 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -497,10 +497,10 @@ static struct at91_pinctrl_mux_ops at91sam9x5_ops = {
 static void at91_pin_dbg(const struct device *dev, const struct at91_pmx_pin *pin)
 {
         if (pin->mux) {
-                dev_dbg(dev, "pio%c%d configured as periph%c with conf = 0x%lu\n",
+                dev_dbg(dev, "pio%c%d configured as periph%c with conf = 0x%lx\n",
                         pin->bank + 'A', pin->pin, pin->mux - 1 + 'A', pin->conf);
         } else {
-                dev_dbg(dev, "pio%c%d configured as gpio with conf = 0x%lu\n",
+                dev_dbg(dev, "pio%c%d configured as gpio with conf = 0x%lx\n",
                         pin->bank + 'A', pin->pin, pin->conf);
         }
 }
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 5e8b2e04cd7a..0c372a300cb8 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -438,7 +438,7 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux)
         int reg, ret, mask;
         unsigned long flags;
         u8 bit;
-        u32 data;
+        u32 data, rmask;
 
         if (iomux_num > 3)
                 return -EINVAL;
@@ -478,8 +478,9 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux)
         spin_lock_irqsave(&bank->slock, flags);
 
         data = (mask << (bit + 16));
+        rmask = data | (data >> 16);
         data |= (mux & mask) << bit;
-        ret = regmap_write(regmap, reg, data);
+        ret = regmap_update_bits(regmap, reg, rmask, data);
 
         spin_unlock_irqrestore(&bank->slock, flags);
 
@@ -634,7 +635,7 @@ static int rk3288_set_drive(struct rockchip_pin_bank *bank, int pin_num,
         struct regmap *regmap;
         unsigned long flags;
         int reg, ret, i;
-        u32 data;
+        u32 data, rmask;
         u8 bit;
 
         rk3288_calc_drv_reg_and_bit(bank, pin_num, &regmap, &reg, &bit);
@@ -657,9 +658,10 @@ static int rk3288_set_drive(struct rockchip_pin_bank *bank, int pin_num,
 
         /* enable the write to the equivalent lower bits */
         data = ((1 << RK3288_DRV_BITS_PER_PIN) - 1) << (bit + 16);
+        rmask = data | (data >> 16);
         data |= (ret << bit);
 
-        ret = regmap_write(regmap, reg, data);
+        ret = regmap_update_bits(regmap, reg, rmask, data);
         spin_unlock_irqrestore(&bank->slock, flags);
 
         return ret;
@@ -722,7 +724,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
         int reg, ret;
         unsigned long flags;
         u8 bit;
-        u32 data;
+        u32 data, rmask;
 
         dev_dbg(info->dev, "setting pull of GPIO%d-%d to %d\n",
                  bank->bank_num, pin_num, pull);
@@ -750,6 +752,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
 
                 /* enable the write to the equivalent lower bits */
                 data = ((1 << RK3188_PULL_BITS_PER_PIN) - 1) << (bit + 16);
+                rmask = data | (data >> 16);
 
                 switch (pull) {
                 case PIN_CONFIG_BIAS_DISABLE:
@@ -770,7 +773,7 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
                         return -EINVAL;
                 }
 
-                ret = regmap_write(regmap, reg, data);
+                ret = regmap_update_bits(regmap, reg, rmask, data);
 
                 spin_unlock_irqrestore(&bank->slock, flags);
                 break;
diff --git a/drivers/pinctrl/pinctrl-tegra-xusb.c b/drivers/pinctrl/pinctrl-tegra-xusb.c
index a06620474845..e641b4226c42 100644
--- a/drivers/pinctrl/pinctrl-tegra-xusb.c
+++ b/drivers/pinctrl/pinctrl-tegra-xusb.c
@@ -680,7 +680,7 @@ static struct phy *tegra_xusb_padctl_xlate(struct device *dev,
         if (args->args_count <= 0)
                 return ERR_PTR(-EINVAL);
 
-        if (index > ARRAY_SIZE(padctl->phys))
+        if (index >= ARRAY_SIZE(padctl->phys))
                 return ERR_PTR(-EINVAL);
 
         return padctl->phys[index];
@@ -930,7 +930,8 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)
 
         padctl->provider = devm_of_phy_provider_register(&pdev->dev,
                                                          tegra_xusb_padctl_xlate);
-        if (err < 0) {
+        if (IS_ERR(padctl->provider)) {
+                err = PTR_ERR(padctl->provider);
                 dev_err(&pdev->dev, "failed to register PHYs: %d\n", err);
                 goto unregister;
         }
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c
index 003bfd874a61..d7154ed0b0eb 100644
--- a/drivers/pinctrl/samsung/pinctrl-exynos.c
+++ b/drivers/pinctrl/samsung/pinctrl-exynos.c
@@ -127,14 +127,10 @@ static int exynos_irq_set_type(struct irq_data *irqd, unsigned int type)
         struct irq_chip *chip = irq_data_get_irq_chip(irqd);
         struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);
         struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);
-        struct samsung_pin_bank_type *bank_type = bank->type;
         struct samsung_pinctrl_drv_data *d = bank->drvdata;
-        unsigned int pin = irqd->hwirq;
-        unsigned int shift = EXYNOS_EINT_CON_LEN * pin;
+        unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;
         unsigned int con, trig_type;
         unsigned long reg_con = our_chip->eint_con + bank->eint_offset;
-        unsigned long flags;
-        unsigned int mask;
 
         switch (type) {
         case IRQ_TYPE_EDGE_RISING:
@@ -167,8 +163,32 @@ static int exynos_irq_set_type(struct irq_data *irqd, unsigned int type)
         con |= trig_type << shift;
         writel(con, d->virt_base + reg_con);
 
+        return 0;
+}
+
+static int exynos_irq_request_resources(struct irq_data *irqd)
+{
+        struct irq_chip *chip = irq_data_get_irq_chip(irqd);
+        struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);
+        struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);
+        struct samsung_pin_bank_type *bank_type = bank->type;
+        struct samsung_pinctrl_drv_data *d = bank->drvdata;
+        unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;
+        unsigned long reg_con = our_chip->eint_con + bank->eint_offset;
+        unsigned long flags;
+        unsigned int mask;
+        unsigned int con;
+        int ret;
+
+        ret = gpio_lock_as_irq(&bank->gpio_chip, irqd->hwirq);
+        if (ret) {
+                dev_err(bank->gpio_chip.dev, "unable to lock pin %s-%lu IRQ\n",
+                        bank->name, irqd->hwirq);
+                return ret;
+        }
+
         reg_con = bank->pctl_offset + bank_type->reg_offset[PINCFG_TYPE_FUNC];
-        shift = pin * bank_type->fld_width[PINCFG_TYPE_FUNC];
+        shift = irqd->hwirq * bank_type->fld_width[PINCFG_TYPE_FUNC];
         mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC]) - 1;
 
         spin_lock_irqsave(&bank->slock, flags);
@@ -180,9 +200,42 @@ static int exynos_irq_set_type(struct irq_data *irqd, unsigned int type)
 
         spin_unlock_irqrestore(&bank->slock, flags);
 
+        exynos_irq_unmask(irqd);
+
         return 0;
 }
 
+static void exynos_irq_release_resources(struct irq_data *irqd)
+{
+        struct irq_chip *chip = irq_data_get_irq_chip(irqd);
+        struct exynos_irq_chip *our_chip = to_exynos_irq_chip(chip);
+        struct samsung_pin_bank *bank = irq_data_get_irq_chip_data(irqd);
+        struct samsung_pin_bank_type *bank_type = bank->type;
+        struct samsung_pinctrl_drv_data *d = bank->drvdata;
+        unsigned int shift = EXYNOS_EINT_CON_LEN * irqd->hwirq;
+        unsigned long reg_con = our_chip->eint_con + bank->eint_offset;
+        unsigned long flags;
+        unsigned int mask;
+        unsigned int con;
+
+        reg_con = bank->pctl_offset + bank_type->reg_offset[PINCFG_TYPE_FUNC];
+        shift = irqd->hwirq * bank_type->fld_width[PINCFG_TYPE_FUNC];
+        mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC]) - 1;
+
+        exynos_irq_mask(irqd);
+
+        spin_lock_irqsave(&bank->slock, flags);
+
+        con = readl(d->virt_base + reg_con);
+        con &= ~(mask << shift);
+        con |= FUNC_INPUT << shift;
+        writel(con, d->virt_base + reg_con);
+
+        spin_unlock_irqrestore(&bank->slock, flags);
+
+        gpio_unlock_as_irq(&bank->gpio_chip, irqd->hwirq);
+}
+
 /*
  * irq_chip for gpio interrupts.
  */
@@ -193,6 +246,8 @@ static struct exynos_irq_chip exynos_gpio_irq_chip = {
                 .irq_mask = exynos_irq_mask,
                 .irq_ack = exynos_irq_ack,
                 .irq_set_type = exynos_irq_set_type,
+                .irq_request_resources = exynos_irq_request_resources,
+                .irq_release_resources = exynos_irq_release_resources,
         },
         .eint_con = EXYNOS_GPIO_ECON_OFFSET,
         .eint_mask = EXYNOS_GPIO_EMASK_OFFSET,
@@ -336,6 +391,8 @@ static struct exynos_irq_chip exynos_wkup_irq_chip = {
                 .irq_ack = exynos_irq_ack,
                 .irq_set_type = exynos_irq_set_type,
                 .irq_set_wake = exynos_wkup_irq_set_wake,
+                .irq_request_resources = exynos_irq_request_resources,
+                .irq_release_resources = exynos_irq_release_resources,
         },
         .eint_con = EXYNOS_WKUP_ECON_OFFSET,
         .eint_mask = EXYNOS_WKUP_EMASK_OFFSET,
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.h b/drivers/pinctrl/samsung/pinctrl-samsung.h
index 2b882320e8e9..5cedc9d26390 100644
--- a/drivers/pinctrl/samsung/pinctrl-samsung.h
+++ b/drivers/pinctrl/samsung/pinctrl-samsung.h
@@ -26,6 +26,7 @@
 #include <linux/gpio.h>
 
 /* pinmux function number for pin as gpio output line */
+#define FUNC_INPUT      0x0
 #define FUNC_OUTPUT     0x1
 
 /**
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
index 576d41b459e9..c6e5deba238e 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
@@ -4509,24 +4509,24 @@ static const char * const audio_clk_groups[] = {
 };
 
 static const char * const can0_groups[] = {
-        "can0_data_a",
+        "can0_data",
         "can0_data_b",
         "can0_data_c",
         "can0_data_d",
         "can0_data_e",
         "can0_data_f",
-        "can_clk_a",
+        "can_clk",
         "can_clk_b",
         "can_clk_c",
         "can_clk_d",
 };
 
 static const char * const can1_groups[] = {
-        "can1_data_a",
+        "can1_data",
         "can1_data_b",
         "can1_data_c",
         "can1_data_d",
-        "can_clk_a",
+        "can_clk",
         "can_clk_b",
         "can_clk_c",
         "can_clk_d",
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index fc468a3d95ce..02152de135b5 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -88,7 +88,6 @@ struct ideapad_private {
         struct dentry *debug;
         unsigned long cfg;
         bool has_hw_rfkill_switch;
-        bool has_touchpad_control;
 };
 
 static bool no_bt_rfkill;
@@ -456,7 +455,7 @@ struct ideapad_rfk_data {
         int type;
 };
 
-const const struct ideapad_rfk_data ideapad_rfk_data[] = {
+static const struct ideapad_rfk_data ideapad_rfk_data[] = {
         { "ideapad_wlan",    CFG_WIFI_BIT, VPCCMD_W_WIFI, RFKILL_TYPE_WLAN },
         { "ideapad_bluetooth", CFG_BT_BIT, VPCCMD_W_BT, RFKILL_TYPE_BLUETOOTH },
         { "ideapad_3g",        CFG_3G_BIT, VPCCMD_W_3G, RFKILL_TYPE_WWAN },
@@ -767,9 +766,6 @@ static void ideapad_sync_touchpad_state(struct ideapad_private *priv)
 {
         unsigned long value;
 
-        if (!priv->has_touchpad_control)
-                return;
-
         /* Without reading from EC touchpad LED doesn't switch state */
         if (!read_ec_data(priv->adev->handle, VPCCMD_R_TOUCHPAD, &value)) {
                 /* Some IdeaPads don't really turn off touchpad - they only
@@ -833,29 +829,7 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)
  * always results in 0 on these models, causing ideapad_laptop to wrongly
  * report all radios as hardware-blocked.
  */
-static struct dmi_system_id no_hw_rfkill_list[] = {
-        {
-                .ident = "Lenovo Yoga 2 11 / 13 / Pro",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                        DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2"),
-                },
-        },
-        {}
-};
-
-/*
- * Some models don't offer touchpad ctrl through the ideapad interface, causing
- * ideapad_sync_touchpad_state to send wrong touchpad enable/disable events.
- */
-static struct dmi_system_id no_touchpad_ctrl_list[] = {
-        {
-                .ident = "Lenovo Yoga 1 series",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                        DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo IdeaPad Yoga"),
-                },
-        },
+static const struct dmi_system_id no_hw_rfkill_list[] = {
         {
                 .ident = "Lenovo Yoga 2 11 / 13 / Pro",
                 .matches = {
@@ -889,7 +863,6 @@ static int ideapad_acpi_add(struct platform_device *pdev)
         priv->adev = adev;
         priv->platform_device = pdev;
         priv->has_hw_rfkill_switch = !dmi_check_system(no_hw_rfkill_list);
-        priv->has_touchpad_control = !dmi_check_system(no_touchpad_ctrl_list);
 
         ret = ideapad_sysfs_init(priv);
         if (ret)
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index b062d3d7b373..d0dce734b2ed 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -1255,10 +1255,15 @@ static ssize_t toshiba_kbd_bl_mode_store(struct device *dev,
                                          const char *buf, size_t count)
 {
         struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
-        int mode = -1;
-        int time = -1;
+        int mode;
+        int time;
+        int ret;
 
-        if (sscanf(buf, "%i", &mode) != 1 && (mode != 2 || mode != 1))
+
+        ret = kstrtoint(buf, 0, &mode);
+        if (ret)
+                return ret;
+        if (mode != SCI_KBD_MODE_FNZ && mode != SCI_KBD_MODE_AUTO)
                 return -EINVAL;
 
         /* Set the Keyboard Backlight Mode where:
@@ -1266,11 +1271,12 @@ static ssize_t toshiba_kbd_bl_mode_store(struct device *dev,
          *      Auto - KBD backlight turns off automatically in given time
          *      FN-Z - KBD backlight "toggles" when hotkey pressed
          */
-        if (mode != -1 && toshiba->kbd_mode != mode) {
+        if (toshiba->kbd_mode != mode) {
                 time = toshiba->kbd_time << HCI_MISC_SHIFT;
                 time = time + toshiba->kbd_mode;
-                if (toshiba_kbd_illum_status_set(toshiba, time) < 0)
-                        return -EIO;
+                ret = toshiba_kbd_illum_status_set(toshiba, time);
+                if (ret)
+                        return ret;
                 toshiba->kbd_mode = mode;
         }
 
@@ -1857,9 +1863,16 @@ static int toshiba_acpi_resume(struct device *device)
 {
         struct toshiba_acpi_dev *dev = acpi_driver_data(to_acpi_device(device));
         u32 result;
+        acpi_status status;
+
+        if (dev->hotkey_dev) {
+                status = acpi_evaluate_object(dev->acpi_dev->handle, "ENAB",
+                                NULL, NULL);
+                if (ACPI_FAILURE(status))
+                        pr_info("Unable to re-enable hotkeys\n");
 
-        if (dev->hotkey_dev)
                 hci_write1(dev, HCI_HOTKEY_EVENT, HCI_HOTKEY_ENABLE, &result);
+        }
 
         return 0;
 }
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index b1cda6ffdbcc..45e05b32f9b6 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -953,6 +953,7 @@ static const struct x86_cpu_id rapl_ids[] = {
         { X86_VENDOR_INTEL, 6, 0x3a},/* Ivy Bridge */
         { X86_VENDOR_INTEL, 6, 0x3c},/* Haswell */
         { X86_VENDOR_INTEL, 6, 0x3d},/* Broadwell */
+        { X86_VENDOR_INTEL, 6, 0x3f},/* Haswell */
         { X86_VENDOR_INTEL, 6, 0x45},/* Haswell ULT */
         /* TODO: Add more CPU IDs after testing */
         {}
@@ -1166,11 +1167,10 @@ static int rapl_detect_domains(struct rapl_package *rp, int cpu)
 
         for (i = 0; i < RAPL_DOMAIN_MAX; i++) {
                 /* use physical package id to read counters */
-                if (!rapl_check_domain(cpu, i))
+                if (!rapl_check_domain(cpu, i)) {
                         rp->domain_map |= 1 << i;
-                else
-                        pr_warn("RAPL domain %s detection failed\n",
-                                rapl_domain_names[i]);
+                        pr_info("Found RAPL domain %s\n", rapl_domain_names[i]);
+                }
         }
         rp->nr_domains = bitmap_weight(&rp->domain_map, RAPL_DOMAIN_MAX);
         if (!rp->nr_domains) {
diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index 8f06250a0389..8754c33361e8 100644
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -717,12 +717,14 @@ static int s5m_rtc_probe(struct platform_device *pdev)
         info->device_type = s5m87xx->device_type;
         info->wtsr_smpl = s5m87xx->wtsr_smpl;
 
-        info->irq = regmap_irq_get_virq(s5m87xx->irq_data, alarm_irq);
-        if (info->irq <= 0) {
-                ret = -EINVAL;
-                dev_err(&pdev->dev, "Failed to get virtual IRQ %d\n",
+        if (s5m87xx->irq_data) {
+                info->irq = regmap_irq_get_virq(s5m87xx->irq_data, alarm_irq);
+                if (info->irq <= 0) {
+                        ret = -EINVAL;
+                        dev_err(&pdev->dev, "Failed to get virtual IRQ %d\n",
                                 alarm_irq);
-                goto err;
+                        goto err;
+                }
         }
 
         platform_set_drvdata(pdev, info);
@@ -744,6 +746,11 @@ static int s5m_rtc_probe(struct platform_device *pdev)
                 goto err;
         }
 
+        if (!info->irq) {
+                dev_info(&pdev->dev, "Alarm IRQ not available\n");
+                return 0;
+        }
+
         ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
                                         s5m_rtc_alarm_irq, 0, "rtc-alarm0",
                                         info);
@@ -802,7 +809,7 @@ static int s5m_rtc_resume(struct device *dev)
         struct s5m_rtc_info *info = dev_get_drvdata(dev);
         int ret = 0;
 
-        if (device_may_wakeup(dev))
+        if (info->irq && device_may_wakeup(dev))
                 ret = disable_irq_wake(info->irq);
 
         return ret;
@@ -813,7 +820,7 @@ static int s5m_rtc_suspend(struct device *dev)
         struct s5m_rtc_info *info = dev_get_drvdata(dev);
         int ret = 0;
 
-        if (device_may_wakeup(dev))
+        if (info->irq && device_may_wakeup(dev))
                 ret = enable_irq_wake(info->irq);
 
         return ret;
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index a6d47e5eee9e..c43aca69fb30 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -1035,12 +1035,26 @@ static int tty3215_write(struct tty_struct * tty,
                          const unsigned char *buf, int count)
 {
         struct raw3215_info *raw;
+        int i, written;
 
         if (!tty)
                 return 0;
         raw = (struct raw3215_info *) tty->driver_data;
-        raw3215_write(raw, buf, count);
-        return count;
+        written = count;
+        while (count > 0) {
+                for (i = 0; i < count; i++)
+                        if (buf[i] == '\t' || buf[i] == '\n')
+                                break;
+                raw3215_write(raw, buf, i);
+                count -= i;
+                buf += i;
+                if (count > 0) {
+                        raw3215_putchar(raw, *buf);
+                        count--;
+                        buf++;
+                }
+        }
+        return written;
 }
 
 /*
@@ -1188,7 +1202,7 @@ static int __init tty3215_init(void)
         driver->subtype = SYSTEM_TYPE_TTY;
         driver->init_termios = tty_std_termios;
         driver->init_termios.c_iflag = IGNBRK | IGNPAR;
-        driver->init_termios.c_oflag = ONLCR | XTABS;
+        driver->init_termios.c_oflag = ONLCR;
         driver->init_termios.c_lflag = ISIG;
         driver->flags = TTY_DRIVER_REAL_RAW;
         tty_set_operations(driver, &tty3215_ops);
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 7ed7a5987816..003663288e29 100644
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -559,7 +559,7 @@ sclp_tty_init(void)
         driver->subtype = SYSTEM_TYPE_TTY;
         driver->init_termios = tty_std_termios;
         driver->init_termios.c_iflag = IGNBRK | IGNPAR;
-        driver->init_termios.c_oflag = ONLCR | XTABS;
+        driver->init_termios.c_oflag = ONLCR;
         driver->init_termios.c_lflag = ISIG | ECHO;
         driver->flags = TTY_DRIVER_REAL_RAW;
         tty_set_operations(driver, &sclp_ops);
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 97ef37b51068..e7646ce3d659 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -889,6 +889,7 @@ extern const struct attribute_group *qeth_generic_attr_groups[];
 extern const struct attribute_group *qeth_osn_attr_groups[];
 extern struct workqueue_struct *qeth_wq;
 
+int qeth_card_hw_is_reachable(struct qeth_card *);
 const char *qeth_get_cardname_short(struct qeth_card *);
 int qeth_realloc_buffer_pool(struct qeth_card *, int);
 int qeth_core_load_discipline(struct qeth_card *, enum qeth_discipline_id);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index c0d6ba8655c7..fd22c811cbe1 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -73,6 +73,13 @@ static int qeth_init_qdio_out_buf(struct qeth_qdio_out_q *, int);
 struct workqueue_struct *qeth_wq;
 EXPORT_SYMBOL_GPL(qeth_wq);
 
+int qeth_card_hw_is_reachable(struct qeth_card *card)
+{
+        return (card->state == CARD_STATE_SOFTSETUP) ||
+                (card->state == CARD_STATE_UP);
+}
+EXPORT_SYMBOL_GPL(qeth_card_hw_is_reachable);
+
 static void qeth_close_dev_handler(struct work_struct *work)
 {
         struct qeth_card *card;
@@ -5790,6 +5797,7 @@ int qeth_core_ethtool_get_settings(struct net_device *netdev,
         struct qeth_card *card = netdev->ml_priv;
         enum qeth_link_types link_type;
         struct carrier_info carrier_info;
+        int rc;
         u32 speed;
 
         if ((card->info.type == QETH_CARD_TYPE_IQD) || (card->info.guestlan))
@@ -5832,8 +5840,14 @@ int qeth_core_ethtool_get_settings(struct net_device *netdev,
         /* Check if we can obtain more accurate information.     */
         /* If QUERY_CARD_INFO command is not supported or fails, */
         /* just return the heuristics that was filled above.     */
-        if (qeth_query_card_info(card, &carrier_info) != 0)
+        if (!qeth_card_hw_is_reachable(card))
+                return -ENODEV;
+        rc = qeth_query_card_info(card, &carrier_info);
+        if (rc == -EOPNOTSUPP) /* for old hardware, return heuristic */
                 return 0;
+        if (rc) /* report error from the hardware operation */
+                return rc;
+        /* on success, fill in the information got from the hardware */
 
         netdev_dbg(netdev,
         "card info: card_type=0x%02x, port_mode=0x%04x, port_speed=0x%08x\n",
diff --git a/drivers/s390/net/qeth_l2_sys.c b/drivers/s390/net/qeth_l2_sys.c
index ae1bc04b8653..59e3aa538b4d 100644
--- a/drivers/s390/net/qeth_l2_sys.c
+++ b/drivers/s390/net/qeth_l2_sys.c
@@ -5,17 +5,12 @@
 
 #include <linux/slab.h>
 #include <asm/ebcdic.h>
+#include "qeth_core.h"
 #include "qeth_l2.h"
 
 #define QETH_DEVICE_ATTR(_id, _name, _mode, _show, _store) \
 struct device_attribute dev_attr_##_id = __ATTR(_name, _mode, _show, _store)
 
-static int qeth_card_hw_is_reachable(struct qeth_card *card)
-{
-        return (card->state == CARD_STATE_SOFTSETUP) ||
-                (card->state == CARD_STATE_UP);
-}
-
 static ssize_t qeth_bridge_port_role_state_show(struct device *dev,
                                 struct device_attribute *attr, char *buf,
                                 int show_state)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ce62e8798cc8..d837dc180522 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1808,7 +1808,6 @@ static int scsi_mq_prep_fn(struct request *req)
 
         cmd->tag = req->tag;
 
-        req->cmd = req->__cmd;
         cmd->cmnd = req->cmd;
         cmd->prot_op = SCSI_PROT_NORMAL;
 
diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile
index 788ed9b59b4e..114203f32843 100644
--- a/drivers/sh/Makefile
+++ b/drivers/sh/Makefile
@@ -1,8 +1,7 @@
 #
 # Makefile for the SuperH specific drivers.
 #
-obj-$(CONFIG_SUPERH)                    += intc/
-obj-$(CONFIG_ARCH_SHMOBILE_LEGACY)      += intc/
+obj-$(CONFIG_SH_INTC)                   += intc/
 ifneq ($(CONFIG_COMMON_CLK),y)
 obj-$(CONFIG_HAVE_CLK)                  += clk/
 endif
diff --git a/drivers/sh/intc/Kconfig b/drivers/sh/intc/Kconfig
index 60228fae943f..6a1b05ddc8c9 100644
--- a/drivers/sh/intc/Kconfig
+++ b/drivers/sh/intc/Kconfig
@@ -1,7 +1,9 @@
 config SH_INTC
-        def_bool y
+        bool
         select IRQ_DOMAIN
 
+if SH_INTC
+
 comment "Interrupt controller options"
 
 config INTC_USERIMASK
@@ -37,3 +39,5 @@ config INTC_MAPPING_DEBUG
           between system IRQs and the per-controller id tables.
 
           If in doubt, say N.
+
+endif
diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c
index 40c3d43c9292..f40b34cdf2fc 100644
--- a/drivers/spi/spi-au1550.c
+++ b/drivers/spi/spi-au1550.c
@@ -945,7 +945,7 @@ static int au1550_spi_remove(struct platform_device *pdev)
         spi_bitbang_stop(&hw->bitbang);
         free_irq(hw->irq, hw);
         iounmap((void __iomem *)hw->regs);
-        release_mem_region(r->start, sizeof(psc_spi_t));
+        release_mem_region(hw->ioarea->start, sizeof(psc_spi_t));
 
         if (hw->usedma) {
                 au1550_spi_dma_rxtmp_free(hw);
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 276a3884fb3c..48f1d26e6ad9 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -417,16 +417,16 @@ static int davinci_spi_setup(struct spi_device *spi)
                                                   flags, dev_name(&spi->dev));
                         internal_cs = false;
                 }
-        }
 
-        if (retval) {
-                dev_err(&spi->dev, "GPIO %d setup failed (%d)\n",
-                        spi->cs_gpio, retval);
-                return retval;
-        }
+                if (retval) {
+                        dev_err(&spi->dev, "GPIO %d setup failed (%d)\n",
+                                spi->cs_gpio, retval);
+                        return retval;
+                }
 
-        if (internal_cs)
-                set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select);
+                if (internal_cs)
+                        set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select);
+        }
 
         if (spi->mode & SPI_READY)
                 set_io_bits(dspi->base + SPIPC0, SPIPC0_SPIENA_MASK);
diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
index 3f3dc1226edf..e14960470d8d 100644
--- a/drivers/spi/spi-dw-pci.c
+++ b/drivers/spi/spi-dw-pci.c
@@ -62,6 +62,8 @@ static int spi_pci_probe(struct pci_dev *pdev,
         if (ret)
                 return ret;
 
+        dws->regs = pcim_iomap_table(pdev)[pci_bar];
+
         dws->bus_num = 0;
         dws->num_cs = 4;
         dws->irq = pdev->irq;
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index 29f33143b795..670f0627f3bf 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -271,7 +271,7 @@ static void giveback(struct dw_spi *dws)
                                         transfer_list);
 
         if (!last_transfer->cs_change)
-                spi_chip_sel(dws, dws->cur_msg->spi, 0);
+                spi_chip_sel(dws, msg->spi, 0);
 
         spi_finalize_current_message(dws->master);
 }
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 68441fa448de..352eed7463ac 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -329,7 +329,8 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi,
 disable_fifo:
         if (t->rx_buf != NULL)
                 chconf &= ~OMAP2_MCSPI_CHCONF_FFER;
-        else
+
+        if (t->tx_buf != NULL)
                 chconf &= ~OMAP2_MCSPI_CHCONF_FFET;
 
         mcspi_write_chconf0(spi, chconf);
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index fe792106bdc5..46f45ca2c694 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1074,6 +1074,7 @@ static struct acpi_device_id pxa2xx_spi_acpi_match[] = {
         { "INT3430", 0 },
         { "INT3431", 0 },
         { "80860F0E", 0 },
+        { "8086228E", 0 },
         { },
 };
 MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match);
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index c0743604b906..cd0e08b0c9f6 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -499,7 +499,7 @@ static void rockchip_spi_config(struct rockchip_spi *rs)
         }
 
         /* div doesn't support odd number */
-        div = rs->max_freq / rs->speed;
+        div = max_t(u32, rs->max_freq / rs->speed, 1);
         div = (div + 1) & 0xfffe;
 
         spi_enable_chip(rs, 0);
@@ -678,7 +678,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
                 rs->dma_tx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_TXDR);
                 rs->dma_rx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_RXDR);
                 rs->dma_tx.direction = DMA_MEM_TO_DEV;
-                rs->dma_tx.direction = DMA_DEV_TO_MEM;
+                rs->dma_rx.direction = DMA_DEV_TO_MEM;
 
                 master->can_dma = rockchip_spi_can_dma;
                 master->dma_tx = rs->dma_tx.ch;
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index c850dfdfa9e3..ad87a98f8f68 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -472,25 +472,52 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx,
         dma_cookie_t cookie;
         int ret;
 
-        if (tx) {
-                desc_tx = dmaengine_prep_slave_sg(rspi->master->dma_tx,
-                                        tx->sgl, tx->nents, DMA_TO_DEVICE,
-                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
-                if (!desc_tx)
-                        goto no_dma;
-
-                irq_mask |= SPCR_SPTIE;
-        }
+        /* First prepare and submit the DMA request(s), as this may fail */
         if (rx) {
                 desc_rx = dmaengine_prep_slave_sg(rspi->master->dma_rx,
                                         rx->sgl, rx->nents, DMA_FROM_DEVICE,
                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
-                if (!desc_rx)
-                        goto no_dma;
+                if (!desc_rx) {
+                        ret = -EAGAIN;
+                        goto no_dma_rx;
+                }
+
+                desc_rx->callback = rspi_dma_complete;
+                desc_rx->callback_param = rspi;
+                cookie = dmaengine_submit(desc_rx);
+                if (dma_submit_error(cookie)) {
+                        ret = cookie;
+                        goto no_dma_rx;
+                }
 
                 irq_mask |= SPCR_SPRIE;
         }
 
+        if (tx) {
+                desc_tx = dmaengine_prep_slave_sg(rspi->master->dma_tx,
+                                        tx->sgl, tx->nents, DMA_TO_DEVICE,
+                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+                if (!desc_tx) {
+                        ret = -EAGAIN;
+                        goto no_dma_tx;
+                }
+
+                if (rx) {
+                        /* No callback */
+                        desc_tx->callback = NULL;
+                } else {
+                        desc_tx->callback = rspi_dma_complete;
+                        desc_tx->callback_param = rspi;
+                }
+                cookie = dmaengine_submit(desc_tx);
+                if (dma_submit_error(cookie)) {
+                        ret = cookie;
+                        goto no_dma_tx;
+                }
+
+                irq_mask |= SPCR_SPTIE;
+        }
+
         /*
          * DMAC needs SPxIE, but if SPxIE is set, the IRQ routine will be
          * called. So, this driver disables the IRQ while DMA transfer.
@@ -503,34 +530,24 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx,
         rspi_enable_irq(rspi, irq_mask);
         rspi->dma_callbacked = 0;
 
-        if (rx) {
-                desc_rx->callback = rspi_dma_complete;
-                desc_rx->callback_param = rspi;
-                cookie = dmaengine_submit(desc_rx);
-                if (dma_submit_error(cookie))
-                        return cookie;
+        /* Now start DMA */
+        if (rx)
                 dma_async_issue_pending(rspi->master->dma_rx);
-        }
-        if (tx) {
-                if (rx) {
-                        /* No callback */
-                        desc_tx->callback = NULL;
-                } else {
-                        desc_tx->callback = rspi_dma_complete;
-                        desc_tx->callback_param = rspi;
-                }
-                cookie = dmaengine_submit(desc_tx);
-                if (dma_submit_error(cookie))
-                        return cookie;
+        if (tx)
                 dma_async_issue_pending(rspi->master->dma_tx);
-        }
 
         ret = wait_event_interruptible_timeout(rspi->wait,
                                                rspi->dma_callbacked, HZ);
         if (ret > 0 && rspi->dma_callbacked)
                 ret = 0;
-        else if (!ret)
+        else if (!ret) {
+                dev_err(&rspi->master->dev, "DMA timeout\n");
                 ret = -ETIMEDOUT;
+                if (tx)
+                        dmaengine_terminate_all(rspi->master->dma_tx);
+                if (rx)
+                        dmaengine_terminate_all(rspi->master->dma_rx);
+        }
 
         rspi_disable_irq(rspi, irq_mask);
 
@@ -541,11 +558,16 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx,
 
         return ret;
 
-no_dma:
-        pr_warn_once("%s %s: DMA not available, falling back to PIO\n",
-                     dev_driver_string(&rspi->master->dev),
-                     dev_name(&rspi->master->dev));
-        return -EAGAIN;
+no_dma_tx:
+        if (rx)
+                dmaengine_terminate_all(rspi->master->dma_rx);
+no_dma_rx:
+        if (ret == -EAGAIN) {
+                pr_warn_once("%s %s: DMA not available, falling back to PIO\n",
+                             dev_driver_string(&rspi->master->dev),
+                             dev_name(&rspi->master->dev));
+        }
+        return ret;
 }
 
 static void rspi_receive_init(const struct rspi_data *rspi)
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 2a4354dcd661..543075b80f16 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -636,48 +636,38 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx,
         dma_cookie_t cookie;
         int ret;
 
-        if (tx) {
-                ier_bits |= IER_TDREQE | IER_TDMAE;
-                dma_sync_single_for_device(p->master->dma_tx->device->dev,
-                                           p->tx_dma_addr, len, DMA_TO_DEVICE);
-                desc_tx = dmaengine_prep_slave_single(p->master->dma_tx,
-                                        p->tx_dma_addr, len, DMA_TO_DEVICE,
-                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
-                if (!desc_tx)
-                        return -EAGAIN;
-        }
-
+        /* First prepare and submit the DMA request(s), as this may fail */
         if (rx) {
                 ier_bits |= IER_RDREQE | IER_RDMAE;
                 desc_rx = dmaengine_prep_slave_single(p->master->dma_rx,
                                         p->rx_dma_addr, len, DMA_FROM_DEVICE,
                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
-                if (!desc_rx)
-                        return -EAGAIN;
-        }
-
-        /* 1 stage FIFO watermarks for DMA */
-        sh_msiof_write(p, FCTR, FCTR_TFWM_1 | FCTR_RFWM_1);
-
-        /* setup msiof transfer mode registers (32-bit words) */
-        sh_msiof_spi_set_mode_regs(p, tx, rx, 32, len / 4);
-
-        sh_msiof_write(p, IER, ier_bits);
-
-        reinit_completion(&p->done);
+                if (!desc_rx) {
+                        ret = -EAGAIN;
+                        goto no_dma_rx;
+                }
 
-        if (rx) {
                 desc_rx->callback = sh_msiof_dma_complete;
                 desc_rx->callback_param = p;
                 cookie = dmaengine_submit(desc_rx);
                 if (dma_submit_error(cookie)) {
                         ret = cookie;
-                        goto stop_ier;
+                        goto no_dma_rx;
                 }
-                dma_async_issue_pending(p->master->dma_rx);
         }
 
         if (tx) {
+                ier_bits |= IER_TDREQE | IER_TDMAE;
+                dma_sync_single_for_device(p->master->dma_tx->device->dev,
+                                           p->tx_dma_addr, len, DMA_TO_DEVICE);
+                desc_tx = dmaengine_prep_slave_single(p->master->dma_tx,
+                                        p->tx_dma_addr, len, DMA_TO_DEVICE,
+                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+                if (!desc_tx) {
+                        ret = -EAGAIN;
+                        goto no_dma_tx;
+                }
+
                 if (rx) {
                         /* No callback */
                         desc_tx->callback = NULL;
@@ -688,15 +678,30 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx,
                 cookie = dmaengine_submit(desc_tx);
                 if (dma_submit_error(cookie)) {
                         ret = cookie;
-                        goto stop_rx;
+                        goto no_dma_tx;
                 }
-                dma_async_issue_pending(p->master->dma_tx);
         }
 
+        /* 1 stage FIFO watermarks for DMA */
+        sh_msiof_write(p, FCTR, FCTR_TFWM_1 | FCTR_RFWM_1);
+
+        /* setup msiof transfer mode registers (32-bit words) */
+        sh_msiof_spi_set_mode_regs(p, tx, rx, 32, len / 4);
+
+        sh_msiof_write(p, IER, ier_bits);
+
+        reinit_completion(&p->done);
+
+        /* Now start DMA */
+        if (rx)
+                dma_async_issue_pending(p->master->dma_rx);
+        if (tx)
+                dma_async_issue_pending(p->master->dma_tx);
+
         ret = sh_msiof_spi_start(p, rx);
         if (ret) {
                 dev_err(&p->pdev->dev, "failed to start hardware\n");
-                goto stop_tx;
+                goto stop_dma;
         }
 
         /* wait for tx fifo to be emptied / rx fifo to be filled */
@@ -726,14 +731,14 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx,
 stop_reset:
         sh_msiof_reset_str(p);
         sh_msiof_spi_stop(p, rx);
-stop_tx:
+stop_dma:
         if (tx)
                 dmaengine_terminate_all(p->master->dma_tx);
-stop_rx:
+no_dma_tx:
         if (rx)
                 dmaengine_terminate_all(p->master->dma_rx);
-stop_ier:
         sh_msiof_write(p, IER, 0);
+no_dma_rx:
         return ret;
 }
 
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index e0531baf2782..ca935df80c88 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -848,6 +848,7 @@ out:
 
 /**
  * spi_finalize_current_transfer - report completion of a transfer
+ * @master: the master reporting completion
  *
  * Called by SPI drivers using the core transfer_one_message()
  * implementation to notify it that the current interrupt driven
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c
index 19396dc4ee47..bed2fedeb057 100644
--- a/drivers/ssb/b43_pci_bridge.c
+++ b/drivers/ssb/b43_pci_bridge.c
@@ -38,6 +38,7 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432b) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x432c) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4350) },
+        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4351) },
         { 0, },
 };
 MODULE_DEVICE_TABLE(pci, b43_pci_bridge_tbl);
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 2c486ea6236b..35b494f5667f 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -28,8 +28,6 @@ source "drivers/staging/et131x/Kconfig"
 
 source "drivers/staging/slicoss/Kconfig"
 
-source "drivers/staging/usbip/Kconfig"
-
 source "drivers/staging/wlan-ng/Kconfig"
 
 source "drivers/staging/comedi/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 1e1a3a10faf7..e66a5dbd9b02 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -6,7 +6,6 @@ obj-$(CONFIG_STAGING)		+= staging.o
 obj-y                           += media/
 obj-$(CONFIG_ET131X)            += et131x/
 obj-$(CONFIG_SLICOSS)           += slicoss/
-obj-$(CONFIG_USBIP_CORE)        += usbip/
 obj-$(CONFIG_PRISM2_USB)        += wlan-ng/
 obj-$(CONFIG_COMEDI)            += comedi/
 obj-$(CONFIG_FB_OLPC_DCON)      += olpc_dcon/
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 9b47e66599a3..0bf0d24d12d5 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -790,7 +790,7 @@ static int __init create_log(char *log_name, int size)
         if (unlikely(ret)) {
                 pr_err("failed to register misc device for log '%s'!\n",
                                 log->misc.name);
-                goto out_free_log;
+                goto out_free_misc_name;
         }
 
         pr_info("created %luK log '%s'\n",
@@ -798,6 +798,9 @@ static int __init create_log(char *log_name, int size)
 
         return 0;
 
+out_free_misc_name:
+        kfree(log->misc.name);
+
 out_free_log:
         kfree(log);
 
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 8bf1eb485163..831b7c6fe494 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -1421,22 +1421,16 @@ static int et131x_mii_read(struct et131x_adapter *adapter, u8 reg, u16 *value)
  * @reg: the register to read
  * @value: 16-bit value to write
  */
-static int et131x_mii_write(struct et131x_adapter *adapter, u8 reg, u16 value)
+static int et131x_mii_write(struct et131x_adapter *adapter, u8 addr, u8 reg,
+                            u16 value)
 {
         struct mac_regs __iomem *mac = &adapter->regs->mac;
-        struct phy_device *phydev = adapter->phydev;
         int status = 0;
-        u8 addr;
         u32 delay = 0;
         u32 mii_addr;
         u32 mii_cmd;
         u32 mii_indicator;
 
-        if (!phydev)
-                return -EIO;
-
-        addr = phydev->addr;
-
         /* Save a local copy of the registers we are dealing with so we can
          * set them back
          */
@@ -1631,17 +1625,7 @@ static int et131x_mdio_write(struct mii_bus *bus, int phy_addr,
         struct net_device *netdev = bus->priv;
         struct et131x_adapter *adapter = netdev_priv(netdev);
 
-        return et131x_mii_write(adapter, reg, value);
-}
-
-static int et131x_mdio_reset(struct mii_bus *bus)
-{
-        struct net_device *netdev = bus->priv;
-        struct et131x_adapter *adapter = netdev_priv(netdev);
-
-        et131x_mii_write(adapter, MII_BMCR, BMCR_RESET);
-
-        return 0;
+        return et131x_mii_write(adapter, phy_addr, reg, value);
 }
 
 /*      et1310_phy_power_switch -       PHY power control
@@ -1656,18 +1640,20 @@ static int et131x_mdio_reset(struct mii_bus *bus)
 static void et1310_phy_power_switch(struct et131x_adapter *adapter, bool down)
 {
         u16 data;
+        struct  phy_device *phydev = adapter->phydev;
 
         et131x_mii_read(adapter, MII_BMCR, &data);
         data &= ~BMCR_PDOWN;
         if (down)
                 data |= BMCR_PDOWN;
-        et131x_mii_write(adapter, MII_BMCR, data);
+        et131x_mii_write(adapter, phydev->addr, MII_BMCR, data);
 }
 
 /* et131x_xcvr_init - Init the phy if we are setting it into force mode */
 static void et131x_xcvr_init(struct et131x_adapter *adapter)
 {
         u16 lcr2;
+        struct  phy_device *phydev = adapter->phydev;
 
         /* Set the LED behavior such that LED 1 indicates speed (off =
          * 10Mbits, blink = 100Mbits, on = 1000Mbits) and LED 2 indicates
@@ -1688,7 +1674,7 @@ static void et131x_xcvr_init(struct et131x_adapter *adapter)
                 else
                         lcr2 |= (LED_VAL_LINKON << LED_TXRX_SHIFT);
 
-                et131x_mii_write(adapter, PHY_LED_2, lcr2);
+                et131x_mii_write(adapter, phydev->addr, PHY_LED_2, lcr2);
         }
 }
 
@@ -3643,14 +3629,14 @@ static void et131x_adjust_link(struct net_device *netdev)
 
                         et131x_mii_read(adapter, PHY_MPHY_CONTROL_REG,
                                          &register18);
-                        et131x_mii_write(adapter, PHY_MPHY_CONTROL_REG,
-                                         register18 | 0x4);
-                        et131x_mii_write(adapter, PHY_INDEX_REG,
+                        et131x_mii_write(adapter, phydev->addr,
+                                         PHY_MPHY_CONTROL_REG, register18 | 0x4);
+                        et131x_mii_write(adapter, phydev->addr, PHY_INDEX_REG,
                                          register18 | 0x8402);
-                        et131x_mii_write(adapter, PHY_DATA_REG,
+                        et131x_mii_write(adapter, phydev->addr, PHY_DATA_REG,
                                          register18 | 511);
-                        et131x_mii_write(adapter, PHY_MPHY_CONTROL_REG,
-                                         register18);
+                        et131x_mii_write(adapter, phydev->addr,
+                                         PHY_MPHY_CONTROL_REG, register18);
                 }
 
                 et1310_config_flow_control(adapter);
@@ -3662,7 +3648,8 @@ static void et131x_adjust_link(struct net_device *netdev)
                         et131x_mii_read(adapter, PHY_CONFIG, &reg);
                         reg &= ~ET_PHY_CONFIG_TX_FIFO_DEPTH;
                         reg |= ET_PHY_CONFIG_FIFO_DEPTH_32;
-                        et131x_mii_write(adapter, PHY_CONFIG, reg);
+                        et131x_mii_write(adapter, phydev->addr, PHY_CONFIG,
+                                         reg);
                 }
 
                 et131x_set_rx_dma_timer(adapter);
@@ -3675,14 +3662,14 @@ static void et131x_adjust_link(struct net_device *netdev)
 
                         et131x_mii_read(adapter, PHY_MPHY_CONTROL_REG,
                                          &register18);
-                        et131x_mii_write(adapter, PHY_MPHY_CONTROL_REG,
-                                         register18 | 0x4);
-                        et131x_mii_write(adapter, PHY_INDEX_REG,
-                                         register18 | 0x8402);
-                        et131x_mii_write(adapter, PHY_DATA_REG,
-                                         register18 | 511);
-                        et131x_mii_write(adapter, PHY_MPHY_CONTROL_REG,
-                                         register18);
+                        et131x_mii_write(adapter, phydev->addr,
+                                        PHY_MPHY_CONTROL_REG, register18 | 0x4);
+                        et131x_mii_write(adapter, phydev->addr,
+                                        PHY_INDEX_REG, register18 | 0x8402);
+                        et131x_mii_write(adapter, phydev->addr,
+                                        PHY_DATA_REG, register18 | 511);
+                        et131x_mii_write(adapter, phydev->addr,
+                                        PHY_MPHY_CONTROL_REG, register18);
                 }
 
                 /* Free the packets being actively sent & stopped */
@@ -4644,10 +4631,6 @@ static int et131x_pci_setup(struct pci_dev *pdev,
         /* Copy address into the net_device struct */
         memcpy(netdev->dev_addr, adapter->addr, ETH_ALEN);
 
-        /* Init variable for counting how long we do not have link status */
-        adapter->boot_coma = 0;
-        et1310_disable_phy_coma(adapter);
-
         rc = -ENOMEM;
 
         /* Setup the mii_bus struct */
@@ -4663,7 +4646,6 @@ static int et131x_pci_setup(struct pci_dev *pdev,
         adapter->mii_bus->priv = netdev;
         adapter->mii_bus->read = et131x_mdio_read;
         adapter->mii_bus->write = et131x_mdio_write;
-        adapter->mii_bus->reset = et131x_mdio_reset;
         adapter->mii_bus->irq = kmalloc_array(PHY_MAX_ADDR, sizeof(int),
                                               GFP_KERNEL);
         if (!adapter->mii_bus->irq)
@@ -4687,6 +4669,10 @@ static int et131x_pci_setup(struct pci_dev *pdev,
         /* Setup et1310 as per the documentation */
         et131x_adapter_setup(adapter);
 
+        /* Init variable for counting how long we do not have link status */
+        adapter->boot_coma = 0;
+        et1310_disable_phy_coma(adapter);
+
         /* We can enable interrupts now
          *
          *  NOTE - Because registration of interrupt handler is done in the
diff --git a/drivers/staging/lustre/lustre/libcfs/workitem.c b/drivers/staging/lustre/lustre/libcfs/workitem.c
index 65629579bd7d..03ab9e046784 100644
--- a/drivers/staging/lustre/lustre/libcfs/workitem.c
+++ b/drivers/staging/lustre/lustre/libcfs/workitem.c
@@ -365,6 +365,7 @@ cfs_wi_sched_create(char *name, struct cfs_cpt_table *cptab,
                 return -ENOMEM;
 
         strncpy(sched->ws_name, name, CFS_WS_NAME_LEN);
+        sched->ws_name[CFS_WS_NAME_LEN - 1] = '\0';
         sched->ws_cptab = cptab;
         sched->ws_cpt = cpt;
 
diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 8b19f3caa68f..701c6a776524 100644
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -35,7 +35,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
-# include <asm/atomic.h>
+# include <linux/atomic.h>
 
 #include "../include/obd_support.h"
 #include "../include/obd_class.h"
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index b8676ac77b0c..407a318b09db 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -43,9 +43,11 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
         {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x0179)}, /* 8188ETV */
         /*=== Customer ID ===*/
         /****** 8188EUS ********/
+        {USB_DEVICE(0x056e, 0x4008)}, /* Elecom WDC-150SU2M */
         {USB_DEVICE(0x07b8, 0x8179)}, /* Abocom - Abocom */
         {USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */
         {USB_DEVICE(0x2001, 0x3310)}, /* Dlink DWA-123 REV D1 */
+        {USB_DEVICE(0x0df6, 0x0076)}, /* Sitecom N150 v2 */
         {}      /* Terminating entry */
 };
 
diff --git a/drivers/staging/usbip/uapi/usbip.h b/drivers/staging/usbip/uapi/usbip.h
deleted file mode 100644
index fa5db30ede36..000000000000
--- a/drivers/staging/usbip/uapi/usbip.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *      usbip.h
- *
- *      USBIP uapi defines and function prototypes etc.
-*/
-
-#ifndef _UAPI_LINUX_USBIP_H
-#define _UAPI_LINUX_USBIP_H
-
-/* usbip device status - exported in usbip device sysfs status */
-enum usbip_device_status {
-        /* sdev is available. */
-        SDEV_ST_AVAILABLE = 0x01,
-        /* sdev is now used. */
-        SDEV_ST_USED,
-        /* sdev is unusable because of a fatal error. */
-        SDEV_ST_ERROR,
-
-        /* vdev does not connect a remote device. */
-        VDEV_ST_NULL,
-        /* vdev is used, but the USB address is not assigned yet */
-        VDEV_ST_NOTASSIGNED,
-        VDEV_ST_USED,
-        VDEV_ST_ERROR
-};
-#endif /* _UAPI_LINUX_USBIP_H */
diff --git a/drivers/staging/usbip/userspace/.gitignore b/drivers/staging/usbip/userspace/.gitignore
deleted file mode 100644
index 9aad9e30a8ba..000000000000
--- a/drivers/staging/usbip/userspace/.gitignore
+++ /dev/null
@@ -1,28 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache/
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libsrc/Makefile
-libsrc/Makefile.in
-libtool
-ltmain.sh
-missing
-src/Makefile
-src/Makefile.in
-stamp-h1
-libsrc/libusbip.la
-libsrc/libusbip_la-names.lo
-libsrc/libusbip_la-usbip_common.lo
-libsrc/libusbip_la-usbip_host_driver.lo
-libsrc/libusbip_la-vhci_driver.lo
-src/usbip
-src/usbipd
diff --git a/drivers/staging/usbip/userspace/AUTHORS b/drivers/staging/usbip/userspace/AUTHORS
deleted file mode 100644
index a27ea8d03aec..000000000000
--- a/drivers/staging/usbip/userspace/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Takahiro Hirofuchi
-Robert Leibl
-matt mooney <mfm@muteddisk.com>
diff --git a/drivers/staging/usbip/userspace/COPYING b/drivers/staging/usbip/userspace/COPYING
deleted file mode 100644
index c5611e48a8e1..000000000000
--- a/drivers/staging/usbip/userspace/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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.
-
-    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/drivers/staging/usbip/userspace/INSTALL b/drivers/staging/usbip/userspace/INSTALL
deleted file mode 100644
index d3c5b40a9409..000000000000
--- a/drivers/staging/usbip/userspace/INSTALL
+++ /dev/null
@@ -1,237 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/drivers/staging/usbip/userspace/Makefile.am b/drivers/staging/usbip/userspace/Makefile.am
deleted file mode 100644
index 66f8bf038c9f..000000000000
--- a/drivers/staging/usbip/userspace/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS := libsrc src
-includedir = @includedir@/usbip
-include_HEADERS := $(addprefix libsrc/, \
-                     usbip_common.h vhci_driver.h usbip_host_driver.h)
-
-dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8)
diff --git a/drivers/staging/usbip/userspace/README b/drivers/staging/usbip/userspace/README
deleted file mode 100644
index 831f49fea3ce..000000000000
--- a/drivers/staging/usbip/userspace/README
+++ /dev/null
@@ -1,202 +0,0 @@
-#
-# README for usbip-utils
-#
-# Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
-#               2005-2008 Takahiro Hirofuchi
-
-
-[Requirements]
-    - USB/IP device drivers
-        Found in the staging directory of the Linux kernel.
-
-    - libudev >= 2.0
-        libudev library
-
-    - libwrap0-dev
-        tcp wrapper library
-
-    - gcc >= 4.0
-
-    - libtool, automake >= 1.9, autoconf >= 2.5.0, pkg-config
-
-[Optional]
-    - hwdata
-        Contains USB device identification data.
-
-
-[Install]
-    0. Generate configuration scripts.
-        $ ./autogen.sh
-
-    1. Compile & install the userspace utilities.
-        $ ./configure [--with-tcp-wrappers=no] [--with-usbids-dir=<dir>]
-        $ make install
-
-    2. Compile & install USB/IP drivers.
-
-
-[Usage]
-    server:# (Physically attach your USB device.)
-
-    server:# insmod usbip-core.ko
-    server:# insmod usbip-host.ko
-
-    server:# usbipd -D
-        - Start usbip daemon.
-
-    server:# usbip list -l
-        - List driver assignments for USB devices.
-
-    server:# usbip bind --busid 1-2
-        - Bind usbip-host.ko to the device with busid 1-2.
-        - The USB device 1-2 is now exportable to other hosts!
-        - Use `usbip unbind --busid 1-2' to stop exporting the device.
-
-    client:# insmod usbip-core.ko
-    client:# insmod vhci-hcd.ko
-
-    client:# usbip list --remote <host>
-        - List exported USB devices on the <host>.
-
-    client:# usbip attach --remote <host> --busid 1-2
-        - Connect the remote USB device.
-
-    client:# usbip port
-        - Show virtual port status.
-
-    client:# usbip detach --port <port>
-        - Detach the USB device.
-
-
-[Example]
----------------------------
-        SERVER SIDE
----------------------------
-Physically attach your USB devices to this host.
-
-    trois:# insmod path/to/usbip-core.ko
-    trois:# insmod path/to/usbip-host.ko
-    trois:# usbipd -D
-
-In another terminal, let's look up what USB devices are physically
-attached to this host.
-
-    trois:# usbip list -l
-    Local USB devices
-    =================
-     - busid 1-1 (05a9:a511)
-             1-1:1.0 -> ov511
-
-     - busid 3-2 (0711:0902)
-             3-2:1.0 -> none
-
-     - busid 3-3.1 (08bb:2702)
-             3-3.1:1.0 -> snd-usb-audio
-             3-3.1:1.1 -> snd-usb-audio
-
-     - busid 3-3.2 (04bb:0206)
-             3-3.2:1.0 -> usb-storage
-
-     - busid 3-3 (0409:0058)
-             3-3:1.0 -> hub
-
-     - busid 4-1 (046d:08b2)
-             4-1:1.0 -> none
-             4-1:1.1 -> none
-             4-1:1.2 -> none
-
-     - busid 5-2 (058f:9254)
-             5-2:1.0 -> hub
-
-A USB storage device of busid 3-3.2 is now bound to the usb-storage
-driver. To export this device, we first mark the device as
-"exportable"; the device is bound to the usbip-host driver. Please
-remember you can not export a USB hub.
-
-Mark the device of busid 3-3.2 as exportable:
-
-    trois:# usbip --debug bind --busid 3-3.2
-    ...
-    usbip debug: usbip_bind.c:162:[unbind_other] 3-3.2:1.0 -> usb-storage
-    ...
-    bind device on busid 3-3.2: complete
-
-    trois:# usbip list -l
-    Local USB devices
-    =================
-    ...
-
-     - busid 3-3.2 (04bb:0206)
-             3-3.2:1.0 -> usbip-host
-    ...
-
----------------------------
-        CLIENT SIDE
----------------------------
-First, let's list available remote devices that are marked as
-exportable on the host.
-
-    deux:# insmod path/to/usbip-core.ko
-    deux:# insmod path/to/vhci-hcd.ko
-
-    deux:# usbip list --remote 10.0.0.3
-    Exportable USB devices
-    ======================
-     - 10.0.0.3
-            1-1: Prolific Technology, Inc. : unknown product (067b:3507)
-               : /sys/devices/pci0000:00/0000:00:1f.2/usb1/1-1
-               : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00)
-               :  0 - Mass Storage / SCSI / Bulk (Zip) (08/06/50)
-
-        1-2.2.1: Apple Computer, Inc. : unknown product (05ac:0203)
-               : /sys/devices/pci0000:00/0000:00:1f.2/usb1/1-2/1-2.2/1-2.2.1
-               : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00)
-               :  0 - Human Interface Devices / Boot Interface Subclass / Keyboard (03/01/01)
-
-        1-2.2.3: OmniVision Technologies, Inc. : OV511+ WebCam (05a9:a511)
-               : /sys/devices/pci0000:00/0000:00:1f.2/usb1/1-2/1-2.2/1-2.2.3
-               : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00)
-               :  0 - Vendor Specific Class / unknown subclass / unknown protocol (ff/00/00)
-
-            3-1: Logitech, Inc. : QuickCam Pro 4000 (046d:08b2)
-               : /sys/devices/pci0000:00/0000:00:1e.0/0000:02:0a.0/usb3/3-1
-               : (Defined at Interface level) / unknown subclass / unknown protocol (00/00/00)
-               :  0 - Data / unknown subclass / unknown protocol (0a/ff/00)
-               :  1 - Audio / Control Device / unknown protocol (01/01/00)
-               :  2 - Audio / Streaming / unknown protocol (01/02/00)
-
-Attach a remote USB device:
-
-    deux:# usbip attach --remote 10.0.0.3 --busid 1-1
-    port 0 attached
-
-Show the devices attached to this client:
-
-    deux:# usbip port
-    Port 00: <Port in Use> at Full Speed(12Mbps)
-           Prolific Technology, Inc. : unknown product (067b:3507)
-           6-1 -> usbip://10.0.0.3:3240/1-1  (remote bus/dev 001/004)
-           6-1:1.0 used by usb-storage
-                          /sys/class/scsi_device/0:0:0:0/device
-                          /sys/class/scsi_host/host0/device
-                          /sys/block/sda/device
-
-Detach the imported device:
-
-    deux:# usbip detach --port 0
-    port 0 detached
-
-
-[Checklist]
-    - See 'Debug Tips' on the project wiki.
-        - http://usbip.wiki.sourceforge.net/how-to-debug-usbip
-    - usbip-host.ko must be bound to the target device.
-        - See /proc/bus/usb/devices and find "Driver=..." lines of the device.
-    - Shutdown firewall.
-        - usbip now uses TCP port 3240.
-    - Disable SELinux.
-    - Check the kernel and daemon messages.
-
-
-[Contact]
-    Mailing List: linux-usb@vger.kernel.org
diff --git a/drivers/staging/usbip/userspace/autogen.sh b/drivers/staging/usbip/userspace/autogen.sh
deleted file mode 100755
index e1112d3fcbf6..000000000000
--- a/drivers/staging/usbip/userspace/autogen.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -x
-
-#aclocal
-#autoheader
-#libtoolize --copy --force
-#automake-1.9 -acf
-#autoconf
-
-autoreconf -i -f -v
diff --git a/drivers/staging/usbip/userspace/cleanup.sh b/drivers/staging/usbip/userspace/cleanup.sh
deleted file mode 100755
index 955c3ccb729a..000000000000
--- a/drivers/staging/usbip/userspace/cleanup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ -r Makefile ]; then
-        make distclean
-fi
-
-FILES="aclocal.m4 autom4te.cache compile config.guess config.h.in config.log \
-       config.status config.sub configure cscope.out depcomp install-sh      \
-       libsrc/Makefile libsrc/Makefile.in libtool ltmain.sh Makefile         \
-       Makefile.in missing src/Makefile src/Makefile.in"
-
-rm -vRf $FILES
diff --git a/drivers/staging/usbip/userspace/configure.ac b/drivers/staging/usbip/userspace/configure.ac
deleted file mode 100644
index 607d05c5ccfd..000000000000
--- a/drivers/staging/usbip/userspace/configure.ac
+++ /dev/null
@@ -1,111 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.59)
-AC_INIT([usbip-utils], [2.0], [linux-usb@vger.kernel.org])
-AC_DEFINE([USBIP_VERSION], [0x00000111], [binary-coded decimal version number])
-
-CURRENT=0
-REVISION=1
-AGE=0
-AC_SUBST([LIBUSBIP_VERSION], [$CURRENT:$REVISION:$AGE], [library version])
-
-AC_CONFIG_SRCDIR([src/usbipd.c])
-AC_CONFIG_HEADERS([config.h])
-
-AM_INIT_AUTOMAKE([foreign])
-LT_INIT
-
-# Silent build for automake >= 1.11
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_SUBST([EXTRA_CFLAGS], ["-Wall -Werror -Wextra -std=gnu99"])
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-
-# Checks for header files.
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h stdlib.h dnl
-                  string.h sys/socket.h syslog.h unistd.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_INT32_T
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT8_T
-
-# Checks for library functions.
-AC_FUNC_REALLOC
-AC_CHECK_FUNCS([memset mkdir regcomp socket strchr strerror strstr dnl
-                strtoul])
-
-AC_CHECK_HEADER([libudev.h],
-                [AC_CHECK_LIB([udev], [udev_new],
-                              [LIBS="$LIBS -ludev"],
-                              [AC_MSG_ERROR([Missing udev library!])])],
-                [AC_MSG_ERROR([Missing /usr/include/libudev.h])])
-
-# Checks for libwrap library.
-AC_MSG_CHECKING([whether to use the libwrap (TCP wrappers) library])
-AC_ARG_WITH([tcp-wrappers],
-            [AS_HELP_STRING([--with-tcp-wrappers],
-                            [use the libwrap (TCP wrappers) library])],
-            dnl [ACTION-IF-GIVEN]
-            [if test "$withval" = "yes"; then
-                     AC_MSG_RESULT([yes])
-                     AC_MSG_CHECKING([for hosts_access in -lwrap])
-                     saved_LIBS="$LIBS"
-                     LIBS="-lwrap $saved_LIBS"
-                     AC_TRY_LINK(
-                       [int hosts_access(); int allow_severity, deny_severity;],
-                       [hosts_access()],
-                       [AC_MSG_RESULT([yes]);
-                        AC_DEFINE([HAVE_LIBWRAP], [1],
-                                  [use tcp wrapper]) wrap_LIB="-lwrap"],
-                       [AC_MSG_RESULT([not found]); exit 1])
-             else
-                     AC_MSG_RESULT([no]);
-             fi],
-            dnl [ACTION-IF-NOT-GIVEN]
-            [AC_MSG_RESULT([(default)])
-             AC_MSG_CHECKING([for hosts_access in -lwrap])
-             saved_LIBS="$LIBS"
-             LIBS="-lwrap $saved_LIBS"
-             AC_TRY_LINK(
-               [int hosts_access(); int allow_severity, deny_severity;],
-               [hosts_access()],
-               [AC_MSG_RESULT([yes]);
-                AC_DEFINE([HAVE_LIBWRAP], [1], [use tcp wrapper])],
-               [AC_MSG_RESULT([no]); LIBS="$saved_LIBS"])])
-
-# Sets directory containing usb.ids.
-AC_ARG_WITH([usbids-dir],
-            [AS_HELP_STRING([--with-usbids-dir=DIR],
-               [where usb.ids is found (default /usr/share/hwdata/)])],
-            [USBIDS_DIR=$withval], [USBIDS_DIR="/usr/share/hwdata/"])
-AC_SUBST([USBIDS_DIR])
-
-# use _FORTIFY_SOURCE
-AC_MSG_CHECKING([whether to use fortify])
-AC_ARG_WITH([fortify],
-            [AS_HELP_STRING([--with-fortify],
-                            [use _FORTIFY_SROUCE option when compiling)])],
-                            dnl [ACTION-IF-GIVEN]
-                            [if test "$withval" = "yes"; then
-                                AC_MSG_RESULT([yes])
-                                CFLAGS="$CFLAGS -D_FORTIFY_SOURCE -O"
-                             else
-                                AC_MSG_RESULT([no])
-                                CFLAGS="$CFLAGS -U_FORTIFY_SOURCE"
-                             fi
-                            ],
-                            dnl [ACTION-IF-NOT-GIVEN]
-                            [AC_MSG_RESULT([default])])
-
-AC_CONFIG_FILES([Makefile libsrc/Makefile src/Makefile])
-AC_OUTPUT
diff --git a/drivers/staging/usbip/userspace/doc/usbip.8 b/drivers/staging/usbip/userspace/doc/usbip.8
deleted file mode 100644
index a6097be25d28..000000000000
--- a/drivers/staging/usbip/userspace/doc/usbip.8
+++ /dev/null
@@ -1,95 +0,0 @@
-.TH USBIP "8" "February 2009" "usbip" "System Administration Utilities"
-.SH NAME
-usbip \- manage USB/IP devices
-.SH SYNOPSIS
-.B usbip
-[\fIoptions\fR] <\fIcommand\fR> <\fIargs\fR>
-
-.SH DESCRIPTION
-On a USB/IP server, devices can be listed, bound, and unbound using
-this program.  On a USB/IP client, devices exported by USB/IP servers
-can be listed, attached and detached.
-
-.SH OPTIONS
-.HP
-\fB\-\-debug\fR
-.IP
-Print debugging information.
-.PP
-
-.HP
-\fB\-\-log\fR
-.IP
-Log to syslog.
-.PP
-
-.HP
-\fB\-\-tcp-port PORT\fR
-.IP
-Connect to PORT on remote host (used for attach and list --remote).
-.PP
-
-.SH COMMANDS
-.HP
-\fBversion\fR
-.IP
-Show version and exit.
-.PP
-
-.HP
-\fBhelp\fR [\fIcommand\fR]
-.IP
-Print the program help message, or help on a specific command, and
-then exit.
-.PP
-
-.HP
-\fBattach\fR \-\-remote=<\fIhost\fR> \-\-busid=<\fIbus_id\fR>
-.IP
-Attach a remote USB device.
-.PP
-
-.HP
-\fBdetach\fR \-\-port=<\fIport\fR>
-.IP
-Detach an imported USB device.
-.PP
-
-.HP
-\fBbind\fR \-\-busid=<\fIbusid\fR>
-.IP
-Make a device exportable.
-.PP
-
-.HP
-\fBunbind\fR \-\-busid=<\fIbusid\fR>
-.IP
-Stop exporting a device so it can be used by a local driver.
-.PP
-
-.HP
-\fBlist\fR \-\-remote=<\fIhost\fR>
-.IP
-List USB devices exported by a remote host.
-.PP
-
-.HP
-\fBlist\fR \-\-local
-.IP
-List local USB devices.
-.PP
-
-
-.SH EXAMPLES
-
-    client:# usbip list --remote=server
-        - List exportable usb devices on the server.
-
-    client:# usbip attach --remote=server --busid=1-2
-        - Connect the remote USB device.
-
-    client:# usbip detach --port=0
-        - Detach the usb device.
-
-.SH "SEE ALSO"
-\fBusbipd\fP\fB(8)\fB\fP
diff --git a/drivers/staging/usbip/userspace/doc/usbipd.8 b/drivers/staging/usbip/userspace/doc/usbipd.8
deleted file mode 100644
index ac4635db3f03..000000000000
--- a/drivers/staging/usbip/userspace/doc/usbipd.8
+++ /dev/null
@@ -1,91 +0,0 @@
-.TH USBIP "8" "February 2009" "usbip" "System Administration Utilities"
-.SH NAME
-usbipd \- USB/IP server daemon
-.SH SYNOPSIS
-.B usbipd
-[\fIoptions\fR]
-
-.SH DESCRIPTION
-.B usbipd
-provides USB/IP clients access to exported USB devices.
-
-Devices have to explicitly be exported using
-.B usbip bind
-before usbipd makes them available to other hosts.
-
-The daemon accepts connections from USB/IP clients
-on TCP port 3240 by default.
-
-.SH OPTIONS
-.HP
-\fB\-4\fR, \fB\-\-ipv4\fR
-.IP
-Bind to IPv4. Default is both.
-.PP
-
-.HP
-\fB\-6\fR, \fB\-\-ipv6\fR
-.IP
-Bind to IPv6. Default is both.
-.PP
-
-.HP
-\fB\-D\fR, \fB\-\-daemon\fR
-.IP
-Run as a daemon process.
-.PP
-
-.HP
-\fB\-d\fR, \fB\-\-debug\fR
-.IP
-Print debugging information.
-.PP
-
-.HP
-\fB\-PFILE\fR, \fB\-\-pid FILE\fR
-.IP
-Write process id to FILE.
-.br
-If no FILE specified, use /var/run/usbipd.pid
-.PP
-
-\fB\-tPORT\fR, \fB\-\-tcp\-port PORT\fR
-.IP
-Listen on TCP/IP port PORT.
-.PP
-
-\fB\-h\fR, \fB\-\-help\fR
-.IP
-Print the program help message and exit.
-.PP
-
-.HP
-\fB\-v\fR, \fB\-\-version\fR
-.IP
-Show version.
-.PP
-
-.SH LIMITATIONS
-
-.B usbipd
-offers no authentication or authorization for USB/IP. Any
-USB/IP client can connect and use exported devices.
-
-.SH EXAMPLES
-
-    server:# modprobe usbip
-
-    server:# usbipd -D
-        - Start usbip daemon.
-
-    server:# usbip list --local
-        - List driver assignments for usb devices.
-
-    server:# usbip bind --busid=1-2
-        - Bind usbip-host.ko to the device of busid 1-2.
-        - A usb device 1-2 is now exportable to other hosts!
-        - Use 'usbip unbind --busid=1-2' when you want to shutdown exporting and use the device locally.
-
-.SH "SEE ALSO"
-\fBusbip\fP\fB(8)\fB\fP
-
diff --git a/drivers/staging/usbip/userspace/libsrc/Makefile.am b/drivers/staging/usbip/userspace/libsrc/Makefile.am
deleted file mode 100644
index 7c8f8a4d54e4..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-libusbip_la_CPPFLAGS = -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
-libusbip_la_CFLAGS   = @EXTRA_CFLAGS@
-libusbip_la_LDFLAGS  = -version-info @LIBUSBIP_VERSION@
-
-lib_LTLIBRARIES := libusbip.la
-libusbip_la_SOURCES := names.c names.h usbip_host_driver.c usbip_host_driver.h \
-                       usbip_common.c usbip_common.h vhci_driver.c vhci_driver.h \
-                       sysfs_utils.c sysfs_utils.h
diff --git a/drivers/staging/usbip/userspace/libsrc/list.h b/drivers/staging/usbip/userspace/libsrc/list.h
deleted file mode 100644
index 8d0c936e184f..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/list.h
+++ /dev/null
@@ -1,136 +0,0 @@
-#ifndef _LIST_H
-#define _LIST_H
-
-/* Stripped down implementation of linked list taken
- * from the Linux Kernel.
- */
-
-/*
- * Simple doubly linked list implementation.
- *
- * Some of the internal functions ("__xxx") are useful when
- * manipulating whole lists rather than single entries, as
- * sometimes we already know the next/prev entries and we can
- * generate better code by using them directly rather than
- * using the generic single-entry routines.
- */
-
-struct list_head {
-        struct list_head *next, *prev;
-};
-
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
-
-#define LIST_HEAD(name) \
-        struct list_head name = LIST_HEAD_INIT(name)
-
-static inline void INIT_LIST_HEAD(struct list_head *list)
-{
-        list->next = list;
-        list->prev = list;
-}
-
-/*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_add(struct list_head *new,
-                              struct list_head *prev,
-                              struct list_head *next)
-{
-        next->prev = new;
-        new->next = next;
-        new->prev = prev;
-        prev->next = new;
-}
-
-/**
- * list_add - add a new entry
- * @new: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- */
-static inline void list_add(struct list_head *new, struct list_head *head)
-{
-        __list_add(new, head, head->next);
-}
-
-/*
- * Delete a list entry by making the prev/next entries
- * point to each other.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_del(struct list_head * prev, struct list_head * next)
-{
-        next->prev = prev;
-        prev->next = next;
-}
-
-#define POISON_POINTER_DELTA 0
-#define LIST_POISON1  ((void *) 0x00100100 + POISON_POINTER_DELTA)
-#define LIST_POISON2  ((void *) 0x00200200 + POISON_POINTER_DELTA)
-
-/**
- * list_del - deletes entry from list.
- * @entry: the element to delete from the list.
- * Note: list_empty() on entry does not return true after this, the entry is
- * in an undefined state.
- */
-static inline void __list_del_entry(struct list_head *entry)
-{
-        __list_del(entry->prev, entry->next);
-}
-
-static inline void list_del(struct list_head *entry)
-{
-        __list_del(entry->prev, entry->next);
-        entry->next = LIST_POISON1;
-        entry->prev = LIST_POISON2;
-}
-
-/**
- * list_entry - get the struct for this entry
- * @ptr:        the &struct list_head pointer.
- * @type:       the type of the struct this is embedded in.
- * @member:     the name of the list_struct within the struct.
- */
-#define list_entry(ptr, type, member) \
-        container_of(ptr, type, member)
-/**
- * list_for_each        -       iterate over a list
- * @pos:        the &struct list_head to use as a loop cursor.
- * @head:       the head for your list.
- */
-#define list_for_each(pos, head) \
-        for (pos = (head)->next; pos != (head); pos = pos->next)
-
-/**
- * list_for_each_safe - iterate over a list safe against removal of list entry
- * @pos:        the &struct list_head to use as a loop cursor.
- * @n:          another &struct list_head to use as temporary storage
- * @head:       the head for your list.
- */
-#define list_for_each_safe(pos, n, head) \
-        for (pos = (head)->next, n = pos->next; pos != (head); \
-                pos = n, n = pos->next)
-
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-
-/**
- * container_of - cast a member of a structure out to the containing structure
- * @ptr:        the pointer to the member.
- * @type:       the type of the container struct this is embedded in.
- * @member:     the name of the member within the struct.
- *
- */
-#define container_of(ptr, type, member) ({                      \
-        const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
-        (type *)( (char *)__mptr - offsetof(type,member) );})
-
-#endif
diff --git a/drivers/staging/usbip/userspace/libsrc/names.c b/drivers/staging/usbip/userspace/libsrc/names.c
deleted file mode 100644
index 81ff8522405c..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/names.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- *      names.c  --  USB name database manipulation routines
- *
- *      Copyright (C) 1999, 2000  Thomas Sailer (sailer@ife.ee.ethz.ch)
- *
- *      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.
- *
- *      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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- *
- *
- *
- *      Copyright (C) 2005 Takahiro Hirofuchi
- *              - names_deinit() is added.
- *
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "names.h"
-#include "usbip_common.h"
-
-struct vendor {
-        struct vendor *next;
-        u_int16_t vendorid;
-        char name[1];
-};
-
-struct product {
-        struct product *next;
-        u_int16_t vendorid, productid;
-        char name[1];
-};
-
-struct class {
-        struct class *next;
-        u_int8_t classid;
-        char name[1];
-};
-
-struct subclass {
-        struct subclass *next;
-        u_int8_t classid, subclassid;
-        char name[1];
-};
-
-struct protocol {
-        struct protocol *next;
-        u_int8_t classid, subclassid, protocolid;
-        char name[1];
-};
-
-struct genericstrtable {
-        struct genericstrtable *next;
-        unsigned int num;
-        char name[1];
-};
-
-
-#define HASH1  0x10
-#define HASH2  0x02
-#define HASHSZ 16
-
-static unsigned int hashnum(unsigned int num)
-{
-        unsigned int mask1 = HASH1 << 27, mask2 = HASH2 << 27;
-
-        for (; mask1 >= HASH1; mask1 >>= 1, mask2 >>= 1)
-                if (num & mask1)
-                        num ^= mask2;
-        return num & (HASHSZ-1);
-}
-
-
-static struct vendor *vendors[HASHSZ] = { NULL, };
-static struct product *products[HASHSZ] = { NULL, };
-static struct class *classes[HASHSZ] = { NULL, };
-static struct subclass *subclasses[HASHSZ] = { NULL, };
-static struct protocol *protocols[HASHSZ] = { NULL, };
-
-const char *names_vendor(u_int16_t vendorid)
-{
-        struct vendor *v;
-
-        v = vendors[hashnum(vendorid)];
-        for (; v; v = v->next)
-                if (v->vendorid == vendorid)
-                        return v->name;
-        return NULL;
-}
-
-const char *names_product(u_int16_t vendorid, u_int16_t productid)
-{
-        struct product *p;
-
-        p = products[hashnum((vendorid << 16) | productid)];
-        for (; p; p = p->next)
-                if (p->vendorid == vendorid && p->productid == productid)
-                        return p->name;
-        return NULL;
-}
-
-const char *names_class(u_int8_t classid)
-{
-        struct class *c;
-
-        c = classes[hashnum(classid)];
-        for (; c; c = c->next)
-                if (c->classid == classid)
-                        return c->name;
-        return NULL;
-}
-
-const char *names_subclass(u_int8_t classid, u_int8_t subclassid)
-{
-        struct subclass *s;
-
-        s = subclasses[hashnum((classid << 8) | subclassid)];
-        for (; s; s = s->next)
-                if (s->classid == classid && s->subclassid == subclassid)
-                        return s->name;
-        return NULL;
-}
-
-const char *names_protocol(u_int8_t classid, u_int8_t subclassid,
-                           u_int8_t protocolid)
-{
-        struct protocol *p;
-
-        p = protocols[hashnum((classid << 16) | (subclassid << 8)
-                              | protocolid)];
-        for (; p; p = p->next)
-                if (p->classid == classid && p->subclassid == subclassid &&
-                    p->protocolid == protocolid)
-                        return p->name;
-        return NULL;
-}
-
-/* add a cleanup function by takahiro */
-struct pool {
-        struct pool *next;
-        void *mem;
-};
-
-static struct pool *pool_head;
-
-static void *my_malloc(size_t size)
-{
-        struct pool *p;
-
-        p = calloc(1, sizeof(struct pool));
-        if (!p)
-                return NULL;
-
-        p->mem = calloc(1, size);
-        if (!p->mem) {
-                free(p);
-                return NULL;
-        }
-
-        p->next = pool_head;
-        pool_head = p;
-
-        return p->mem;
-}
-
-void names_free(void)
-{
-        struct pool *pool;
-
-        if (!pool_head)
-                return;
-
-        for (pool = pool_head; pool != NULL; ) {
-                struct pool *tmp;
-
-                if (pool->mem)
-                        free(pool->mem);
-
-                tmp = pool;
-                pool = pool->next;
-                free(tmp);
-        }
-}
-
-static int new_vendor(const char *name, u_int16_t vendorid)
-{
-        struct vendor *v;
-        unsigned int h = hashnum(vendorid);
-
-        v = vendors[h];
-        for (; v; v = v->next)
-                if (v->vendorid == vendorid)
-                        return -1;
-        v = my_malloc(sizeof(struct vendor) + strlen(name));
-        if (!v)
-                return -1;
-        strcpy(v->name, name);
-        v->vendorid = vendorid;
-        v->next = vendors[h];
-        vendors[h] = v;
-        return 0;
-}
-
-static int new_product(const char *name, u_int16_t vendorid,
-                       u_int16_t productid)
-{
-        struct product *p;
-        unsigned int h = hashnum((vendorid << 16) | productid);
-
-        p = products[h];
-        for (; p; p = p->next)
-                if (p->vendorid == vendorid && p->productid == productid)
-                        return -1;
-        p = my_malloc(sizeof(struct product) + strlen(name));
-        if (!p)
-                return -1;
-        strcpy(p->name, name);
-        p->vendorid = vendorid;
-        p->productid = productid;
-        p->next = products[h];
-        products[h] = p;
-        return 0;
-}
-
-static int new_class(const char *name, u_int8_t classid)
-{
-        struct class *c;
-        unsigned int h = hashnum(classid);
-
-        c = classes[h];
-        for (; c; c = c->next)
-                if (c->classid == classid)
-                        return -1;
-        c = my_malloc(sizeof(struct class) + strlen(name));
-        if (!c)
-                return -1;
-        strcpy(c->name, name);
-        c->classid = classid;
-        c->next = classes[h];
-        classes[h] = c;
-        return 0;
-}
-
-static int new_subclass(const char *name, u_int8_t classid, u_int8_t subclassid)
-{
-        struct subclass *s;
-        unsigned int h = hashnum((classid << 8) | subclassid);
-
-        s = subclasses[h];
-        for (; s; s = s->next)
-                if (s->classid == classid && s->subclassid == subclassid)
-                        return -1;
-        s = my_malloc(sizeof(struct subclass) + strlen(name));
-        if (!s)
-                return -1;
-        strcpy(s->name, name);
-        s->classid = classid;
-        s->subclassid = subclassid;
-        s->next = subclasses[h];
-        subclasses[h] = s;
-        return 0;
-}
-
-static int new_protocol(const char *name, u_int8_t classid, u_int8_t subclassid,
-                        u_int8_t protocolid)
-{
-        struct protocol *p;
-        unsigned int h = hashnum((classid << 16) | (subclassid << 8)
-                                 | protocolid);
-
-        p = protocols[h];
-        for (; p; p = p->next)
-                if (p->classid == classid && p->subclassid == subclassid
-                    && p->protocolid == protocolid)
-                        return -1;
-        p = my_malloc(sizeof(struct protocol) + strlen(name));
-        if (!p)
-                return -1;
-        strcpy(p->name, name);
-        p->classid = classid;
-        p->subclassid = subclassid;
-        p->protocolid = protocolid;
-        p->next = protocols[h];
-        protocols[h] = p;
-        return 0;
-}
-
-static void parse(FILE *f)
-{
-        char buf[512], *cp;
-        unsigned int linectr = 0;
-        int lastvendor = -1;
-        int lastclass = -1;
-        int lastsubclass = -1;
-        int lasthut = -1;
-        int lastlang = -1;
-        unsigned int u;
-
-        while (fgets(buf, sizeof(buf), f)) {
-                linectr++;
-                /* remove line ends */
-                cp = strchr(buf, '\r');
-                if (cp)
-                        *cp = 0;
-                cp = strchr(buf, '\n');
-                if (cp)
-                        *cp = 0;
-                if (buf[0] == '#' || !buf[0])
-                        continue;
-                cp = buf;
-                if (buf[0] == 'P' && buf[1] == 'H' && buf[2] == 'Y' &&
-                    buf[3] == 'S' && buf[4] == 'D' &&
-                    buf[5] == 'E' && buf[6] == 'S' && /*isspace(buf[7])*/
-                    buf[7] == ' ') {
-                        continue;
-                }
-                if (buf[0] == 'P' && buf[1] == 'H' &&
-                    buf[2] == 'Y' && /*isspace(buf[3])*/ buf[3] == ' ') {
-                        continue;
-                }
-                if (buf[0] == 'B' && buf[1] == 'I' && buf[2] == 'A' &&
-                    buf[3] == 'S' && /*isspace(buf[4])*/ buf[4] == ' ') {
-                        continue;
-                }
-                if (buf[0] == 'L' && /*isspace(buf[1])*/ buf[1] == ' ') {
-                        lasthut = lastclass = lastvendor = lastsubclass = -1;
-                        /*
-                         * set 1 as pseudo-id to indicate that the parser is
-                         * in a `L' section.
-                         */
-                        lastlang = 1;
-                        continue;
-                }
-                if (buf[0] == 'C' && /*isspace(buf[1])*/ buf[1] == ' ') {
-                        /* class spec */
-                        cp = buf+2;
-                        while (isspace(*cp))
-                                cp++;
-                        if (!isxdigit(*cp)) {
-                                err("Invalid class spec at line %u", linectr);
-                                continue;
-                        }
-                        u = strtoul(cp, &cp, 16);
-                        while (isspace(*cp))
-                                cp++;
-                        if (!*cp) {
-                                err("Invalid class spec at line %u", linectr);
-                                continue;
-                        }
-                        if (new_class(cp, u))
-                                err("Duplicate class spec at line %u class %04x %s",
-                                    linectr, u, cp);
-                        dbg("line %5u class %02x %s", linectr, u, cp);
-                        lasthut = lastlang = lastvendor = lastsubclass = -1;
-                        lastclass = u;
-                        continue;
-                }
-                if (buf[0] == 'A' && buf[1] == 'T' && isspace(buf[2])) {
-                        /* audio terminal type spec */
-                        continue;
-                }
-                if (buf[0] == 'H' && buf[1] == 'C' && buf[2] == 'C'
-                    && isspace(buf[3])) {
-                        /* HID Descriptor bCountryCode */
-                        continue;
-                }
-                if (isxdigit(*cp)) {
-                        /* vendor */
-                        u = strtoul(cp, &cp, 16);
-                        while (isspace(*cp))
-                                cp++;
-                        if (!*cp) {
-                                err("Invalid vendor spec at line %u", linectr);
-                                continue;
-                        }
-                        if (new_vendor(cp, u))
-                                err("Duplicate vendor spec at line %u vendor %04x %s",
-                                    linectr, u, cp);
-                        dbg("line %5u vendor %04x %s", linectr, u, cp);
-                        lastvendor = u;
-                        lasthut = lastlang = lastclass = lastsubclass = -1;
-                        continue;
-                }
-                if (buf[0] == '\t' && isxdigit(buf[1])) {
-                        /* product or subclass spec */
-                        u = strtoul(buf+1, &cp, 16);
-                        while (isspace(*cp))
-                                cp++;
-                        if (!*cp) {
-                                err("Invalid product/subclass spec at line %u",
-                                    linectr);
-                                continue;
-                        }
-                        if (lastvendor != -1) {
-                                if (new_product(cp, lastvendor, u))
-                                        err("Duplicate product spec at line %u product %04x:%04x %s",
-                                            linectr, lastvendor, u, cp);
-                                dbg("line %5u product %04x:%04x %s", linectr,
-                                    lastvendor, u, cp);
-                                continue;
-                        }
-                        if (lastclass != -1) {
-                                if (new_subclass(cp, lastclass, u))
-                                        err("Duplicate subclass spec at line %u class %02x:%02x %s",
-                                            linectr, lastclass, u, cp);
-                                dbg("line %5u subclass %02x:%02x %s", linectr,
-                                    lastclass, u, cp);
-                                lastsubclass = u;
-                                continue;
-                        }
-                        if (lasthut != -1) {
-                                /* do not store hut */
-                                continue;
-                        }
-                        if (lastlang != -1) {
-                                /* do not store langid */
-                                continue;
-                        }
-                        err("Product/Subclass spec without prior Vendor/Class spec at line %u",
-                            linectr);
-                        continue;
-                }
-                if (buf[0] == '\t' && buf[1] == '\t' && isxdigit(buf[2])) {
-                        /* protocol spec */
-                        u = strtoul(buf+2, &cp, 16);
-                        while (isspace(*cp))
-                                cp++;
-                        if (!*cp) {
-                                err("Invalid protocol spec at line %u",
-                                    linectr);
-                                continue;
-                        }
-                        if (lastclass != -1 && lastsubclass != -1) {
-                                if (new_protocol(cp, lastclass, lastsubclass,
-                                                 u))
-                                        err("Duplicate protocol spec at line %u class %02x:%02x:%02x %s",
-                                            linectr, lastclass, lastsubclass,
-                                            u, cp);
-                                dbg("line %5u protocol %02x:%02x:%02x %s",
-                                    linectr, lastclass, lastsubclass, u, cp);
-                                continue;
-                        }
-                        err("Protocol spec without prior Class and Subclass spec at line %u",
-                            linectr);
-                        continue;
-                }
-                if (buf[0] == 'H' && buf[1] == 'I' &&
-                    buf[2] == 'D' && /*isspace(buf[3])*/ buf[3] == ' ') {
-                        continue;
-                }
-                if (buf[0] == 'H' && buf[1] == 'U' &&
-                    buf[2] == 'T' && /*isspace(buf[3])*/ buf[3] == ' ') {
-                        lastlang = lastclass = lastvendor = lastsubclass = -1;
-                        /*
-                         * set 1 as pseudo-id to indicate that the parser is
-                         * in a `HUT' section.
-                         */
-                        lasthut = 1;
-                        continue;
-                }
-                if (buf[0] == 'R' && buf[1] == ' ')
-                        continue;
-
-                if (buf[0] == 'V' && buf[1] == 'T')
-                        continue;
-
-                err("Unknown line at line %u", linectr);
-        }
-}
-
-
-int names_init(char *n)
-{
-        FILE *f;
-
-        f = fopen(n, "r");
-        if (!f)
-                return errno;
-
-        parse(f);
-        fclose(f);
-        return 0;
-}
diff --git a/drivers/staging/usbip/userspace/libsrc/names.h b/drivers/staging/usbip/userspace/libsrc/names.h
deleted file mode 100644
index 680926512de2..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/names.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *      names.h  --  USB name database manipulation routines
- *
- *      Copyright (C) 1999, 2000  Thomas Sailer (sailer@ife.ee.ethz.ch)
- *
- *      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.
- *
- *      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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- *
- *      Copyright (C) 2005 Takahiro Hirofuchi
- *             - names_free() is added.
- */
-
-#ifndef _NAMES_H
-#define _NAMES_H
-
-#include <sys/types.h>
-
-/* used by usbip_common.c */
-extern const char *names_vendor(u_int16_t vendorid);
-extern const char *names_product(u_int16_t vendorid, u_int16_t productid);
-extern const char *names_class(u_int8_t classid);
-extern const char *names_subclass(u_int8_t classid, u_int8_t subclassid);
-extern const char *names_protocol(u_int8_t classid, u_int8_t subclassid,
-                                  u_int8_t protocolid);
-extern int  names_init(char *n);
-extern void names_free(void);
-
-#endif /* _NAMES_H */
diff --git a/drivers/staging/usbip/userspace/libsrc/sysfs_utils.c b/drivers/staging/usbip/userspace/libsrc/sysfs_utils.c
deleted file mode 100644
index 36ac88ece0b8..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/sysfs_utils.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include "sysfs_utils.h"
-#include "usbip_common.h"
-
-int write_sysfs_attribute(const char *attr_path, const char *new_value,
-                          size_t len)
-{
-        int fd;
-        int length;
-
-        fd = open(attr_path, O_WRONLY);
-        if (fd < 0) {
-                dbg("error opening attribute %s", attr_path);
-                return -1;
-        }
-
-        length = write(fd, new_value, len);
-        if (length < 0) {
-                dbg("error writing to attribute %s", attr_path);
-                close(fd);
-                return -1;
-        }
-
-        close(fd);
-
-        return 0;
-}
diff --git a/drivers/staging/usbip/userspace/libsrc/sysfs_utils.h b/drivers/staging/usbip/userspace/libsrc/sysfs_utils.h
deleted file mode 100644
index 32ac1d105d18..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/sysfs_utils.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#ifndef __SYSFS_UTILS_H
-#define __SYSFS_UTILS_H
-
-int write_sysfs_attribute(const char *attr_path, const char *new_value,
-                          size_t len);
-
-#endif
diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_common.c b/drivers/staging/usbip/userspace/libsrc/usbip_common.c
deleted file mode 100644
index ac73710473de..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/usbip_common.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Takahiro Hirofuchi
- */
-
-#include <libudev.h>
-#include "usbip_common.h"
-#include "names.h"
-
-#undef  PROGNAME
-#define PROGNAME "libusbip"
-
-int usbip_use_syslog;
-int usbip_use_stderr;
-int usbip_use_debug;
-
-extern struct udev *udev_context;
-
-struct speed_string {
-        int num;
-        char *speed;
-        char *desc;
-};
-
-static const struct speed_string speed_strings[] = {
-        { USB_SPEED_UNKNOWN, "unknown", "Unknown Speed"},
-        { USB_SPEED_LOW,  "1.5", "Low Speed(1.5Mbps)"  },
-        { USB_SPEED_FULL, "12",  "Full Speed(12Mbps)" },
-        { USB_SPEED_HIGH, "480", "High Speed(480Mbps)" },
-        { USB_SPEED_WIRELESS, "53.3-480", "Wireless"},
-        { USB_SPEED_SUPER, "5000", "Super Speed(5000Mbps)" },
-        { 0, NULL, NULL }
-};
-
-struct portst_string {
-        int num;
-        char *desc;
-};
-
-static struct portst_string portst_strings[] = {
-        { SDEV_ST_AVAILABLE,    "Device Available" },
-        { SDEV_ST_USED,         "Device in Use" },
-        { SDEV_ST_ERROR,        "Device Error"},
-        { VDEV_ST_NULL,         "Port Available"},
-        { VDEV_ST_NOTASSIGNED,  "Port Initializing"},
-        { VDEV_ST_USED,         "Port in Use"},
-        { VDEV_ST_ERROR,        "Port Error"},
-        { 0, NULL}
-};
-
-const char *usbip_status_string(int32_t status)
-{
-        for (int i = 0; portst_strings[i].desc != NULL; i++)
-                if (portst_strings[i].num == status)
-                        return portst_strings[i].desc;
-
-        return "Unknown Status";
-}
-
-const char *usbip_speed_string(int num)
-{
-        for (int i = 0; speed_strings[i].speed != NULL; i++)
-                if (speed_strings[i].num == num)
-                        return speed_strings[i].desc;
-
-        return "Unknown Speed";
-}
-
-
-#define DBG_UDEV_INTEGER(name)\
-        dbg("%-20s = %x", to_string(name), (int) udev->name)
-
-#define DBG_UINF_INTEGER(name)\
-        dbg("%-20s = %x", to_string(name), (int) uinf->name)
-
-void dump_usb_interface(struct usbip_usb_interface *uinf)
-{
-        char buff[100];
-
-        usbip_names_get_class(buff, sizeof(buff),
-                        uinf->bInterfaceClass,
-                        uinf->bInterfaceSubClass,
-                        uinf->bInterfaceProtocol);
-        dbg("%-20s = %s", "Interface(C/SC/P)", buff);
-}
-
-void dump_usb_device(struct usbip_usb_device *udev)
-{
-        char buff[100];
-
-        dbg("%-20s = %s", "path",  udev->path);
-        dbg("%-20s = %s", "busid", udev->busid);
-
-        usbip_names_get_class(buff, sizeof(buff),
-                        udev->bDeviceClass,
-                        udev->bDeviceSubClass,
-                        udev->bDeviceProtocol);
-        dbg("%-20s = %s", "Device(C/SC/P)", buff);
-
-        DBG_UDEV_INTEGER(bcdDevice);
-
-        usbip_names_get_product(buff, sizeof(buff),
-                        udev->idVendor,
-                        udev->idProduct);
-        dbg("%-20s = %s", "Vendor/Product", buff);
-
-        DBG_UDEV_INTEGER(bNumConfigurations);
-        DBG_UDEV_INTEGER(bNumInterfaces);
-
-        dbg("%-20s = %s", "speed",
-                        usbip_speed_string(udev->speed));
-
-        DBG_UDEV_INTEGER(busnum);
-        DBG_UDEV_INTEGER(devnum);
-}
-
-
-int read_attr_value(struct udev_device *dev, const char *name,
-                    const char *format)
-{
-        const char *attr;
-        int num = 0;
-        int ret;
-
-        attr = udev_device_get_sysattr_value(dev, name);
-        if (!attr) {
-                err("udev_device_get_sysattr_value failed");
-                goto err;
-        }
-
-        /* The client chooses the device configuration
-         * when attaching it so right after being bound
-         * to usbip-host on the server the device will
-         * have no configuration.
-         * Therefore, attributes such as bConfigurationValue
-         * and bNumInterfaces will not exist and sscanf will
-         * fail. Check for these cases and don't treat them
-         * as errors.
-         */
-
-        ret = sscanf(attr, format, &num);
-        if (ret < 1) {
-                if (strcmp(name, "bConfigurationValue") &&
-                                strcmp(name, "bNumInterfaces")) {
-                        err("sscanf failed for attribute %s", name);
-                        goto err;
-                }
-        }
-
-err:
-
-        return num;
-}
-
-
-int read_attr_speed(struct udev_device *dev)
-{
-        const char *speed;
-
-        speed = udev_device_get_sysattr_value(dev, "speed");
-        if (!speed) {
-                err("udev_device_get_sysattr_value failed");
-                goto err;
-        }
-
-        for (int i = 0; speed_strings[i].speed != NULL; i++) {
-                if (!strcmp(speed, speed_strings[i].speed))
-                        return speed_strings[i].num;
-        }
-
-err:
-
-        return USB_SPEED_UNKNOWN;
-}
-
-#define READ_ATTR(object, type, dev, name, format)                            \
-        do {                                                                  \
-                (object)->name = (type) read_attr_value(dev, to_string(name), \
-                                                        format);              \
-        } while (0)
-
-
-int read_usb_device(struct udev_device *sdev, struct usbip_usb_device *udev)
-{
-        uint32_t busnum, devnum;
-        const char *path, *name;
-
-        READ_ATTR(udev, uint8_t,  sdev, bDeviceClass,           "%02x\n");
-        READ_ATTR(udev, uint8_t,  sdev, bDeviceSubClass,        "%02x\n");
-        READ_ATTR(udev, uint8_t,  sdev, bDeviceProtocol,        "%02x\n");
-
-        READ_ATTR(udev, uint16_t, sdev, idVendor,               "%04x\n");
-        READ_ATTR(udev, uint16_t, sdev, idProduct,              "%04x\n");
-        READ_ATTR(udev, uint16_t, sdev, bcdDevice,              "%04x\n");
-
-        READ_ATTR(udev, uint8_t,  sdev, bConfigurationValue,    "%02x\n");
-        READ_ATTR(udev, uint8_t,  sdev, bNumConfigurations,     "%02x\n");
-        READ_ATTR(udev, uint8_t,  sdev, bNumInterfaces,         "%02x\n");
-
-        READ_ATTR(udev, uint8_t,  sdev, devnum,                 "%d\n");
-        udev->speed = read_attr_speed(sdev);
-
-        path = udev_device_get_syspath(sdev);
-        name = udev_device_get_sysname(sdev);
-
-        strncpy(udev->path,  path,  SYSFS_PATH_MAX);
-        strncpy(udev->busid, name, SYSFS_BUS_ID_SIZE);
-
-        sscanf(name, "%u-%u", &busnum, &devnum);
-        udev->busnum = busnum;
-
-        return 0;
-}
-
-int read_usb_interface(struct usbip_usb_device *udev, int i,
-                       struct usbip_usb_interface *uinf)
-{
-        char busid[SYSFS_BUS_ID_SIZE];
-        struct udev_device *sif;
-
-        sprintf(busid, "%s:%d.%d", udev->busid, udev->bConfigurationValue, i);
-
-        sif = udev_device_new_from_subsystem_sysname(udev_context, "usb", busid);
-        if (!sif) {
-                err("udev_device_new_from_subsystem_sysname %s failed", busid);
-                return -1;
-        }
-
-        READ_ATTR(uinf, uint8_t,  sif, bInterfaceClass,         "%02x\n");
-        READ_ATTR(uinf, uint8_t,  sif, bInterfaceSubClass,      "%02x\n");
-        READ_ATTR(uinf, uint8_t,  sif, bInterfaceProtocol,      "%02x\n");
-
-        return 0;
-}
-
-int usbip_names_init(char *f)
-{
-        return names_init(f);
-}
-
-void usbip_names_free(void)
-{
-        names_free();
-}
-
-void usbip_names_get_product(char *buff, size_t size, uint16_t vendor,
-                             uint16_t product)
-{
-        const char *prod, *vend;
-
-        prod = names_product(vendor, product);
-        if (!prod)
-                prod = "unknown product";
-
-
-        vend = names_vendor(vendor);
-        if (!vend)
-                vend = "unknown vendor";
-
-        snprintf(buff, size, "%s : %s (%04x:%04x)", vend, prod, vendor, product);
-}
-
-void usbip_names_get_class(char *buff, size_t size, uint8_t class,
-                           uint8_t subclass, uint8_t protocol)
-{
-        const char *c, *s, *p;
-
-        if (class == 0 && subclass == 0 && protocol == 0) {
-                snprintf(buff, size, "(Defined at Interface level) (%02x/%02x/%02x)", class, subclass, protocol);
-                return;
-        }
-
-        p = names_protocol(class, subclass, protocol);
-        if (!p)
-                p = "unknown protocol";
-
-        s = names_subclass(class, subclass);
-        if (!s)
-                s = "unknown subclass";
-
-        c = names_class(class);
-        if (!c)
-                c = "unknown class";
-
-        snprintf(buff, size, "%s / %s / %s (%02x/%02x/%02x)", c, s, p, class, subclass, protocol);
-}
diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_common.h b/drivers/staging/usbip/userspace/libsrc/usbip_common.h
deleted file mode 100644
index 5a0e95edf4df..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/usbip_common.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Takahiro Hirofuchi
- */
-
-#ifndef __USBIP_COMMON_H
-#define __USBIP_COMMON_H
-
-#include <libudev.h>
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <syslog.h>
-#include <unistd.h>
-#include <linux/usb/ch9.h>
-#include "../../uapi/usbip.h"
-
-#ifndef USBIDS_FILE
-#define USBIDS_FILE "/usr/share/hwdata/usb.ids"
-#endif
-
-#ifndef VHCI_STATE_PATH
-#define VHCI_STATE_PATH "/var/run/vhci_hcd"
-#endif
-
-/* kernel module names */
-#define USBIP_CORE_MOD_NAME     "usbip-core"
-#define USBIP_HOST_DRV_NAME     "usbip-host"
-#define USBIP_VHCI_DRV_NAME     "vhci_hcd"
-
-/* sysfs constants */
-#define SYSFS_MNT_PATH         "/sys"
-#define SYSFS_BUS_NAME         "bus"
-#define SYSFS_BUS_TYPE         "usb"
-#define SYSFS_DRIVERS_NAME     "drivers"
-
-#define SYSFS_PATH_MAX          256
-#define SYSFS_BUS_ID_SIZE       32
-
-extern int usbip_use_syslog;
-extern int usbip_use_stderr;
-extern int usbip_use_debug ;
-
-#define PROGNAME "usbip"
-
-#define pr_fmt(fmt)     "%s: %s: " fmt "\n", PROGNAME
-#define dbg_fmt(fmt)    pr_fmt("%s:%d:[%s] " fmt), "debug",     \
-                        __FILE__, __LINE__, __func__
-
-#define err(fmt, args...)                                               \
-        do {                                                            \
-                if (usbip_use_syslog) {                                 \
-                        syslog(LOG_ERR, pr_fmt(fmt), "error", ##args);  \
-                }                                                       \
-                if (usbip_use_stderr) {                                 \
-                        fprintf(stderr, pr_fmt(fmt), "error", ##args);  \
-                }                                                       \
-        } while (0)
-
-#define info(fmt, args...)                                              \
-        do {                                                            \
-                if (usbip_use_syslog) {                                 \
-                        syslog(LOG_INFO, pr_fmt(fmt), "info", ##args);  \
-                }                                                       \
-                if (usbip_use_stderr) {                                 \
-                        fprintf(stderr, pr_fmt(fmt), "info", ##args);   \
-                }                                                       \
-        } while (0)
-
-#define dbg(fmt, args...)                                               \
-        do {                                                            \
-        if (usbip_use_debug) {                                          \
-                if (usbip_use_syslog) {                                 \
-                        syslog(LOG_DEBUG, dbg_fmt(fmt), ##args);        \
-                }                                                       \
-                if (usbip_use_stderr) {                                 \
-                        fprintf(stderr, dbg_fmt(fmt), ##args);          \
-                }                                                       \
-        }                                                               \
-        } while (0)
-
-#define BUG()                                           \
-        do {                                            \
-                err("sorry, it's a bug!");              \
-                abort();                                \
-        } while (0)
-
-struct usbip_usb_interface {
-        uint8_t bInterfaceClass;
-        uint8_t bInterfaceSubClass;
-        uint8_t bInterfaceProtocol;
-        uint8_t padding;        /* alignment */
-} __attribute__((packed));
-
-struct usbip_usb_device {
-        char path[SYSFS_PATH_MAX];
-        char busid[SYSFS_BUS_ID_SIZE];
-
-        uint32_t busnum;
-        uint32_t devnum;
-        uint32_t speed;
-
-        uint16_t idVendor;
-        uint16_t idProduct;
-        uint16_t bcdDevice;
-
-        uint8_t bDeviceClass;
-        uint8_t bDeviceSubClass;
-        uint8_t bDeviceProtocol;
-        uint8_t bConfigurationValue;
-        uint8_t bNumConfigurations;
-        uint8_t bNumInterfaces;
-} __attribute__((packed));
-
-#define to_string(s)    #s
-
-void dump_usb_interface(struct usbip_usb_interface *);
-void dump_usb_device(struct usbip_usb_device *);
-int read_usb_device(struct udev_device *sdev, struct usbip_usb_device *udev);
-int read_attr_value(struct udev_device *dev, const char *name,
-                    const char *format);
-int read_usb_interface(struct usbip_usb_device *udev, int i,
-                       struct usbip_usb_interface *uinf);
-
-const char *usbip_speed_string(int num);
-const char *usbip_status_string(int32_t status);
-
-int usbip_names_init(char *);
-void usbip_names_free(void);
-void usbip_names_get_product(char *buff, size_t size, uint16_t vendor,
-                             uint16_t product);
-void usbip_names_get_class(char *buff, size_t size, uint8_t class,
-                           uint8_t subclass, uint8_t protocol);
-
-#endif /* __USBIP_COMMON_H */
diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c b/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c
deleted file mode 100644
index bef08d5c44e8..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-#include <libudev.h>
-
-#include "usbip_common.h"
-#include "usbip_host_driver.h"
-#include "list.h"
-#include "sysfs_utils.h"
-
-#undef  PROGNAME
-#define PROGNAME "libusbip"
-
-struct usbip_host_driver *host_driver;
-struct udev *udev_context;
-
-static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
-{
-        char status_attr_path[SYSFS_PATH_MAX];
-        int fd;
-        int length;
-        char status;
-        int value = 0;
-
-        snprintf(status_attr_path, SYSFS_PATH_MAX, "%s/usbip_status",
-                 udev->path);
-
-        fd = open(status_attr_path, O_RDONLY);
-        if (fd < 0) {
-                err("error opening attribute %s", status_attr_path);
-                return -1;
-        }
-
-        length = read(fd, &status, 1);
-        if (length < 0) {
-                err("error reading attribute %s", status_attr_path);
-                close(fd);
-                return -1;
-        }
-
-        value = atoi(&status);
-
-        return value;
-}
-
-static
-struct usbip_exported_device *usbip_exported_device_new(const char *sdevpath)
-{
-        struct usbip_exported_device *edev = NULL;
-        struct usbip_exported_device *edev_old;
-        size_t size;
-        int i;
-
-        edev = calloc(1, sizeof(struct usbip_exported_device));
-
-        edev->sudev = udev_device_new_from_syspath(udev_context, sdevpath);
-        if (!edev->sudev) {
-                err("udev_device_new_from_syspath: %s", sdevpath);
-                goto err;
-        }
-
-        read_usb_device(edev->sudev, &edev->udev);
-
-        edev->status = read_attr_usbip_status(&edev->udev);
-        if (edev->status < 0)
-                goto err;
-
-        /* reallocate buffer to include usb interface data */
-        size = sizeof(struct usbip_exported_device) +
-                edev->udev.bNumInterfaces * sizeof(struct usbip_usb_interface);
-
-        edev_old = edev;
-        edev = realloc(edev, size);
-        if (!edev) {
-                edev = edev_old;
-                dbg("realloc failed");
-                goto err;
-        }
-
-        for (i = 0; i < edev->udev.bNumInterfaces; i++)
-                read_usb_interface(&edev->udev, i, &edev->uinf[i]);
-
-        return edev;
-err:
-        if (edev->sudev)
-                udev_device_unref(edev->sudev);
-        if (edev)
-                free(edev);
-
-        return NULL;
-}
-
-static int refresh_exported_devices(void)
-{
-        struct usbip_exported_device *edev;
-        struct udev_enumerate *enumerate;
-        struct udev_list_entry *devices, *dev_list_entry;
-        struct udev_device *dev;
-        const char *path;
-        const char *driver;
-
-        enumerate = udev_enumerate_new(udev_context);
-        udev_enumerate_add_match_subsystem(enumerate, "usb");
-        udev_enumerate_scan_devices(enumerate);
-
-        devices = udev_enumerate_get_list_entry(enumerate);
-
-        udev_list_entry_foreach(dev_list_entry, devices) {
-                path = udev_list_entry_get_name(dev_list_entry);
-                dev = udev_device_new_from_syspath(udev_context, path);
-                if (dev == NULL)
-                        continue;
-
-                /* Check whether device uses usbip-host driver. */
-                driver = udev_device_get_driver(dev);
-                if (driver != NULL && !strcmp(driver, USBIP_HOST_DRV_NAME)) {
-                        edev = usbip_exported_device_new(path);
-                        if (!edev) {
-                                dbg("usbip_exported_device_new failed");
-                                continue;
-                        }
-
-                        list_add(&edev->node, &host_driver->edev_list);
-                        host_driver->ndevs++;
-                }
-        }
-
-        return 0;
-}
-
-static void usbip_exported_device_destroy(void)
-{
-        struct list_head *i, *tmp;
-        struct usbip_exported_device *edev;
-
-        list_for_each_safe(i, tmp, &host_driver->edev_list) {
-                edev = list_entry(i, struct usbip_exported_device, node);
-                list_del(i);
-                free(edev);
-        }
-}
-
-int usbip_host_driver_open(void)
-{
-        int rc;
-
-        udev_context = udev_new();
-        if (!udev_context) {
-                err("udev_new failed");
-                return -1;
-        }
-
-        host_driver = calloc(1, sizeof(*host_driver));
-
-        host_driver->ndevs = 0;
-        INIT_LIST_HEAD(&host_driver->edev_list);
-
-        rc = refresh_exported_devices();
-        if (rc < 0)
-                goto err_free_host_driver;
-
-        return 0;
-
-err_free_host_driver:
-        free(host_driver);
-        host_driver = NULL;
-
-        udev_unref(udev_context);
-
-        return -1;
-}
-
-void usbip_host_driver_close(void)
-{
-        if (!host_driver)
-                return;
-
-        usbip_exported_device_destroy();
-
-        free(host_driver);
-        host_driver = NULL;
-
-        udev_unref(udev_context);
-}
-
-int usbip_host_refresh_device_list(void)
-{
-        int rc;
-
-        usbip_exported_device_destroy();
-
-        host_driver->ndevs = 0;
-        INIT_LIST_HEAD(&host_driver->edev_list);
-
-        rc = refresh_exported_devices();
-        if (rc < 0)
-                return -1;
-
-        return 0;
-}
-
-int usbip_host_export_device(struct usbip_exported_device *edev, int sockfd)
-{
-        char attr_name[] = "usbip_sockfd";
-        char sockfd_attr_path[SYSFS_PATH_MAX];
-        char sockfd_buff[30];
-        int ret;
-
-        if (edev->status != SDEV_ST_AVAILABLE) {
-                dbg("device not available: %s", edev->udev.busid);
-                switch (edev->status) {
-                case SDEV_ST_ERROR:
-                        dbg("status SDEV_ST_ERROR");
-                        break;
-                case SDEV_ST_USED:
-                        dbg("status SDEV_ST_USED");
-                        break;
-                default:
-                        dbg("status unknown: 0x%x", edev->status);
-                }
-                return -1;
-        }
-
-        /* only the first interface is true */
-        snprintf(sockfd_attr_path, sizeof(sockfd_attr_path), "%s/%s",
-                 edev->udev.path, attr_name);
-
-        snprintf(sockfd_buff, sizeof(sockfd_buff), "%d\n", sockfd);
-
-        ret = write_sysfs_attribute(sockfd_attr_path, sockfd_buff,
-                                    strlen(sockfd_buff));
-        if (ret < 0) {
-                err("write_sysfs_attribute failed: sockfd %s to %s",
-                    sockfd_buff, sockfd_attr_path);
-                return ret;
-        }
-
-        info("connect: %s", edev->udev.busid);
-
-        return ret;
-}
-
-struct usbip_exported_device *usbip_host_get_device(int num)
-{
-        struct list_head *i;
-        struct usbip_exported_device *edev;
-        int cnt = 0;
-
-        list_for_each(i, &host_driver->edev_list) {
-                edev = list_entry(i, struct usbip_exported_device, node);
-                if (num == cnt)
-                        return edev;
-                else
-                        cnt++;
-        }
-
-        return NULL;
-}
diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.h b/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.h
deleted file mode 100644
index 2a31f855c616..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __USBIP_HOST_DRIVER_H
-#define __USBIP_HOST_DRIVER_H
-
-#include <stdint.h>
-#include "usbip_common.h"
-#include "list.h"
-
-struct usbip_host_driver {
-        int ndevs;
-        /* list of exported device */
-        struct list_head edev_list;
-};
-
-struct usbip_exported_device {
-        struct udev_device *sudev;
-        int32_t status;
-        struct usbip_usb_device udev;
-        struct list_head node;
-        struct usbip_usb_interface uinf[];
-};
-
-extern struct usbip_host_driver *host_driver;
-
-int usbip_host_driver_open(void);
-void usbip_host_driver_close(void);
-
-int usbip_host_refresh_device_list(void);
-int usbip_host_export_device(struct usbip_exported_device *edev, int sockfd);
-struct usbip_exported_device *usbip_host_get_device(int num);
-
-#endif /* __USBIP_HOST_DRIVER_H */
diff --git a/drivers/staging/usbip/userspace/libsrc/vhci_driver.c b/drivers/staging/usbip/userspace/libsrc/vhci_driver.c
deleted file mode 100644
index ad9204773533..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/vhci_driver.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Takahiro Hirofuchi
- */
-
-#include "usbip_common.h"
-#include "vhci_driver.h"
-#include <limits.h>
-#include <netdb.h>
-#include <libudev.h>
-#include "sysfs_utils.h"
-
-#undef  PROGNAME
-#define PROGNAME "libusbip"
-
-struct usbip_vhci_driver *vhci_driver;
-struct udev *udev_context;
-
-static struct usbip_imported_device *
-imported_device_init(struct usbip_imported_device *idev, char *busid)
-{
-        struct udev_device *sudev;
-
-        sudev = udev_device_new_from_subsystem_sysname(udev_context,
-                                                       "usb", busid);
-        if (!sudev) {
-                dbg("udev_device_new_from_subsystem_sysname failed: %s", busid);
-                goto err;
-        }
-        read_usb_device(sudev, &idev->udev);
-        udev_device_unref(sudev);
-
-        return idev;
-
-err:
-        return NULL;
-}
-
-
-
-static int parse_status(const char *value)
-{
-        int ret = 0;
-        char *c;
-
-
-        for (int i = 0; i < vhci_driver->nports; i++)
-                memset(&vhci_driver->idev[i], 0, sizeof(vhci_driver->idev[i]));
-
-
-        /* skip a header line */
-        c = strchr(value, '\n');
-        if (!c)
-                return -1;
-        c++;
-
-        while (*c != '\0') {
-                int port, status, speed, devid;
-                unsigned long socket;
-                char lbusid[SYSFS_BUS_ID_SIZE];
-
-                ret = sscanf(c, "%d %d %d %x %lx %31s\n",
-                                &port, &status, &speed,
-                                &devid, &socket, lbusid);
-
-                if (ret < 5) {
-                        dbg("sscanf failed: %d", ret);
-                        BUG();
-                }
-
-                dbg("port %d status %d speed %d devid %x",
-                                port, status, speed, devid);
-                dbg("socket %lx lbusid %s", socket, lbusid);
-
-
-                /* if a device is connected, look at it */
-                {
-                        struct usbip_imported_device *idev = &vhci_driver->idev[port];
-
-                        idev->port      = port;
-                        idev->status    = status;
-
-                        idev->devid     = devid;
-
-                        idev->busnum    = (devid >> 16);
-                        idev->devnum    = (devid & 0x0000ffff);
-
-                        if (idev->status != VDEV_ST_NULL
-                            && idev->status != VDEV_ST_NOTASSIGNED) {
-                                idev = imported_device_init(idev, lbusid);
-                                if (!idev) {
-                                        dbg("imported_device_init failed");
-                                        return -1;
-                                }
-                        }
-                }
-
-
-                /* go to the next line */
-                c = strchr(c, '\n');
-                if (!c)
-                        break;
-                c++;
-        }
-
-        dbg("exit");
-
-        return 0;
-}
-
-static int refresh_imported_device_list(void)
-{
-        const char *attr_status;
-
-        attr_status = udev_device_get_sysattr_value(vhci_driver->hc_device,
-                                               "status");
-        if (!attr_status) {
-                err("udev_device_get_sysattr_value failed");
-                return -1;
-        }
-
-        return parse_status(attr_status);
-}
-
-static int get_nports(void)
-{
-        char *c;
-        int nports = 0;
-        const char *attr_status;
-
-        attr_status = udev_device_get_sysattr_value(vhci_driver->hc_device,
-                                               "status");
-        if (!attr_status) {
-                err("udev_device_get_sysattr_value failed");
-                return -1;
-        }
-
-        /* skip a header line */
-        c = strchr(attr_status, '\n');
-        if (!c)
-                return 0;
-        c++;
-
-        while (*c != '\0') {
-                /* go to the next line */
-                c = strchr(c, '\n');
-                if (!c)
-                        return nports;
-                c++;
-                nports += 1;
-        }
-
-        return nports;
-}
-
-/*
- * Read the given port's record.
- *
- * To avoid buffer overflow we will read the entire line and
- * validate each part's size. The initial buffer is padded by 4 to
- * accommodate the 2 spaces, 1 newline and an additional character
- * which is needed to properly validate the 3rd part without it being
- * truncated to an acceptable length.
- */
-static int read_record(int rhport, char *host, unsigned long host_len,
-                char *port, unsigned long port_len, char *busid)
-{
-        int part;
-        FILE *file;
-        char path[PATH_MAX+1];
-        char *buffer, *start, *end;
-        char delim[] = {' ', ' ', '\n'};
-        int max_len[] = {(int)host_len, (int)port_len, SYSFS_BUS_ID_SIZE};
-        size_t buffer_len = host_len + port_len + SYSFS_BUS_ID_SIZE + 4;
-
-        buffer = malloc(buffer_len);
-        if (!buffer)
-                return -1;
-
-        snprintf(path, PATH_MAX, VHCI_STATE_PATH"/port%d", rhport);
-
-        file = fopen(path, "r");
-        if (!file) {
-                err("fopen");
-                free(buffer);
-                return -1;
-        }
-
-        if (fgets(buffer, buffer_len, file) == NULL) {
-                err("fgets");
-                free(buffer);
-                fclose(file);
-                return -1;
-        }
-        fclose(file);
-
-        /* validate the length of each of the 3 parts */
-        start = buffer;
-        for (part = 0; part < 3; part++) {
-                end = strchr(start, delim[part]);
-                if (end == NULL || (end - start) > max_len[part]) {
-                        free(buffer);
-                        return -1;
-                }
-                start = end + 1;
-        }
-
-        if (sscanf(buffer, "%s %s %s\n", host, port, busid) != 3) {
-                err("sscanf");
-                free(buffer);
-                return -1;
-        }
-
-        free(buffer);
-
-        return 0;
-}
-
-/* ---------------------------------------------------------------------- */
-
-int usbip_vhci_driver_open(void)
-{
-        udev_context = udev_new();
-        if (!udev_context) {
-                err("udev_new failed");
-                return -1;
-        }
-
-        vhci_driver = calloc(1, sizeof(struct usbip_vhci_driver));
-
-        /* will be freed in usbip_driver_close() */
-        vhci_driver->hc_device =
-                udev_device_new_from_subsystem_sysname(udev_context,
-                                                       USBIP_VHCI_BUS_TYPE,
-                                                       USBIP_VHCI_DRV_NAME);
-        if (!vhci_driver->hc_device) {
-                err("udev_device_new_from_subsystem_sysname failed");
-                goto err;
-        }
-
-        vhci_driver->nports = get_nports();
-
-        dbg("available ports: %d", vhci_driver->nports);
-
-        if (refresh_imported_device_list())
-                goto err;
-
-        return 0;
-
-err:
-        udev_device_unref(vhci_driver->hc_device);
-
-        if (vhci_driver)
-                free(vhci_driver);
-
-        vhci_driver = NULL;
-
-        udev_unref(udev_context);
-
-        return -1;
-}
-
-
-void usbip_vhci_driver_close(void)
-{
-        if (!vhci_driver)
-                return;
-
-        udev_device_unref(vhci_driver->hc_device);
-
-        free(vhci_driver);
-
-        vhci_driver = NULL;
-
-        udev_unref(udev_context);
-}
-
-
-int usbip_vhci_refresh_device_list(void)
-{
-
-        if (refresh_imported_device_list())
-                goto err;
-
-        return 0;
-err:
-        dbg("failed to refresh device list");
-        return -1;
-}
-
-
-int usbip_vhci_get_free_port(void)
-{
-        for (int i = 0; i < vhci_driver->nports; i++) {
-                if (vhci_driver->idev[i].status == VDEV_ST_NULL)
-                        return i;
-        }
-
-        return -1;
-}
-
-int usbip_vhci_attach_device2(uint8_t port, int sockfd, uint32_t devid,
-                uint32_t speed) {
-        char buff[200]; /* what size should be ? */
-        char attach_attr_path[SYSFS_PATH_MAX];
-        char attr_attach[] = "attach";
-        const char *path;
-        int ret;
-
-        snprintf(buff, sizeof(buff), "%u %d %u %u",
-                        port, sockfd, devid, speed);
-        dbg("writing: %s", buff);
-
-        path = udev_device_get_syspath(vhci_driver->hc_device);
-        snprintf(attach_attr_path, sizeof(attach_attr_path), "%s/%s",
-                 path, attr_attach);
-        dbg("attach attribute path: %s", attach_attr_path);
-
-        ret = write_sysfs_attribute(attach_attr_path, buff, strlen(buff));
-        if (ret < 0) {
-                dbg("write_sysfs_attribute failed");
-                return -1;
-        }
-
-        dbg("attached port: %d", port);
-
-        return 0;
-}
-
-static unsigned long get_devid(uint8_t busnum, uint8_t devnum)
-{
-        return (busnum << 16) | devnum;
-}
-
-/* will be removed */
-int usbip_vhci_attach_device(uint8_t port, int sockfd, uint8_t busnum,
-                uint8_t devnum, uint32_t speed)
-{
-        int devid = get_devid(busnum, devnum);
-
-        return usbip_vhci_attach_device2(port, sockfd, devid, speed);
-}
-
-int usbip_vhci_detach_device(uint8_t port)
-{
-        char detach_attr_path[SYSFS_PATH_MAX];
-        char attr_detach[] = "detach";
-        char buff[200]; /* what size should be ? */
-        const char *path;
-        int ret;
-
-        snprintf(buff, sizeof(buff), "%u", port);
-        dbg("writing: %s", buff);
-
-        path = udev_device_get_syspath(vhci_driver->hc_device);
-        snprintf(detach_attr_path, sizeof(detach_attr_path), "%s/%s",
-                 path, attr_detach);
-        dbg("detach attribute path: %s", detach_attr_path);
-
-        ret = write_sysfs_attribute(detach_attr_path, buff, strlen(buff));
-        if (ret < 0) {
-                dbg("write_sysfs_attribute failed");
-                return -1;
-        }
-
-        dbg("detached port: %d", port);
-
-        return 0;
-}
-
-int usbip_vhci_imported_device_dump(struct usbip_imported_device *idev)
-{
-        char product_name[100];
-        char host[NI_MAXHOST] = "unknown host";
-        char serv[NI_MAXSERV] = "unknown port";
-        char remote_busid[SYSFS_BUS_ID_SIZE];
-        int ret;
-        int read_record_error = 0;
-
-        if (idev->status == VDEV_ST_NULL || idev->status == VDEV_ST_NOTASSIGNED)
-                return 0;
-
-        ret = read_record(idev->port, host, sizeof(host), serv, sizeof(serv),
-                          remote_busid);
-        if (ret) {
-                err("read_record");
-                read_record_error = 1;
-        }
-
-        printf("Port %02d: <%s> at %s\n", idev->port,
-               usbip_status_string(idev->status),
-               usbip_speed_string(idev->udev.speed));
-
-        usbip_names_get_product(product_name, sizeof(product_name),
-                                idev->udev.idVendor, idev->udev.idProduct);
-
-        printf("       %s\n",  product_name);
-
-        if (!read_record_error) {
-                printf("%10s -> usbip://%s:%s/%s\n", idev->udev.busid,
-                       host, serv, remote_busid);
-                printf("%10s -> remote bus/dev %03d/%03d\n", " ",
-                       idev->busnum, idev->devnum);
-        } else {
-                printf("%10s -> unknown host, remote port and remote busid\n",
-                       idev->udev.busid);
-                printf("%10s -> remote bus/dev %03d/%03d\n", " ",
-                       idev->busnum, idev->devnum);
-        }
-
-        return 0;
-}
diff --git a/drivers/staging/usbip/userspace/libsrc/vhci_driver.h b/drivers/staging/usbip/userspace/libsrc/vhci_driver.h
deleted file mode 100644
index fa2316cf2cac..000000000000
--- a/drivers/staging/usbip/userspace/libsrc/vhci_driver.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Takahiro Hirofuchi
- */
-
-#ifndef __VHCI_DRIVER_H
-#define __VHCI_DRIVER_H
-
-#include <libudev.h>
-#include <stdint.h>
-
-#include "usbip_common.h"
-
-#define USBIP_VHCI_BUS_TYPE "platform"
-#define MAXNPORT 128
-
-struct usbip_imported_device {
-        uint8_t port;
-        uint32_t status;
-
-        uint32_t devid;
-
-        uint8_t busnum;
-        uint8_t devnum;
-
-        /* usbip_class_device list */
-        struct usbip_usb_device udev;
-};
-
-struct usbip_vhci_driver {
-
-        /* /sys/devices/platform/vhci_hcd */
-        struct udev_device *hc_device;
-
-        int nports;
-        struct usbip_imported_device idev[MAXNPORT];
-};
-
-
-extern struct usbip_vhci_driver *vhci_driver;
-
-int usbip_vhci_driver_open(void);
-void usbip_vhci_driver_close(void);
-
-int  usbip_vhci_refresh_device_list(void);
-
-
-int usbip_vhci_get_free_port(void);
-int usbip_vhci_attach_device2(uint8_t port, int sockfd, uint32_t devid,
-                uint32_t speed);
-
-/* will be removed */
-int usbip_vhci_attach_device(uint8_t port, int sockfd, uint8_t busnum,
-                uint8_t devnum, uint32_t speed);
-
-int usbip_vhci_detach_device(uint8_t port);
-
-int usbip_vhci_imported_device_dump(struct usbip_imported_device *idev);
-
-#endif /* __VHCI_DRIVER_H */
diff --git a/drivers/staging/usbip/userspace/src/Makefile.am b/drivers/staging/usbip/userspace/src/Makefile.am
deleted file mode 100644
index e81a4ebadeff..000000000000
--- a/drivers/staging/usbip/userspace/src/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/libsrc -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
-AM_CFLAGS   = @EXTRA_CFLAGS@
-LDADD       = $(top_builddir)/libsrc/libusbip.la
-
-sbin_PROGRAMS := usbip usbipd
-
-usbip_SOURCES := usbip.h utils.h usbip.c utils.c usbip_network.c \
-                 usbip_attach.c usbip_detach.c usbip_list.c \
-                 usbip_bind.c usbip_unbind.c usbip_port.c
-
-usbipd_SOURCES := usbip_network.h usbipd.c usbip_network.c
diff --git a/drivers/staging/usbip/userspace/src/usbip.c b/drivers/staging/usbip/userspace/src/usbip.c
deleted file mode 100644
index d7599d943529..000000000000
--- a/drivers/staging/usbip/userspace/src/usbip.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * command structure borrowed from udev
- * (git://git.kernel.org/pub/scm/linux/hotplug/udev.git)
- *
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <getopt.h>
-#include <syslog.h>
-
-#include "usbip_common.h"
-#include "usbip_network.h"
-#include "usbip.h"
-
-static int usbip_help(int argc, char *argv[]);
-static int usbip_version(int argc, char *argv[]);
-
-static const char usbip_version_string[] = PACKAGE_STRING;
-
-static const char usbip_usage_string[] =
-        "usbip [--debug] [--log] [--tcp-port PORT] [version]\n"
-        "             [help] <command> <args>\n";
-
-static void usbip_usage(void)
-{
-        printf("usage: %s", usbip_usage_string);
-}
-
-struct command {
-        const char *name;
-        int (*fn)(int argc, char *argv[]);
-        const char *help;
-        void (*usage)(void);
-};
-
-static const struct command cmds[] = {
-        {
-                .name  = "help",
-                .fn    = usbip_help,
-                .help  = NULL,
-                .usage = NULL
-        },
-        {
-                .name  = "version",
-                .fn    = usbip_version,
-                .help  = NULL,
-                .usage = NULL
-        },
-        {
-                .name  = "attach",
-                .fn    = usbip_attach,
-                .help  = "Attach a remote USB device",
-                .usage = usbip_attach_usage
-        },
-        {
-                .name  = "detach",
-                .fn    = usbip_detach,
-                .help  = "Detach a remote USB device",
-                .usage = usbip_detach_usage
-        },
-        {
-                .name  = "list",
-                .fn    = usbip_list,
-                .help  = "List exportable or local USB devices",
-                .usage = usbip_list_usage
-        },
-        {
-                .name  = "bind",
-                .fn    = usbip_bind,
-                .help  = "Bind device to " USBIP_HOST_DRV_NAME ".ko",
-                .usage = usbip_bind_usage
-        },
-        {
-                .name  = "unbind",
-                .fn    = usbip_unbind,
-                .help  = "Unbind device from " USBIP_HOST_DRV_NAME ".ko",
-                .usage = usbip_unbind_usage
-        },
-        {
-                .name  = "port",
-                .fn    = usbip_port_show,
-                .help  = "Show imported USB devices",
-                .usage = NULL
-        },
-        { NULL, NULL, NULL, NULL }
-};
-
-static int usbip_help(int argc, char *argv[])
-{
-        const struct command *cmd;
-        int i;
-        int ret = 0;
-
-        if (argc > 1 && argv++) {
-                for (i = 0; cmds[i].name != NULL; i++)
-                        if (!strcmp(cmds[i].name, argv[0]) && cmds[i].usage) {
-                                cmds[i].usage();
-                                goto done;
-                        }
-                ret = -1;
-        }
-
-        usbip_usage();
-        printf("\n");
-        for (cmd = cmds; cmd->name != NULL; cmd++)
-                if (cmd->help != NULL)
-                        printf("  %-10s %s\n", cmd->name, cmd->help);
-        printf("\n");
-done:
-        return ret;
-}
-
-static int usbip_version(int argc, char *argv[])
-{
-        (void) argc;
-        (void) argv;
-
-        printf(PROGNAME " (%s)\n", usbip_version_string);
-        return 0;
-}
-
-static int run_command(const struct command *cmd, int argc, char *argv[])
-{
-        dbg("running command: `%s'", cmd->name);
-        return cmd->fn(argc, argv);
-}
-
-int main(int argc, char *argv[])
-{
-        static const struct option opts[] = {
-                { "debug",    no_argument,       NULL, 'd' },
-                { "log",      no_argument,       NULL, 'l' },
-                { "tcp-port", required_argument, NULL, 't' },
-                { NULL,       0,                 NULL,  0  }
-        };
-
-        char *cmd;
-        int opt;
-        int i, rc = -1;
-
-        usbip_use_stderr = 1;
-        opterr = 0;
-        for (;;) {
-                opt = getopt_long(argc, argv, "+dlt:", opts, NULL);
-
-                if (opt == -1)
-                        break;
-
-                switch (opt) {
-                case 'd':
-                        usbip_use_debug = 1;
-                        break;
-                case 'l':
-                        usbip_use_syslog = 1;
-                        openlog("", LOG_PID, LOG_USER);
-                        break;
-                case 't':
-                        usbip_setup_port_number(optarg);
-                        break;
-                case '?':
-                        printf("usbip: invalid option\n");
-                default:
-                        usbip_usage();
-                        goto out;
-                }
-        }
-
-        cmd = argv[optind];
-        if (cmd) {
-                for (i = 0; cmds[i].name != NULL; i++)
-                        if (!strcmp(cmds[i].name, cmd)) {
-                                argc -= optind;
-                                argv += optind;
-                                optind = 0;
-                                rc = run_command(&cmds[i], argc, argv);
-                                goto out;
-                        }
-        }
-
-        /* invalid command */
-        usbip_help(0, NULL);
-out:
-        return (rc > -1 ? EXIT_SUCCESS : EXIT_FAILURE);
-}
diff --git a/drivers/staging/usbip/userspace/src/usbip.h b/drivers/staging/usbip/userspace/src/usbip.h
deleted file mode 100644
index 84fe66a9d8ad..000000000000
--- a/drivers/staging/usbip/userspace/src/usbip.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __USBIP_H
-#define __USBIP_H
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
-/* usbip commands */
-int usbip_attach(int argc, char *argv[]);
-int usbip_detach(int argc, char *argv[]);
-int usbip_list(int argc, char *argv[]);
-int usbip_bind(int argc, char *argv[]);
-int usbip_unbind(int argc, char *argv[]);
-int usbip_port_show(int argc, char *argv[]);
-
-void usbip_attach_usage(void);
-void usbip_detach_usage(void);
-void usbip_list_usage(void);
-void usbip_bind_usage(void);
-void usbip_unbind_usage(void);
-
-#endif /* __USBIP_H */
diff --git a/drivers/staging/usbip/userspace/src/usbip_attach.c b/drivers/staging/usbip/userspace/src/usbip_attach.c
deleted file mode 100644
index d58a14dfc094..000000000000
--- a/drivers/staging/usbip/userspace/src/usbip_attach.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <sys/stat.h>
-
-#include <limits.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <fcntl.h>
-#include <getopt.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "vhci_driver.h"
-#include "usbip_common.h"
-#include "usbip_network.h"
-#include "usbip.h"
-
-static const char usbip_attach_usage_string[] =
-        "usbip attach <args>\n"
-        "    -r, --remote=<host>      The machine with exported USB devices\n"
-        "    -b, --busid=<busid>    Busid of the device on <host>\n";
-
-void usbip_attach_usage(void)
-{
-        printf("usage: %s", usbip_attach_usage_string);
-}
-
-#define MAX_BUFF 100
-static int record_connection(char *host, char *port, char *busid, int rhport)
-{
-        int fd;
-        char path[PATH_MAX+1];
-        char buff[MAX_BUFF+1];
-        int ret;
-
-        ret = mkdir(VHCI_STATE_PATH, 0700);
-        if (ret < 0) {
-                /* if VHCI_STATE_PATH exists, then it better be a directory */
-                if (errno == EEXIST) {
-                        struct stat s;
-
-                        ret = stat(VHCI_STATE_PATH, &s);
-                        if (ret < 0)
-                                return -1;
-                        if (!(s.st_mode & S_IFDIR))
-                                return -1;
-                } else
-                        return -1;
-        }
-
-        snprintf(path, PATH_MAX, VHCI_STATE_PATH"/port%d", rhport);
-
-        fd = open(path, O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU);
-        if (fd < 0)
-                return -1;
-
-        snprintf(buff, MAX_BUFF, "%s %s %s\n",
-                        host, port, busid);
-
-        ret = write(fd, buff, strlen(buff));
-        if (ret != (ssize_t) strlen(buff)) {
-                close(fd);
-                return -1;
-        }
-
-        close(fd);
-
-        return 0;
-}
-
-static int import_device(int sockfd, struct usbip_usb_device *udev)
-{
-        int rc;
-        int port;
-
-        rc = usbip_vhci_driver_open();
-        if (rc < 0) {
-                err("open vhci_driver");
-                return -1;
-        }
-
-        port = usbip_vhci_get_free_port();
-        if (port < 0) {
-                err("no free port");
-                usbip_vhci_driver_close();
-                return -1;
-        }
-
-        rc = usbip_vhci_attach_device(port, sockfd, udev->busnum,
-                                      udev->devnum, udev->speed);
-        if (rc < 0) {
-                err("import device");
-                usbip_vhci_driver_close();
-                return -1;
-        }
-
-        usbip_vhci_driver_close();
-
-        return port;
-}
-
-static int query_import_device(int sockfd, char *busid)
-{
-        int rc;
-        struct op_import_request request;
-        struct op_import_reply   reply;
-        uint16_t code = OP_REP_IMPORT;
-
-        memset(&request, 0, sizeof(request));
-        memset(&reply, 0, sizeof(reply));
-
-        /* send a request */
-        rc = usbip_net_send_op_common(sockfd, OP_REQ_IMPORT, 0);
-        if (rc < 0) {
-                err("send op_common");
-                return -1;
-        }
-
-        strncpy(request.busid, busid, SYSFS_BUS_ID_SIZE-1);
-
-        PACK_OP_IMPORT_REQUEST(0, &request);
-
-        rc = usbip_net_send(sockfd, (void *) &request, sizeof(request));
-        if (rc < 0) {
-                err("send op_import_request");
-                return -1;
-        }
-
-        /* receive a reply */
-        rc = usbip_net_recv_op_common(sockfd, &code);
-        if (rc < 0) {
-                err("recv op_common");
-                return -1;
-        }
-
-        rc = usbip_net_recv(sockfd, (void *) &reply, sizeof(reply));
-        if (rc < 0) {
-                err("recv op_import_reply");
-                return -1;
-        }
-
-        PACK_OP_IMPORT_REPLY(0, &reply);
-
-        /* check the reply */
-        if (strncmp(reply.udev.busid, busid, SYSFS_BUS_ID_SIZE)) {
-                err("recv different busid %s", reply.udev.busid);
-                return -1;
-        }
-
-        /* import a device */
-        return import_device(sockfd, &reply.udev);
-}
-
-static int attach_device(char *host, char *busid)
-{
-        int sockfd;
-        int rc;
-        int rhport;
-
-        sockfd = usbip_net_tcp_connect(host, usbip_port_string);
-        if (sockfd < 0) {
-                err("tcp connect");
-                return -1;
-        }
-
-        rhport = query_import_device(sockfd, busid);
-        if (rhport < 0) {
-                err("query");
-                return -1;
-        }
-
-        close(sockfd);
-
-        rc = record_connection(host, usbip_port_string, busid, rhport);
-        if (rc < 0) {
-                err("record connection");
-                return -1;
-        }
-
-        return 0;
-}
-
-int usbip_attach(int argc, char *argv[])
-{
-        static const struct option opts[] = {
-                { "remote", required_argument, NULL, 'r' },
-                { "busid",  required_argument, NULL, 'b' },
-                { NULL, 0,  NULL, 0 }
-        };
-        char *host = NULL;
-        char *busid = NULL;
-        int opt;
-        int ret = -1;
-
-        for (;;) {
-                opt = getopt_long(argc, argv, "r:b:", opts, NULL);
-
-                if (opt == -1)
-                        break;
-
-                switch (opt) {
-                case 'r':
-                        host = optarg;
-                        break;
-                case 'b':
-                        busid = optarg;
-                        break;
-                default:
-                        goto err_out;
-                }
-        }
-
-        if (!host || !busid)
-                goto err_out;
-
-        ret = attach_device(host, busid);
-        goto out;
-
-err_out:
-        usbip_attach_usage();
-out:
-        return ret;
-}
diff --git a/drivers/staging/usbip/userspace/src/usbip_bind.c b/drivers/staging/usbip/userspace/src/usbip_bind.c
deleted file mode 100644
index fa46141ae68b..000000000000
--- a/drivers/staging/usbip/userspace/src/usbip_bind.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <libudev.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <getopt.h>
-
-#include "usbip_common.h"
-#include "utils.h"
-#include "usbip.h"
-#include "sysfs_utils.h"
-
-enum unbind_status {
-        UNBIND_ST_OK,
-        UNBIND_ST_USBIP_HOST,
-        UNBIND_ST_FAILED
-};
-
-static const char usbip_bind_usage_string[] =
-        "usbip bind <args>\n"
-        "    -b, --busid=<busid>    Bind " USBIP_HOST_DRV_NAME ".ko to device "
-        "on <busid>\n";
-
-void usbip_bind_usage(void)
-{
-        printf("usage: %s", usbip_bind_usage_string);
-}
-
-/* call at unbound state */
-static int bind_usbip(char *busid)
-{
-        char attr_name[] = "bind";
-        char bind_attr_path[SYSFS_PATH_MAX];
-        int rc = -1;
-
-        snprintf(bind_attr_path, sizeof(bind_attr_path), "%s/%s/%s/%s/%s/%s",
-                 SYSFS_MNT_PATH, SYSFS_BUS_NAME, SYSFS_BUS_TYPE,
-                 SYSFS_DRIVERS_NAME, USBIP_HOST_DRV_NAME, attr_name);
-
-        rc = write_sysfs_attribute(bind_attr_path, busid, strlen(busid));
-        if (rc < 0) {
-                err("error binding device %s to driver: %s", busid,
-                    strerror(errno));
-                return -1;
-        }
-
-        return 0;
-}
-
-/* buggy driver may cause dead lock */
-static int unbind_other(char *busid)
-{
-        enum unbind_status status = UNBIND_ST_OK;
-
-        char attr_name[] = "unbind";
-        char unbind_attr_path[SYSFS_PATH_MAX];
-        int rc = -1;
-
-        struct udev *udev;
-        struct udev_device *dev;
-        const char *driver;
-        const char *bDevClass;
-
-        /* Create libudev context. */
-        udev = udev_new();
-
-        /* Get the device. */
-        dev = udev_device_new_from_subsystem_sysname(udev, "usb", busid);
-        if (!dev) {
-                dbg("unable to find device with bus ID %s", busid);
-                goto err_close_busid_dev;
-        }
-
-        /* Check what kind of device it is. */
-        bDevClass  = udev_device_get_sysattr_value(dev, "bDeviceClass");
-        if (!bDevClass) {
-                dbg("unable to get bDevClass device attribute");
-                goto err_close_busid_dev;
-        }
-
-        if (!strncmp(bDevClass, "09", strlen(bDevClass))) {
-                dbg("skip unbinding of hub");
-                goto err_close_busid_dev;
-        }
-
-        /* Get the device driver. */
-        driver = udev_device_get_driver(dev);
-        if (!driver) {
-                /* No driver bound to this device. */
-                goto out;
-        }
-
-        if (!strncmp(USBIP_HOST_DRV_NAME, driver,
-                                strlen(USBIP_HOST_DRV_NAME))) {
-                /* Already bound to usbip-host. */
-                status = UNBIND_ST_USBIP_HOST;
-                goto out;
-        }
-
-        /* Unbind device from driver. */
-        snprintf(unbind_attr_path, sizeof(unbind_attr_path), "%s/%s/%s/%s/%s/%s",
-                 SYSFS_MNT_PATH, SYSFS_BUS_NAME, SYSFS_BUS_TYPE,
-                 SYSFS_DRIVERS_NAME, driver, attr_name);
-
-        rc = write_sysfs_attribute(unbind_attr_path, busid, strlen(busid));
-        if (rc < 0) {
-                err("error unbinding device %s from driver", busid);
-                goto err_close_busid_dev;
-        }
-
-        goto out;
-
-err_close_busid_dev:
-        status = UNBIND_ST_FAILED;
-out:
-        udev_device_unref(dev);
-        udev_unref(udev);
-
-        return status;
-}
-
-static int bind_device(char *busid)
-{
-        int rc;
-        struct udev *udev;
-        struct udev_device *dev;
-
-        /* Check whether the device with this bus ID exists. */
-        udev = udev_new();
-        dev = udev_device_new_from_subsystem_sysname(udev, "usb", busid);
-        if (!dev) {
-                err("device with the specified bus ID does not exist");
-                return -1;
-        }
-        udev_unref(udev);
-
-        rc = unbind_other(busid);
-        if (rc == UNBIND_ST_FAILED) {
-                err("could not unbind driver from device on busid %s", busid);
-                return -1;
-        } else if (rc == UNBIND_ST_USBIP_HOST) {
-                err("device on busid %s is already bound to %s", busid,
-                    USBIP_HOST_DRV_NAME);
-                return -1;
-        }
-
-        rc = modify_match_busid(busid, 1);
-        if (rc < 0) {
-                err("unable to bind device on %s", busid);
-                return -1;
-        }
-
-        rc = bind_usbip(busid);
-        if (rc < 0) {
-                err("could not bind device to %s", USBIP_HOST_DRV_NAME);
-                modify_match_busid(busid, 0);
-                return -1;
-        }
-
-        info("bind device on busid %s: complete", busid);
-
-        return 0;
-}
-
-int usbip_bind(int argc, char *argv[])
-{
-        static const struct option opts[] = {
-                { "busid", required_argument, NULL, 'b' },
-                { NULL,    0,                 NULL,  0  }
-        };
-
-        int opt;
-        int ret = -1;
-
-        for (;;) {
-                opt = getopt_long(argc, argv, "b:", opts, NULL);
-
-                if (opt == -1)
-                        break;
-
-                switch (opt) {
-                case 'b':
-                        ret = bind_device(optarg);
-                        goto out;
-                default:
-                        goto err_out;
-                }
-        }
-
-err_out:
-        usbip_bind_usage();
-out:
-        return ret;
-}
diff --git a/drivers/staging/usbip/userspace/src/usbip_detach.c b/drivers/staging/usbip/userspace/src/usbip_detach.c
deleted file mode 100644
index 05c6d15856eb..000000000000
--- a/drivers/staging/usbip/userspace/src/usbip_detach.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <ctype.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <getopt.h>
-#include <unistd.h>
-
-#include "vhci_driver.h"
-#include "usbip_common.h"
-#include "usbip_network.h"
-#include "usbip.h"
-
-static const char usbip_detach_usage_string[] =
-        "usbip detach <args>\n"
-        "    -p, --port=<port>    " USBIP_VHCI_DRV_NAME
-        " port the device is on\n";
-
-void usbip_detach_usage(void)
-{
-        printf("usage: %s", usbip_detach_usage_string);
-}
-
-static int detach_port(char *port)
-{
-        int ret;
-        uint8_t portnum;
-        char path[PATH_MAX+1];
-
-        for (unsigned int i = 0; i < strlen(port); i++)
-                if (!isdigit(port[i])) {
-                        err("invalid port %s", port);
-                        return -1;
-                }
-
-        /* check max port */
-
-        portnum = atoi(port);
-
-        /* remove the port state file */
-
-        snprintf(path, PATH_MAX, VHCI_STATE_PATH"/port%d", portnum);
-
-        remove(path);
-        rmdir(VHCI_STATE_PATH);
-
-        ret = usbip_vhci_driver_open();
-        if (ret < 0) {
-                err("open vhci_driver");
-                return -1;
-        }
-
-        ret = usbip_vhci_detach_device(portnum);
-        if (ret < 0)
-                return -1;
-
-        usbip_vhci_driver_close();
-
-        return ret;
-}
-
-int usbip_detach(int argc, char *argv[])
-{
-        static const struct option opts[] = {
-                { "port", required_argument, NULL, 'p' },
-                { NULL, 0, NULL, 0 }
-        };
-        int opt;
-        int ret = -1;
-
-        for (;;) {
-                opt = getopt_long(argc, argv, "p:", opts, NULL);
-
-                if (opt == -1)
-                        break;
-
-                switch (opt) {
-                case 'p':
-                        ret = detach_port(optarg);
-                        goto out;
-                default:
-                        goto err_out;
-                }
-        }
-
-err_out:
-        usbip_detach_usage();
-out:
-        return ret;
-}
diff --git a/drivers/staging/usbip/userspace/src/usbip_list.c b/drivers/staging/usbip/userspace/src/usbip_list.c
deleted file mode 100644
index d5ce34a410e7..000000000000
--- a/drivers/staging/usbip/userspace/src/usbip_list.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <sys/types.h>
-#include <libudev.h>
-
-#include <errno.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <getopt.h>
-#include <netdb.h>
-#include <unistd.h>
-
-#include "usbip_common.h"
-#include "usbip_network.h"
-#include "usbip.h"
-
-static const char usbip_list_usage_string[] =
-        "usbip list [-p|--parsable] <args>\n"
-        "    -p, --parsable         Parsable list format\n"
-        "    -r, --remote=<host>    List the exportable USB devices on <host>\n"
-        "    -l, --local            List the local USB devices\n";
-
-void usbip_list_usage(void)
-{
-        printf("usage: %s", usbip_list_usage_string);
-}
-
-static int get_exported_devices(char *host, int sockfd)
-{
-        char product_name[100];
-        char class_name[100];
-        struct op_devlist_reply reply;
-        uint16_t code = OP_REP_DEVLIST;
-        struct usbip_usb_device udev;
-        struct usbip_usb_interface uintf;
-        unsigned int i;
-        int rc, j;
-
-        rc = usbip_net_send_op_common(sockfd, OP_REQ_DEVLIST, 0);
-        if (rc < 0) {
-                dbg("usbip_net_send_op_common failed");
-                return -1;
-        }
-
-        rc = usbip_net_recv_op_common(sockfd, &code);
-        if (rc < 0) {
-                dbg("usbip_net_recv_op_common failed");
-                return -1;
-        }
-
-        memset(&reply, 0, sizeof(reply));
-        rc = usbip_net_recv(sockfd, &reply, sizeof(reply));
-        if (rc < 0) {
-                dbg("usbip_net_recv_op_devlist failed");
-                return -1;
-        }
-        PACK_OP_DEVLIST_REPLY(0, &reply);
-        dbg("exportable devices: %d\n", reply.ndev);
-
-        if (reply.ndev == 0) {
-                info("no exportable devices found on %s", host);
-                return 0;
-        }
-
-        printf("Exportable USB devices\n");
-        printf("======================\n");
-        printf(" - %s\n", host);
-
-        for (i = 0; i < reply.ndev; i++) {
-                memset(&udev, 0, sizeof(udev));
-                rc = usbip_net_recv(sockfd, &udev, sizeof(udev));
-                if (rc < 0) {
-                        dbg("usbip_net_recv failed: usbip_usb_device[%d]", i);
-                        return -1;
-                }
-                usbip_net_pack_usb_device(0, &udev);
-
-                usbip_names_get_product(product_name, sizeof(product_name),
-                                        udev.idVendor, udev.idProduct);
-                usbip_names_get_class(class_name, sizeof(class_name),
-                                      udev.bDeviceClass, udev.bDeviceSubClass,
-                                      udev.bDeviceProtocol);
-                printf("%11s: %s\n", udev.busid, product_name);
-                printf("%11s: %s\n", "", udev.path);
-                printf("%11s: %s\n", "", class_name);
-
-                for (j = 0; j < udev.bNumInterfaces; j++) {
-                        rc = usbip_net_recv(sockfd, &uintf, sizeof(uintf));
-                        if (rc < 0) {
-                                err("usbip_net_recv failed: usbip_usb_intf[%d]",
-                                                j);
-
-                                return -1;
-                        }
-                        usbip_net_pack_usb_interface(0, &uintf);
-
-                        usbip_names_get_class(class_name, sizeof(class_name),
-                                        uintf.bInterfaceClass,
-                                        uintf.bInterfaceSubClass,
-                                        uintf.bInterfaceProtocol);
-                        printf("%11s: %2d - %s\n", "", j, class_name);
-                }
-
-                printf("\n");
-        }
-
-        return 0;
-}
-
-static int list_exported_devices(char *host)
-{
-        int rc;
-        int sockfd;
-
-        sockfd = usbip_net_tcp_connect(host, usbip_port_string);
-        if (sockfd < 0) {
-                err("could not connect to %s:%s: %s", host,
-                    usbip_port_string, gai_strerror(sockfd));
-                return -1;
-        }
-        dbg("connected to %s:%s", host, usbip_port_string);
-
-        rc = get_exported_devices(host, sockfd);
-        if (rc < 0) {
-                err("failed to get device list from %s", host);
-                return -1;
-        }
-
-        close(sockfd);
-
-        return 0;
-}
-
-static void print_device(const char *busid, const char *vendor,
-                         const char *product, bool parsable)
-{
-        if (parsable)
-                printf("busid=%s#usbid=%.4s:%.4s#", busid, vendor, product);
-        else
-                printf(" - busid %s (%.4s:%.4s)\n", busid, vendor, product);
-}
-
-static void print_product_name(char *product_name, bool parsable)
-{
-        if (!parsable)
-                printf("   %s\n", product_name);
-}
-
-static int list_devices(bool parsable)
-{
-        struct udev *udev;
-        struct udev_enumerate *enumerate;
-        struct udev_list_entry *devices, *dev_list_entry;
-        struct udev_device *dev;
-        const char *path;
-        const char *idVendor;
-        const char *idProduct;
-        const char *bConfValue;
-        const char *bNumIntfs;
-        const char *busid;
-        char product_name[128];
-        int ret = -1;
-
-        /* Create libudev context. */
-        udev = udev_new();
-
-        /* Create libudev device enumeration. */
-        enumerate = udev_enumerate_new(udev);
-
-        /* Take only USB devices that are not hubs and do not have
-         * the bInterfaceNumber attribute, i.e. are not interfaces.
-         */
-        udev_enumerate_add_match_subsystem(enumerate, "usb");
-        udev_enumerate_add_nomatch_sysattr(enumerate, "bDeviceClass", "09");
-        udev_enumerate_add_nomatch_sysattr(enumerate, "bInterfaceNumber", NULL);
-        udev_enumerate_scan_devices(enumerate);
-
-        devices = udev_enumerate_get_list_entry(enumerate);
-
-        /* Show information about each device. */
-        udev_list_entry_foreach(dev_list_entry, devices) {
-                path = udev_list_entry_get_name(dev_list_entry);
-                dev = udev_device_new_from_syspath(udev, path);
-
-                /* Get device information. */
-                idVendor = udev_device_get_sysattr_value(dev, "idVendor");
-                idProduct = udev_device_get_sysattr_value(dev, "idProduct");
-                bConfValue = udev_device_get_sysattr_value(dev, "bConfigurationValue");
-                bNumIntfs = udev_device_get_sysattr_value(dev, "bNumInterfaces");
-                busid = udev_device_get_sysname(dev);
-                if (!idVendor || !idProduct || !bConfValue || !bNumIntfs) {
-                        err("problem getting device attributes: %s",
-                            strerror(errno));
-                        goto err_out;
-                }
-
-                /* Get product name. */
-                usbip_names_get_product(product_name, sizeof(product_name),
-                                        strtol(idVendor, NULL, 16),
-                                        strtol(idProduct, NULL, 16));
-
-                /* Print information. */
-                print_device(busid, idVendor, idProduct, parsable);
-                print_product_name(product_name, parsable);
-
-                printf("\n");
-
-                udev_device_unref(dev);
-        }
-
-        ret = 0;
-
-err_out:
-        udev_enumerate_unref(enumerate);
-        udev_unref(udev);
-
-        return ret;
-}
-
-int usbip_list(int argc, char *argv[])
-{
-        static const struct option opts[] = {
-                { "parsable", no_argument,       NULL, 'p' },
-                { "remote",   required_argument, NULL, 'r' },
-                { "local",    no_argument,       NULL, 'l' },
-                { NULL,       0,                 NULL,  0  }
-        };
-
-        bool parsable = false;
-        int opt;
-        int ret = -1;
-
-        if (usbip_names_init(USBIDS_FILE))
-                err("failed to open %s", USBIDS_FILE);
-
-        for (;;) {
-                opt = getopt_long(argc, argv, "pr:l", opts, NULL);
-
-                if (opt == -1)
-                        break;
-
-                switch (opt) {
-                case 'p':
-                        parsable = true;
-                        break;
-                case 'r':
-                        ret = list_exported_devices(optarg);
-                        goto out;
-                case 'l':
-                        ret = list_devices(parsable);
-                        goto out;
-                default:
-                        goto err_out;
-                }
-        }
-
-err_out:
-        usbip_list_usage();
-out:
-        usbip_names_free();
-
-        return ret;
-}
diff --git a/drivers/staging/usbip/userspace/src/usbip_network.c b/drivers/staging/usbip/userspace/src/usbip_network.c
deleted file mode 100644
index b4c37e76a6e0..000000000000
--- a/drivers/staging/usbip/userspace/src/usbip_network.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <sys/socket.h>
-
-#include <string.h>
-
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/tcp.h>
-#include <unistd.h>
-
-#ifdef HAVE_LIBWRAP
-#include <tcpd.h>
-#endif
-
-#include "usbip_common.h"
-#include "usbip_network.h"
-
-int usbip_port = 3240;
-char *usbip_port_string = "3240";
-
-void usbip_setup_port_number(char *arg)
-{
-        dbg("parsing port arg '%s'", arg);
-        char *end;
-        unsigned long int port = strtoul(arg, &end, 10);
-
-        if (end == arg) {
-                err("port: could not parse '%s' as a decimal integer", arg);
-                return;
-        }
-
-        if (*end != '\0') {
-                err("port: garbage at end of '%s'", arg);
-                return;
-        }
-
-        if (port > UINT16_MAX) {
-                err("port: %s too high (max=%d)",
-                    arg, UINT16_MAX);
-                return;
-        }
-
-        usbip_port = port;
-        usbip_port_string = arg;
-        info("using port %d (\"%s\")", usbip_port, usbip_port_string);
-}
-
-void usbip_net_pack_uint32_t(int pack, uint32_t *num)
-{
-        uint32_t i;
-
-        if (pack)
-                i = htonl(*num);
-        else
-                i = ntohl(*num);
-
-        *num = i;
-}
-
-void usbip_net_pack_uint16_t(int pack, uint16_t *num)
-{
-        uint16_t i;
-
-        if (pack)
-                i = htons(*num);
-        else
-                i = ntohs(*num);
-
-        *num = i;
-}
-
-void usbip_net_pack_usb_device(int pack, struct usbip_usb_device *udev)
-{
-        usbip_net_pack_uint32_t(pack, &udev->busnum);
-        usbip_net_pack_uint32_t(pack, &udev->devnum);
-        usbip_net_pack_uint32_t(pack, &udev->speed);
-
-        usbip_net_pack_uint16_t(pack, &udev->idVendor);
-        usbip_net_pack_uint16_t(pack, &udev->idProduct);
-        usbip_net_pack_uint16_t(pack, &udev->bcdDevice);
-}
-
-void usbip_net_pack_usb_interface(int pack __attribute__((unused)),
-                                  struct usbip_usb_interface *udev
-                                  __attribute__((unused)))
-{
-        /* uint8_t members need nothing */
-}
-
-static ssize_t usbip_net_xmit(int sockfd, void *buff, size_t bufflen,
-                              int sending)
-{
-        ssize_t nbytes;
-        ssize_t total = 0;
-
-        if (!bufflen)
-                return 0;
-
-        do {
-                if (sending)
-                        nbytes = send(sockfd, buff, bufflen, 0);
-                else
-                        nbytes = recv(sockfd, buff, bufflen, MSG_WAITALL);
-
-                if (nbytes <= 0)
-                        return -1;
-
-                buff     = (void *)((intptr_t) buff + nbytes);
-                bufflen -= nbytes;
-                total   += nbytes;
-
-        } while (bufflen > 0);
-
-        return total;
-}
-
-ssize_t usbip_net_recv(int sockfd, void *buff, size_t bufflen)
-{
-        return usbip_net_xmit(sockfd, buff, bufflen, 0);
-}
-
-ssize_t usbip_net_send(int sockfd, void *buff, size_t bufflen)
-{
-        return usbip_net_xmit(sockfd, buff, bufflen, 1);
-}
-
-int usbip_net_send_op_common(int sockfd, uint32_t code, uint32_t status)
-{
-        struct op_common op_common;
-        int rc;
-
-        memset(&op_common, 0, sizeof(op_common));
-
-        op_common.version = USBIP_VERSION;
-        op_common.code    = code;
-        op_common.status  = status;
-
-        PACK_OP_COMMON(1, &op_common);
-
-        rc = usbip_net_send(sockfd, &op_common, sizeof(op_common));
-        if (rc < 0) {
-                dbg("usbip_net_send failed: %d", rc);
-                return -1;
-        }
-
-        return 0;
-}
-
-int usbip_net_recv_op_common(int sockfd, uint16_t *code)
-{
-        struct op_common op_common;
-        int rc;
-
-        memset(&op_common, 0, sizeof(op_common));
-
-        rc = usbip_net_recv(sockfd, &op_common, sizeof(op_common));
-        if (rc < 0) {
-                dbg("usbip_net_recv failed: %d", rc);
-                goto err;
-        }
-
-        PACK_OP_COMMON(0, &op_common);
-
-        if (op_common.version != USBIP_VERSION) {
-                dbg("version mismatch: %d %d", op_common.version,
-                    USBIP_VERSION);
-                goto err;
-        }
-
-        switch (*code) {
-        case OP_UNSPEC:
-                break;
-        default:
-                if (op_common.code != *code) {
-                        dbg("unexpected pdu %#0x for %#0x", op_common.code,
-                            *code);
-                        goto err;
-                }
-        }
-
-        if (op_common.status != ST_OK) {
-                dbg("request failed at peer: %d", op_common.status);
-                goto err;
-        }
-
-        *code = op_common.code;
-
-        return 0;
-err:
-        return -1;
-}
-
-int usbip_net_set_reuseaddr(int sockfd)
-{
-        const int val = 1;
-        int ret;
-
-        ret = setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
-        if (ret < 0)
-                dbg("setsockopt: SO_REUSEADDR");
-
-        return ret;
-}
-
-int usbip_net_set_nodelay(int sockfd)
-{
-        const int val = 1;
-        int ret;
-
-        ret = setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
-        if (ret < 0)
-                dbg("setsockopt: TCP_NODELAY");
-
-        return ret;
-}
-
-int usbip_net_set_keepalive(int sockfd)
-{
-        const int val = 1;
-        int ret;
-
-        ret = setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val));
-        if (ret < 0)
-                dbg("setsockopt: SO_KEEPALIVE");
-
-        return ret;
-}
-
-int usbip_net_set_v6only(int sockfd)
-{
-        const int val = 1;
-        int ret;
-
-        ret = setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof(val));
-        if (ret < 0)
-                dbg("setsockopt: IPV6_V6ONLY");
-
-        return ret;
-}
-
-/*
- * IPv6 Ready
- */
-int usbip_net_tcp_connect(char *hostname, char *service)
-{
-        struct addrinfo hints, *res, *rp;
-        int sockfd;
-        int ret;
-
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = AF_UNSPEC;
-        hints.ai_socktype = SOCK_STREAM;
-
-        /* get all possible addresses */
-        ret = getaddrinfo(hostname, service, &hints, &res);
-        if (ret < 0) {
-                dbg("getaddrinfo: %s service %s: %s", hostname, service,
-                    gai_strerror(ret));
-                return ret;
-        }
-
-        /* try the addresses */
-        for (rp = res; rp; rp = rp->ai_next) {
-                sockfd = socket(rp->ai_family, rp->ai_socktype,
-                                rp->ai_protocol);
-                if (sockfd < 0)
-                        continue;
-
-                /* should set TCP_NODELAY for usbip */
-                usbip_net_set_nodelay(sockfd);
-                /* TODO: write code for heartbeat */
-                usbip_net_set_keepalive(sockfd);
-
-                if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) == 0)
-                        break;
-
-                close(sockfd);
-        }
-
-        freeaddrinfo(res);
-
-        if (!rp)
-                return EAI_SYSTEM;
-
-        return sockfd;
-}
diff --git a/drivers/staging/usbip/userspace/src/usbip_network.h b/drivers/staging/usbip/userspace/src/usbip_network.h
deleted file mode 100644
index c1e875cf1078..000000000000
--- a/drivers/staging/usbip/userspace/src/usbip_network.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Takahiro Hirofuchi
- */
-
-#ifndef __USBIP_NETWORK_H
-#define __USBIP_NETWORK_H
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
-#include <sys/types.h>
-
-#include <stdint.h>
-
-extern int usbip_port;
-extern char *usbip_port_string;
-void usbip_setup_port_number(char *arg);
-
-/* ---------------------------------------------------------------------- */
-/* Common header for all the kinds of PDUs. */
-struct op_common {
-        uint16_t version;
-
-#define OP_REQUEST      (0x80 << 8)
-#define OP_REPLY        (0x00 << 8)
-        uint16_t code;
-
-        /* add more error code */
-#define ST_OK   0x00
-#define ST_NA   0x01
-        uint32_t status; /* op_code status (for reply) */
-
-} __attribute__((packed));
-
-#define PACK_OP_COMMON(pack, op_common)  do {\
-        usbip_net_pack_uint16_t(pack, &(op_common)->version);\
-        usbip_net_pack_uint16_t(pack, &(op_common)->code);\
-        usbip_net_pack_uint32_t(pack, &(op_common)->status);\
-} while (0)
-
-/* ---------------------------------------------------------------------- */
-/* Dummy Code */
-#define OP_UNSPEC       0x00
-#define OP_REQ_UNSPEC   OP_UNSPEC
-#define OP_REP_UNSPEC   OP_UNSPEC
-
-/* ---------------------------------------------------------------------- */
-/* Retrieve USB device information. (still not used) */
-#define OP_DEVINFO      0x02
-#define OP_REQ_DEVINFO  (OP_REQUEST | OP_DEVINFO)
-#define OP_REP_DEVINFO  (OP_REPLY   | OP_DEVINFO)
-
-struct op_devinfo_request {
-        char busid[SYSFS_BUS_ID_SIZE];
-} __attribute__((packed));
-
-struct op_devinfo_reply {
-        struct usbip_usb_device udev;
-        struct usbip_usb_interface uinf[];
-} __attribute__((packed));
-
-/* ---------------------------------------------------------------------- */
-/* Import a remote USB device. */
-#define OP_IMPORT       0x03
-#define OP_REQ_IMPORT   (OP_REQUEST | OP_IMPORT)
-#define OP_REP_IMPORT   (OP_REPLY   | OP_IMPORT)
-
-struct op_import_request {
-        char busid[SYSFS_BUS_ID_SIZE];
-} __attribute__((packed));
-
-struct op_import_reply {
-        struct usbip_usb_device udev;
-//      struct usbip_usb_interface uinf[];
-} __attribute__((packed));
-
-#define PACK_OP_IMPORT_REQUEST(pack, request)  do {\
-} while (0)
-
-#define PACK_OP_IMPORT_REPLY(pack, reply)  do {\
-        usbip_net_pack_usb_device(pack, &(reply)->udev);\
-} while (0)
-
-/* ---------------------------------------------------------------------- */
-/* Export a USB device to a remote host. */
-#define OP_EXPORT       0x06
-#define OP_REQ_EXPORT   (OP_REQUEST | OP_EXPORT)
-#define OP_REP_EXPORT   (OP_REPLY   | OP_EXPORT)
-
-struct op_export_request {
-        struct usbip_usb_device udev;
-} __attribute__((packed));
-
-struct op_export_reply {
-        int returncode;
-} __attribute__((packed));
-
-
-#define PACK_OP_EXPORT_REQUEST(pack, request)  do {\
-        usbip_net_pack_usb_device(pack, &(request)->udev);\
-} while (0)
-
-#define PACK_OP_EXPORT_REPLY(pack, reply)  do {\
-} while (0)
-
-/* ---------------------------------------------------------------------- */
-/* un-Export a USB device from a remote host. */
-#define OP_UNEXPORT     0x07
-#define OP_REQ_UNEXPORT (OP_REQUEST | OP_UNEXPORT)
-#define OP_REP_UNEXPORT (OP_REPLY   | OP_UNEXPORT)
-
-struct op_unexport_request {
-        struct usbip_usb_device udev;
-} __attribute__((packed));
-
-struct op_unexport_reply {
-        int returncode;
-} __attribute__((packed));
-
-#define PACK_OP_UNEXPORT_REQUEST(pack, request)  do {\
-        usbip_net_pack_usb_device(pack, &(request)->udev);\
-} while (0)
-
-#define PACK_OP_UNEXPORT_REPLY(pack, reply)  do {\
-} while (0)
-
-/* ---------------------------------------------------------------------- */
-/* Negotiate IPSec encryption key. (still not used) */
-#define OP_CRYPKEY      0x04
-#define OP_REQ_CRYPKEY  (OP_REQUEST | OP_CRYPKEY)
-#define OP_REP_CRYPKEY  (OP_REPLY   | OP_CRYPKEY)
-
-struct op_crypkey_request {
-        /* 128bit key */
-        uint32_t key[4];
-} __attribute__((packed));
-
-struct op_crypkey_reply {
-        uint32_t __reserved;
-} __attribute__((packed));
-
-
-/* ---------------------------------------------------------------------- */
-/* Retrieve the list of exported USB devices. */
-#define OP_DEVLIST      0x05
-#define OP_REQ_DEVLIST  (OP_REQUEST | OP_DEVLIST)
-#define OP_REP_DEVLIST  (OP_REPLY   | OP_DEVLIST)
-
-struct op_devlist_request {
-} __attribute__((packed));
-
-struct op_devlist_reply {
-        uint32_t ndev;
-        /* followed by reply_extra[] */
-} __attribute__((packed));
-
-struct op_devlist_reply_extra {
-        struct usbip_usb_device    udev;
-        struct usbip_usb_interface uinf[];
-} __attribute__((packed));
-
-#define PACK_OP_DEVLIST_REQUEST(pack, request)  do {\
-} while (0)
-
-#define PACK_OP_DEVLIST_REPLY(pack, reply)  do {\
-        usbip_net_pack_uint32_t(pack, &(reply)->ndev);\
-} while (0)
-
-void usbip_net_pack_uint32_t(int pack, uint32_t *num);
-void usbip_net_pack_uint16_t(int pack, uint16_t *num);
-void usbip_net_pack_usb_device(int pack, struct usbip_usb_device *udev);
-void usbip_net_pack_usb_interface(int pack, struct usbip_usb_interface *uinf);
-
-ssize_t usbip_net_recv(int sockfd, void *buff, size_t bufflen);
-ssize_t usbip_net_send(int sockfd, void *buff, size_t bufflen);
-int usbip_net_send_op_common(int sockfd, uint32_t code, uint32_t status);
-int usbip_net_recv_op_common(int sockfd, uint16_t *code);
-int usbip_net_set_reuseaddr(int sockfd);
-int usbip_net_set_nodelay(int sockfd);
-int usbip_net_set_keepalive(int sockfd);
-int usbip_net_set_v6only(int sockfd);
-int usbip_net_tcp_connect(char *hostname, char *port);
-
-#endif /* __USBIP_NETWORK_H */
diff --git a/drivers/staging/usbip/userspace/src/usbip_port.c b/drivers/staging/usbip/userspace/src/usbip_port.c
deleted file mode 100644
index a2e884fd9226..000000000000
--- a/drivers/staging/usbip/userspace/src/usbip_port.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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.
- */
-
-#include "vhci_driver.h"
-#include "usbip_common.h"
-
-static int list_imported_devices(void)
-{
-        int i;
-        struct usbip_imported_device *idev;
-        int ret;
-
-        ret = usbip_vhci_driver_open();
-        if (ret < 0) {
-                err("open vhci_driver");
-                return -1;
-        }
-
-        printf("Imported USB devices\n");
-        printf("====================\n");
-
-        for (i = 0; i < vhci_driver->nports; i++) {
-                idev = &vhci_driver->idev[i];
-
-                if (usbip_vhci_imported_device_dump(idev) < 0)
-                        ret = -1;
-        }
-
-        usbip_vhci_driver_close();
-
-        return ret;
-
-}
-
-int usbip_port_show(__attribute__((unused)) int argc,
-                    __attribute__((unused)) char *argv[])
-{
-        int ret;
-
-        ret = list_imported_devices();
-        if (ret < 0)
-                err("list imported devices");
-
-        return ret;
-}
diff --git a/drivers/staging/usbip/userspace/src/usbip_unbind.c b/drivers/staging/usbip/userspace/src/usbip_unbind.c
deleted file mode 100644
index a4a496c9cbaf..000000000000
--- a/drivers/staging/usbip/userspace/src/usbip_unbind.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <libudev.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <getopt.h>
-
-#include "usbip_common.h"
-#include "utils.h"
-#include "usbip.h"
-#include "sysfs_utils.h"
-
-static const char usbip_unbind_usage_string[] =
-        "usbip unbind <args>\n"
-        "    -b, --busid=<busid>    Unbind " USBIP_HOST_DRV_NAME ".ko from "
-        "device on <busid>\n";
-
-void usbip_unbind_usage(void)
-{
-        printf("usage: %s", usbip_unbind_usage_string);
-}
-
-static int unbind_device(char *busid)
-{
-        char bus_type[] = "usb";
-        int rc, ret = -1;
-
-        char unbind_attr_name[] = "unbind";
-        char unbind_attr_path[SYSFS_PATH_MAX];
-        char rebind_attr_name[] = "rebind";
-        char rebind_attr_path[SYSFS_PATH_MAX];
-
-        struct udev *udev;
-        struct udev_device *dev;
-        const char *driver;
-
-        /* Create libudev context. */
-        udev = udev_new();
-
-        /* Check whether the device with this bus ID exists. */
-        dev = udev_device_new_from_subsystem_sysname(udev, "usb", busid);
-        if (!dev) {
-                err("device with the specified bus ID does not exist");
-                goto err_close_udev;
-        }
-
-        /* Check whether the device is using usbip-host driver. */
-        driver = udev_device_get_driver(dev);
-        if (!driver || strcmp(driver, "usbip-host")) {
-                err("device is not bound to usbip-host driver");
-                goto err_close_udev;
-        }
-
-        /* Unbind device from driver. */
-        snprintf(unbind_attr_path, sizeof(unbind_attr_path), "%s/%s/%s/%s/%s/%s",
-                 SYSFS_MNT_PATH, SYSFS_BUS_NAME, bus_type, SYSFS_DRIVERS_NAME,
-                 USBIP_HOST_DRV_NAME, unbind_attr_name);
-
-        rc = write_sysfs_attribute(unbind_attr_path, busid, strlen(busid));
-        if (rc < 0) {
-                err("error unbinding device %s from driver", busid);
-                goto err_close_udev;
-        }
-
-        /* Notify driver of unbind. */
-        rc = modify_match_busid(busid, 0);
-        if (rc < 0) {
-                err("unable to unbind device on %s", busid);
-                goto err_close_udev;
-        }
-
-        /* Trigger new probing. */
-        snprintf(rebind_attr_path, sizeof(unbind_attr_path), "%s/%s/%s/%s/%s/%s",
-                        SYSFS_MNT_PATH, SYSFS_BUS_NAME, bus_type, SYSFS_DRIVERS_NAME,
-                        USBIP_HOST_DRV_NAME, rebind_attr_name);
-
-        rc = write_sysfs_attribute(rebind_attr_path, busid, strlen(busid));
-        if (rc < 0) {
-                err("error rebinding");
-                goto err_close_udev;
-        }
-
-        ret = 0;
-        info("unbind device on busid %s: complete", busid);
-
-err_close_udev:
-        udev_device_unref(dev);
-        udev_unref(udev);
-
-        return ret;
-}
-
-int usbip_unbind(int argc, char *argv[])
-{
-        static const struct option opts[] = {
-                { "busid", required_argument, NULL, 'b' },
-                { NULL,    0,                 NULL,  0  }
-        };
-
-        int opt;
-        int ret = -1;
-
-        for (;;) {
-                opt = getopt_long(argc, argv, "b:", opts, NULL);
-
-                if (opt == -1)
-                        break;
-
-                switch (opt) {
-                case 'b':
-                        ret = unbind_device(optarg);
-                        goto out;
-                default:
-                        goto err_out;
-                }
-        }
-
-err_out:
-        usbip_unbind_usage();
-out:
-        return ret;
-}
diff --git a/drivers/staging/usbip/userspace/src/usbipd.c b/drivers/staging/usbip/userspace/src/usbipd.c
deleted file mode 100644
index 2f87f2d348ba..000000000000
--- a/drivers/staging/usbip/userspace/src/usbipd.c
+++ /dev/null
@@ -1,679 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
-#define _GNU_SOURCE
-#include <errno.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#ifdef HAVE_LIBWRAP
-#include <tcpd.h>
-#endif
-
-#include <getopt.h>
-#include <signal.h>
-#include <poll.h>
-
-#include "usbip_host_driver.h"
-#include "usbip_common.h"
-#include "usbip_network.h"
-#include "list.h"
-
-#undef  PROGNAME
-#define PROGNAME "usbipd"
-#define MAXSOCKFD 20
-
-#define MAIN_LOOP_TIMEOUT 10
-
-#define DEFAULT_PID_FILE "/var/run/" PROGNAME ".pid"
-
-static const char usbip_version_string[] = PACKAGE_STRING;
-
-static const char usbipd_help_string[] =
-        "usage: usbipd [options]\n"
-        "\n"
-        "       -4, --ipv4\n"
-        "               Bind to IPv4. Default is both.\n"
-        "\n"
-        "       -6, --ipv6\n"
-        "               Bind to IPv6. Default is both.\n"
-        "\n"
-        "       -D, --daemon\n"
-        "               Run as a daemon process.\n"
-        "\n"
-        "       -d, --debug\n"
-        "               Print debugging information.\n"
-        "\n"
-        "       -PFILE, --pid FILE\n"
-        "               Write process id to FILE.\n"
-        "               If no FILE specified, use " DEFAULT_PID_FILE "\n"
-        "\n"
-        "       -tPORT, --tcp-port PORT\n"
-        "               Listen on TCP/IP port PORT.\n"
-        "\n"
-        "       -h, --help\n"
-        "               Print this help.\n"
-        "\n"
-        "       -v, --version\n"
-        "               Show version.\n";
-
-static void usbipd_help(void)
-{
-        printf("%s\n", usbipd_help_string);
-}
-
-static int recv_request_import(int sockfd)
-{
-        struct op_import_request req;
-        struct op_common reply;
-        struct usbip_exported_device *edev;
-        struct usbip_usb_device pdu_udev;
-        struct list_head *i;
-        int found = 0;
-        int error = 0;
-        int rc;
-
-        memset(&req, 0, sizeof(req));
-        memset(&reply, 0, sizeof(reply));
-
-        rc = usbip_net_recv(sockfd, &req, sizeof(req));
-        if (rc < 0) {
-                dbg("usbip_net_recv failed: import request");
-                return -1;
-        }
-        PACK_OP_IMPORT_REQUEST(0, &req);
-
-        list_for_each(i, &host_driver->edev_list) {
-                edev = list_entry(i, struct usbip_exported_device, node);
-                if (!strncmp(req.busid, edev->udev.busid, SYSFS_BUS_ID_SIZE)) {
-                        info("found requested device: %s", req.busid);
-                        found = 1;
-                        break;
-                }
-        }
-
-        if (found) {
-                /* should set TCP_NODELAY for usbip */
-                usbip_net_set_nodelay(sockfd);
-
-                /* export device needs a TCP/IP socket descriptor */
-                rc = usbip_host_export_device(edev, sockfd);
-                if (rc < 0)
-                        error = 1;
-        } else {
-                info("requested device not found: %s", req.busid);
-                error = 1;
-        }
-
-        rc = usbip_net_send_op_common(sockfd, OP_REP_IMPORT,
-                                      (!error ? ST_OK : ST_NA));
-        if (rc < 0) {
-                dbg("usbip_net_send_op_common failed: %#0x", OP_REP_IMPORT);
-                return -1;
-        }
-
-        if (error) {
-                dbg("import request busid %s: failed", req.busid);
-                return -1;
-        }
-
-        memcpy(&pdu_udev, &edev->udev, sizeof(pdu_udev));
-        usbip_net_pack_usb_device(1, &pdu_udev);
-
-        rc = usbip_net_send(sockfd, &pdu_udev, sizeof(pdu_udev));
-        if (rc < 0) {
-                dbg("usbip_net_send failed: devinfo");
-                return -1;
-        }
-
-        dbg("import request busid %s: complete", req.busid);
-
-        return 0;
-}
-
-static int send_reply_devlist(int connfd)
-{
-        struct usbip_exported_device *edev;
-        struct usbip_usb_device pdu_udev;
-        struct usbip_usb_interface pdu_uinf;
-        struct op_devlist_reply reply;
-        struct list_head *j;
-        int rc, i;
-
-        reply.ndev = 0;
-        /* number of exported devices */
-        list_for_each(j, &host_driver->edev_list) {
-                reply.ndev += 1;
-        }
-        info("exportable devices: %d", reply.ndev);
-
-        rc = usbip_net_send_op_common(connfd, OP_REP_DEVLIST, ST_OK);
-        if (rc < 0) {
-                dbg("usbip_net_send_op_common failed: %#0x", OP_REP_DEVLIST);
-                return -1;
-        }
-        PACK_OP_DEVLIST_REPLY(1, &reply);
-
-        rc = usbip_net_send(connfd, &reply, sizeof(reply));
-        if (rc < 0) {
-                dbg("usbip_net_send failed: %#0x", OP_REP_DEVLIST);
-                return -1;
-        }
-
-        list_for_each(j, &host_driver->edev_list) {
-                edev = list_entry(j, struct usbip_exported_device, node);
-                dump_usb_device(&edev->udev);
-                memcpy(&pdu_udev, &edev->udev, sizeof(pdu_udev));
-                usbip_net_pack_usb_device(1, &pdu_udev);
-
-                rc = usbip_net_send(connfd, &pdu_udev, sizeof(pdu_udev));
-                if (rc < 0) {
-                        dbg("usbip_net_send failed: pdu_udev");
-                        return -1;
-                }
-
-                for (i = 0; i < edev->udev.bNumInterfaces; i++) {
-                        dump_usb_interface(&edev->uinf[i]);
-                        memcpy(&pdu_uinf, &edev->uinf[i], sizeof(pdu_uinf));
-                        usbip_net_pack_usb_interface(1, &pdu_uinf);
-
-                        rc = usbip_net_send(connfd, &pdu_uinf,
-                                        sizeof(pdu_uinf));
-                        if (rc < 0) {
-                                err("usbip_net_send failed: pdu_uinf");
-                                return -1;
-                        }
-                }
-        }
-
-        return 0;
-}
-
-static int recv_request_devlist(int connfd)
-{
-        struct op_devlist_request req;
-        int rc;
-
-        memset(&req, 0, sizeof(req));
-
-        rc = usbip_net_recv(connfd, &req, sizeof(req));
-        if (rc < 0) {
-                dbg("usbip_net_recv failed: devlist request");
-                return -1;
-        }
-
-        rc = send_reply_devlist(connfd);
-        if (rc < 0) {
-                dbg("send_reply_devlist failed");
-                return -1;
-        }
-
-        return 0;
-}
-
-static int recv_pdu(int connfd)
-{
-        uint16_t code = OP_UNSPEC;
-        int ret;
-
-        ret = usbip_net_recv_op_common(connfd, &code);
-        if (ret < 0) {
-                dbg("could not receive opcode: %#0x", code);
-                return -1;
-        }
-
-        ret = usbip_host_refresh_device_list();
-        if (ret < 0) {
-                dbg("could not refresh device list: %d", ret);
-                return -1;
-        }
-
-        info("received request: %#0x(%d)", code, connfd);
-        switch (code) {
-        case OP_REQ_DEVLIST:
-                ret = recv_request_devlist(connfd);
-                break;
-        case OP_REQ_IMPORT:
-                ret = recv_request_import(connfd);
-                break;
-        case OP_REQ_DEVINFO:
-        case OP_REQ_CRYPKEY:
-        default:
-                err("received an unknown opcode: %#0x", code);
-                ret = -1;
-        }
-
-        if (ret == 0)
-                info("request %#0x(%d): complete", code, connfd);
-        else
-                info("request %#0x(%d): failed", code, connfd);
-
-        return ret;
-}
-
-#ifdef HAVE_LIBWRAP
-static int tcpd_auth(int connfd)
-{
-        struct request_info request;
-        int rc;
-
-        request_init(&request, RQ_DAEMON, PROGNAME, RQ_FILE, connfd, 0);
-        fromhost(&request);
-        rc = hosts_access(&request);
-        if (rc == 0)
-                return -1;
-
-        return 0;
-}
-#endif
-
-static int do_accept(int listenfd)
-{
-        int connfd;
-        struct sockaddr_storage ss;
-        socklen_t len = sizeof(ss);
-        char host[NI_MAXHOST], port[NI_MAXSERV];
-        int rc;
-
-        memset(&ss, 0, sizeof(ss));
-
-        connfd = accept(listenfd, (struct sockaddr *)&ss, &len);
-        if (connfd < 0) {
-                err("failed to accept connection");
-                return -1;
-        }
-
-        rc = getnameinfo((struct sockaddr *)&ss, len, host, sizeof(host),
-                         port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
-        if (rc)
-                err("getnameinfo: %s", gai_strerror(rc));
-
-#ifdef HAVE_LIBWRAP
-        rc = tcpd_auth(connfd);
-        if (rc < 0) {
-                info("denied access from %s", host);
-                close(connfd);
-                return -1;
-        }
-#endif
-        info("connection from %s:%s", host, port);
-
-        return connfd;
-}
-
-int process_request(int listenfd)
-{
-        pid_t childpid;
-        int connfd;
-
-        connfd = do_accept(listenfd);
-        if (connfd < 0)
-                return -1;
-        childpid = fork();
-        if (childpid == 0) {
-                close(listenfd);
-                recv_pdu(connfd);
-                exit(0);
-        }
-        close(connfd);
-        return 0;
-}
-
-static void addrinfo_to_text(struct addrinfo *ai, char buf[],
-                             const size_t buf_size)
-{
-        char hbuf[NI_MAXHOST];
-        char sbuf[NI_MAXSERV];
-        int rc;
-
-        buf[0] = '\0';
-
-        rc = getnameinfo(ai->ai_addr, ai->ai_addrlen, hbuf, sizeof(hbuf),
-                         sbuf, sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV);
-        if (rc)
-                err("getnameinfo: %s", gai_strerror(rc));
-
-        snprintf(buf, buf_size, "%s:%s", hbuf, sbuf);
-}
-
-static int listen_all_addrinfo(struct addrinfo *ai_head, int sockfdlist[],
-                             int maxsockfd)
-{
-        struct addrinfo *ai;
-        int ret, nsockfd = 0;
-        const size_t ai_buf_size = NI_MAXHOST + NI_MAXSERV + 2;
-        char ai_buf[ai_buf_size];
-
-        for (ai = ai_head; ai && nsockfd < maxsockfd; ai = ai->ai_next) {
-                int sock;
-
-                addrinfo_to_text(ai, ai_buf, ai_buf_size);
-                dbg("opening %s", ai_buf);
-                sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-                if (sock < 0) {
-                        err("socket: %s: %d (%s)",
-                            ai_buf, errno, strerror(errno));
-                        continue;
-                }
-
-                usbip_net_set_reuseaddr(sock);
-                usbip_net_set_nodelay(sock);
-                /* We use seperate sockets for IPv4 and IPv6
-                 * (see do_standalone_mode()) */
-                usbip_net_set_v6only(sock);
-
-                if (sock >= FD_SETSIZE) {
-                        err("FD_SETSIZE: %s: sock=%d, max=%d",
-                            ai_buf, sock, FD_SETSIZE);
-                        close(sock);
-                        continue;
-                }
-
-                ret = bind(sock, ai->ai_addr, ai->ai_addrlen);
-                if (ret < 0) {
-                        err("bind: %s: %d (%s)",
-                            ai_buf, errno, strerror(errno));
-                        close(sock);
-                        continue;
-                }
-
-                ret = listen(sock, SOMAXCONN);
-                if (ret < 0) {
-                        err("listen: %s: %d (%s)",
-                            ai_buf, errno, strerror(errno));
-                        close(sock);
-                        continue;
-                }
-
-                info("listening on %s", ai_buf);
-                sockfdlist[nsockfd++] = sock;
-        }
-
-        return nsockfd;
-}
-
-static struct addrinfo *do_getaddrinfo(char *host, int ai_family)
-{
-        struct addrinfo hints, *ai_head;
-        int rc;
-
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family   = ai_family;
-        hints.ai_socktype = SOCK_STREAM;
-        hints.ai_flags    = AI_PASSIVE;
-
-        rc = getaddrinfo(host, usbip_port_string, &hints, &ai_head);
-        if (rc) {
-                err("failed to get a network address %s: %s", usbip_port_string,
-                    gai_strerror(rc));
-                return NULL;
-        }
-
-        return ai_head;
-}
-
-static void signal_handler(int i)
-{
-        dbg("received '%s' signal", strsignal(i));
-}
-
-static void set_signal(void)
-{
-        struct sigaction act;
-
-        memset(&act, 0, sizeof(act));
-        act.sa_handler = signal_handler;
-        sigemptyset(&act.sa_mask);
-        sigaction(SIGTERM, &act, NULL);
-        sigaction(SIGINT, &act, NULL);
-        act.sa_handler = SIG_IGN;
-        sigaction(SIGCLD, &act, NULL);
-}
-
-static const char *pid_file;
-
-static void write_pid_file(void)
-{
-        if (pid_file) {
-                dbg("creating pid file %s", pid_file);
-                FILE *fp;
-
-                fp = fopen(pid_file, "w");
-                if (!fp) {
-                        err("pid_file: %s: %d (%s)",
-                            pid_file, errno, strerror(errno));
-                        return;
-                }
-                fprintf(fp, "%d\n", getpid());
-                fclose(fp);
-        }
-}
-
-static void remove_pid_file(void)
-{
-        if (pid_file) {
-                dbg("removing pid file %s", pid_file);
-                unlink(pid_file);
-        }
-}
-
-static int do_standalone_mode(int daemonize, int ipv4, int ipv6)
-{
-        struct addrinfo *ai_head;
-        int sockfdlist[MAXSOCKFD];
-        int nsockfd, family;
-        int i, terminate;
-        struct pollfd *fds;
-        struct timespec timeout;
-        sigset_t sigmask;
-
-        if (usbip_host_driver_open()) {
-                err("please load " USBIP_CORE_MOD_NAME ".ko and "
-                    USBIP_HOST_DRV_NAME ".ko!");
-                return -1;
-        }
-
-        if (daemonize) {
-                if (daemon(0, 0) < 0) {
-                        err("daemonizing failed: %s", strerror(errno));
-                        usbip_host_driver_close();
-                        return -1;
-                }
-                umask(0);
-                usbip_use_syslog = 1;
-        }
-        set_signal();
-        write_pid_file();
-
-        info("starting " PROGNAME " (%s)", usbip_version_string);
-
-        /*
-         * To suppress warnings on systems with bindv6only disabled
-         * (default), we use seperate sockets for IPv6 and IPv4 and set
-         * IPV6_V6ONLY on the IPv6 sockets.
-         */
-        if (ipv4 && ipv6)
-                family = AF_UNSPEC;
-        else if (ipv4)
-                family = AF_INET;
-        else
-                family = AF_INET6;
-
-        ai_head = do_getaddrinfo(NULL, family);
-        if (!ai_head) {
-                usbip_host_driver_close();
-                return -1;
-        }
-        nsockfd = listen_all_addrinfo(ai_head, sockfdlist,
-                sizeof(sockfdlist) / sizeof(*sockfdlist));
-        freeaddrinfo(ai_head);
-        if (nsockfd <= 0) {
-                err("failed to open a listening socket");
-                usbip_host_driver_close();
-                return -1;
-        }
-
-        dbg("listening on %d address%s", nsockfd, (nsockfd == 1) ? "" : "es");
-
-        fds = calloc(nsockfd, sizeof(struct pollfd));
-        for (i = 0; i < nsockfd; i++) {
-                fds[i].fd = sockfdlist[i];
-                fds[i].events = POLLIN;
-        }
-        timeout.tv_sec = MAIN_LOOP_TIMEOUT;
-        timeout.tv_nsec = 0;
-
-        sigfillset(&sigmask);
-        sigdelset(&sigmask, SIGTERM);
-        sigdelset(&sigmask, SIGINT);
-
-        terminate = 0;
-        while (!terminate) {
-                int r;
-
-                r = ppoll(fds, nsockfd, &timeout, &sigmask);
-                if (r < 0) {
-                        dbg("%s", strerror(errno));
-                        terminate = 1;
-                } else if (r) {
-                        for (i = 0; i < nsockfd; i++) {
-                                if (fds[i].revents & POLLIN) {
-                                        dbg("read event on fd[%d]=%d",
-                                            i, sockfdlist[i]);
-                                        process_request(sockfdlist[i]);
-                                }
-                        }
-                } else {
-                        dbg("heartbeat timeout on ppoll()");
-                }
-        }
-
-        info("shutting down " PROGNAME);
-        free(fds);
-        usbip_host_driver_close();
-
-        return 0;
-}
-
-int main(int argc, char *argv[])
-{
-        static const struct option longopts[] = {
-                { "ipv4",     no_argument,       NULL, '4' },
-                { "ipv6",     no_argument,       NULL, '6' },
-                { "daemon",   no_argument,       NULL, 'D' },
-                { "daemon",   no_argument,       NULL, 'D' },
-                { "debug",    no_argument,       NULL, 'd' },
-                { "pid",      optional_argument, NULL, 'P' },
-                { "tcp-port", required_argument, NULL, 't' },
-                { "help",     no_argument,       NULL, 'h' },
-                { "version",  no_argument,       NULL, 'v' },
-                { NULL,       0,                 NULL,  0  }
-        };
-
-        enum {
-                cmd_standalone_mode = 1,
-                cmd_help,
-                cmd_version
-        } cmd;
-
-        int daemonize = 0;
-        int ipv4 = 0, ipv6 = 0;
-        int opt, rc = -1;
-
-        pid_file = NULL;
-
-        usbip_use_stderr = 1;
-        usbip_use_syslog = 0;
-
-        if (geteuid() != 0)
-                err("not running as root?");
-
-        cmd = cmd_standalone_mode;
-        for (;;) {
-                opt = getopt_long(argc, argv, "46DdP::t:hv", longopts, NULL);
-
-                if (opt == -1)
-                        break;
-
-                switch (opt) {
-                case '4':
-                        ipv4 = 1;
-                        break;
-                case '6':
-                        ipv6 = 1;
-                        break;
-                case 'D':
-                        daemonize = 1;
-                        break;
-                case 'd':
-                        usbip_use_debug = 1;
-                        break;
-                case 'h':
-                        cmd = cmd_help;
-                        break;
-                case 'P':
-                        pid_file = optarg ? optarg : DEFAULT_PID_FILE;
-                        break;
-                case 't':
-                        usbip_setup_port_number(optarg);
-                        break;
-                case 'v':
-                        cmd = cmd_version;
-                        break;
-                case '?':
-                        usbipd_help();
-                default:
-                        goto err_out;
-                }
-        }
-
-        if (!ipv4 && !ipv6)
-                ipv4 = ipv6 = 1;
-
-        switch (cmd) {
-        case cmd_standalone_mode:
-                rc = do_standalone_mode(daemonize, ipv4, ipv6);
-                remove_pid_file();
-                break;
-        case cmd_version:
-                printf(PROGNAME " (%s)\n", usbip_version_string);
-                rc = 0;
-                break;
-        case cmd_help:
-                usbipd_help();
-                rc = 0;
-                break;
-        default:
-                usbipd_help();
-                goto err_out;
-        }
-
-err_out:
-        return (rc > -1 ? EXIT_SUCCESS : EXIT_FAILURE);
-}
diff --git a/drivers/staging/usbip/userspace/src/utils.c b/drivers/staging/usbip/userspace/src/utils.c
deleted file mode 100644
index 2b3d6d235015..000000000000
--- a/drivers/staging/usbip/userspace/src/utils.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "usbip_common.h"
-#include "utils.h"
-#include "sysfs_utils.h"
-
-int modify_match_busid(char *busid, int add)
-{
-        char attr_name[] = "match_busid";
-        char command[SYSFS_BUS_ID_SIZE + 4];
-        char match_busid_attr_path[SYSFS_PATH_MAX];
-        int rc;
-
-        snprintf(match_busid_attr_path, sizeof(match_busid_attr_path),
-                 "%s/%s/%s/%s/%s/%s", SYSFS_MNT_PATH, SYSFS_BUS_NAME,
-                 SYSFS_BUS_TYPE, SYSFS_DRIVERS_NAME, USBIP_HOST_DRV_NAME,
-                 attr_name);
-
-        if (add)
-                snprintf(command, SYSFS_BUS_ID_SIZE + 4, "add %s", busid);
-        else
-                snprintf(command, SYSFS_BUS_ID_SIZE + 4, "del %s", busid);
-
-        rc = write_sysfs_attribute(match_busid_attr_path, command,
-                                   sizeof(command));
-        if (rc < 0) {
-                dbg("failed to write match_busid: %s", strerror(errno));
-                return -1;
-        }
-
-        return 0;
-}
diff --git a/drivers/staging/usbip/userspace/src/utils.h b/drivers/staging/usbip/userspace/src/utils.h
deleted file mode 100644
index 5916fd3e02a6..000000000000
--- a/drivers/staging/usbip/userspace/src/utils.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2011 matt mooney <mfm@muteddisk.com>
- *               2005-2007 Takahiro Hirofuchi
- *
- * 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.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __UTILS_H
-#define __UTILS_H
-
-int modify_match_busid(char *busid, int add);
-
-#endif /* __UTILS_H */
-
diff --git a/drivers/thunderbolt/path.c b/drivers/thunderbolt/path.c
index 8fcf8a7b6c22..9562cd026dc0 100644
--- a/drivers/thunderbolt/path.c
+++ b/drivers/thunderbolt/path.c
@@ -150,7 +150,26 @@ int tb_path_activate(struct tb_path *path)
 
         /* Activate hops. */
         for (i = path->path_length - 1; i >= 0; i--) {
-                struct tb_regs_hop hop;
+                struct tb_regs_hop hop = { 0 };
+
+                /*
+                 * We do (currently) not tear down paths setup by the firmeware.
+                 * If a firmware device is unplugged and plugged in again then
+                 * it can happen that we reuse some of the hops from the (now
+                 * defunct) firmeware path. This causes the hotplug operation to
+                 * fail (the pci device does not show up). Clearing the hop
+                 * before overwriting it fixes the problem.
+                 *
+                 * Should be removed once we discover and tear down firmeware
+                 * paths.
+                 */
+                res = tb_port_write(path->hops[i].in_port, &hop, TB_CFG_HOPS,
+                                    2 * path->hops[i].in_hop_index, 2);
+                if (res) {
+                        __tb_path_deactivate_hops(path, i);
+                        __tb_path_deallocate_nfc(path, 0);
+                        goto err;
+                }
 
                 /* dword 0 */
                 hop.next_hop = path->hops[i].next_hop_index;
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index e0cad4418085..cf1b19bca306 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -92,6 +92,8 @@ source "drivers/usb/storage/Kconfig"
 
 source "drivers/usb/image/Kconfig"
 
+source "drivers/usb/usbip/Kconfig"
+
 endif
 
 source "drivers/usb/musb/Kconfig"
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 3cba892b83a2..d7be71778059 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -60,3 +60,5 @@ obj-$(CONFIG_USB_RENESAS_USBHS)	+= renesas_usbhs/
 obj-$(CONFIG_USB_GADGET)        += gadget/
 
 obj-$(CONFIG_USB_COMMON)        += common/
+
+obj-$(CONFIG_USBIP_CORE)        += usbip/
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 8a4dcbc7a75f..46f5161c7891 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1728,8 +1728,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
          * - Change autosuspend delay of hub can avoid unnecessary auto
          *   suspend timer for hub, also may decrease power consumption
          *   of USB bus.
+         *
+         * - If user has indicated to prevent autosuspend by passing
+         *   usbcore.autosuspend = -1 then keep autosuspend disabled.
          */
-        pm_runtime_set_autosuspend_delay(&hdev->dev, 0);
+#ifdef CONFIG_PM_RUNTIME
+        if (hdev->dev.power.autosuspend_delay >= 0)
+                pm_runtime_set_autosuspend_delay(&hdev->dev, 0);
+#endif
 
         /*
          * Hubs have proper suspend/resume support, except for root hubs
@@ -2107,8 +2113,8 @@ void usb_disconnect(struct usb_device **pdev)
 {
         struct usb_port *port_dev = NULL;
         struct usb_device *udev = *pdev;
-        struct usb_hub *hub;
-        int port1;
+        struct usb_hub *hub = NULL;
+        int port1 = 1;
 
         /* mark the device as inactive, so any further urb submissions for
          * this device (and any of its children) will fail immediately.
@@ -4631,9 +4637,7 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
                         if (status != -ENODEV &&
                                 port1 != unreliable_port &&
                                 printk_ratelimit())
-                                dev_err(&udev->dev, "connect-debounce failed, port %d disabled\n",
-                                        port1);
-
+                                dev_err(&port_dev->dev, "connect-debounce failed\n");
                         portstatus &= ~USB_PORT_STAT_CONNECTION;
                         unreliable_port = port1;
                 } else {
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 0ba9c335b584..7c9618e916e2 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -1901,7 +1901,7 @@ static void s3c_hsotg_epint(struct s3c_hsotg *hsotg, unsigned int idx,
 static void s3c_hsotg_irq_enumdone(struct s3c_hsotg *hsotg)
 {
         u32 dsts = readl(hsotg->regs + DSTS);
-        int ep0_mps = 0, ep_mps;
+        int ep0_mps = 0, ep_mps = 8;
 
         /*
          * This should signal the finish of the enumeration phase
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index ef4936ff626c..9dcfbe7cd5f5 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -425,7 +425,7 @@ static void dwc3_omap_set_utmi_mode(struct dwc3_omap *omap)
 
 static int dwc3_omap_extcon_register(struct dwc3_omap *omap)
 {
-        u32                     ret;
+        int                     ret;
         struct device_node      *node = omap->dev->of_node;
         struct extcon_dev       *edev;
 
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index a186afeaa700..9add915d41f7 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -3,7 +3,7 @@
 #
 subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG)       := -DDEBUG
 subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE)     += -DVERBOSE_DEBUG
-ccflags-y                               += -I$(PWD)/drivers/usb/gadget/udc
+ccflags-y                               += -Idrivers/usb/gadget/udc
 
 obj-$(CONFIG_USB_LIBCOMPOSITE)  += libcomposite.o
 libcomposite-y                  := usbstring.o config.o epautoconf.o
diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
index 6d91f21b52a6..83ae1065149d 100644
--- a/drivers/usb/gadget/function/Makefile
+++ b/drivers/usb/gadget/function/Makefile
@@ -2,8 +2,8 @@
 # USB peripheral controller drivers
 #
 
-ccflags-y                       := -I$(PWD)/drivers/usb/gadget/
-ccflags-y                       += -I$(PWD)/drivers/usb/gadget/udc/
+ccflags-y                       := -Idrivers/usb/gadget/
+ccflags-y                       += -Idrivers/usb/gadget/udc/
 
 # USB Functions
 usb_f_acm-y                     := f_acm.o
diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
index d50adda913cf..6e6f87656e7b 100644
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -1127,10 +1127,7 @@ void gether_disconnect(struct gether *link)
 
         DBG(dev, "%s\n", __func__);
 
-        netif_tx_lock(dev->net);
         netif_stop_queue(dev->net);
-        netif_tx_unlock(dev->net);
-
         netif_carrier_off(dev->net);
 
         /* disable endpoints, forcing (synchronous) completion
diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c
index 71e896d4c5ae..a5eb9a3fbb7a 100644
--- a/drivers/usb/gadget/function/uvc_video.c
+++ b/drivers/usb/gadget/function/uvc_video.c
@@ -195,6 +195,7 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req)
                 printk(KERN_INFO "Failed to queue request (%d).\n", ret);
                 usb_ep_set_halt(ep);
                 spin_unlock_irqrestore(&video->queue.irqlock, flags);
+                uvc_queue_cancel(queue, 0);
                 goto requeue;
         }
         spin_unlock_irqrestore(&video->queue.irqlock, flags);
@@ -281,6 +282,7 @@ error:
 static int
 uvc_video_pump(struct uvc_video *video)
 {
+        struct uvc_video_queue *queue = &video->queue;
         struct usb_request *req;
         struct uvc_buffer *buf;
         unsigned long flags;
@@ -322,6 +324,7 @@ uvc_video_pump(struct uvc_video *video)
                         printk(KERN_INFO "Failed to queue request (%d)\n", ret);
                         usb_ep_set_halt(video->ep);
                         spin_unlock_irqrestore(&video->queue.irqlock, flags);
+                        uvc_queue_cancel(queue, 0);
                         break;
                 }
                 spin_unlock_irqrestore(&video->queue.irqlock, flags);
diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile
index a11aad5635df..edba2d1ee0f3 100644
--- a/drivers/usb/gadget/legacy/Makefile
+++ b/drivers/usb/gadget/legacy/Makefile
@@ -2,9 +2,9 @@
 # USB gadget drivers
 #
 
-ccflags-y                       := -I$(PWD)/drivers/usb/gadget/
-ccflags-y                       += -I$(PWD)/drivers/usb/gadget/udc/
-ccflags-y                       += -I$(PWD)/drivers/usb/gadget/function/
+ccflags-y                       := -Idrivers/usb/gadget/
+ccflags-y                       += -Idrivers/usb/gadget/udc/
+ccflags-y                       += -Idrivers/usb/gadget/function/
 
 g_zero-y                        := zero.o
 g_audio-y                       := audio.o
diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c
index 986fc511a2ed..225e385a6160 100644
--- a/drivers/usb/gadget/legacy/dbgp.c
+++ b/drivers/usb/gadget/legacy/dbgp.c
@@ -222,10 +222,12 @@ static void dbgp_unbind(struct usb_gadget *gadget)
 {
 #ifdef CONFIG_USB_G_DBGP_SERIAL
         kfree(dbgp.serial);
+        dbgp.serial = NULL;
 #endif
         if (dbgp.req) {
                 kfree(dbgp.req->buf);
                 usb_ep_free_request(gadget->ep0, dbgp.req);
+                dbgp.req = NULL;
         }
 
         gadget->ep0->driver_data = NULL;
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index 2e4ce7704908..e96077b8bf79 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -440,7 +440,7 @@ ep_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
 
         value = -ENOMEM;
         kbuf = memdup_user(buf, len);
-        if (!kbuf) {
+        if (IS_ERR(kbuf)) {
                 value = PTR_ERR(kbuf);
                 goto free1;
         }
diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig
index 5151f947a4f5..34ebaa68504c 100644
--- a/drivers/usb/gadget/udc/Kconfig
+++ b/drivers/usb/gadget/udc/Kconfig
@@ -332,7 +332,7 @@ config USB_GOKU
            gadget drivers to also be dynamically linked.
 
 config USB_EG20T
-        tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
+        tristate "Intel QUARK X1000/EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
         depends on PCI
         help
           This is a USB device driver for EG20T PCH.
@@ -353,6 +353,7 @@ config USB_EG20T
           ML7213/ML7831 is companion chip for Intel Atom E6xx series.
           ML7213/ML7831 is completely compatible for Intel EG20T PCH.
 
+          This driver can be used with Intel's Quark X1000 SOC platform
 #
 # LAST -- dummy/emulated controller
 #
diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 906e65f0e4fa..c9fe67e29d35 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -1661,7 +1661,7 @@ static irqreturn_t usba_udc_irq(int irq, void *devid)
         if (dma_status) {
                 int i;
 
-                for (i = 1; i < USBA_NR_DMAS; i++)
+                for (i = 1; i <= USBA_NR_DMAS; i++)
                         if (dma_status & (1 << i))
                                 usba_dma_irq(udc, &udc->usba_ep[i]);
         }
diff --git a/drivers/usb/gadget/udc/fusb300_udc.c b/drivers/usb/gadget/udc/fusb300_udc.c
index d40255f784df..5c5d1adda7eb 100644
--- a/drivers/usb/gadget/udc/fusb300_udc.c
+++ b/drivers/usb/gadget/udc/fusb300_udc.c
@@ -1398,13 +1398,17 @@ static int fusb300_probe(struct platform_device *pdev)
 
         /* initialize udc */
         fusb300 = kzalloc(sizeof(struct fusb300), GFP_KERNEL);
-        if (fusb300 == NULL)
+        if (fusb300 == NULL) {
+                ret = -ENOMEM;
                 goto clean_up;
+        }
 
         for (i = 0; i < FUSB300_MAX_NUM_EP; i++) {
                 _ep[i] = kzalloc(sizeof(struct fusb300_ep), GFP_KERNEL);
-                if (_ep[i] == NULL)
+                if (_ep[i] == NULL) {
+                        ret = -ENOMEM;
                         goto clean_up;
+                }
                 fusb300->ep[i] = _ep[i];
         }
 
diff --git a/drivers/usb/gadget/udc/pch_udc.c b/drivers/usb/gadget/udc/pch_udc.c
index eb8c3bedb57a..460d953c91b6 100644
--- a/drivers/usb/gadget/udc/pch_udc.c
+++ b/drivers/usb/gadget/udc/pch_udc.c
@@ -343,6 +343,7 @@ struct pch_vbus_gpio_data {
  * @setup_data:         Received setup data
  * @phys_addr:          of device memory
  * @base_addr:          for mapped device memory
+ * @bar:                Indicates which PCI BAR for USB regs
  * @irq:                IRQ line for the device
  * @cfg_data:           current cfg, intf, and alt in use
  * @vbus_gpio:          GPIO informaton for detecting VBUS
@@ -370,14 +371,17 @@ struct pch_udc_dev {
         struct usb_ctrlrequest          setup_data;
         unsigned long                   phys_addr;
         void __iomem                    *base_addr;
+        unsigned                        bar;
         unsigned                        irq;
         struct pch_udc_cfg_data         cfg_data;
         struct pch_vbus_gpio_data       vbus_gpio;
 };
 #define to_pch_udc(g)   (container_of((g), struct pch_udc_dev, gadget))
 
+#define PCH_UDC_PCI_BAR_QUARK_X1000     0
 #define PCH_UDC_PCI_BAR                 1
 #define PCI_DEVICE_ID_INTEL_EG20T_UDC   0x8808
+#define PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC     0x0939
 #define PCI_VENDOR_ID_ROHM              0x10DB
 #define PCI_DEVICE_ID_ML7213_IOH_UDC    0x801D
 #define PCI_DEVICE_ID_ML7831_IOH_UDC    0x8808
@@ -3076,7 +3080,7 @@ static void pch_udc_remove(struct pci_dev *pdev)
                 iounmap(dev->base_addr);
         if (dev->mem_region)
                 release_mem_region(dev->phys_addr,
-                                   pci_resource_len(pdev, PCH_UDC_PCI_BAR));
+                                   pci_resource_len(pdev, dev->bar));
         if (dev->active)
                 pci_disable_device(pdev);
         kfree(dev);
@@ -3144,9 +3148,15 @@ static int pch_udc_probe(struct pci_dev *pdev,
         dev->active = 1;
         pci_set_drvdata(pdev, dev);
 
+        /* Determine BAR based on PCI ID */
+        if (id->device == PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC)
+                dev->bar = PCH_UDC_PCI_BAR_QUARK_X1000;
+        else
+                dev->bar = PCH_UDC_PCI_BAR;
+
         /* PCI resource allocation */
-        resource = pci_resource_start(pdev, 1);
-        len = pci_resource_len(pdev, 1);
+        resource = pci_resource_start(pdev, dev->bar);
+        len = pci_resource_len(pdev, dev->bar);
 
         if (!request_mem_region(resource, len, KBUILD_MODNAME)) {
                 dev_err(&pdev->dev, "%s: pci device used already\n", __func__);
@@ -3212,6 +3222,12 @@ finished:
 
 static const struct pci_device_id pch_udc_pcidev_id[] = {
         {
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL,
+                           PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC),
+                .class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
+                .class_mask = 0xffffffff,
+        },
+        {
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EG20T_UDC),
                 .class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
                 .class_mask = 0xffffffff,
diff --git a/drivers/usb/gadget/udc/r8a66597-udc.c b/drivers/usb/gadget/udc/r8a66597-udc.c
index 46008421c1ec..de2a8713b428 100644
--- a/drivers/usb/gadget/udc/r8a66597-udc.c
+++ b/drivers/usb/gadget/udc/r8a66597-udc.c
@@ -1868,8 +1868,8 @@ static int r8a66597_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         reg = devm_ioremap_resource(&pdev->dev, res);
-        if (!reg)
-                return -ENODEV;
+        if (IS_ERR(reg))
+                return PTR_ERR(reg);
 
         ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         irq = ires->start;
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index cc305c71ac3d..6130b7574908 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -1230,7 +1230,7 @@ int ehci_hub_control(
                         if (selector == EHSET_TEST_SINGLE_STEP_SET_FEATURE) {
                                 spin_unlock_irqrestore(&ehci->lock, flags);
                                 retval = ehset_single_step_set_feature(hcd,
-                                                                        wIndex);
+                                                                wIndex + 1);
                                 spin_lock_irqsave(&ehci->lock, flags);
                                 break;
                         }
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 687d36608155..c22a3e15a16e 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -101,6 +101,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
         /* AMD PLL quirk */
         if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_find_chipset_info())
                 xhci->quirks |= XHCI_AMD_PLL_FIX;
+
+        if (pdev->vendor == PCI_VENDOR_ID_AMD)
+                xhci->quirks |= XHCI_TRUST_TX_LENGTH;
+
         if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
                 xhci->quirks |= XHCI_LPM_SUPPORT;
                 xhci->quirks |= XHCI_INTEL_HOST;
@@ -151,6 +155,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
         if (pdev->vendor == PCI_VENDOR_ID_VIA)
                 xhci->quirks |= XHCI_RESET_ON_RESUME;
 
+        /* See https://bugzilla.kernel.org/show_bug.cgi?id=79511 */
+        if (pdev->vendor == PCI_VENDOR_ID_VIA &&
+                        pdev->device == 0x3432)
+                xhci->quirks |= XHCI_BROKEN_STREAMS;
+
         if (xhci->quirks & XHCI_RESET_ON_RESUME)
                 xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
                                 "QUIRK: Resetting on resume");
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 60fb52ae864b..abed30b82905 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -364,32 +364,6 @@ static void ring_doorbell_for_active_rings(struct xhci_hcd *xhci,
         }
 }
 
-/*
- * Find the segment that trb is in.  Start searching in start_seg.
- * If we must move past a segment that has a link TRB with a toggle cycle state
- * bit set, then we will toggle the value pointed at by cycle_state.
- */
-static struct xhci_segment *find_trb_seg(
-                struct xhci_segment *start_seg,
-                union xhci_trb  *trb, int *cycle_state)
-{
-        struct xhci_segment *cur_seg = start_seg;
-        struct xhci_generic_trb *generic_trb;
-
-        while (cur_seg->trbs > trb ||
-                        &cur_seg->trbs[TRBS_PER_SEGMENT - 1] < trb) {
-                generic_trb = &cur_seg->trbs[TRBS_PER_SEGMENT - 1].generic;
-                if (generic_trb->field[3] & cpu_to_le32(LINK_TOGGLE))
-                        *cycle_state ^= 0x1;
-                cur_seg = cur_seg->next;
-                if (cur_seg == start_seg)
-                        /* Looped over the entire list.  Oops! */
-                        return NULL;
-        }
-        return cur_seg;
-}
-
-
 static struct xhci_ring *xhci_triad_to_transfer_ring(struct xhci_hcd *xhci,
                 unsigned int slot_id, unsigned int ep_index,
                 unsigned int stream_id)
@@ -459,9 +433,12 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
         struct xhci_virt_device *dev = xhci->devs[slot_id];
         struct xhci_virt_ep *ep = &dev->eps[ep_index];
         struct xhci_ring *ep_ring;
-        struct xhci_generic_trb *trb;
+        struct xhci_segment *new_seg;
+        union xhci_trb *new_deq;
         dma_addr_t addr;
         u64 hw_dequeue;
+        bool cycle_found = false;
+        bool td_last_trb_found = false;
 
         ep_ring = xhci_triad_to_transfer_ring(xhci, slot_id,
                         ep_index, stream_id);
@@ -486,45 +463,45 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
                 hw_dequeue = le64_to_cpu(ep_ctx->deq);
         }
 
-        /* Find virtual address and segment of hardware dequeue pointer */
-        state->new_deq_seg = ep_ring->deq_seg;
-        state->new_deq_ptr = ep_ring->dequeue;
-        while (xhci_trb_virt_to_dma(state->new_deq_seg, state->new_deq_ptr)
-                        != (dma_addr_t)(hw_dequeue & ~0xf)) {
-                next_trb(xhci, ep_ring, &state->new_deq_seg,
-                                        &state->new_deq_ptr);
-                if (state->new_deq_ptr == ep_ring->dequeue) {
-                        WARN_ON(1);
-                        return;
-                }
-        }
+        new_seg = ep_ring->deq_seg;
+        new_deq = ep_ring->dequeue;
+        state->new_cycle_state = hw_dequeue & 0x1;
+
         /*
-         * Find cycle state for last_trb, starting at old cycle state of
-         * hw_dequeue. If there is only one segment ring, find_trb_seg() will
-         * return immediately and cannot toggle the cycle state if this search
-         * wraps around, so add one more toggle manually in that case.
+         * We want to find the pointer, segment and cycle state of the new trb
+         * (the one after current TD's last_trb). We know the cycle state at
+         * hw_dequeue, so walk the ring until both hw_dequeue and last_trb are
+         * found.
          */
-        state->new_cycle_state = hw_dequeue & 0x1;
-        if (ep_ring->first_seg == ep_ring->first_seg->next &&
-                        cur_td->last_trb < state->new_deq_ptr)
-                state->new_cycle_state ^= 0x1;
+        do {
+                if (!cycle_found && xhci_trb_virt_to_dma(new_seg, new_deq)
+                    == (dma_addr_t)(hw_dequeue & ~0xf)) {
+                        cycle_found = true;
+                        if (td_last_trb_found)
+                                break;
+                }
+                if (new_deq == cur_td->last_trb)
+                        td_last_trb_found = true;
 
-        state->new_deq_ptr = cur_td->last_trb;
-        xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
-                        "Finding segment containing last TRB in TD.");
-        state->new_deq_seg = find_trb_seg(state->new_deq_seg,
-                        state->new_deq_ptr, &state->new_cycle_state);
-        if (!state->new_deq_seg) {
-                WARN_ON(1);
-                return;
-        }
+                if (cycle_found &&
+                    TRB_TYPE_LINK_LE32(new_deq->generic.field[3]) &&
+                    new_deq->generic.field[3] & cpu_to_le32(LINK_TOGGLE))
+                        state->new_cycle_state ^= 0x1;
+
+                next_trb(xhci, ep_ring, &new_seg, &new_deq);
+
+                /* Search wrapped around, bail out */
+                if (new_deq == ep->ring->dequeue) {
+                        xhci_err(xhci, "Error: Failed finding new dequeue state\n");
+                        state->new_deq_seg = NULL;
+                        state->new_deq_ptr = NULL;
+                        return;
+                }
+
+        } while (!cycle_found || !td_last_trb_found);
 
-        /* Increment to find next TRB after last_trb. Cycle if appropriate. */
-        trb = &state->new_deq_ptr->generic;
-        if (TRB_TYPE_LINK_LE32(trb->field[3]) &&
-            (trb->field[3] & cpu_to_le32(LINK_TOGGLE)))
-                state->new_cycle_state ^= 0x1;
-        next_trb(xhci, ep_ring, &state->new_deq_seg, &state->new_deq_ptr);
+        state->new_deq_seg = new_seg;
+        state->new_deq_ptr = new_deq;
 
         /* Don't update the ring cycle state for the producer (us). */
         xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
@@ -2487,7 +2464,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                  * last TRB of the previous TD. The command completion handle
                  * will take care the rest.
                  */
-                if (!event_seg && trb_comp_code == COMP_STOP_INVAL) {
+                if (!event_seg && (trb_comp_code == COMP_STOP ||
+                                   trb_comp_code == COMP_STOP_INVAL)) {
                         ret = 0;
                         goto cleanup;
                 }
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index b6f21175b872..c020b094fe7d 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -2880,6 +2880,9 @@ void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci,
                         ep_index, ep->stopped_stream, ep->stopped_td,
                         &deq_state);
 
+        if (!deq_state.new_deq_ptr || !deq_state.new_deq_seg)
+                return;
+
         /* HW with the reset endpoint quirk will use the saved dequeue state to
          * issue a configure endpoint command later.
          */
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 06b5d77cd9ad..633caf643122 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3250,6 +3250,7 @@ static const struct usb_device_id sisusb_table[] = {
         { USB_DEVICE(0x0711, 0x0918) },
         { USB_DEVICE(0x0711, 0x0920) },
         { USB_DEVICE(0x0711, 0x0950) },
+        { USB_DEVICE(0x0711, 0x5200) },
         { USB_DEVICE(0x182d, 0x021c) },
         { USB_DEVICE(0x182d, 0x0269) },
         { }
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index 9aad00f11bd5..221faed9f074 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -96,7 +96,7 @@ static bool ux500_configure_channel(struct dma_channel *channel,
         struct musb *musb = ux500_channel->controller->private_data;
 
         dev_dbg(musb->controller,
-                "packet_sz=%d, mode=%d, dma_addr=0x%llu, len=%d is_tx=%d\n",
+                "packet_sz=%d, mode=%d, dma_addr=0x%llx, len=%d is_tx=%d\n",
                 packet_sz, mode, (unsigned long long) dma_addr,
                 len, ux500_channel->is_tx);
 
diff --git a/drivers/usb/phy/phy-gpio-vbus-usb.c b/drivers/usb/phy/phy-gpio-vbus-usb.c
index ea9e705555df..f4b14bd97e14 100644
--- a/drivers/usb/phy/phy-gpio-vbus-usb.c
+++ b/drivers/usb/phy/phy-gpio-vbus-usb.c
@@ -260,10 +260,8 @@ static int gpio_vbus_probe(struct platform_device *pdev)
 
         gpio_vbus->phy.otg = devm_kzalloc(&pdev->dev, sizeof(struct usb_otg),
                                           GFP_KERNEL);
-        if (!gpio_vbus->phy.otg) {
-                kfree(gpio_vbus);
+        if (!gpio_vbus->phy.otg)
                 return -ENOMEM;
-        }
 
         platform_set_drvdata(pdev, gpio_vbus);
         gpio_vbus->dev = &pdev->dev;
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index e4108eec5ef4..afc09087ec36 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -1601,8 +1601,8 @@ static int msm_otg_probe(struct platform_device *pdev)
          */
         if (motg->phy_number) {
                 phy_select = devm_ioremap_nocache(&pdev->dev, USB2_PHY_SEL, 4);
-                if (IS_ERR(phy_select))
-                        return PTR_ERR(phy_select);
+                if (!phy_select)
+                        return -ENOMEM;
                 /* Enable second PHY with the OTG port */
                 writel(0x1, phy_select);
         }
diff --git a/drivers/usb/phy/phy-samsung-usb.h b/drivers/usb/phy/phy-samsung-usb.h
index 68771bfd1825..80eedd45a20a 100644
--- a/drivers/usb/phy/phy-samsung-usb.h
+++ b/drivers/usb/phy/phy-samsung-usb.h
@@ -216,7 +216,7 @@
 
 #define EXYNOS5_DRD_PHYPARAM1                   (0x20)
 
-#define PHYPARAM1_PCS_TXDEEMPH_MASK             (0x1f << 0)
+#define PHYPARAM1_PCS_TXDEEMPH_MASK             (0x3f << 0)
 #define PHYPARAM1_PCS_TXDEEMPH                  (0x1c)
 
 #define EXYNOS5_DRD_PHYTERM                     (0x24)
diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c
index 6d0f6080eceb..045cd309367a 100644
--- a/drivers/usb/phy/phy.c
+++ b/drivers/usb/phy/phy.c
@@ -232,6 +232,9 @@ struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index)
         phy = __usb_find_phy_dev(dev, &phy_bind_list, index);
         if (IS_ERR(phy) || !try_module_get(phy->dev->driver->owner)) {
                 dev_dbg(dev, "unable to find transceiver\n");
+                if (!IS_ERR(phy))
+                        phy = ERR_PTR(-ENODEV);
+
                 goto err0;
         }
 
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 216ce3078270..824ea5e7ec8b 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -146,6 +146,7 @@ static const struct usb_device_id id_table_combined[] = {
         { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_BM_ATOM_NANO_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_NXTCAM_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_EV3CON_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_0_PID) },
@@ -934,6 +935,8 @@ static const struct usb_device_id id_table_combined[] = {
         { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },
         { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },
         { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
+        /* ekey Devices */
+        { USB_DEVICE(FTDI_VID, FTDI_EKEY_CONV_USB_PID) },
         /* Infineon Devices */
         { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_PID, 1) },
         { }                                     /* Terminating entry */
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 1e58d90a0b6c..70b0b1d88ae9 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -42,6 +42,8 @@
 /* www.candapter.com Ewert Energy Systems CANdapter device */
 #define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */
 
+#define FTDI_BM_ATOM_NANO_PID   0xa559  /* Basic Micro ATOM Nano USB2Serial */
+
 /*
  * Texas Instruments XDS100v2 JTAG / BeagleBone A3
  * http://processors.wiki.ti.com/index.php/XDS100
@@ -1378,3 +1380,8 @@
 #define BRAINBOXES_US_160_6_PID         0x9006 /* US-160 16xRS232 1Mbaud Port 11 and 12 */
 #define BRAINBOXES_US_160_7_PID         0x9007 /* US-160 16xRS232 1Mbaud Port 13 and 14 */
 #define BRAINBOXES_US_160_8_PID         0x9008 /* US-160 16xRS232 1Mbaud Port 15 and 16 */
+
+/*
+ * ekey biometric systems GmbH (http://ekey.net/)
+ */
+#define FTDI_EKEY_CONV_USB_PID          0xCB08  /* Converter USB */
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index a9688940543d..54a8120897a6 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -275,8 +275,12 @@ static void option_instat_callback(struct urb *urb);
 #define ZTE_PRODUCT_MF622                       0x0001
 #define ZTE_PRODUCT_MF628                       0x0015
 #define ZTE_PRODUCT_MF626                       0x0031
-#define ZTE_PRODUCT_MC2718                      0xffe8
 #define ZTE_PRODUCT_AC2726                      0xfff1
+#define ZTE_PRODUCT_CDMA_TECH                   0xfffe
+#define ZTE_PRODUCT_AC8710T                     0xffff
+#define ZTE_PRODUCT_MC2718                      0xffe8
+#define ZTE_PRODUCT_AD3812                      0xffeb
+#define ZTE_PRODUCT_MC2716                      0xffed
 
 #define BENQ_VENDOR_ID                          0x04a5
 #define BENQ_PRODUCT_H10                        0x4068
@@ -494,6 +498,10 @@ static void option_instat_callback(struct urb *urb);
 #define INOVIA_VENDOR_ID                        0x20a6
 #define INOVIA_SEW858                           0x1105
 
+/* VIA Telecom */
+#define VIATELECOM_VENDOR_ID                    0x15eb
+#define VIATELECOM_PRODUCT_CDS7                 0x0001
+
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
                 OPTION_BLACKLIST_NONE = 0,
@@ -527,10 +535,18 @@ static const struct option_blacklist_info zte_k3765_z_blacklist = {
         .reserved = BIT(4),
 };
 
+static const struct option_blacklist_info zte_ad3812_z_blacklist = {
+        .sendsetup = BIT(0) | BIT(1) | BIT(2),
+};
+
 static const struct option_blacklist_info zte_mc2718_z_blacklist = {
         .sendsetup = BIT(1) | BIT(2) | BIT(3) | BIT(4),
 };
 
+static const struct option_blacklist_info zte_mc2716_z_blacklist = {
+        .sendsetup = BIT(1) | BIT(2) | BIT(3),
+};
+
 static const struct option_blacklist_info huawei_cdc12_blacklist = {
         .reserved = BIT(1) | BIT(2),
 };
@@ -1070,6 +1086,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_INTERFACE_CLASS(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1012, 0xff) },
         { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) },
         { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },
+        { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */
         { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
         { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
         { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */
@@ -1544,13 +1561,18 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff93, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff94, 0xff, 0xff, 0xff) },
 
-        /* NOTE: most ZTE CDMA devices should be driven by zte_ev, not option */
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2718, 0xff, 0xff, 0xff),
          .driver_info = (kernel_ulong_t)&zte_mc2718_z_blacklist },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AD3812, 0xff, 0xff, 0xff),
+         .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2716, 0xff, 0xff, 0xff),
+         .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist },
         { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x01) },
         { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x05) },
         { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x86, 0x10) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
 
         { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
         { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
@@ -1724,6 +1746,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
         { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
         { USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) },
+        { USB_DEVICE(VIATELECOM_VENDOR_ID, VIATELECOM_PRODUCT_CDS7) },
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
@@ -1916,6 +1939,8 @@ static void option_instat_callback(struct urb *urb)
                         dev_dbg(dev, "%s: type %x req %x\n", __func__,
                                 req_pkt->bRequestType, req_pkt->bRequest);
                 }
+        } else if (status == -ENOENT || status == -ESHUTDOWN) {
+                dev_dbg(dev, "%s: urb stopped: %d\n", __func__, status);
         } else
                 dev_err(dev, "%s: error %d\n", __func__, status);
 
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index b3d5a35c0d4b..e9bad928039f 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -45,6 +45,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GPRS) },
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_HCR331) },
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MOTOROLA) },
+        { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ZTEK) },
         { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
         { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) },
         { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 42bc082896ac..71fd9da1d6e7 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -22,6 +22,7 @@
 #define PL2303_PRODUCT_ID_GPRS          0x0609
 #define PL2303_PRODUCT_ID_HCR331        0x331a
 #define PL2303_PRODUCT_ID_MOTOROLA      0x0307
+#define PL2303_PRODUCT_ID_ZTEK          0xe1f1
 
 #define ATEN_VENDOR_ID          0x0557
 #define ATEN_VENDOR_ID2         0x0547
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 02de3110fe94..475723c006f9 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -764,29 +764,39 @@ static int usb_serial_probe(struct usb_interface *interface,
                 if (usb_endpoint_is_bulk_in(endpoint)) {
                         /* we found a bulk in endpoint */
                         dev_dbg(ddev, "found bulk in on endpoint %d\n", i);
-                        bulk_in_endpoint[num_bulk_in] = endpoint;
-                        ++num_bulk_in;
+                        if (num_bulk_in < MAX_NUM_PORTS) {
+                                bulk_in_endpoint[num_bulk_in] = endpoint;
+                                ++num_bulk_in;
+                        }
                 }
 
                 if (usb_endpoint_is_bulk_out(endpoint)) {
                         /* we found a bulk out endpoint */
                         dev_dbg(ddev, "found bulk out on endpoint %d\n", i);
-                        bulk_out_endpoint[num_bulk_out] = endpoint;
-                        ++num_bulk_out;
+                        if (num_bulk_out < MAX_NUM_PORTS) {
+                                bulk_out_endpoint[num_bulk_out] = endpoint;
+                                ++num_bulk_out;
+                        }
                 }
 
                 if (usb_endpoint_is_int_in(endpoint)) {
                         /* we found a interrupt in endpoint */
                         dev_dbg(ddev, "found interrupt in on endpoint %d\n", i);
-                        interrupt_in_endpoint[num_interrupt_in] = endpoint;
-                        ++num_interrupt_in;
+                        if (num_interrupt_in < MAX_NUM_PORTS) {
+                                interrupt_in_endpoint[num_interrupt_in] =
+                                                endpoint;
+                                ++num_interrupt_in;
+                        }
                 }
 
                 if (usb_endpoint_is_int_out(endpoint)) {
                         /* we found an interrupt out endpoint */
                         dev_dbg(ddev, "found interrupt out on endpoint %d\n", i);
-                        interrupt_out_endpoint[num_interrupt_out] = endpoint;
-                        ++num_interrupt_out;
+                        if (num_interrupt_out < MAX_NUM_PORTS) {
+                                interrupt_out_endpoint[num_interrupt_out] =
+                                                endpoint;
+                                ++num_interrupt_out;
+                        }
                 }
         }
 
@@ -809,8 +819,10 @@ static int usb_serial_probe(struct usb_interface *interface,
                                 if (usb_endpoint_is_int_in(endpoint)) {
                                         /* we found a interrupt in endpoint */
                                         dev_dbg(ddev, "found interrupt in for Prolific device on separate interface\n");
-                                        interrupt_in_endpoint[num_interrupt_in] = endpoint;
-                                        ++num_interrupt_in;
+                                        if (num_interrupt_in < MAX_NUM_PORTS) {
+                                                interrupt_in_endpoint[num_interrupt_in] = endpoint;
+                                                ++num_interrupt_in;
+                                        }
                                 }
                         }
                 }
@@ -850,6 +862,11 @@ static int usb_serial_probe(struct usb_interface *interface,
                         num_ports = type->num_ports;
         }
 
+        if (num_ports > MAX_NUM_PORTS) {
+                dev_warn(ddev, "too many ports requested: %d\n", num_ports);
+                num_ports = MAX_NUM_PORTS;
+        }
+
         serial->num_ports = num_ports;
         serial->num_bulk_in = num_bulk_in;
         serial->num_bulk_out = num_bulk_out;
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index e62f2dff8b7d..6c3734d2b45a 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -514,6 +514,10 @@ static void command_port_read_callback(struct urb *urb)
                 dev_dbg(&urb->dev->dev, "%s - command_info is NULL, exiting.\n", __func__);
                 return;
         }
+        if (!urb->actual_length) {
+                dev_dbg(&urb->dev->dev, "%s - empty response, exiting.\n", __func__);
+                return;
+        }
         if (status) {
                 dev_dbg(&urb->dev->dev, "%s - nonzero urb status: %d\n", __func__, status);
                 if (status != -ENOENT)
@@ -534,7 +538,8 @@ static void command_port_read_callback(struct urb *urb)
                 /* These are unsolicited reports from the firmware, hence no
                    waiting command to wakeup */
                 dev_dbg(&urb->dev->dev, "%s - event received\n", __func__);
-        } else if (data[0] == WHITEHEAT_GET_DTR_RTS) {
+        } else if ((data[0] == WHITEHEAT_GET_DTR_RTS) &&
+                (urb->actual_length - 1 <= sizeof(command_info->result_buffer))) {
                 memcpy(command_info->result_buffer, &data[1],
                                                 urb->actual_length - 1);
                 command_info->command_finished = WHITEHEAT_CMD_COMPLETE;
diff --git a/drivers/usb/serial/zte_ev.c b/drivers/usb/serial/zte_ev.c
index e40ab739c4a6..1a132e9e947a 100644
--- a/drivers/usb/serial/zte_ev.c
+++ b/drivers/usb/serial/zte_ev.c
@@ -272,28 +272,8 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port)
 }
 
 static const struct usb_device_id id_table[] = {
-        /* AC8710, AC8710T */
-        { USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xffff, 0xff, 0xff, 0xff) },
-         /* AC8700 */
-        { USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xfffe, 0xff, 0xff, 0xff) },
         /* MG880 */
         { USB_DEVICE(0x19d2, 0xfffd) },
-        { USB_DEVICE(0x19d2, 0xfffc) },
-        { USB_DEVICE(0x19d2, 0xfffb) },
-        /* AC8710_V3 */
-        { USB_DEVICE(0x19d2, 0xfff6) },
-        { USB_DEVICE(0x19d2, 0xfff7) },
-        { USB_DEVICE(0x19d2, 0xfff8) },
-        { USB_DEVICE(0x19d2, 0xfff9) },
-        { USB_DEVICE(0x19d2, 0xffee) },
-        /* AC2716, MC2716 */
-        { USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xffed, 0xff, 0xff, 0xff) },
-        /* AD3812 */
-        { USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xffeb, 0xff, 0xff, 0xff) },
-        { USB_DEVICE(0x19d2, 0xffec) },
-        { USB_DEVICE(0x05C6, 0x3197) },
-        { USB_DEVICE(0x05C6, 0x6000) },
-        { USB_DEVICE(0x05C6, 0x9008) },
         { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 80a5b366255f..7ef99b2f3aaf 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -922,6 +922,12 @@ UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x0001,
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY ),
 
+UNUSUAL_DEV(  0x06ca, 0x2003, 0x0100, 0x0100,
+                "Newer Technology",
+                "uSCSI",
+                USB_SC_DEVICE, USB_PR_DEVICE, usb_stor_euscsi_init,
+                US_FL_SCM_MULT_TARG ),
+
 /* Reported by Adrian Pilchowiec <adi1981@epf.pl> */
 UNUSUAL_DEV(  0x071b, 0x3203, 0x0000, 0x0000,
                 "RockChip",
diff --git a/drivers/staging/usbip/Kconfig b/drivers/usb/usbip/Kconfig
index bd99e9e47e50..bd99e9e47e50 100644
--- a/drivers/staging/usbip/Kconfig
+++ b/drivers/usb/usbip/Kconfig
diff --git a/drivers/staging/usbip/Makefile b/drivers/usb/usbip/Makefile
index 9ecd61545be1..9ecd61545be1 100644
--- a/drivers/staging/usbip/Makefile
+++ b/drivers/usb/usbip/Makefile
diff --git a/drivers/staging/usbip/README b/drivers/usb/usbip/README
index 41a2cf2e77a6..41a2cf2e77a6 100644
--- a/drivers/staging/usbip/README
+++ b/drivers/usb/usbip/README
diff --git a/drivers/staging/usbip/stub.h b/drivers/usb/usbip/stub.h
index 266e2b0ce9a8..266e2b0ce9a8 100644
--- a/drivers/staging/usbip/stub.h
+++ b/drivers/usb/usbip/stub.h
diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/usb/usbip/stub_dev.c
index 51d0c7188738..fac20e0434c0 100644
--- a/drivers/staging/usbip/stub_dev.c
+++ b/drivers/usb/usbip/stub_dev.c
@@ -26,33 +26,6 @@
 #include "stub.h"
 
 /*
- * Define device IDs here if you want to explicitly limit exportable devices.
- * In most cases, wildcard matching will be okay because driver binding can be
- * changed dynamically by a userland program.
- */
-static struct usb_device_id stub_table[] = {
-#if 0
-        /* just an example */
-        { USB_DEVICE(0x05ac, 0x0301) },   /* Mac 1 button mouse */
-        { USB_DEVICE(0x0430, 0x0009) },   /* Plat Home Keyboard */
-        { USB_DEVICE(0x059b, 0x0001) },   /* Iomega USB Zip 100 */
-        { USB_DEVICE(0x04b3, 0x4427) },   /* IBM USB CD-ROM */
-        { USB_DEVICE(0x05a9, 0xa511) },   /* LifeView USB cam */
-        { USB_DEVICE(0x55aa, 0x0201) },   /* Imation card reader */
-        { USB_DEVICE(0x046d, 0x0870) },   /* Qcam Express(QV-30) */
-        { USB_DEVICE(0x04bb, 0x0101) },   /* IO-DATA HD 120GB */
-        { USB_DEVICE(0x04bb, 0x0904) },   /* IO-DATA USB-ET/TX */
-        { USB_DEVICE(0x04bb, 0x0201) },   /* IO-DATA USB-ET/TX */
-        { USB_DEVICE(0x08bb, 0x2702) },   /* ONKYO USB Speaker */
-        { USB_DEVICE(0x046d, 0x08b2) },   /* Logicool Qcam 4000 Pro */
-#endif
-        /* magic for wild card */
-        { .driver_info = 1 },
-        { 0, }                                     /* Terminating entry */
-};
-MODULE_DEVICE_TABLE(usb, stub_table);
-
-/*
  * usbip_status shows the status of usbip-host as long as this driver is bound
  * to the target device.
  */
diff --git a/drivers/staging/usbip/stub_main.c b/drivers/usb/usbip/stub_main.c
index 44ab43fc4fcc..44ab43fc4fcc 100644
--- a/drivers/staging/usbip/stub_main.c
+++ b/drivers/usb/usbip/stub_main.c
diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/usb/usbip/stub_rx.c
index 00e475c51a12..00e475c51a12 100644
--- a/drivers/staging/usbip/stub_rx.c
+++ b/drivers/usb/usbip/stub_rx.c
diff --git a/drivers/staging/usbip/stub_tx.c b/drivers/usb/usbip/stub_tx.c
index dbcabc9dbe0d..dbcabc9dbe0d 100644
--- a/drivers/staging/usbip/stub_tx.c
+++ b/drivers/usb/usbip/stub_tx.c
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c
index facaaf003f19..facaaf003f19 100644
--- a/drivers/staging/usbip/usbip_common.c
+++ b/drivers/usb/usbip/usbip_common.c
diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/usb/usbip/usbip_common.h
index 4da3866a037d..86b08475c254 100644
--- a/drivers/staging/usbip/usbip_common.h
+++ b/drivers/usb/usbip/usbip_common.h
@@ -29,7 +29,7 @@
 #include <linux/types.h>
 #include <linux/usb.h>
 #include <linux/wait.h>
-#include "uapi/usbip.h"
+#include <uapi/linux/usbip.h>
 
 #define USBIP_VERSION "1.0.0"
 
diff --git a/drivers/staging/usbip/usbip_event.c b/drivers/usb/usbip/usbip_event.c
index 64933b993d7a..64933b993d7a 100644
--- a/drivers/staging/usbip/usbip_event.c
+++ b/drivers/usb/usbip/usbip_event.c
diff --git a/drivers/staging/usbip/usbip_protocol.txt b/drivers/usb/usbip/usbip_protocol.txt
index 16b6fe27284c..16b6fe27284c 100644
--- a/drivers/staging/usbip/usbip_protocol.txt
+++ b/drivers/usb/usbip/usbip_protocol.txt
diff --git a/drivers/staging/usbip/vhci.h b/drivers/usb/usbip/vhci.h
index a863a98a91ce..a863a98a91ce 100644
--- a/drivers/staging/usbip/vhci.h
+++ b/drivers/usb/usbip/vhci.h
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index c02374b6049c..c02374b6049c 100644
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c
diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
index 00e4a54308e4..00e4a54308e4 100644
--- a/drivers/staging/usbip/vhci_rx.c
+++ b/drivers/usb/usbip/vhci_rx.c
diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/usb/usbip/vhci_sysfs.c
index 211f43f67ea2..211f43f67ea2 100644
--- a/drivers/staging/usbip/vhci_sysfs.c
+++ b/drivers/usb/usbip/vhci_sysfs.c
diff --git a/drivers/staging/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c
index 409fd99f3257..409fd99f3257 100644
--- a/drivers/staging/usbip/vhci_tx.c
+++ b/drivers/usb/usbip/vhci_tx.c
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 3e2e4ed20157..e279015be466 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -2602,6 +2602,7 @@ static void wa_buf_in_cb(struct urb *urb)
         dev = &wa->usb_iface->dev;
         --(wa->active_buf_in_urbs);
         active_buf_in_urbs = wa->active_buf_in_urbs;
+        rpipe = xfer->ep->hcpriv;
 
         if (usb_pipeisoc(xfer->urb->pipe)) {
                 struct usb_iso_packet_descriptor *iso_frame_desc =
@@ -2659,7 +2660,6 @@ static void wa_buf_in_cb(struct urb *urb)
                           resubmit_dti = (isoc_data_frame_count ==
                                                         urb_frame_count);
                 } else if (active_buf_in_urbs == 0) {
-                        rpipe = xfer->ep->hcpriv;
                         dev_dbg(dev,
                                 "xfer %p 0x%08X#%u: data in done (%zu bytes)\n",
                                 xfer, wa_xfer_id(xfer), seg->index,
@@ -2685,7 +2685,6 @@ static void wa_buf_in_cb(struct urb *urb)
                  */
                 resubmit_dti = wa->dti_state != WA_DTI_TRANSFER_RESULT_PENDING;
                 spin_lock_irqsave(&xfer->lock, flags);
-                rpipe = xfer->ep->hcpriv;
                 if (printk_ratelimit())
                         dev_err(dev, "xfer %p 0x%08X#%u: data in error %d\n",
                                 xfer, wa_xfer_id(xfer), seg->index,
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index d7a3d13e72ec..b85983e97f0a 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -173,6 +173,7 @@ static int pwm_backlight_parse_dt(struct device *dev,
                 data->max_brightness--;
         }
 
+        data->enable_gpio = -EINVAL;
         return 0;
 }
 
diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c
index beadd3edaa17..a7b6217ac87b 100644
--- a/drivers/video/fbdev/amba-clcd.c
+++ b/drivers/video/fbdev/amba-clcd.c
@@ -24,6 +24,7 @@
 #include <linux/list.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
+#include <linux/bitops.h>
 #include <linux/clk.h>
 #include <linux/hardirq.h>
 #include <linux/dma-mapping.h>
@@ -650,6 +651,7 @@ static int clcdfb_of_init_display(struct clcd_fb *fb)
 {
         struct device_node *endpoint;
         int err;
+        unsigned int bpp;
         u32 max_bandwidth;
         u32 tft_r0b0g0[3];
 
@@ -667,11 +669,22 @@ static int clcdfb_of_init_display(struct clcd_fb *fb)
 
         err = of_property_read_u32(fb->dev->dev.of_node, "max-memory-bandwidth",
                         &max_bandwidth);
-        if (!err)
-                fb->panel->bpp = 8 * max_bandwidth / (fb->panel->mode.xres *
-                                fb->panel->mode.yres * fb->panel->mode.refresh);
-        else
-                fb->panel->bpp = 32;
+        if (!err) {
+                /*
+                 * max_bandwidth is in bytes per second and pixclock in
+                 * pico-seconds, so the maximum allowed bits per pixel is
+                 *   8 * max_bandwidth / (PICOS2KHZ(pixclock) * 1000)
+                 * Rearrange this calculation to avoid overflow and then ensure
+                 * result is a valid format.
+                 */
+                bpp = max_bandwidth / (1000 / 8)
+                        / PICOS2KHZ(fb->panel->mode.pixclock);
+                bpp = rounddown_pow_of_two(bpp);
+                if (bpp > 32)
+                        bpp = 32;
+        } else
+                bpp = 32;
+        fb->panel->bpp = bpp;
 
 #ifdef CONFIG_CPU_BIG_ENDIAN
         fb->panel->cntl |= CNTL_BEBO;
diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
index 92640d46770a..1d8bdb92939b 100644
--- a/drivers/video/fbdev/atmel_lcdfb.c
+++ b/drivers/video/fbdev/atmel_lcdfb.c
@@ -1102,12 +1102,14 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
         timings = of_get_display_timings(display_np);
         if (!timings) {
                 dev_err(dev, "failed to get display timings\n");
+                ret = -EINVAL;
                 goto put_display_node;
         }
 
         timings_np = of_find_node_by_name(display_np, "display-timings");
         if (!timings_np) {
                 dev_err(dev, "failed to find display-timings node\n");
+                ret = -ENODEV;
                 goto put_display_node;
         }
 
diff --git a/drivers/video/fbdev/chipsfb.c b/drivers/video/fbdev/chipsfb.c
index 206a66b61072..59abdc6a97f6 100644
--- a/drivers/video/fbdev/chipsfb.c
+++ b/drivers/video/fbdev/chipsfb.c
@@ -273,7 +273,7 @@ static struct chips_init_reg chips_init_xr[] = {
         { 0xa8, 0x00 }
 };
 
-static void __init chips_hw_init(void)
+static void chips_hw_init(void)
 {
         int i;
 
diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
index 788f6b37fce7..10c876c95772 100644
--- a/drivers/video/fbdev/da8xx-fb.c
+++ b/drivers/video/fbdev/da8xx-fb.c
@@ -419,7 +419,7 @@ static void lcd_cfg_horizontal_sync(int back_porch, int pulse_width,
 {
         u32 reg;
 
-        reg = lcdc_read(LCD_RASTER_TIMING_0_REG) & 0xf;
+        reg = lcdc_read(LCD_RASTER_TIMING_0_REG) & 0x3ff;
         reg |= (((back_porch-1) & 0xff) << 24)
             | (((front_porch-1) & 0xff) << 16)
             | (((pulse_width-1) & 0x3f) << 10);
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index 987edf110038..5c098d5b4043 100644
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@ -236,6 +236,7 @@ timingfail:
         if (native_mode)
                 of_node_put(native_mode);
         display_timings_release(disp);
+        disp = NULL;
 entryfail:
         kfree(disp);
 dispfail: