227 files changed, 3280 insertions, 3536 deletions
diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c
index b193f8425999..ff6d8adc9cda 100644
--- a/drivers/acpi/acpi_pnp.c
+++ b/drivers/acpi/acpi_pnp.c
@@ -304,6 +304,8 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
        {"PNPb006"},
        /* cs423x-pnpbios */
        {"CSC0100"},
+        {"CSC0103"},
+        {"CSC0110"},
        {"CSC0000"},
        {"GIM0100"},            /* Guillemot Turtlebeach something appears to be cs4232 compatible */
        /* es18xx-pnpbios */
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index a72685c1e819..5e8df9177da4 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -102,19 +102,12 @@ const struct acpi_predefined_names acpi_gbl_pre_defined_names[] = {
        {"_SB_", ACPI_TYPE_DEVICE, NULL},
        {"_SI_", ACPI_TYPE_LOCAL_SCOPE, NULL},
        {"_TZ_", ACPI_TYPE_DEVICE, NULL},
-        /*
+        {"_REV", ACPI_TYPE_INTEGER, (char *)ACPI_CA_SUPPORT_LEVEL},
-         * March, 2015:
-         * The _REV object is in the process of being deprecated, because
-         * other ACPI implementations permanently return 2. Thus, it
-         * has little or no value. Return 2 for compatibility with
-         * other ACPI implementations.
-         */
-        {"_REV", ACPI_TYPE_INTEGER, ACPI_CAST_PTR(char, 2)},
        {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME},
-        {"_GL_", ACPI_TYPE_MUTEX, ACPI_CAST_PTR(char, 1)},
+        {"_GL_", ACPI_TYPE_MUTEX, (char *)1},
 #if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY)
-        {"_OSI", ACPI_TYPE_METHOD, ACPI_CAST_PTR(char, 1)},
+        {"_OSI", ACPI_TYPE_METHOD, (char *)1},
 #endif
        /* Table terminator */
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 39748bb3a543..7ccba395c9dd 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -182,7 +182,7 @@ static void __init acpi_request_region (struct acpi_generic_address *gas,
                request_mem_region(addr, length, desc);
 }
-static int __init acpi_reserve_resources(void)
+static void __init acpi_reserve_resources(void)
 {
        acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, acpi_gbl_FADT.pm1_event_length,
                "ACPI PM1a_EVT_BLK");
@@ -211,10 +211,7 @@ static int __init acpi_reserve_resources(void)
        if (!(acpi_gbl_FADT.gpe1_block_length & 0x1))
                acpi_request_region(&acpi_gbl_FADT.xgpe1_block,
                               acpi_gbl_FADT.gpe1_block_length, "ACPI GPE1_BLK");
-        return 0;
 }
-device_initcall(acpi_reserve_resources);
 void acpi_os_printf(const char *fmt, ...)
 {
@@ -1845,6 +1842,7 @@ acpi_status __init acpi_os_initialize(void)
 acpi_status __init acpi_os_initialize1(void)
 {
+        acpi_reserve_resources();
        kacpid_wq = alloc_workqueue("kacpid", 0, 1);
        kacpi_notify_wq = alloc_workqueue("kacpi_notify", 0, 1);
        kacpi_hotplug_wq = alloc_ordered_workqueue("kacpi_hotplug", 0);
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 5589a6e2a023..8244f013f210 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -573,7 +573,7 @@ EXPORT_SYMBOL_GPL(acpi_dev_get_resources);
 * @ares: Input ACPI resource object.
 * @types: Valid resource types of IORESOURCE_XXX
 *
- * This is a hepler function to support acpi_dev_get_resources(), which filters
+ * This is a helper function to support acpi_dev_get_resources(), which filters
 * ACPI resource objects according to resource types.
 */
 int acpi_dev_filter_resource_type(struct acpi_resource *ares,
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index 26e5b5060523..bf034f8b7c1a 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -14,6 +14,7 @@
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/dmi.h>
 #include "sbshc.h"
 #define PREFIX "ACPI: "
@@ -87,6 +88,8 @@ enum acpi_smb_offset {
        ACPI_SMB_ALARM_DATA = 0x26,     /* 2 bytes alarm data */
 };
+static bool macbook;
 static inline int smb_hc_read(struct acpi_smb_hc *hc, u8 address, u8 *data)
 {
        return ec_read(hc->offset + address, data);
@@ -132,6 +135,8 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
        }
        mutex_lock(&hc->lock);
+        if (macbook)
+                udelay(5);
        if (smb_hc_read(hc, ACPI_SMB_PROTOCOL, &temp))
                goto end;
        if (temp) {
@@ -257,12 +262,29 @@ extern int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
                              acpi_handle handle, acpi_ec_query_func func,
                              void *data);
+static int macbook_dmi_match(const struct dmi_system_id *d)
+{
+        pr_debug("Detected MacBook, enabling workaround\n");
+        macbook = true;
+        return 0;
+}
+static struct dmi_system_id acpi_smbus_dmi_table[] = {
+        { macbook_dmi_match, "Apple MacBook", {
+          DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME, "MacBook") },
+        },
+        { },
+};
 static int acpi_smbus_hc_add(struct acpi_device *device)
 {
        int status;
        unsigned long long val;
        struct acpi_smb_hc *hc;
+        dmi_check_system(acpi_smbus_dmi_table);
        if (!device)
                return -EINVAL;
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 5f601553b9b0..9dca4b995be0 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -270,6 +270,7 @@ config ATA_PIIX
 config SATA_DWC
        tristate "DesignWare Cores SATA support"
        depends on 460EX
+        select DW_DMAC
        help
          This option enables support for the on-chip SATA controller of the
          AppliedMicro processor 460EX.
@@ -729,15 +730,6 @@ config PATA_SC1200
          If unsure, say N.
-config PATA_SCC
-        tristate "Toshiba's Cell Reference Set IDE support"
-        depends on PCI && PPC_CELLEB
-        help
-          This option enables support for the built-in IDE controller on
-          Toshiba Cell Reference Board.
-          If unsure, say N.
 config PATA_SCH
        tristate "Intel SCH PATA support"
        depends on PCI
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index b67e995179a9..40f7865f20a1 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -75,7 +75,6 @@ obj-$(CONFIG_PATA_PDC_OLD)	+= pata_pdc202xx_old.o
 obj-$(CONFIG_PATA_RADISYS)      += pata_radisys.o
 obj-$(CONFIG_PATA_RDC)          += pata_rdc.o
 obj-$(CONFIG_PATA_SC1200)       += pata_sc1200.o
-obj-$(CONFIG_PATA_SCC)          += pata_scc.o
 obj-$(CONFIG_PATA_SCH)          += pata_sch.o
 obj-$(CONFIG_PATA_SERVERWORKS)  += pata_serverworks.o
 obj-$(CONFIG_PATA_SIL680)       += pata_sil680.o
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index c7a92a743ed0..65ee94454bbd 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -66,6 +66,7 @@ enum board_ids {
        board_ahci_yes_fbs,
        /* board IDs for specific chipsets in alphabetical order */
+        board_ahci_avn,
        board_ahci_mcp65,
        board_ahci_mcp77,
        board_ahci_mcp89,
@@ -84,6 +85,8 @@ enum board_ids {
 static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
 static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class,
                                 unsigned long deadline);
+static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class,
+                              unsigned long deadline);
 static void ahci_mcp89_apple_enable(struct pci_dev *pdev);
 static bool is_mcp89_apple(struct pci_dev *pdev);
 static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class,
@@ -107,6 +110,11 @@ static struct ata_port_operations ahci_p5wdh_ops = {
        .hardreset              = ahci_p5wdh_hardreset,
 };
+static struct ata_port_operations ahci_avn_ops = {
+        .inherits               = &ahci_ops,
+        .hardreset              = ahci_avn_hardreset,
+};
 static const struct ata_port_info ahci_port_info[] = {
        /* by features */
        [board_ahci] = {
@@ -151,6 +159,12 @@ static const struct ata_port_info ahci_port_info[] = {
                .port_ops       = &ahci_ops,
        },
        /* by chipsets */
+        [board_ahci_avn] = {
+                .flags          = AHCI_FLAG_COMMON,
+                .pio_mask       = ATA_PIO4,
+                .udma_mask      = ATA_UDMA6,
+                .port_ops       = &ahci_avn_ops,
+        },
        [board_ahci_mcp65] = {
                AHCI_HFLAGS     (AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP |
                                 AHCI_HFLAG_YES_NCQ),
@@ -290,14 +304,14 @@ static const struct pci_device_id ahci_pci_tbl[] = {
        { PCI_VDEVICE(INTEL, 0x1f27), board_ahci }, /* Avoton RAID */
        { PCI_VDEVICE(INTEL, 0x1f2e), board_ahci }, /* Avoton RAID */
        { PCI_VDEVICE(INTEL, 0x1f2f), board_ahci }, /* Avoton RAID */
-        { PCI_VDEVICE(INTEL, 0x1f32), board_ahci }, /* Avoton AHCI */
+        { PCI_VDEVICE(INTEL, 0x1f32), board_ahci_avn }, /* Avoton AHCI */
-        { PCI_VDEVICE(INTEL, 0x1f33), board_ahci }, /* Avoton AHCI */
+        { PCI_VDEVICE(INTEL, 0x1f33), board_ahci_avn }, /* Avoton AHCI */
-        { PCI_VDEVICE(INTEL, 0x1f34), board_ahci }, /* Avoton RAID */
+        { PCI_VDEVICE(INTEL, 0x1f34), board_ahci_avn }, /* Avoton RAID */
-        { PCI_VDEVICE(INTEL, 0x1f35), board_ahci }, /* Avoton RAID */
+        { PCI_VDEVICE(INTEL, 0x1f35), board_ahci_avn }, /* Avoton RAID */
-        { PCI_VDEVICE(INTEL, 0x1f36), board_ahci }, /* Avoton RAID */
+        { PCI_VDEVICE(INTEL, 0x1f36), board_ahci_avn }, /* Avoton RAID */
-        { PCI_VDEVICE(INTEL, 0x1f37), board_ahci }, /* Avoton RAID */
+        { PCI_VDEVICE(INTEL, 0x1f37), board_ahci_avn }, /* Avoton RAID */
-        { PCI_VDEVICE(INTEL, 0x1f3e), board_ahci }, /* Avoton RAID */
+        { PCI_VDEVICE(INTEL, 0x1f3e), board_ahci_avn }, /* Avoton RAID */
-        { PCI_VDEVICE(INTEL, 0x1f3f), board_ahci }, /* Avoton RAID */
+        { PCI_VDEVICE(INTEL, 0x1f3f), board_ahci_avn }, /* Avoton RAID */
        { PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Wellsburg RAID */
        { PCI_VDEVICE(INTEL, 0x2827), board_ahci }, /* Wellsburg RAID */
        { PCI_VDEVICE(INTEL, 0x8d02), board_ahci }, /* Wellsburg AHCI */
@@ -670,6 +684,79 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class,
        return rc;
 }
+/*
+ * ahci_avn_hardreset - attempt more aggressive recovery of Avoton ports.
+ *
+ * It has been observed with some SSDs that the timing of events in the
+ * link synchronization phase can leave the port in a state that can not
+ * be recovered by a SATA-hard-reset alone.  The failing signature is
+ * SStatus.DET stuck at 1 ("Device presence detected but Phy
+ * communication not established").  It was found that unloading and
+ * reloading the driver when this problem occurs allows the drive
+ * connection to be recovered (DET advanced to 0x3).  The critical
+ * component of reloading the driver is that the port state machines are
+ * reset by bouncing "port enable" in the AHCI PCS configuration
+ * register.  So, reproduce that effect by bouncing a port whenever we
+ * see DET==1 after a reset.
+ */
+static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class,
+                              unsigned long deadline)
+{
+        const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context);
+        struct ata_port *ap = link->ap;
+        struct ahci_port_priv *pp = ap->private_data;
+        struct ahci_host_priv *hpriv = ap->host->private_data;
+        u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
+        unsigned long tmo = deadline - jiffies;
+        struct ata_taskfile tf;
+        bool online;
+        int rc, i;
+        DPRINTK("ENTER\n");
+        ahci_stop_engine(ap);
+        for (i = 0; i < 2; i++) {
+                u16 val;
+                u32 sstatus;
+                int port = ap->port_no;
+                struct ata_host *host = ap->host;
+                struct pci_dev *pdev = to_pci_dev(host->dev);
+                /* 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 (sata_scr_read(link, SCR_STATUS, &sstatus) != 0 ||
+                                (sstatus & 0xf) != 1)
+                        break;
+                ata_link_printk(link, KERN_INFO, "avn bounce port%d\n",
+                                port);
+                pci_read_config_word(pdev, 0x92, &val);
+                val &= ~(1 << port);
+                pci_write_config_word(pdev, 0x92, val);
+                ata_msleep(ap, 1000);
+                val |= 1 << port;
+                pci_write_config_word(pdev, 0x92, val);
+                deadline += tmo;
+        }
+        hpriv->start_engine(ap);
+        if (online)
+                *class = ahci_dev_classify(ap);
+        DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);
+        return rc;
+}
 #ifdef CONFIG_PM
 static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
 {
diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index ea0ff005b86c..8ff428fe8e0f 100644
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -37,7 +37,6 @@ struct st_ahci_drv_data {
        struct reset_control *pwr;
        struct reset_control *sw_rst;
        struct reset_control *pwr_rst;
-        struct ahci_host_priv *hpriv;
 };
 static void st_ahci_configure_oob(void __iomem *mmio)
@@ -55,9 +54,10 @@ static void st_ahci_configure_oob(void __iomem *mmio)
        writel(new_val, mmio + ST_AHCI_OOBR);
 }
-static int st_ahci_deassert_resets(struct device *dev)
+static int st_ahci_deassert_resets(struct ahci_host_priv *hpriv,
+                                struct device *dev)
 {
-        struct st_ahci_drv_data *drv_data = dev_get_drvdata(dev);
+        struct st_ahci_drv_data *drv_data = hpriv->plat_data;
        int err;
        if (drv_data->pwr) {
@@ -90,8 +90,8 @@ static int st_ahci_deassert_resets(struct device *dev)
 static void st_ahci_host_stop(struct ata_host *host)
 {
        struct ahci_host_priv *hpriv = host->private_data;
+        struct st_ahci_drv_data *drv_data = hpriv->plat_data;
        struct device *dev = host->dev;
-        struct st_ahci_drv_data *drv_data = dev_get_drvdata(dev);
        int err;
        if (drv_data->pwr) {
@@ -103,29 +103,30 @@ static void st_ahci_host_stop(struct ata_host *host)
        ahci_platform_disable_resources(hpriv);
 }
-static int st_ahci_probe_resets(struct platform_device *pdev)
+static int st_ahci_probe_resets(struct ahci_host_priv *hpriv,
+                                struct device *dev)
 {
-        struct st_ahci_drv_data *drv_data = platform_get_drvdata(pdev);
+        struct st_ahci_drv_data *drv_data = hpriv->plat_data;
-        drv_data->pwr = devm_reset_control_get(&pdev->dev, "pwr-dwn");
+        drv_data->pwr = devm_reset_control_get(dev, "pwr-dwn");
        if (IS_ERR(drv_data->pwr)) {
-                dev_info(&pdev->dev, "power reset control not defined\n");
+                dev_info(dev, "power reset control not defined\n");
                drv_data->pwr = NULL;
        }
-        drv_data->sw_rst = devm_reset_control_get(&pdev->dev, "sw-rst");
+        drv_data->sw_rst = devm_reset_control_get(dev, "sw-rst");
        if (IS_ERR(drv_data->sw_rst)) {
-                dev_info(&pdev->dev, "soft reset control not defined\n");
+                dev_info(dev, "soft reset control not defined\n");
                drv_data->sw_rst = NULL;
        }
-        drv_data->pwr_rst = devm_reset_control_get(&pdev->dev, "pwr-rst");
+        drv_data->pwr_rst = devm_reset_control_get(dev, "pwr-rst");
        if (IS_ERR(drv_data->pwr_rst)) {
-                dev_dbg(&pdev->dev, "power soft reset control not defined\n");
+                dev_dbg(dev, "power soft reset control not defined\n");
                drv_data->pwr_rst = NULL;
        }
-        return st_ahci_deassert_resets(&pdev->dev);
+        return st_ahci_deassert_resets(hpriv, dev);
 }
 static struct ata_port_operations st_ahci_port_ops = {
@@ -154,15 +155,12 @@ static int st_ahci_probe(struct platform_device *pdev)
        if (!drv_data)
                return -ENOMEM;
-        platform_set_drvdata(pdev, drv_data);
        hpriv = ahci_platform_get_resources(pdev);
        if (IS_ERR(hpriv))
                return PTR_ERR(hpriv);
+        hpriv->plat_data = drv_data;
-        drv_data->hpriv = hpriv;
+        err = st_ahci_probe_resets(hpriv, &pdev->dev);
-        err = st_ahci_probe_resets(pdev);
        if (err)
                return err;
@@ -170,7 +168,7 @@ static int st_ahci_probe(struct platform_device *pdev)
        if (err)
                return err;
-        st_ahci_configure_oob(drv_data->hpriv->mmio);
+        st_ahci_configure_oob(hpriv->mmio);
        err = ahci_platform_init_host(pdev, hpriv, &st_ahci_port_info,
                                      &ahci_platform_sht);
@@ -185,8 +183,9 @@ static int st_ahci_probe(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int st_ahci_suspend(struct device *dev)
 {
-        struct st_ahci_drv_data *drv_data = dev_get_drvdata(dev);
+        struct ata_host *host = dev_get_drvdata(dev);
-        struct ahci_host_priv *hpriv = drv_data->hpriv;
+        struct ahci_host_priv *hpriv = host->private_data;
+        struct st_ahci_drv_data *drv_data = hpriv->plat_data;
        int err;
        err = ahci_platform_suspend_host(dev);
@@ -208,21 +207,21 @@ static int st_ahci_suspend(struct device *dev)
 static int st_ahci_resume(struct device *dev)
 {
-        struct st_ahci_drv_data *drv_data = dev_get_drvdata(dev);
+        struct ata_host *host = dev_get_drvdata(dev);
-        struct ahci_host_priv *hpriv = drv_data->hpriv;
+        struct ahci_host_priv *hpriv = host->private_data;
        int err;
        err = ahci_platform_enable_resources(hpriv);
        if (err)
                return err;
-        err = st_ahci_deassert_resets(dev);
+        err = st_ahci_deassert_resets(hpriv, dev);
        if (err) {
                ahci_platform_disable_resources(hpriv);
                return err;
        }
-        st_ahci_configure_oob(drv_data->hpriv->mmio);
+        st_ahci_configure_oob(hpriv->mmio);
        return ahci_platform_resume_host(dev);
 }
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 61a9c07e0dff..287c4ba0219f 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1707,8 +1707,7 @@ static void ahci_handle_port_interrupt(struct ata_port *ap,
        if (unlikely(resetting))
                status &= ~PORT_IRQ_BAD_PMP;
-        /* if LPM is enabled, PHYRDY doesn't mean anything */
+        if (sata_lpm_ignore_phy_events(&ap->link)) {
-        if (ap->link.lpm_policy > ATA_LPM_MAX_POWER) {
                status &= ~PORT_IRQ_PHYRDY;
                ahci_scr_write(&ap->link, SCR_ERROR, SERR_PHYRDY_CHG);
        }
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index f6cb1f1b30b7..577849c6611a 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4235,7 +4235,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
                                                ATA_HORKAGE_ZERO_AFTER_TRIM, },
        { "Crucial_CT*MX100*",          "MU01", ATA_HORKAGE_NO_NCQ_TRIM |
                                                ATA_HORKAGE_ZERO_AFTER_TRIM, },
-        { "Samsung SSD 850 PRO*",       NULL,   ATA_HORKAGE_NO_NCQ_TRIM |
+        { "Samsung SSD 8*",             NULL,   ATA_HORKAGE_NO_NCQ_TRIM |
                                                ATA_HORKAGE_ZERO_AFTER_TRIM, },
        /*
@@ -6752,6 +6752,38 @@ u32 ata_wait_register(struct ata_port *ap, void __iomem *reg, u32 mask, u32 val,
        return tmp;
 }
+/**
+ *      sata_lpm_ignore_phy_events - test if PHY event should be ignored
+ *      @link: Link receiving the event
+ *
+ *      Test whether the received PHY event has to be ignored or not.
+ *
+ *      LOCKING:
+ *      None:
+ *
+ *      RETURNS:
+ *      True if the event has to be ignored.
+ */
+bool sata_lpm_ignore_phy_events(struct ata_link *link)
+{
+        unsigned long lpm_timeout = link->last_lpm_change +
+                                    msecs_to_jiffies(ATA_TMOUT_SPURIOUS_PHY);
+        /* if LPM is enabled, PHYRDY doesn't mean anything */
+        if (link->lpm_policy > ATA_LPM_MAX_POWER)
+                return true;
+        /* ignore the first PHY event after the LPM policy changed
+         * as it is might be spurious
+         */
+        if ((link->flags & ATA_LFLAG_CHANGED) &&
+            time_before(jiffies, lpm_timeout))
+                return true;
+        return false;
+}
+EXPORT_SYMBOL_GPL(sata_lpm_ignore_phy_events);
 /*
 * Dummy port_ops
 */
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 07f41be38fbe..cf0022ec07f2 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -3597,6 +3597,9 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy,
                }
        }
+        link->last_lpm_change = jiffies;
+        link->flags |= ATA_LFLAG_CHANGED;
        return 0;
 fail:
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
deleted file mode 100644
index 5cd60d6388ec..000000000000
--- a/drivers/ata/pata_scc.c
+++ /dev/null
@@ -1,1110 +0,0 @@
-/*
- * Support for IDE interfaces on Celleb platform
- *
- * (C) Copyright 2006 TOSHIBA CORPORATION
- *
- * This code is based on drivers/ata/ata_piix.c:
- *  Copyright 2003-2005 Red Hat Inc
- *  Copyright 2003-2005 Jeff Garzik
- *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
- *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2003 Red Hat Inc
- *
- * and drivers/ata/ahci.c:
- *  Copyright 2004-2005 Red Hat, Inc.
- *
- * and drivers/ata/libata-core.c:
- *  Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
- *  Copyright 2003-2004 Jeff Garzik
- *
- * 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.
- */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/blkdev.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <scsi/scsi_host.h>
-#include <linux/libata.h>
-#define DRV_NAME                "pata_scc"
-#define DRV_VERSION             "0.3"
-#define PCI_DEVICE_ID_TOSHIBA_SCC_ATA           0x01b4
-/* PCI BARs */
-#define SCC_CTRL_BAR            0
-#define SCC_BMID_BAR            1
-/* offset of CTRL registers */
-#define SCC_CTL_PIOSHT          0x000
-#define SCC_CTL_PIOCT           0x004
-#define SCC_CTL_MDMACT          0x008
-#define SCC_CTL_MCRCST          0x00C
-#define SCC_CTL_SDMACT          0x010
-#define SCC_CTL_SCRCST          0x014
-#define SCC_CTL_UDENVT          0x018
-#define SCC_CTL_TDVHSEL         0x020
-#define SCC_CTL_MODEREG         0x024
-#define SCC_CTL_ECMODE          0xF00
-#define SCC_CTL_MAEA0           0xF50
-#define SCC_CTL_MAEC0           0xF54
-#define SCC_CTL_CCKCTRL         0xFF0
-/* offset of BMID registers */
-#define SCC_DMA_CMD             0x000
-#define SCC_DMA_STATUS          0x004
-#define SCC_DMA_TABLE_OFS       0x008
-#define SCC_DMA_INTMASK         0x010
-#define SCC_DMA_INTST           0x014
-#define SCC_DMA_PTERADD         0x018
-#define SCC_REG_CMD_ADDR        0x020
-#define SCC_REG_DATA            0x000
-#define SCC_REG_ERR             0x004
-#define SCC_REG_FEATURE         0x004
-#define SCC_REG_NSECT           0x008
-#define SCC_REG_LBAL            0x00C
-#define SCC_REG_LBAM            0x010
-#define SCC_REG_LBAH            0x014
-#define SCC_REG_DEVICE          0x018
-#define SCC_REG_STATUS          0x01C
-#define SCC_REG_CMD             0x01C
-#define SCC_REG_ALTSTATUS       0x020
-/* register value */
-#define TDVHSEL_MASTER          0x00000001
-#define TDVHSEL_SLAVE           0x00000004
-#define MODE_JCUSFEN            0x00000080
-#define ECMODE_VALUE            0x01
-#define CCKCTRL_ATARESET        0x00040000
-#define CCKCTRL_BUFCNT          0x00020000
-#define CCKCTRL_CRST            0x00010000
-#define CCKCTRL_OCLKEN          0x00000100
-#define CCKCTRL_ATACLKOEN       0x00000002
-#define CCKCTRL_LCLKEN          0x00000001
-#define QCHCD_IOS_SS            0x00000001
-#define QCHSD_STPDIAG           0x00020000
-#define INTMASK_MSK             0xD1000012
-#define INTSTS_SERROR           0x80000000
-#define INTSTS_PRERR            0x40000000
-#define INTSTS_RERR             0x10000000
-#define INTSTS_ICERR            0x01000000
-#define INTSTS_BMSINT           0x00000010
-#define INTSTS_BMHE             0x00000008
-#define INTSTS_IOIRQS           0x00000004
-#define INTSTS_INTRQ            0x00000002
-#define INTSTS_ACTEINT          0x00000001
-/* PIO transfer mode table */
-/* JCHST */
-static const unsigned long JCHSTtbl[2][7] = {
-        {0x0E, 0x05, 0x02, 0x03, 0x02, 0x00, 0x00},     /* 100MHz */
-        {0x13, 0x07, 0x04, 0x04, 0x03, 0x00, 0x00}      /* 133MHz */
-};
-/* JCHHT */
-static const unsigned long JCHHTtbl[2][7] = {
-        {0x0E, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00},     /* 100MHz */
-        {0x13, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00}      /* 133MHz */
-};
-/* JCHCT */
-static const unsigned long JCHCTtbl[2][7] = {
-        {0x1D, 0x1D, 0x1C, 0x0B, 0x06, 0x00, 0x00},     /* 100MHz */
-        {0x27, 0x26, 0x26, 0x0E, 0x09, 0x00, 0x00}      /* 133MHz */
-};
-/* DMA transfer mode  table */
-/* JCHDCTM/JCHDCTS */
-static const unsigned long JCHDCTxtbl[2][7] = {
-        {0x0A, 0x06, 0x04, 0x03, 0x01, 0x00, 0x00},     /* 100MHz */
-        {0x0E, 0x09, 0x06, 0x04, 0x02, 0x01, 0x00}      /* 133MHz */
-};
-/* JCSTWTM/JCSTWTS  */
-static const unsigned long JCSTWTxtbl[2][7] = {
-        {0x06, 0x04, 0x03, 0x02, 0x02, 0x02, 0x00},     /* 100MHz */
-        {0x09, 0x06, 0x04, 0x02, 0x02, 0x02, 0x02}      /* 133MHz */
-};
-/* JCTSS */
-static const unsigned long JCTSStbl[2][7] = {
-        {0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00},     /* 100MHz */
-        {0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05}      /* 133MHz */
-};
-/* JCENVT */
-static const unsigned long JCENVTtbl[2][7] = {
-        {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00},     /* 100MHz */
-        {0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}      /* 133MHz */
-};
-/* JCACTSELS/JCACTSELM */
-static const unsigned long JCACTSELtbl[2][7] = {
-        {0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00},     /* 100MHz */
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}      /* 133MHz */
-};
-static const struct pci_device_id scc_pci_tbl[] = {
-        { PCI_VDEVICE(TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA), 0},
-        { }     /* terminate list */
-};
-/**
- *      scc_set_piomode - Initialize host controller PATA PIO timings
- *      @ap: Port whose timings we are configuring
- *      @adev: um
- *
- *      Set PIO mode for device.
- *
- *      LOCKING:
- *      None (inherited from caller).
- */
-static void scc_set_piomode (struct ata_port *ap, struct ata_device *adev)
-{
-        unsigned int pio = adev->pio_mode - XFER_PIO_0;
-        void __iomem *ctrl_base = ap->host->iomap[SCC_CTRL_BAR];
-        void __iomem *cckctrl_port = ctrl_base + SCC_CTL_CCKCTRL;
-        void __iomem *piosht_port = ctrl_base + SCC_CTL_PIOSHT;
-        void __iomem *pioct_port = ctrl_base + SCC_CTL_PIOCT;
-        unsigned long reg;
-        int offset;
-        reg = in_be32(cckctrl_port);
-        if (reg & CCKCTRL_ATACLKOEN)
-                offset = 1;     /* 133MHz */
-        else
-                offset = 0;     /* 100MHz */
-        reg = JCHSTtbl[offset][pio] << 16 | JCHHTtbl[offset][pio];
-        out_be32(piosht_port, reg);
-        reg = JCHCTtbl[offset][pio];
-        out_be32(pioct_port, reg);
-}
-/**
- *      scc_set_dmamode - Initialize host controller PATA DMA timings
- *      @ap: Port whose timings we are configuring
- *      @adev: um
- *
- *      Set UDMA mode for device.
- *
- *      LOCKING:
- *      None (inherited from caller).
- */
-static void scc_set_dmamode (struct ata_port *ap, struct ata_device *adev)
-{
-        unsigned int udma = adev->dma_mode;
-        unsigned int is_slave = (adev->devno != 0);
-        u8 speed = udma;
-        void __iomem *ctrl_base = ap->host->iomap[SCC_CTRL_BAR];
-        void __iomem *cckctrl_port = ctrl_base + SCC_CTL_CCKCTRL;
-        void __iomem *mdmact_port = ctrl_base + SCC_CTL_MDMACT;
-        void __iomem *mcrcst_port = ctrl_base + SCC_CTL_MCRCST;
-        void __iomem *sdmact_port = ctrl_base + SCC_CTL_SDMACT;
-        void __iomem *scrcst_port = ctrl_base + SCC_CTL_SCRCST;
-        void __iomem *udenvt_port = ctrl_base + SCC_CTL_UDENVT;
-        void __iomem *tdvhsel_port = ctrl_base + SCC_CTL_TDVHSEL;
-        int offset, idx;
-        if (in_be32(cckctrl_port) & CCKCTRL_ATACLKOEN)
-                offset = 1;     /* 133MHz */
-        else
-                offset = 0;     /* 100MHz */
-        if (speed >= XFER_UDMA_0)
-                idx = speed - XFER_UDMA_0;
-        else
-                return;
-        if (is_slave) {
-                out_be32(sdmact_port, JCHDCTxtbl[offset][idx]);
-                out_be32(scrcst_port, JCSTWTxtbl[offset][idx]);
-                out_be32(tdvhsel_port,
-                         (in_be32(tdvhsel_port) & ~TDVHSEL_SLAVE) | (JCACTSELtbl[offset][idx] << 2));
-        } else {
-                out_be32(mdmact_port, JCHDCTxtbl[offset][idx]);
-                out_be32(mcrcst_port, JCSTWTxtbl[offset][idx]);
-                out_be32(tdvhsel_port,
-                         (in_be32(tdvhsel_port) & ~TDVHSEL_MASTER) | JCACTSELtbl[offset][idx]);
-        }
-        out_be32(udenvt_port,
-                 JCTSStbl[offset][idx] << 16 | JCENVTtbl[offset][idx]);
-}
-unsigned long scc_mode_filter(struct ata_device *adev, unsigned long mask)
-{
-        /* errata A308 workaround: limit ATAPI UDMA mode to UDMA4 */
-        if (adev->class == ATA_DEV_ATAPI &&
-            (mask & (0xE0 << ATA_SHIFT_UDMA))) {
-                printk(KERN_INFO "%s: limit ATAPI UDMA to UDMA4\n", DRV_NAME);
-                mask &= ~(0xE0 << ATA_SHIFT_UDMA);
-        }
-        return mask;
-}
-/**
- *      scc_tf_load - send taskfile registers to host controller
- *      @ap: Port to which output is sent
- *      @tf: ATA taskfile register set
- *
- *      Note: Original code is ata_sff_tf_load().
- */
-static void scc_tf_load (struct ata_port *ap, const struct ata_taskfile *tf)
-{
-        struct ata_ioports *ioaddr = &ap->ioaddr;
-        unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
-        if (tf->ctl != ap->last_ctl) {
-                out_be32(ioaddr->ctl_addr, tf->ctl);
-                ap->last_ctl = tf->ctl;
-                ata_wait_idle(ap);
-        }
-        if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
-                out_be32(ioaddr->feature_addr, tf->hob_feature);
-                out_be32(ioaddr->nsect_addr, tf->hob_nsect);
-                out_be32(ioaddr->lbal_addr, tf->hob_lbal);
-                out_be32(ioaddr->lbam_addr, tf->hob_lbam);
-                out_be32(ioaddr->lbah_addr, tf->hob_lbah);
-                VPRINTK("hob: feat 0x%X nsect 0x%X, lba 0x%X 0x%X 0x%X\n",
-                        tf->hob_feature,
-                        tf->hob_nsect,
-                        tf->hob_lbal,
-                        tf->hob_lbam,
-                        tf->hob_lbah);
-        }
-        if (is_addr) {
-                out_be32(ioaddr->feature_addr, tf->feature);
-                out_be32(ioaddr->nsect_addr, tf->nsect);
-                out_be32(ioaddr->lbal_addr, tf->lbal);
-                out_be32(ioaddr->lbam_addr, tf->lbam);
-                out_be32(ioaddr->lbah_addr, tf->lbah);
-                VPRINTK("feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n",
-                        tf->feature,
-                        tf->nsect,
-                        tf->lbal,
-                        tf->lbam,
-                        tf->lbah);
-        }
-        if (tf->flags & ATA_TFLAG_DEVICE) {
-                out_be32(ioaddr->device_addr, tf->device);
-                VPRINTK("device 0x%X\n", tf->device);
-        }
-        ata_wait_idle(ap);
-}
-/**
- *      scc_check_status - Read device status reg & clear interrupt
- *      @ap: port where the device is
- *
- *      Note: Original code is ata_check_status().
- */
-static u8 scc_check_status (struct ata_port *ap)
-{
-        return in_be32(ap->ioaddr.status_addr);
-}
-/**
- *      scc_tf_read - input device's ATA taskfile shadow registers
- *      @ap: Port from which input is read
- *      @tf: ATA taskfile register set for storing input
- *
- *      Note: Original code is ata_sff_tf_read().
- */
-static void scc_tf_read (struct ata_port *ap, struct ata_taskfile *tf)
-{
-        struct ata_ioports *ioaddr = &ap->ioaddr;
-        tf->command = scc_check_status(ap);
-        tf->feature = in_be32(ioaddr->error_addr);
-        tf->nsect = in_be32(ioaddr->nsect_addr);
-        tf->lbal = in_be32(ioaddr->lbal_addr);
-        tf->lbam = in_be32(ioaddr->lbam_addr);
-        tf->lbah = in_be32(ioaddr->lbah_addr);
-        tf->device = in_be32(ioaddr->device_addr);
-        if (tf->flags & ATA_TFLAG_LBA48) {
-                out_be32(ioaddr->ctl_addr, tf->ctl | ATA_HOB);
-                tf->hob_feature = in_be32(ioaddr->error_addr);
-                tf->hob_nsect = in_be32(ioaddr->nsect_addr);
-                tf->hob_lbal = in_be32(ioaddr->lbal_addr);
-                tf->hob_lbam = in_be32(ioaddr->lbam_addr);
-                tf->hob_lbah = in_be32(ioaddr->lbah_addr);
-                out_be32(ioaddr->ctl_addr, tf->ctl);
-                ap->last_ctl = tf->ctl;
-        }
-}
-/**
- *      scc_exec_command - issue ATA command to host controller
- *      @ap: port to which command is being issued
- *      @tf: ATA taskfile register set
- *
- *      Note: Original code is ata_sff_exec_command().
- */
-static void scc_exec_command (struct ata_port *ap,
-                              const struct ata_taskfile *tf)
-{
-        DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);
-        out_be32(ap->ioaddr.command_addr, tf->command);
-        ata_sff_pause(ap);
-}
-/**
- *      scc_check_altstatus - Read device alternate status reg
- *      @ap: port where the device is
- */
-static u8 scc_check_altstatus (struct ata_port *ap)
-{
-        return in_be32(ap->ioaddr.altstatus_addr);
-}
-/**
- *      scc_dev_select - Select device 0/1 on ATA bus
- *      @ap: ATA channel to manipulate
- *      @device: ATA device (numbered from zero) to select
- *
- *      Note: Original code is ata_sff_dev_select().
- */
-static void scc_dev_select (struct ata_port *ap, unsigned int device)
-{
-        u8 tmp;
-        if (device == 0)
-                tmp = ATA_DEVICE_OBS;
-        else
-                tmp = ATA_DEVICE_OBS | ATA_DEV1;
-        out_be32(ap->ioaddr.device_addr, tmp);
-        ata_sff_pause(ap);
-}
-/**
- *      scc_set_devctl - Write device control reg
- *      @ap: port where the device is
- *      @ctl: value to write
- */
-static void scc_set_devctl(struct ata_port *ap, u8 ctl)
-{
-        out_be32(ap->ioaddr.ctl_addr, ctl);
-}
-/**
- *      scc_bmdma_setup - Set up PCI IDE BMDMA transaction
- *      @qc: Info associated with this ATA transaction.
- *
- *      Note: Original code is ata_bmdma_setup().
- */
-static void scc_bmdma_setup (struct ata_queued_cmd *qc)
-{
-        struct ata_port *ap = qc->ap;
-        unsigned int rw = (qc->tf.flags & ATA_TFLAG_WRITE);
-        u8 dmactl;
-        void __iomem *mmio = ap->ioaddr.bmdma_addr;
-        /* load PRD table addr */
-        out_be32(mmio + SCC_DMA_TABLE_OFS, ap->bmdma_prd_dma);
-        /* specify data direction, triple-check start bit is clear */
-        dmactl = in_be32(mmio + SCC_DMA_CMD);
-        dmactl &= ~(ATA_DMA_WR | ATA_DMA_START);
-        if (!rw)
-                dmactl |= ATA_DMA_WR;
-        out_be32(mmio + SCC_DMA_CMD, dmactl);
-        /* issue r/w command */
-        ap->ops->sff_exec_command(ap, &qc->tf);
-}
-/**
- *      scc_bmdma_start - Start a PCI IDE BMDMA transaction
- *      @qc: Info associated with this ATA transaction.
- *
- *      Note: Original code is ata_bmdma_start().
- */
-static void scc_bmdma_start (struct ata_queued_cmd *qc)
-{
-        struct ata_port *ap = qc->ap;
-        u8 dmactl;
-        void __iomem *mmio = ap->ioaddr.bmdma_addr;
-        /* start host DMA transaction */
-        dmactl = in_be32(mmio + SCC_DMA_CMD);
-        out_be32(mmio + SCC_DMA_CMD, dmactl | ATA_DMA_START);
-}
-/**
- *      scc_devchk - PATA device presence detection
- *      @ap: ATA channel to examine
- *      @device: Device to examine (starting at zero)
- *
- *      Note: Original code is ata_devchk().
- */
-static unsigned int scc_devchk (struct ata_port *ap,
-                                unsigned int device)
-{
-        struct ata_ioports *ioaddr = &ap->ioaddr;
-        u8 nsect, lbal;
-        ap->ops->sff_dev_select(ap, device);
-        out_be32(ioaddr->nsect_addr, 0x55);
-        out_be32(ioaddr->lbal_addr, 0xaa);
-        out_be32(ioaddr->nsect_addr, 0xaa);
-        out_be32(ioaddr->lbal_addr, 0x55);
-        out_be32(ioaddr->nsect_addr, 0x55);
-        out_be32(ioaddr->lbal_addr, 0xaa);
-        nsect = in_be32(ioaddr->nsect_addr);
-        lbal = in_be32(ioaddr->lbal_addr);
-        if ((nsect == 0x55) && (lbal == 0xaa))
-                return 1;       /* we found a device */
-        return 0;               /* nothing found */
-}
-/**
- *      scc_wait_after_reset - wait for devices to become ready after reset
- *
- *      Note: Original code is ata_sff_wait_after_reset
- */
-static int scc_wait_after_reset(struct ata_link *link, unsigned int devmask,
-                                unsigned long deadline)
-{
-        struct ata_port *ap = link->ap;
-        struct ata_ioports *ioaddr = &ap->ioaddr;
-        unsigned int dev0 = devmask & (1 << 0);
-        unsigned int dev1 = devmask & (1 << 1);
-        int rc, ret = 0;
-        /* Spec mandates ">= 2ms" before checking status.  We wait
-         * 150ms, because that was the magic delay used for ATAPI
-         * devices in Hale Landis's ATADRVR, for the period of time
-         * between when the ATA command register is written, and then
-         * status is checked.  Because waiting for "a while" before
-         * checking status is fine, post SRST, we perform this magic
-         * delay here as well.
-         *
-         * Old drivers/ide uses the 2mS rule and then waits for ready.
-         */
-        ata_msleep(ap, 150);
-        /* always check readiness of the master device */
-        rc = ata_sff_wait_ready(link, deadline);
-        /* -ENODEV means the odd clown forgot the D7 pulldown resistor
-         * and TF status is 0xff, bail out on it too.
-         */
-        if (rc)
-                return rc;
-        /* if device 1 was found in ata_devchk, wait for register
-         * access briefly, then wait for BSY to clear.
-         */
-        if (dev1) {
-                int i;
-                ap->ops->sff_dev_select(ap, 1);
-                /* Wait for register access.  Some ATAPI devices fail
-                 * to set nsect/lbal after reset, so don't waste too
-                 * much time on it.  We're gonna wait for !BSY anyway.
-                 */
-                for (i = 0; i < 2; i++) {
-                        u8 nsect, lbal;
-                        nsect = in_be32(ioaddr->nsect_addr);
-                        lbal = in_be32(ioaddr->lbal_addr);
-                        if ((nsect == 1) && (lbal == 1))
-                                break;
-                        ata_msleep(ap, 50);     /* give drive a breather */
-                }
-                rc = ata_sff_wait_ready(link, deadline);
-                if (rc) {
-                        if (rc != -ENODEV)
-                                return rc;
-                        ret = rc;
-                }
-        }
-        /* is all this really necessary? */
-        ap->ops->sff_dev_select(ap, 0);
-        if (dev1)
-                ap->ops->sff_dev_select(ap, 1);
-        if (dev0)
-                ap->ops->sff_dev_select(ap, 0);
-        return ret;
-}
-/**
- *      scc_bus_softreset - PATA device software reset
- *
- *      Note: Original code is ata_bus_softreset().
- */
-static int scc_bus_softreset(struct ata_port *ap, unsigned int devmask,
-                                      unsigned long deadline)
-{
-        struct ata_ioports *ioaddr = &ap->ioaddr;
-        DPRINTK("ata%u: bus reset via SRST\n", ap->print_id);
-        /* software reset.  causes dev0 to be selected */
-        out_be32(ioaddr->ctl_addr, ap->ctl);
-        udelay(20);
-        out_be32(ioaddr->ctl_addr, ap->ctl | ATA_SRST);
-        udelay(20);
-        out_be32(ioaddr->ctl_addr, ap->ctl);
-        return scc_wait_after_reset(&ap->link, devmask, deadline);
-}
-/**
- *      scc_softreset - reset host port via ATA SRST
- *      @ap: port to reset
- *      @classes: resulting classes of attached devices
- *      @deadline: deadline jiffies for the operation
- *
- *      Note: Original code is ata_sff_softreset().
- */
-static int scc_softreset(struct ata_link *link, unsigned int *classes,
-                         unsigned long deadline)
-{
-        struct ata_port *ap = link->ap;
-        unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
-        unsigned int devmask = 0;
-        int rc;
-        u8 err;
-        DPRINTK("ENTER\n");
-        /* determine if device 0/1 are present */
-        if (scc_devchk(ap, 0))
-                devmask |= (1 << 0);
-        if (slave_possible && scc_devchk(ap, 1))
-                devmask |= (1 << 1);
-        /* select device 0 again */
-        ap->ops->sff_dev_select(ap, 0);
-        /* issue bus reset */
-        DPRINTK("about to softreset, devmask=%x\n", devmask);
-        rc = scc_bus_softreset(ap, devmask, deadline);
-        if (rc) {
-                ata_port_err(ap, "SRST failed (err_mask=0x%x)\n", rc);
-                return -EIO;
-        }
-        /* determine by signature whether we have ATA or ATAPI devices */
-        classes[0] = ata_sff_dev_classify(&ap->link.device[0],
-                                          devmask & (1 << 0), &err);
-        if (slave_possible && err != 0x81)
-                classes[1] = ata_sff_dev_classify(&ap->link.device[1],
-                                                  devmask & (1 << 1), &err);
-        DPRINTK("EXIT, classes[0]=%u [1]=%u\n", classes[0], classes[1]);
-        return 0;
-}
-/**
- *      scc_bmdma_stop - Stop PCI IDE BMDMA transfer
- *      @qc: Command we are ending DMA for
- */
-static void scc_bmdma_stop (struct ata_queued_cmd *qc)
-{
-        struct ata_port *ap = qc->ap;
-        void __iomem *ctrl_base = ap->host->iomap[SCC_CTRL_BAR];
-        void __iomem *bmid_base = ap->host->iomap[SCC_BMID_BAR];
-        u32 reg;
-        while (1) {
-                reg = in_be32(bmid_base + SCC_DMA_INTST);
-                if (reg & INTSTS_SERROR) {
-                        printk(KERN_WARNING "%s: SERROR\n", DRV_NAME);
-                        out_be32(bmid_base + SCC_DMA_INTST, INTSTS_SERROR|INTSTS_BMSINT);
-                        out_be32(bmid_base + SCC_DMA_CMD,
-                                 in_be32(bmid_base + SCC_DMA_CMD) & ~ATA_DMA_START);
-                        continue;
-                }
-                if (reg & INTSTS_PRERR) {
-                        u32 maea0, maec0;
-                        maea0 = in_be32(ctrl_base + SCC_CTL_MAEA0);
-                        maec0 = in_be32(ctrl_base + SCC_CTL_MAEC0);
-                        printk(KERN_WARNING "%s: PRERR [addr:%x cmd:%x]\n", DRV_NAME, maea0, maec0);
-                        out_be32(bmid_base + SCC_DMA_INTST, INTSTS_PRERR|INTSTS_BMSINT);
-                        out_be32(bmid_base + SCC_DMA_CMD,
-                                 in_be32(bmid_base + SCC_DMA_CMD) & ~ATA_DMA_START);
-                        continue;
-                }
-                if (reg & INTSTS_RERR) {
-                        printk(KERN_WARNING "%s: Response Error\n", DRV_NAME);
-                        out_be32(bmid_base + SCC_DMA_INTST, INTSTS_RERR|INTSTS_BMSINT);
-                        out_be32(bmid_base + SCC_DMA_CMD,
-                                 in_be32(bmid_base + SCC_DMA_CMD) & ~ATA_DMA_START);
-                        continue;
-                }
-                if (reg & INTSTS_ICERR) {
-                        out_be32(bmid_base + SCC_DMA_CMD,
-                                 in_be32(bmid_base + SCC_DMA_CMD) & ~ATA_DMA_START);
-                        printk(KERN_WARNING "%s: Illegal Configuration\n", DRV_NAME);
-                        out_be32(bmid_base + SCC_DMA_INTST, INTSTS_ICERR|INTSTS_BMSINT);
-                        continue;
-                }
-                if (reg & INTSTS_BMSINT) {
-                        unsigned int classes;
-                        unsigned long deadline = ata_deadline(jiffies, ATA_TMOUT_BOOT);
-                        printk(KERN_WARNING "%s: Internal Bus Error\n", DRV_NAME);
-                        out_be32(bmid_base + SCC_DMA_INTST, INTSTS_BMSINT);
-                        /* TBD: SW reset */
-                        scc_softreset(&ap->link, &classes, deadline);
-                        continue;
-                }
-                if (reg & INTSTS_BMHE) {
-                        out_be32(bmid_base + SCC_DMA_INTST, INTSTS_BMHE);
-                        continue;
-                }
-                if (reg & INTSTS_ACTEINT) {
-                        out_be32(bmid_base + SCC_DMA_INTST, INTSTS_ACTEINT);
-                        continue;
-                }
-                if (reg & INTSTS_IOIRQS) {
-                        out_be32(bmid_base + SCC_DMA_INTST, INTSTS_IOIRQS);
-                        continue;
-                }
-                break;
-        }
-        /* clear start/stop bit */
-        out_be32(bmid_base + SCC_DMA_CMD,
-                 in_be32(bmid_base + SCC_DMA_CMD) & ~ATA_DMA_START);
-        /* one-PIO-cycle guaranteed wait, per spec, for HDMA1:0 transition */
-        ata_sff_dma_pause(ap);  /* dummy read */
-}
-/**
- *      scc_bmdma_status - Read PCI IDE BMDMA status
- *      @ap: Port associated with this ATA transaction.
- */
-static u8 scc_bmdma_status (struct ata_port *ap)
-{
-        void __iomem *mmio = ap->ioaddr.bmdma_addr;
-        u8 host_stat = in_be32(mmio + SCC_DMA_STATUS);
-        u32 int_status = in_be32(mmio + SCC_DMA_INTST);
-        struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap->link.active_tag);
-        static int retry = 0;
-        /* return if IOS_SS is cleared */
-        if (!(in_be32(mmio + SCC_DMA_CMD) & ATA_DMA_START))
-                return host_stat;
-        /* errata A252,A308 workaround: Step4 */
-        if ((scc_check_altstatus(ap) & ATA_ERR)
-                                        && (int_status & INTSTS_INTRQ))
-                return (host_stat | ATA_DMA_INTR);
-        /* errata A308 workaround Step5 */
-        if (int_status & INTSTS_IOIRQS) {
-                host_stat |= ATA_DMA_INTR;
-                /* We don't check ATAPI DMA because it is limited to UDMA4 */
-                if ((qc->tf.protocol == ATA_PROT_DMA &&
-                     qc->dev->xfer_mode > XFER_UDMA_4)) {
-                        if (!(int_status & INTSTS_ACTEINT)) {
-                                printk(KERN_WARNING "ata%u: operation failed (transfer data loss)\n",
-                                       ap->print_id);
-                                host_stat |= ATA_DMA_ERR;
-                                if (retry++)
-                                        ap->udma_mask &= ~(1 << qc->dev->xfer_mode);
-                        } else
-                                retry = 0;
-                }
-        }
-        return host_stat;
-}
-/**
- *      scc_data_xfer - Transfer data by PIO
- *      @dev: device for this I/O
- *      @buf: data buffer
- *      @buflen: buffer length
- *      @rw: read/write
- *
- *      Note: Original code is ata_sff_data_xfer().
- */
-static unsigned int scc_data_xfer (struct ata_device *dev, unsigned char *buf,
-                                   unsigned int buflen, int rw)
-{
-        struct ata_port *ap = dev->link->ap;
-        unsigned int words = buflen >> 1;
-        unsigned int i;
-        __le16 *buf16 = (__le16 *) buf;
-        void __iomem *mmio = ap->ioaddr.data_addr;
-        /* Transfer multiple of 2 bytes */
-        if (rw == READ)
-                for (i = 0; i < words; i++)
-                        buf16[i] = cpu_to_le16(in_be32(mmio));
-        else
-                for (i = 0; i < words; i++)
-                        out_be32(mmio, le16_to_cpu(buf16[i]));
-        /* Transfer trailing 1 byte, if any. */
-        if (unlikely(buflen & 0x01)) {
-                __le16 align_buf[1] = { 0 };
-                unsigned char *trailing_buf = buf + buflen - 1;
-                if (rw == READ) {
-                        align_buf[0] = cpu_to_le16(in_be32(mmio));
-                        memcpy(trailing_buf, align_buf, 1);
-                } else {
-                        memcpy(align_buf, trailing_buf, 1);
-                        out_be32(mmio, le16_to_cpu(align_buf[0]));
-                }
-                words++;
-        }
-        return words << 1;
-}
-/**
- *      scc_postreset - standard postreset callback
- *      @ap: the target ata_port
- *      @classes: classes of attached devices
- *
- *      Note: Original code is ata_sff_postreset().
- */
-static void scc_postreset(struct ata_link *link, unsigned int *classes)
-{
-        struct ata_port *ap = link->ap;
-        DPRINTK("ENTER\n");
-        /* is double-select really necessary? */
-        if (classes[0] != ATA_DEV_NONE)
-                ap->ops->sff_dev_select(ap, 1);
-        if (classes[1] != ATA_DEV_NONE)
-                ap->ops->sff_dev_select(ap, 0);
-        /* bail out if no device is present */
-        if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
-                DPRINTK("EXIT, no device\n");
-                return;
-        }
-        /* set up device control */
-        out_be32(ap->ioaddr.ctl_addr, ap->ctl);
-        DPRINTK("EXIT\n");
-}
-/**
- *      scc_irq_clear - Clear PCI IDE BMDMA interrupt.
- *      @ap: Port associated with this ATA transaction.
- *
- *      Note: Original code is ata_bmdma_irq_clear().
- */
-static void scc_irq_clear (struct ata_port *ap)
-{
-        void __iomem *mmio = ap->ioaddr.bmdma_addr;
-        if (!mmio)
-                return;
-        out_be32(mmio + SCC_DMA_STATUS, in_be32(mmio + SCC_DMA_STATUS));
-}
-/**
- *      scc_port_start - Set port up for dma.
- *      @ap: Port to initialize
- *
- *      Allocate space for PRD table using ata_bmdma_port_start().
- *      Set PRD table address for PTERADD. (PRD Transfer End Read)
- */
-static int scc_port_start (struct ata_port *ap)
-{
-        void __iomem *mmio = ap->ioaddr.bmdma_addr;
-        int rc;
-        rc = ata_bmdma_port_start(ap);
-        if (rc)
-                return rc;
-        out_be32(mmio + SCC_DMA_PTERADD, ap->bmdma_prd_dma);
-        return 0;
-}
-/**
- *      scc_port_stop - Undo scc_port_start()
- *      @ap: Port to shut down
- *
- *      Reset PTERADD.
- */
-static void scc_port_stop (struct ata_port *ap)
-{
-        void __iomem *mmio = ap->ioaddr.bmdma_addr;
-        out_be32(mmio + SCC_DMA_PTERADD, 0);
-}
-static struct scsi_host_template scc_sht = {
-        ATA_BMDMA_SHT(DRV_NAME),
-};
-static struct ata_port_operations scc_pata_ops = {
-        .inherits               = &ata_bmdma_port_ops,
-        .set_piomode            = scc_set_piomode,
-        .set_dmamode            = scc_set_dmamode,
-        .mode_filter            = scc_mode_filter,
-        .sff_tf_load            = scc_tf_load,
-        .sff_tf_read            = scc_tf_read,
-        .sff_exec_command       = scc_exec_command,
-        .sff_check_status       = scc_check_status,
-        .sff_check_altstatus    = scc_check_altstatus,
-        .sff_dev_select         = scc_dev_select,
-        .sff_set_devctl         = scc_set_devctl,
-        .bmdma_setup            = scc_bmdma_setup,
-        .bmdma_start            = scc_bmdma_start,
-        .bmdma_stop             = scc_bmdma_stop,
-        .bmdma_status           = scc_bmdma_status,
-        .sff_data_xfer          = scc_data_xfer,
-        .cable_detect           = ata_cable_80wire,
-        .softreset              = scc_softreset,
-        .postreset              = scc_postreset,
-        .sff_irq_clear          = scc_irq_clear,
-        .port_start             = scc_port_start,
-        .port_stop              = scc_port_stop,
-};
-static struct ata_port_info scc_port_info[] = {
-        {
-                .flags          = ATA_FLAG_SLAVE_POSS,
-                .pio_mask       = ATA_PIO4,
-                /* No MWDMA */
-                .udma_mask      = ATA_UDMA6,
-                .port_ops       = &scc_pata_ops,
-        },
-};
-/**
- *      scc_reset_controller - initialize SCC PATA controller.
- */
-static int scc_reset_controller(struct ata_host *host)
-{
-        void __iomem *ctrl_base = host->iomap[SCC_CTRL_BAR];
-        void __iomem *bmid_base = host->iomap[SCC_BMID_BAR];
-        void __iomem *cckctrl_port = ctrl_base + SCC_CTL_CCKCTRL;
-        void __iomem *mode_port = ctrl_base + SCC_CTL_MODEREG;
-        void __iomem *ecmode_port = ctrl_base + SCC_CTL_ECMODE;
-        void __iomem *intmask_port = bmid_base + SCC_DMA_INTMASK;
-        void __iomem *dmastatus_port = bmid_base + SCC_DMA_STATUS;
-        u32 reg = 0;
-        out_be32(cckctrl_port, reg);
-        reg |= CCKCTRL_ATACLKOEN;
-        out_be32(cckctrl_port, reg);
-        reg |= CCKCTRL_LCLKEN | CCKCTRL_OCLKEN;
-        out_be32(cckctrl_port, reg);
-        reg |= CCKCTRL_CRST;
-        out_be32(cckctrl_port, reg);
-        for (;;) {
-                reg = in_be32(cckctrl_port);
-                if (reg & CCKCTRL_CRST)
-                        break;
-                udelay(5000);
-        }
-        reg |= CCKCTRL_ATARESET;
-        out_be32(cckctrl_port, reg);
-        out_be32(ecmode_port, ECMODE_VALUE);
-        out_be32(mode_port, MODE_JCUSFEN);
-        out_be32(intmask_port, INTMASK_MSK);
-        if (in_be32(dmastatus_port) & QCHSD_STPDIAG) {
-                printk(KERN_WARNING "%s: failed to detect 80c cable. (PDIAG# is high)\n", DRV_NAME);
-                return -EIO;
-        }
-        return 0;
-}
-/**
- *      scc_setup_ports - initialize ioaddr with SCC PATA port offsets.
- *      @ioaddr: IO address structure to be initialized
- *      @base: base address of BMID region
- */
-static void scc_setup_ports (struct ata_ioports *ioaddr, void __iomem *base)
-{
-        ioaddr->cmd_addr = base + SCC_REG_CMD_ADDR;
-        ioaddr->altstatus_addr = ioaddr->cmd_addr + SCC_REG_ALTSTATUS;
-        ioaddr->ctl_addr = ioaddr->cmd_addr + SCC_REG_ALTSTATUS;
-        ioaddr->bmdma_addr = base;
-        ioaddr->data_addr = ioaddr->cmd_addr + SCC_REG_DATA;
-        ioaddr->error_addr = ioaddr->cmd_addr + SCC_REG_ERR;
-        ioaddr->feature_addr = ioaddr->cmd_addr + SCC_REG_FEATURE;
-        ioaddr->nsect_addr = ioaddr->cmd_addr + SCC_REG_NSECT;
-        ioaddr->lbal_addr = ioaddr->cmd_addr + SCC_REG_LBAL;
-        ioaddr->lbam_addr = ioaddr->cmd_addr + SCC_REG_LBAM;
-        ioaddr->lbah_addr = ioaddr->cmd_addr + SCC_REG_LBAH;
-        ioaddr->device_addr = ioaddr->cmd_addr + SCC_REG_DEVICE;
-        ioaddr->status_addr = ioaddr->cmd_addr + SCC_REG_STATUS;
-        ioaddr->command_addr = ioaddr->cmd_addr + SCC_REG_CMD;
-}
-static int scc_host_init(struct ata_host *host)
-{
-        struct pci_dev *pdev = to_pci_dev(host->dev);
-        int rc;
-        rc = scc_reset_controller(host);
-        if (rc)
-                return rc;
-        rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-        rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);
-        if (rc)
-                return rc;
-        scc_setup_ports(&host->ports[0]->ioaddr, host->iomap[SCC_BMID_BAR]);
-        pci_set_master(pdev);
-        return 0;
-}
-/**
- *      scc_init_one - Register SCC PATA device with kernel services
- *      @pdev: PCI device to register
- *      @ent: Entry in scc_pci_tbl matching with @pdev
- *
- *      LOCKING:
- *      Inherited from PCI layer (may sleep).
- *
- *      RETURNS:
- *      Zero on success, or -ERRNO value.
- */
-static int scc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-        unsigned int board_idx = (unsigned int) ent->driver_data;
-        const struct ata_port_info *ppi[] = { &scc_port_info[board_idx], NULL };
-        struct ata_host *host;
-        int rc;
-        ata_print_version_once(&pdev->dev, DRV_VERSION);
-        host = ata_host_alloc_pinfo(&pdev->dev, ppi, 1);
-        if (!host)
-                return -ENOMEM;
-        rc = pcim_enable_device(pdev);
-        if (rc)
-                return rc;
-        rc = pcim_iomap_regions(pdev, (1 << SCC_CTRL_BAR) | (1 << SCC_BMID_BAR), DRV_NAME);
-        if (rc == -EBUSY)
-                pcim_pin_device(pdev);
-        if (rc)
-                return rc;
-        host->iomap = pcim_iomap_table(pdev);
-        ata_port_pbar_desc(host->ports[0], SCC_CTRL_BAR, -1, "ctrl");
-        ata_port_pbar_desc(host->ports[0], SCC_BMID_BAR, -1, "bmid");
-        rc = scc_host_init(host);
-        if (rc)
-                return rc;
-        return ata_host_activate(host, pdev->irq, ata_bmdma_interrupt,
-                                 IRQF_SHARED, &scc_sht);
-}
-static struct pci_driver scc_pci_driver = {
-        .name                   = DRV_NAME,
-        .id_table               = scc_pci_tbl,
-        .probe                  = scc_init_one,
-        .remove                 = ata_pci_remove_one,
-#ifdef CONFIG_PM_SLEEP
-        .suspend                = ata_pci_device_suspend,
-        .resume                 = ata_pci_device_resume,
-#endif
-};
-module_pci_driver(scc_pci_driver);
-MODULE_AUTHOR("Toshiba corp");
-MODULE_DESCRIPTION("SCSI low-level driver for Toshiba SCC PATA controller");
-MODULE_LICENSE("GPL");
-MODULE_DEVICE_TABLE(pci, scc_pci_tbl);
-MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index ae3fcb4199e9..d7173cb1ea76 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1620,8 +1620,8 @@ out:
 static void loop_remove(struct loop_device *lo)
 {
-        del_gendisk(lo->lo_disk);
        blk_cleanup_queue(lo->lo_queue);
+        del_gendisk(lo->lo_disk);
        blk_mq_free_tag_set(&lo->tag_set);
        put_disk(lo->lo_disk);
        kfree(lo);
diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c
index 6b736b00f63e..88f13c525712 100644
--- a/drivers/block/nvme-scsi.c
+++ b/drivers/block/nvme-scsi.c
@@ -944,7 +944,8 @@ static int nvme_trans_ext_inq_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 static int nvme_trans_bdev_limits_page(struct nvme_ns *ns, struct sg_io_hdr *hdr,
                                        u8 *inq_response, int alloc_len)
 {
-        __be32 max_sectors = cpu_to_be32(queue_max_hw_sectors(ns->queue));
+        __be32 max_sectors = cpu_to_be32(
+                nvme_block_nr(ns, queue_max_hw_sectors(ns->queue)));
        __be32 max_discard = cpu_to_be32(ns->queue->limits.max_discard_sectors);
        __be32 discard_desc_count = cpu_to_be32(0x100);
diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c
index bd2b3bbbb22c..713fc9ff1149 100644
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
@@ -265,17 +265,6 @@ static void put_persistent_gnt(struct xen_blkif *blkif,
        atomic_dec(&blkif->persistent_gnt_in_use);
 }
-static void free_persistent_gnts_unmap_callback(int result,
-                                                struct gntab_unmap_queue_data *data)
-{
-        struct completion *c = data->data;
-        /* BUG_ON used to reproduce existing behaviour,
-           but is this the best way to deal with this? */
-        BUG_ON(result);
-        complete(c);
-}
 static void free_persistent_gnts(struct xen_blkif *blkif, struct rb_root *root,
                                 unsigned int num)
 {
@@ -285,12 +274,7 @@ static void free_persistent_gnts(struct xen_blkif *blkif, struct rb_root *root,
        struct rb_node *n;
        int segs_to_unmap = 0;
        struct gntab_unmap_queue_data unmap_data;
-        struct completion unmap_completion;
-        init_completion(&unmap_completion);
-        unmap_data.data = &unmap_completion;
-        unmap_data.done = &free_persistent_gnts_unmap_callback;
        unmap_data.pages = pages;
        unmap_data.unmap_ops = unmap;
        unmap_data.kunmap_ops = NULL;
@@ -310,8 +294,7 @@ static void free_persistent_gnts(struct xen_blkif *blkif, struct rb_root *root,
                        !rb_next(&persistent_gnt->node)) {
                        unmap_data.count = segs_to_unmap;
-                        gnttab_unmap_refs_async(&unmap_data);
+                        BUG_ON(gnttab_unmap_refs_sync(&unmap_data));
-                        wait_for_completion(&unmap_completion);
                        put_free_pages(blkif, pages, segs_to_unmap);
                        segs_to_unmap = 0;
@@ -329,8 +312,13 @@ void xen_blkbk_unmap_purged_grants(struct work_struct *work)
        struct gnttab_unmap_grant_ref unmap[BLKIF_MAX_SEGMENTS_PER_REQUEST];
        struct page *pages[BLKIF_MAX_SEGMENTS_PER_REQUEST];
        struct persistent_gnt *persistent_gnt;
-        int ret, segs_to_unmap = 0;
+        int segs_to_unmap = 0;
        struct xen_blkif *blkif = container_of(work, typeof(*blkif), persistent_purge_work);
+        struct gntab_unmap_queue_data unmap_data;
+        unmap_data.pages = pages;
+        unmap_data.unmap_ops = unmap;
+        unmap_data.kunmap_ops = NULL;
        while(!list_empty(&blkif->persistent_purge_list)) {
                persistent_gnt = list_first_entry(&blkif->persistent_purge_list,
@@ -346,17 +334,16 @@ void xen_blkbk_unmap_purged_grants(struct work_struct *work)
                pages[segs_to_unmap] = persistent_gnt->page;
                if (++segs_to_unmap == BLKIF_MAX_SEGMENTS_PER_REQUEST) {
-                        ret = gnttab_unmap_refs(unmap, NULL, pages,
+                        unmap_data.count = segs_to_unmap;
-                                segs_to_unmap);
+                        BUG_ON(gnttab_unmap_refs_sync(&unmap_data));
-                        BUG_ON(ret);
                        put_free_pages(blkif, pages, segs_to_unmap);
                        segs_to_unmap = 0;
                }
                kfree(persistent_gnt);
        }
        if (segs_to_unmap > 0) {
-                ret = gnttab_unmap_refs(unmap, NULL, pages, segs_to_unmap);
+                unmap_data.count = segs_to_unmap;
-                BUG_ON(ret);
+                BUG_ON(gnttab_unmap_refs_sync(&unmap_data));
                put_free_pages(blkif, pages, segs_to_unmap);
        }
 }
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index c94386aa563d..8dcbced0eafd 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -74,6 +74,27 @@ static inline struct zram *dev_to_zram(struct device *dev)
        return (struct zram *)dev_to_disk(dev)->private_data;
 }
+static ssize_t compact_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t len)
+{
+        unsigned long nr_migrated;
+        struct zram *zram = dev_to_zram(dev);
+        struct zram_meta *meta;
+        down_read(&zram->init_lock);
+        if (!init_done(zram)) {
+                up_read(&zram->init_lock);
+                return -EINVAL;
+        }
+        meta = zram->meta;
+        nr_migrated = zs_compact(meta->mem_pool);
+        atomic64_add(nr_migrated, &zram->stats.num_migrated);
+        up_read(&zram->init_lock);
+        return len;
+}
 static ssize_t disksize_show(struct device *dev,
                struct device_attribute *attr, char *buf)
 {
@@ -1038,6 +1059,7 @@ static const struct block_device_operations zram_devops = {
        .owner = THIS_MODULE
 };
+static DEVICE_ATTR_WO(compact);
 static DEVICE_ATTR_RW(disksize);
 static DEVICE_ATTR_RO(initstate);
 static DEVICE_ATTR_WO(reset);
@@ -1114,6 +1136,7 @@ static struct attribute *zram_disk_attrs[] = {
        &dev_attr_num_writes.attr,
        &dev_attr_failed_reads.attr,
        &dev_attr_failed_writes.attr,
+        &dev_attr_compact.attr,
        &dev_attr_invalid_io.attr,
        &dev_attr_notify_free.attr,
        &dev_attr_zero_pages.attr,
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 4f7e8d400bc0..6de97b3871b0 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -227,7 +227,6 @@ static void bt3c_receive(struct bt3c_info *info)
        iobase = info->p_dev->resource[0]->start;
        avail = bt3c_read(iobase, 0x7006);
-        //printk("bt3c_cs: receiving %d bytes\n", avail);
        bt3c_address(iobase, 0x7480);
        while (size < avail) {
@@ -250,7 +249,6 @@ static void bt3c_receive(struct bt3c_info *info)
                        bt_cb(info->rx_skb)->pkt_type = inb(iobase + DATA_L);
                        inb(iobase + DATA_H);
-                        //printk("bt3c: PACKET_TYPE=%02x\n", bt_cb(info->rx_skb)->pkt_type);
                        switch (bt_cb(info->rx_skb)->pkt_type) {
@@ -364,7 +362,6 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
                        if (stat & 0x0001)
                                bt3c_receive(info);
                        if (stat & 0x0002) {
-                                //BT_ERR("Ack (stat=0x%04x)", stat);
                                clear_bit(XMIT_SENDING, &(info->tx_state));
                                bt3c_write_wakeup(info);
                        }
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index d0741f3ed7ec..4bba86677adc 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -95,6 +95,78 @@ int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)
 }
 EXPORT_SYMBOL_GPL(btbcm_set_bdaddr);
+int btbcm_patchram(struct hci_dev *hdev, const char *firmware)
+{
+        const struct hci_command_hdr *cmd;
+        const struct firmware *fw;
+        const u8 *fw_ptr;
+        size_t fw_size;
+        struct sk_buff *skb;
+        u16 opcode;
+        int err;
+        err = request_firmware(&fw, firmware, &hdev->dev);
+        if (err < 0) {
+                BT_INFO("%s: BCM: Patch %s not found", hdev->name, firmware);
+                return err;
+        }
+        /* Start Download */
+        skb = __hci_cmd_sync(hdev, 0xfc2e, 0, NULL, HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                err = PTR_ERR(skb);
+                BT_ERR("%s: BCM: Download Minidrv command failed (%d)",
+                       hdev->name, err);
+                goto done;
+        }
+        kfree_skb(skb);
+        /* 50 msec delay after Download Minidrv completes */
+        msleep(50);
+        fw_ptr = fw->data;
+        fw_size = fw->size;
+        while (fw_size >= sizeof(*cmd)) {
+                const u8 *cmd_param;
+                cmd = (struct hci_command_hdr *)fw_ptr;
+                fw_ptr += sizeof(*cmd);
+                fw_size -= sizeof(*cmd);
+                if (fw_size < cmd->plen) {
+                        BT_ERR("%s: BCM: Patch %s is corrupted", hdev->name,
+                               firmware);
+                        err = -EINVAL;
+                        goto done;
+                }
+                cmd_param = fw_ptr;
+                fw_ptr += cmd->plen;
+                fw_size -= cmd->plen;
+                opcode = le16_to_cpu(cmd->opcode);
+                skb = __hci_cmd_sync(hdev, opcode, cmd->plen, cmd_param,
+                                     HCI_INIT_TIMEOUT);
+                if (IS_ERR(skb)) {
+                        err = PTR_ERR(skb);
+                        BT_ERR("%s: BCM: Patch command %04x failed (%d)",
+                               hdev->name, opcode, err);
+                        goto done;
+                }
+                kfree_skb(skb);
+        }
+        /* 250 msec delay after Launch Ram completes */
+        msleep(250);
+done:
+        release_firmware(fw);
+        return err;
+}
+EXPORT_SYMBOL(btbcm_patchram);
 static int btbcm_reset(struct hci_dev *hdev)
 {
        struct sk_buff *skb;
@@ -198,12 +270,8 @@ static const struct {
 int btbcm_setup_patchram(struct hci_dev *hdev)
 {
-        const struct hci_command_hdr *cmd;
-        const struct firmware *fw;
-        const u8 *fw_ptr;
-        size_t fw_size;
        char fw_name[64];
-        u16 opcode, subver, rev, pid, vid;
+        u16 subver, rev, pid, vid;
        const char *hw_name = NULL;
        struct sk_buff *skb;
        struct hci_rp_read_local_version *ver;
@@ -273,74 +341,19 @@ int btbcm_setup_patchram(struct hci_dev *hdev)
                hw_name ? : "BCM", (subver & 0x7000) >> 13,
                (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff);
-        err = request_firmware(&fw, fw_name, &hdev->dev);
+        err = btbcm_patchram(hdev, fw_name);
-        if (err < 0) {
+        if (err == -ENOENT)
-                BT_INFO("%s: BCM: patch %s not found", hdev->name, fw_name);
                return 0;
-        }
-        /* Start Download */
-        skb = __hci_cmd_sync(hdev, 0xfc2e, 0, NULL, HCI_INIT_TIMEOUT);
-        if (IS_ERR(skb)) {
-                err = PTR_ERR(skb);
-                BT_ERR("%s: BCM: Download Minidrv command failed (%d)",
-                       hdev->name, err);
-                goto reset;
-        }
-        kfree_skb(skb);
-        /* 50 msec delay after Download Minidrv completes */
-        msleep(50);
-        fw_ptr = fw->data;
-        fw_size = fw->size;
-        while (fw_size >= sizeof(*cmd)) {
-                const u8 *cmd_param;
-                cmd = (struct hci_command_hdr *)fw_ptr;
-                fw_ptr += sizeof(*cmd);
-                fw_size -= sizeof(*cmd);
-                if (fw_size < cmd->plen) {
-                        BT_ERR("%s: BCM: patch %s is corrupted", hdev->name,
-                               fw_name);
-                        err = -EINVAL;
-                        goto reset;
-                }
-                cmd_param = fw_ptr;
-                fw_ptr += cmd->plen;
-                fw_size -= cmd->plen;
-                opcode = le16_to_cpu(cmd->opcode);
-                skb = __hci_cmd_sync(hdev, opcode, cmd->plen, cmd_param,
-                                     HCI_INIT_TIMEOUT);
-                if (IS_ERR(skb)) {
-                        err = PTR_ERR(skb);
-                        BT_ERR("%s: BCM: patch command %04x failed (%d)",
-                               hdev->name, opcode, err);
-                        goto reset;
-                }
-                kfree_skb(skb);
-        }
-        /* 250 msec delay after Launch Ram completes */
-        msleep(250);
-reset:
        /* Reset */
        err = btbcm_reset(hdev);
        if (err)
-                goto done;
+                return err;
        /* Read Local Version Info */
        skb = btbcm_read_local_version(hdev);
-        if (IS_ERR(skb)) {
+        if (IS_ERR(skb))
-                err = PTR_ERR(skb);
+                return PTR_ERR(skb);
-                goto done;
-        }
        ver = (struct hci_rp_read_local_version *)skb->data;
        rev = le16_to_cpu(ver->hci_rev);
@@ -355,10 +368,7 @@ reset:
        set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
-done:
+        return 0;
-        release_firmware(fw);
-        return err;
 }
 EXPORT_SYMBOL_GPL(btbcm_setup_patchram);
diff --git a/drivers/bluetooth/btbcm.h b/drivers/bluetooth/btbcm.h
index 34268ae3eb46..eb6ab5f9483d 100644
--- a/drivers/bluetooth/btbcm.h
+++ b/drivers/bluetooth/btbcm.h
@@ -25,6 +25,7 @@
 int btbcm_check_bdaddr(struct hci_dev *hdev);
 int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
+int btbcm_patchram(struct hci_dev *hdev, const char *firmware);
 int btbcm_setup_patchram(struct hci_dev *hdev);
 int btbcm_setup_apple(struct hci_dev *hdev);
@@ -41,6 +42,11 @@ static inline int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)
        return -EOPNOTSUPP;
 }
+static inline int btbcm_patchram(struct hci_dev *hdev, const char *firmware)
+{
+        return -EOPNOTSUPP;
+}
 static inline int btbcm_setup_patchram(struct hci_dev *hdev)
 {
        return 0;
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index de7b236eeae7..d21f3b4176d3 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/firmware.h>
+#include <asm/unaligned.h>
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
@@ -57,6 +58,7 @@ static struct usb_driver btusb_driver;
 #define BTUSB_AMP               0x4000
 #define BTUSB_QCA_ROME          0x8000
 #define BTUSB_BCM_APPLE         0x10000
+#define BTUSB_REALTEK           0x20000
 static const struct usb_device_id btusb_table[] = {
        /* Generic Bluetooth USB device */
@@ -288,6 +290,28 @@ static const struct usb_device_id blacklist_table[] = {
        { USB_VENDOR_AND_INTERFACE_INFO(0x8087, 0xe0, 0x01, 0x01),
          .driver_info = BTUSB_IGNORE },
+        /* Realtek Bluetooth devices */
+        { USB_VENDOR_AND_INTERFACE_INFO(0x0bda, 0xe0, 0x01, 0x01),
+          .driver_info = BTUSB_REALTEK },
+        /* Additional Realtek 8723AE Bluetooth devices */
+        { USB_DEVICE(0x0930, 0x021d), .driver_info = BTUSB_REALTEK },
+        { USB_DEVICE(0x13d3, 0x3394), .driver_info = BTUSB_REALTEK },
+        /* Additional Realtek 8723BE Bluetooth devices */
+        { USB_DEVICE(0x0489, 0xe085), .driver_info = BTUSB_REALTEK },
+        { USB_DEVICE(0x0489, 0xe08b), .driver_info = BTUSB_REALTEK },
+        { USB_DEVICE(0x13d3, 0x3410), .driver_info = BTUSB_REALTEK },
+        { USB_DEVICE(0x13d3, 0x3416), .driver_info = BTUSB_REALTEK },
+        { USB_DEVICE(0x13d3, 0x3459), .driver_info = BTUSB_REALTEK },
+        /* Additional Realtek 8821AE Bluetooth devices */
+        { USB_DEVICE(0x0b05, 0x17dc), .driver_info = BTUSB_REALTEK },
+        { USB_DEVICE(0x13d3, 0x3414), .driver_info = BTUSB_REALTEK },
+        { USB_DEVICE(0x13d3, 0x3458), .driver_info = BTUSB_REALTEK },
+        { USB_DEVICE(0x13d3, 0x3461), .driver_info = BTUSB_REALTEK },
+        { USB_DEVICE(0x13d3, 0x3462), .driver_info = BTUSB_REALTEK },
        { }     /* Terminating entry */
 };
@@ -892,7 +916,7 @@ static int btusb_open(struct hci_dev *hdev)
         */
        if (data->setup_on_usb) {
                err = data->setup_on_usb(hdev);
-                if (err <0)
+                if (err < 0)
                        return err;
        }
@@ -1345,6 +1369,378 @@ static int btusb_setup_csr(struct hci_dev *hdev)
        return ret;
 }
+#define RTL_FRAG_LEN 252
+struct rtl_download_cmd {
+        __u8 index;
+        __u8 data[RTL_FRAG_LEN];
+} __packed;
+struct rtl_download_response {
+        __u8 status;
+        __u8 index;
+} __packed;
+struct rtl_rom_version_evt {
+        __u8 status;
+        __u8 version;
+} __packed;
+struct rtl_epatch_header {
+        __u8 signature[8];
+        __le32 fw_version;
+        __le16 num_patches;
+} __packed;
+#define RTL_EPATCH_SIGNATURE    "Realtech"
+#define RTL_ROM_LMP_3499        0x3499
+#define RTL_ROM_LMP_8723A       0x1200
+#define RTL_ROM_LMP_8723B       0x8723
+#define RTL_ROM_LMP_8821A       0x8821
+#define RTL_ROM_LMP_8761A       0x8761
+static int rtl_read_rom_version(struct hci_dev *hdev, u8 *version)
+{
+        struct rtl_rom_version_evt *rom_version;
+        struct sk_buff *skb;
+        int ret;
+        /* Read RTL ROM version command */
+        skb = __hci_cmd_sync(hdev, 0xfc6d, 0, NULL, HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                BT_ERR("%s: Read ROM version failed (%ld)",
+                       hdev->name, PTR_ERR(skb));
+                return PTR_ERR(skb);
+        }
+        if (skb->len != sizeof(*rom_version)) {
+                BT_ERR("%s: RTL version event length mismatch", hdev->name);
+                kfree_skb(skb);
+                return -EIO;
+        }
+        rom_version = (struct rtl_rom_version_evt *)skb->data;
+        BT_INFO("%s: rom_version status=%x version=%x",
+                hdev->name, rom_version->status, rom_version->version);
+        ret = rom_version->status;
+        if (ret == 0)
+                *version = rom_version->version;
+        kfree_skb(skb);
+        return ret;
+}
+static int rtl8723b_parse_firmware(struct hci_dev *hdev, u16 lmp_subver,
+                                   const struct firmware *fw,
+                                   unsigned char **_buf)
+{
+        const u8 extension_sig[] = { 0x51, 0x04, 0xfd, 0x77 };
+        struct rtl_epatch_header *epatch_info;
+        unsigned char *buf;
+        int i, ret, len;
+        size_t min_size;
+        u8 opcode, length, data, rom_version = 0;
+        int project_id = -1;
+        const unsigned char *fwptr, *chip_id_base;
+        const unsigned char *patch_length_base, *patch_offset_base;
+        u32 patch_offset = 0;
+        u16 patch_length, num_patches;
+        const u16 project_id_to_lmp_subver[] = {
+                RTL_ROM_LMP_8723A,
+                RTL_ROM_LMP_8723B,
+                RTL_ROM_LMP_8821A,
+                RTL_ROM_LMP_8761A
+        };
+        ret = rtl_read_rom_version(hdev, &rom_version);
+        if (ret)
+                return -bt_to_errno(ret);
+        min_size = sizeof(struct rtl_epatch_header) + sizeof(extension_sig) + 3;
+        if (fw->size < min_size)
+                return -EINVAL;
+        fwptr = fw->data + fw->size - sizeof(extension_sig);
+        if (memcmp(fwptr, extension_sig, sizeof(extension_sig)) != 0) {
+                BT_ERR("%s: extension section signature mismatch", hdev->name);
+                return -EINVAL;
+        }
+        /* Loop from the end of the firmware parsing instructions, until
+         * we find an instruction that identifies the "project ID" for the
+         * hardware supported by this firwmare file.
+         * Once we have that, we double-check that that project_id is suitable
+         * for the hardware we are working with.
+         */
+        while (fwptr >= fw->data + (sizeof(struct rtl_epatch_header) + 3)) {
+                opcode = *--fwptr;
+                length = *--fwptr;
+                data = *--fwptr;
+                BT_DBG("check op=%x len=%x data=%x", opcode, length, data);
+                if (opcode == 0xff) /* EOF */
+                        break;
+                if (length == 0) {
+                        BT_ERR("%s: found instruction with length 0",
+                               hdev->name);
+                        return -EINVAL;
+                }
+                if (opcode == 0 && length == 1) {
+                        project_id = data;
+                        break;
+                }
+                fwptr -= length;
+        }
+        if (project_id < 0) {
+                BT_ERR("%s: failed to find version instruction", hdev->name);
+                return -EINVAL;
+        }
+        if (project_id >= ARRAY_SIZE(project_id_to_lmp_subver)) {
+                BT_ERR("%s: unknown project id %d", hdev->name, project_id);
+                return -EINVAL;
+        }
+        if (lmp_subver != project_id_to_lmp_subver[project_id]) {
+                BT_ERR("%s: firmware is for %x but this is a %x", hdev->name,
+                       project_id_to_lmp_subver[project_id], lmp_subver);
+                return -EINVAL;
+        }
+        epatch_info = (struct rtl_epatch_header *)fw->data;
+        if (memcmp(epatch_info->signature, RTL_EPATCH_SIGNATURE, 8) != 0) {
+                BT_ERR("%s: bad EPATCH signature", hdev->name);
+                return -EINVAL;
+        }
+        num_patches = le16_to_cpu(epatch_info->num_patches);
+        BT_DBG("fw_version=%x, num_patches=%d",
+               le32_to_cpu(epatch_info->fw_version), num_patches);
+        /* After the rtl_epatch_header there is a funky patch metadata section.
+         * Assuming 2 patches, the layout is:
+         * ChipID1 ChipID2 PatchLength1 PatchLength2 PatchOffset1 PatchOffset2
+         *
+         * Find the right patch for this chip.
+         */
+        min_size += 8 * num_patches;
+        if (fw->size < min_size)
+                return -EINVAL;
+        chip_id_base = fw->data + sizeof(struct rtl_epatch_header);
+        patch_length_base = chip_id_base + (sizeof(u16) * num_patches);
+        patch_offset_base = patch_length_base + (sizeof(u16) * num_patches);
+        for (i = 0; i < num_patches; i++) {
+                u16 chip_id = get_unaligned_le16(chip_id_base +
+                                                 (i * sizeof(u16)));
+                if (chip_id == rom_version + 1) {
+                        patch_length = get_unaligned_le16(patch_length_base +
+                                                          (i * sizeof(u16)));
+                        patch_offset = get_unaligned_le32(patch_offset_base +
+                                                          (i * sizeof(u32)));
+                        break;
+                }
+        }
+        if (!patch_offset) {
+                BT_ERR("%s: didn't find patch for chip id %d",
+                       hdev->name, rom_version);
+                return -EINVAL;
+        }
+        BT_DBG("length=%x offset=%x index %d", patch_length, patch_offset, i);
+        min_size = patch_offset + patch_length;
+        if (fw->size < min_size)
+                return -EINVAL;
+        /* Copy the firmware into a new buffer and write the version at
+         * the end.
+         */
+        len = patch_length;
+        buf = kmemdup(fw->data + patch_offset, patch_length, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+        memcpy(buf + patch_length - 4, &epatch_info->fw_version, 4);
+        *_buf = buf;
+        return len;
+}
+static int rtl_download_firmware(struct hci_dev *hdev,
+                                 const unsigned char *data, int fw_len)
+{
+        struct rtl_download_cmd *dl_cmd;
+        int frag_num = fw_len / RTL_FRAG_LEN + 1;
+        int frag_len = RTL_FRAG_LEN;
+        int ret = 0;
+        int i;
+        dl_cmd = kmalloc(sizeof(struct rtl_download_cmd), GFP_KERNEL);
+        if (!dl_cmd)
+                return -ENOMEM;
+        for (i = 0; i < frag_num; i++) {
+                struct rtl_download_response *dl_resp;
+                struct sk_buff *skb;
+                BT_DBG("download fw (%d/%d)", i, frag_num);
+                dl_cmd->index = i;
+                if (i == (frag_num - 1)) {
+                        dl_cmd->index |= 0x80; /* data end */
+                        frag_len = fw_len % RTL_FRAG_LEN;
+                }
+                memcpy(dl_cmd->data, data, frag_len);
+                /* Send download command */
+                skb = __hci_cmd_sync(hdev, 0xfc20, frag_len + 1, dl_cmd,
+                                     HCI_INIT_TIMEOUT);
+                if (IS_ERR(skb)) {
+                        BT_ERR("%s: download fw command failed (%ld)",
+                               hdev->name, PTR_ERR(skb));
+                        ret = -PTR_ERR(skb);
+                        goto out;
+                }
+                if (skb->len != sizeof(*dl_resp)) {
+                        BT_ERR("%s: download fw event length mismatch",
+                               hdev->name);
+                        kfree_skb(skb);
+                        ret = -EIO;
+                        goto out;
+                }
+                dl_resp = (struct rtl_download_response *)skb->data;
+                if (dl_resp->status != 0) {
+                        kfree_skb(skb);
+                        ret = bt_to_errno(dl_resp->status);
+                        goto out;
+                }
+                kfree_skb(skb);
+                data += RTL_FRAG_LEN;
+        }
+out:
+        kfree(dl_cmd);
+        return ret;
+}
+static int btusb_setup_rtl8723a(struct hci_dev *hdev)
+{
+        struct btusb_data *data = dev_get_drvdata(&hdev->dev);
+        struct usb_device *udev = interface_to_usbdev(data->intf);
+        const struct firmware *fw;
+        int ret;
+        BT_INFO("%s: rtl: loading rtl_bt/rtl8723a_fw.bin", hdev->name);
+        ret = request_firmware(&fw, "rtl_bt/rtl8723a_fw.bin", &udev->dev);
+        if (ret < 0) {
+                BT_ERR("%s: Failed to load rtl_bt/rtl8723a_fw.bin", hdev->name);
+                return ret;
+        }
+        if (fw->size < 8) {
+                ret = -EINVAL;
+                goto out;
+        }
+        /* Check that the firmware doesn't have the epatch signature
+         * (which is only for RTL8723B and newer).
+         */
+        if (!memcmp(fw->data, RTL_EPATCH_SIGNATURE, 8)) {
+                BT_ERR("%s: unexpected EPATCH signature!", hdev->name);
+                ret = -EINVAL;
+                goto out;
+        }
+        ret = rtl_download_firmware(hdev, fw->data, fw->size);
+out:
+        release_firmware(fw);
+        return ret;
+}
+static int btusb_setup_rtl8723b(struct hci_dev *hdev, u16 lmp_subver,
+                                const char *fw_name)
+{
+        struct btusb_data *data = dev_get_drvdata(&hdev->dev);
+        struct usb_device *udev = interface_to_usbdev(data->intf);
+        unsigned char *fw_data = NULL;
+        const struct firmware *fw;
+        int ret;
+        BT_INFO("%s: rtl: loading %s", hdev->name, fw_name);
+        ret = request_firmware(&fw, fw_name, &udev->dev);
+        if (ret < 0) {
+                BT_ERR("%s: Failed to load %s", hdev->name, fw_name);
+                return ret;
+        }
+        ret = rtl8723b_parse_firmware(hdev, lmp_subver, fw, &fw_data);
+        if (ret < 0)
+                goto out;
+        ret = rtl_download_firmware(hdev, fw_data, ret);
+        kfree(fw_data);
+        if (ret < 0)
+                goto out;
+out:
+        release_firmware(fw);
+        return ret;
+}
+static int btusb_setup_realtek(struct hci_dev *hdev)
+{
+        struct sk_buff *skb;
+        struct hci_rp_read_local_version *resp;
+        u16 lmp_subver;
+        skb = btusb_read_local_version(hdev);
+        if (IS_ERR(skb))
+                return -PTR_ERR(skb);
+        resp = (struct hci_rp_read_local_version *)skb->data;
+        BT_INFO("%s: rtl: examining hci_ver=%02x hci_rev=%04x lmp_ver=%02x "
+                "lmp_subver=%04x", hdev->name, resp->hci_ver, resp->hci_rev,
+                resp->lmp_ver, resp->lmp_subver);
+        lmp_subver = le16_to_cpu(resp->lmp_subver);
+        kfree_skb(skb);
+        /* Match a set of subver values that correspond to stock firmware,
+         * which is not compatible with standard btusb.
+         * If matched, upload an alternative firmware that does conform to
+         * standard btusb. Once that firmware is uploaded, the subver changes
+         * to a different value.
+         */
+        switch (lmp_subver) {
+        case RTL_ROM_LMP_8723A:
+        case RTL_ROM_LMP_3499:
+                return btusb_setup_rtl8723a(hdev);
+        case RTL_ROM_LMP_8723B:
+                return btusb_setup_rtl8723b(hdev, lmp_subver,
+                                            "rtl_bt/rtl8723b_fw.bin");
+        case RTL_ROM_LMP_8821A:
+                return btusb_setup_rtl8723b(hdev, lmp_subver,
+                                            "rtl_bt/rtl8821a_fw.bin");
+        case RTL_ROM_LMP_8761A:
+                return btusb_setup_rtl8723b(hdev, lmp_subver,
+                                            "rtl_bt/rtl8761a_fw.bin");
+        default:
+                BT_INFO("rtl: assuming no firmware upload needed.");
+                return 0;
+        }
+}
 static const struct firmware *btusb_setup_intel_get_fw(struct hci_dev *hdev,
                                                       struct intel_version *ver)
 {
@@ -2577,7 +2973,7 @@ static int btusb_setup_qca(struct hci_dev *hdev)
        int i, err;
        err = btusb_qca_send_vendor_req(hdev, QCA_GET_TARGET_VERSION, &ver,
-                                        sizeof(ver));
+                                        sizeof(ver));
        if (err < 0)
                return err;
@@ -2776,6 +3172,9 @@ static int btusb_probe(struct usb_interface *intf,
                hdev->set_bdaddr = btusb_set_bdaddr_ath3012;
        }
+        if (id->driver_info & BTUSB_REALTEK)
+                hdev->setup = btusb_setup_realtek;
        if (id->driver_info & BTUSB_AMP) {
                /* AMP controllers do not support SCO packets */
                data->isoc = NULL;
diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c
index 1b3f8647ea2f..ec8fa0e0f036 100644
--- a/drivers/bluetooth/hci_ath.c
+++ b/drivers/bluetooth/hci_ath.c
@@ -95,7 +95,6 @@ static void ath_hci_uart_work(struct work_struct *work)
        hci_uart_tx_wakeup(hu);
 }
-/* Initialize protocol */
 static int ath_open(struct hci_uart *hu)
 {
        struct ath_struct *ath;
@@ -116,8 +115,7 @@ static int ath_open(struct hci_uart *hu)
        return 0;
 }
-/* Flush protocol data */
+static int ath_close(struct hci_uart *hu)
-static int ath_flush(struct hci_uart *hu)
 {
        struct ath_struct *ath = hu->priv;
@@ -125,11 +123,17 @@ static int ath_flush(struct hci_uart *hu)
        skb_queue_purge(&ath->txq);
+        kfree_skb(ath->rx_skb);
+        cancel_work_sync(&ath->ctxtsw);
+        hu->priv = NULL;
+        kfree(ath);
        return 0;
 }
-/* Close protocol */
+static int ath_flush(struct hci_uart *hu)
-static int ath_close(struct hci_uart *hu)
 {
        struct ath_struct *ath = hu->priv;
@@ -137,19 +141,65 @@ static int ath_close(struct hci_uart *hu)
        skb_queue_purge(&ath->txq);
-        kfree_skb(ath->rx_skb);
+        return 0;
+}
-        cancel_work_sync(&ath->ctxtsw);
+static int ath_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)
+{
+        struct sk_buff *skb;
+        u8 buf[10];
+        int err;
+        buf[0] = 0x01;
+        buf[1] = 0x01;
+        buf[2] = 0x00;
+        buf[3] = sizeof(bdaddr_t);
+        memcpy(buf + 4, bdaddr, sizeof(bdaddr_t));
+        skb = __hci_cmd_sync(hdev, 0xfc0b, sizeof(buf), buf, HCI_INIT_TIMEOUT);
+        if (IS_ERR(skb)) {
+                err = PTR_ERR(skb);
+                BT_ERR("%s: Change address command failed (%d)",
+                       hdev->name, err);
+                return err;
+        }
+        kfree_skb(skb);
-        hu->priv = NULL;
+        return 0;
-        kfree(ath);
+}
+static int ath_setup(struct hci_uart *hu)
+{
+        BT_DBG("hu %p", hu);
+        hu->hdev->set_bdaddr = ath_set_bdaddr;
        return 0;
 }
+static const struct h4_recv_pkt ath_recv_pkts[] = {
+        { H4_RECV_ACL,   .recv = hci_recv_frame },
+        { H4_RECV_SCO,   .recv = hci_recv_frame },
+        { H4_RECV_EVENT, .recv = hci_recv_frame },
+};
+static int ath_recv(struct hci_uart *hu, const void *data, int count)
+{
+        struct ath_struct *ath = hu->priv;
+        ath->rx_skb = h4_recv_buf(hu->hdev, ath->rx_skb, data, count,
+                                  ath_recv_pkts, ARRAY_SIZE(ath_recv_pkts));
+        if (IS_ERR(ath->rx_skb)) {
+                int err = PTR_ERR(ath->rx_skb);
+                BT_ERR("%s: Frame reassembly failed (%d)", hu->hdev->name, err);
+                return err;
+        }
+        return count;
+}
 #define HCI_OP_ATH_SLEEP 0xFC04
-/* Enqueue frame for transmittion */
 static int ath_enqueue(struct hci_uart *hu, struct sk_buff *skb)
 {
        struct ath_struct *ath = hu->priv;
@@ -159,8 +209,7 @@ static int ath_enqueue(struct hci_uart *hu, struct sk_buff *skb)
                return 0;
        }
-        /*
+        /* Update power management enable flag with parameters of
-         * Update power management enable flag with parameters of
         * HCI sleep enable vendor specific HCI command.
         */
        if (bt_cb(skb)->pkt_type == HCI_COMMAND_PKT) {
@@ -190,37 +239,16 @@ static struct sk_buff *ath_dequeue(struct hci_uart *hu)
        return skb_dequeue(&ath->txq);
 }
-static const struct h4_recv_pkt ath_recv_pkts[] = {
-        { H4_RECV_ACL,   .recv = hci_recv_frame },
-        { H4_RECV_SCO,   .recv = hci_recv_frame },
-        { H4_RECV_EVENT, .recv = hci_recv_frame },
-};
-/* Recv data */
-static int ath_recv(struct hci_uart *hu, const void *data, int count)
-{
-        struct ath_struct *ath = hu->priv;
-        ath->rx_skb = h4_recv_buf(hu->hdev, ath->rx_skb, data, count,
-                                  ath_recv_pkts, ARRAY_SIZE(ath_recv_pkts));
-        if (IS_ERR(ath->rx_skb)) {
-                int err = PTR_ERR(ath->rx_skb);
-                BT_ERR("%s: Frame reassembly failed (%d)", hu->hdev->name, err);
-                return err;
-        }
-        return count;
-}
 static const struct hci_uart_proto athp = {
        .id             = HCI_UART_ATH3K,
        .name           = "ATH3K",
        .open           = ath_open,
        .close          = ath_close,
+        .flush          = ath_flush,
+        .setup          = ath_setup,
        .recv           = ath_recv,
        .enqueue        = ath_enqueue,
        .dequeue        = ath_dequeue,
-        .flush          = ath_flush,
 };
 int __init ath_init(void)
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index b854125e4831..5340604b23a4 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -660,7 +660,7 @@ validate_group(struct perf_event *event)
                 * Initialise the fake PMU. We only need to populate the
                 * used_mask for the purposes of validation.
                 */
-                .used_mask = CPU_BITS_NONE,
+                .used_mask = { 0 },
        };
        if (!validate_event(event->pmu, &fake_pmu, leader))
diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c
index 11f7982cbdb3..ebee57d715d2 100644
--- a/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@ -1,7 +1,7 @@
 /*
 * OMAP L3 Interconnect error handling driver
 *
- * Copyright (C) 2011-2014 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (C) 2011-2015 Texas Instruments Incorporated - http://www.ti.com/
 *      Santosh Shilimkar <santosh.shilimkar@ti.com>
 *      Sricharan <r.sricharan@ti.com>
 *
@@ -233,7 +233,8 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
 }
 static const struct of_device_id l3_noc_match[] = {
-        {.compatible = "ti,omap4-l3-noc", .data = &omap_l3_data},
+        {.compatible = "ti,omap4-l3-noc", .data = &omap4_l3_data},
+        {.compatible = "ti,omap5-l3-noc", .data = &omap5_l3_data},
        {.compatible = "ti,dra7-l3-noc", .data = &dra_l3_data},
        {.compatible = "ti,am4372-l3-noc", .data = &am4372_l3_data},
        {},
diff --git a/drivers/bus/omap_l3_noc.h b/drivers/bus/omap_l3_noc.h
index 95254585db86..73431f81da28 100644
--- a/drivers/bus/omap_l3_noc.h
+++ b/drivers/bus/omap_l3_noc.h
@@ -1,7 +1,7 @@
 /*
 * OMAP L3 Interconnect  error handling driver header
 *
- * Copyright (C) 2011-2014 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (C) 2011-2015 Texas Instruments Incorporated - http://www.ti.com/
 *      Santosh Shilimkar <santosh.shilimkar@ti.com>
 *      sricharan <r.sricharan@ti.com>
 *
@@ -175,16 +175,14 @@ static struct l3_flagmux_data omap_l3_flagmux_clk2 = {
 };
-static struct l3_target_data omap_l3_target_data_clk3[] = {
+static struct l3_target_data omap4_l3_target_data_clk3[] = {
-        {0x0100, "EMUSS",},
+        {0x0100, "DEBUGSS",},
-        {0x0300, "DEBUG SOURCE",},
-        {0x0,   "HOST CLK3",},
 };
-static struct l3_flagmux_data omap_l3_flagmux_clk3 = {
+static struct l3_flagmux_data omap4_l3_flagmux_clk3 = {
        .offset = 0x0200,
-        .l3_targ = omap_l3_target_data_clk3,
+        .l3_targ = omap4_l3_target_data_clk3,
-        .num_targ_data = ARRAY_SIZE(omap_l3_target_data_clk3),
+        .num_targ_data = ARRAY_SIZE(omap4_l3_target_data_clk3),
 };
 static struct l3_masters_data omap_l3_masters[] = {
@@ -215,21 +213,49 @@ static struct l3_masters_data omap_l3_masters[] = {
        { 0x32, "USBHOSTFS"}
 };
-static struct l3_flagmux_data *omap_l3_flagmux[] = {
+static struct l3_flagmux_data *omap4_l3_flagmux[] = {
        &omap_l3_flagmux_clk1,
        &omap_l3_flagmux_clk2,
-        &omap_l3_flagmux_clk3,
+        &omap4_l3_flagmux_clk3,
 };
-static const struct omap_l3 omap_l3_data = {
+static const struct omap_l3 omap4_l3_data = {
-        .l3_flagmux = omap_l3_flagmux,
+        .l3_flagmux = omap4_l3_flagmux,
-        .num_modules = ARRAY_SIZE(omap_l3_flagmux),
+        .num_modules = ARRAY_SIZE(omap4_l3_flagmux),
        .l3_masters = omap_l3_masters,
        .num_masters = ARRAY_SIZE(omap_l3_masters),
        /* The 6 MSBs of register field used to distinguish initiator */
        .mst_addr_mask = 0xFC,
 };
+/* OMAP5 data */
+static struct l3_target_data omap5_l3_target_data_clk3[] = {
+        {0x0100, "L3INSTR",},
+        {0x0300, "DEBUGSS",},
+        {0x0,    "HOSTCLK3",},
+};
+static struct l3_flagmux_data omap5_l3_flagmux_clk3 = {
+        .offset = 0x0200,
+        .l3_targ = omap5_l3_target_data_clk3,
+        .num_targ_data = ARRAY_SIZE(omap5_l3_target_data_clk3),
+};
+static struct l3_flagmux_data *omap5_l3_flagmux[] = {
+        &omap_l3_flagmux_clk1,
+        &omap_l3_flagmux_clk2,
+        &omap5_l3_flagmux_clk3,
+};
+static const struct omap_l3 omap5_l3_data = {
+        .l3_flagmux = omap5_l3_flagmux,
+        .num_modules = ARRAY_SIZE(omap5_l3_flagmux),
+        .l3_masters = omap_l3_masters,
+        .num_masters = ARRAY_SIZE(omap_l3_masters),
+        /* The 6 MSBs of register field used to distinguish initiator */
+        .mst_addr_mask = 0x7E0,
+};
 /* DRA7 data */
 static struct l3_target_data dra_l3_target_data_clk1[] = {
        {0x2a00, "AES1",},
@@ -274,7 +300,7 @@ static struct l3_flagmux_data dra_l3_flagmux_clk1 = {
 static struct l3_target_data dra_l3_target_data_clk2[] = {
        {0x0,   "HOST CLK1",},
-        {0x0,   "HOST CLK2",},
+        {0x800000, "HOST CLK2",},
        {0xdead, L3_TARGET_NOT_SUPPORTED,},
        {0x3400, "SHA2_2",},
        {0x0900, "BB2D",},
diff --git a/drivers/char/hw_random/bcm63xx-rng.c b/drivers/char/hw_random/bcm63xx-rng.c
index d1494ecd9e11..4b31f1387f37 100644
--- a/drivers/char/hw_random/bcm63xx-rng.c
+++ b/drivers/char/hw_random/bcm63xx-rng.c
@@ -57,7 +57,7 @@ static void bcm63xx_rng_cleanup(struct hwrng *rng)
        val &= ~RNG_EN;
        __raw_writel(val, priv->regs + RNG_CTRL);
-        clk_didsable_unprepare(prov->clk);
+        clk_disable_unprepare(priv->clk);
 }
 static int bcm63xx_rng_data_present(struct hwrng *rng, int wait)
@@ -97,14 +97,14 @@ static int bcm63xx_rng_probe(struct platform_device *pdev)
        priv->rng.name = pdev->name;
        priv->rng.init = bcm63xx_rng_init;
        priv->rng.cleanup = bcm63xx_rng_cleanup;
-        prov->rng.data_present = bcm63xx_rng_data_present;
+        priv->rng.data_present = bcm63xx_rng_data_present;
        priv->rng.data_read = bcm63xx_rng_data_read;
        priv->clk = devm_clk_get(&pdev->dev, "ipsec");
        if (IS_ERR(priv->clk)) {
-                error = PTR_ERR(priv->clk);
+                ret = PTR_ERR(priv->clk);
-                dev_err(&pdev->dev, "no clock for device: %d\n", error);
+                dev_err(&pdev->dev, "no clock for device: %d\n", ret);
-                return error;
+                return ret;
        }
        if (!devm_request_mem_region(&pdev->dev, r->start,
@@ -120,11 +120,11 @@ static int bcm63xx_rng_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
-        error = devm_hwrng_register(&pdev->dev, &priv->rng);
+        ret = devm_hwrng_register(&pdev->dev, &priv->rng);
-        if (error) {
+        if (ret) {
                dev_err(&pdev->dev, "failed to register rng device: %d\n",
-                        error);
+                        ret);
-                return error;
+                return ret;
        }
        dev_info(&pdev->dev, "registered RNG driver\n");
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 9bb592872532..bf75f6361773 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -2000,7 +2000,7 @@ static int smi_ipmb_proc_show(struct seq_file *m, void *v)
                seq_printf(m, " %x", intf->channels[i].address);
        seq_putc(m, '\n');
-        return seq_has_overflowed(m);
+        return 0;
 }
 static int smi_ipmb_proc_open(struct inode *inode, struct file *file)
@@ -2023,7 +2023,7 @@ static int smi_version_proc_show(struct seq_file *m, void *v)
                   ipmi_version_major(&intf->bmc->id),
                   ipmi_version_minor(&intf->bmc->id));
-        return seq_has_overflowed(m);
+        return 0;
 }
 static int smi_version_proc_open(struct inode *inode, struct file *file)
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 5e90a18afbaf..8a45e92ff60c 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -942,8 +942,7 @@ static void sender(void                *send_info,
                 * If we are running to completion, start it and run
                 * transactions until everything is clear.
                 */
-                smi_info->curr_msg = msg;
+                smi_info->waiting_msg = msg;
-                smi_info->waiting_msg = NULL;
                /*
                 * Run to completion means we are single-threaded, no
@@ -2244,7 +2243,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev,
        acpi_handle handle;
        acpi_status status;
        unsigned long long tmp;
-        int rv;
+        int rv = -EINVAL;
        acpi_dev = pnp_acpi_device(dev);
        if (!acpi_dev)
@@ -2262,8 +2261,10 @@ static int ipmi_pnp_probe(struct pnp_dev *dev,
        /* _IFT tells us the interface type: KCS, BT, etc */
        status = acpi_evaluate_integer(handle, "_IFT", NULL, &tmp);
-        if (ACPI_FAILURE(status))
+        if (ACPI_FAILURE(status)) {
+                dev_err(&dev->dev, "Could not find ACPI IPMI interface type\n");
                goto err_free;
+        }
        switch (tmp) {
        case 1:
@@ -2276,6 +2277,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev,
                info->si_type = SI_BT;
                break;
        case 4: /* SSIF, just ignore */
+                rv = -ENODEV;
                goto err_free;
        default:
                dev_info(&dev->dev, "unknown IPMI type %lld\n", tmp);
@@ -2336,7 +2338,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev,
 err_free:
        kfree(info);
-        return -EINVAL;
+        return rv;
 }
 static void ipmi_pnp_remove(struct pnp_dev *dev)
@@ -3080,7 +3082,7 @@ static int smi_type_proc_show(struct seq_file *m, void *v)
        seq_printf(m, "%s\n", si_to_str[smi->si_type]);
-        return seq_has_overflowed(m);
+        return 0;
 }
 static int smi_type_proc_open(struct inode *inode, struct file *file)
@@ -3153,7 +3155,7 @@ static int smi_params_proc_show(struct seq_file *m, void *v)
                   smi->irq,
                   smi->slave_addr);
-        return seq_has_overflowed(m);
+        return 0;
 }
 static int smi_params_proc_open(struct inode *inode, struct file *file)
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index f40e3bd2c69c..207689c444a8 100644
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -31,7 +31,6 @@
 * interface into the I2C driver, I believe.
 */
-#include <linux/version.h>
 #if defined(MODVERSIONS)
 #include <linux/modversions.h>
 #endif
@@ -166,6 +165,9 @@ enum ssif_stat_indexes {
        /* Number of watchdog pretimeouts. */
        SSIF_STAT_watchdog_pretimeouts,
+        /* Number of alers received. */
+        SSIF_STAT_alerts,
        /* Always add statistics before this value, it must be last. */
        SSIF_NUM_STATS
 };
@@ -214,7 +216,16 @@ struct ssif_info {
 #define WDT_PRE_TIMEOUT_INT     0x08
        unsigned char       msg_flags;
+        u8                  global_enables;
        bool                has_event_buffer;
+        bool                supports_alert;
+        /*
+         * Used to tell what we should do with alerts.  If we are
+         * waiting on a response, read the data immediately.
+         */
+        bool                got_alert;
+        bool                waiting_alert;
        /*
         * If set to true, this will request events the next time the
@@ -478,13 +489,13 @@ static int ipmi_ssif_thread(void *data)
                if (ssif_info->i2c_read_write == I2C_SMBUS_WRITE) {
                        result = i2c_smbus_write_block_data(
-                                ssif_info->client, SSIF_IPMI_REQUEST,
+                                ssif_info->client, ssif_info->i2c_command,
                                ssif_info->i2c_data[0],
                                ssif_info->i2c_data + 1);
                        ssif_info->done_handler(ssif_info, result, NULL, 0);
                } else {
                        result = i2c_smbus_read_block_data(
-                                ssif_info->client, SSIF_IPMI_RESPONSE,
+                                ssif_info->client, ssif_info->i2c_command,
                                ssif_info->i2c_data);
                        if (result < 0)
                                ssif_info->done_handler(ssif_info, result,
@@ -518,15 +529,12 @@ static int ssif_i2c_send(struct ssif_info *ssif_info,
 static void msg_done_handler(struct ssif_info *ssif_info, int result,
                             unsigned char *data, unsigned int len);
-static void retry_timeout(unsigned long data)
+static void start_get(struct ssif_info *ssif_info)
 {
-        struct ssif_info *ssif_info = (void *) data;
        int rv;
-        if (ssif_info->stopping)
-                return;
        ssif_info->rtc_us_timer = 0;
+        ssif_info->multi_pos = 0;
        rv = ssif_i2c_send(ssif_info, msg_done_handler, I2C_SMBUS_READ,
                          SSIF_IPMI_RESPONSE,
@@ -540,6 +548,46 @@ static void retry_timeout(unsigned long data)
        }
 }
+static void retry_timeout(unsigned long data)
+{
+        struct ssif_info *ssif_info = (void *) data;
+        unsigned long oflags, *flags;
+        bool waiting;
+        if (ssif_info->stopping)
+                return;
+        flags = ipmi_ssif_lock_cond(ssif_info, &oflags);
+        waiting = ssif_info->waiting_alert;
+        ssif_info->waiting_alert = false;
+        ipmi_ssif_unlock_cond(ssif_info, flags);
+        if (waiting)
+                start_get(ssif_info);
+}
+static void ssif_alert(struct i2c_client *client, unsigned int data)
+{
+        struct ssif_info *ssif_info = i2c_get_clientdata(client);
+        unsigned long oflags, *flags;
+        bool do_get = false;
+        ssif_inc_stat(ssif_info, alerts);
+        flags = ipmi_ssif_lock_cond(ssif_info, &oflags);
+        if (ssif_info->waiting_alert) {
+                ssif_info->waiting_alert = false;
+                del_timer(&ssif_info->retry_timer);
+                do_get = true;
+        } else if (ssif_info->curr_msg) {
+                ssif_info->got_alert = true;
+        }
+        ipmi_ssif_unlock_cond(ssif_info, flags);
+        if (do_get)
+                start_get(ssif_info);
+}
 static int start_resend(struct ssif_info *ssif_info);
 static void msg_done_handler(struct ssif_info *ssif_info, int result,
@@ -559,9 +607,12 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                if (ssif_info->retries_left > 0) {
                        ssif_inc_stat(ssif_info, receive_retries);
+                        flags = ipmi_ssif_lock_cond(ssif_info, &oflags);
+                        ssif_info->waiting_alert = true;
+                        ssif_info->rtc_us_timer = SSIF_MSG_USEC;
                        mod_timer(&ssif_info->retry_timer,
                                  jiffies + SSIF_MSG_JIFFIES);
-                        ssif_info->rtc_us_timer = SSIF_MSG_USEC;
+                        ipmi_ssif_unlock_cond(ssif_info, flags);
                        return;
                }
@@ -581,9 +632,9 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                ssif_inc_stat(ssif_info, received_message_parts);
                /* Remove the multi-part read marker. */
-                for (i = 0; i < (len-2); i++)
-                        ssif_info->data[i] = data[i+2];
                len -= 2;
+                for (i = 0; i < len; i++)
+                        ssif_info->data[i] = data[i+2];
                ssif_info->multi_len = len;
                ssif_info->multi_pos = 1;
@@ -610,9 +661,9 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                        goto continue_op;
                }
-                blocknum = data[ssif_info->multi_len];
+                blocknum = data[0];
-                if (ssif_info->multi_len+len-1 > IPMI_MAX_MSG_LENGTH) {
+                if (ssif_info->multi_len + len - 1 > IPMI_MAX_MSG_LENGTH) {
                        /* Received message too big, abort the operation. */
                        result = -E2BIG;
                        if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
@@ -622,15 +673,15 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                }
                /* Remove the blocknum from the data. */
-                for (i = 0; i < (len-1); i++)
-                        ssif_info->data[i+ssif_info->multi_len] = data[i+1];
                len--;
+                for (i = 0; i < len; i++)
+                        ssif_info->data[i + ssif_info->multi_len] = data[i + 1];
                ssif_info->multi_len += len;
                if (blocknum == 0xff) {
                        /* End of read */
                        len = ssif_info->multi_len;
                        data = ssif_info->data;
-                } else if ((blocknum+1) != ssif_info->multi_pos) {
+                } else if (blocknum + 1 != ssif_info->multi_pos) {
                        /*
                         * Out of sequence block, just abort.  Block
                         * numbers start at zero for the second block,
@@ -650,7 +701,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
                        if (rv < 0) {
                                if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
                                        pr_info(PFX
-                                                "Error from i2c_non_blocking_op(2)\n");
+                                                "Error from ssif_i2c_send\n");
                                result = -EIO;
                        } else
@@ -830,7 +881,11 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
        }
        if (ssif_info->multi_data) {
-                /* In the middle of a multi-data write. */
+                /*
+                 * In the middle of a multi-data write.  See the comment
+                 * in the SSIF_MULTI_n_PART case in the probe function
+                 * for details on the intricacies of this.
+                 */
                int left;
                ssif_inc_stat(ssif_info, sent_messages_parts);
@@ -864,15 +919,32 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
                        msg_done_handler(ssif_info, -EIO, NULL, 0);
                }
        } else {
+                unsigned long oflags, *flags;
+                bool got_alert;
                ssif_inc_stat(ssif_info, sent_messages);
                ssif_inc_stat(ssif_info, sent_messages_parts);
-                /* Wait a jiffie then request the next message */
+                flags = ipmi_ssif_lock_cond(ssif_info, &oflags);
-                ssif_info->retries_left = SSIF_RECV_RETRIES;
+                got_alert = ssif_info->got_alert;
-                ssif_info->rtc_us_timer = SSIF_MSG_PART_USEC;
+                if (got_alert) {
-                mod_timer(&ssif_info->retry_timer,
+                        ssif_info->got_alert = false;
-                          jiffies + SSIF_MSG_PART_JIFFIES);
+                        ssif_info->waiting_alert = false;
-                return;
+                }
+                if (got_alert) {
+                        ipmi_ssif_unlock_cond(ssif_info, flags);
+                        /* The alert already happened, try now. */
+                        retry_timeout((unsigned long) ssif_info);
+                } else {
+                        /* Wait a jiffie then request the next message */
+                        ssif_info->waiting_alert = true;
+                        ssif_info->retries_left = SSIF_RECV_RETRIES;
+                        ssif_info->rtc_us_timer = SSIF_MSG_PART_USEC;
+                        mod_timer(&ssif_info->retry_timer,
+                                  jiffies + SSIF_MSG_PART_JIFFIES);
+                        ipmi_ssif_unlock_cond(ssif_info, flags);
+                }
        }
 }
@@ -881,6 +953,8 @@ static int start_resend(struct ssif_info *ssif_info)
        int rv;
        int command;
+        ssif_info->got_alert = false;
        if (ssif_info->data_len > 32) {
                command = SSIF_IPMI_MULTI_PART_REQUEST_START;
                ssif_info->multi_data = ssif_info->data;
@@ -915,7 +989,7 @@ static int start_send(struct ssif_info *ssif_info,
                return -E2BIG;
        ssif_info->retries_left = SSIF_SEND_RETRIES;
-        memcpy(ssif_info->data+1, data, len);
+        memcpy(ssif_info->data + 1, data, len);
        ssif_info->data_len = len;
        return start_resend(ssif_info);
 }
@@ -1200,7 +1274,7 @@ static int smi_type_proc_show(struct seq_file *m, void *v)
 {
        seq_puts(m, "ssif\n");
-        return seq_has_overflowed(m);
+        return 0;
 }
 static int smi_type_proc_open(struct inode *inode, struct file *file)
@@ -1243,6 +1317,8 @@ static int smi_stats_proc_show(struct seq_file *m, void *v)
                   ssif_get_stat(ssif_info, events));
        seq_printf(m, "watchdog_pretimeouts:   %u\n",
                   ssif_get_stat(ssif_info, watchdog_pretimeouts));
+        seq_printf(m, "alerts:                 %u\n",
+                   ssif_get_stat(ssif_info, alerts));
        return 0;
 }
@@ -1258,6 +1334,23 @@ static const struct file_operations smi_stats_proc_ops = {
        .release        = single_release,
 };
+static int strcmp_nospace(char *s1, char *s2)
+{
+        while (*s1 && *s2) {
+                while (isspace(*s1))
+                        s1++;
+                while (isspace(*s2))
+                        s2++;
+                if (*s1 > *s2)
+                        return 1;
+                if (*s1 < *s2)
+                        return -1;
+                s1++;
+                s2++;
+        }
+        return 0;
+}
 static struct ssif_addr_info *ssif_info_find(unsigned short addr,
                                             char *adapter_name,
                                             bool match_null_name)
@@ -1272,8 +1365,10 @@ restart:
                                        /* One is NULL and one is not */
                                        continue;
                                }
-                                if (strcmp(info->adapter_name, adapter_name))
+                                if (adapter_name &&
-                                        /* Names to not match */
+                                    strcmp_nospace(info->adapter_name,
+                                                   adapter_name))
+                                        /* Names do not match */
                                        continue;
                        }
                        found = info;
@@ -1306,6 +1401,12 @@ static bool check_acpi(struct ssif_info *ssif_info, struct device *dev)
        return false;
 }
+/*
+ * Global enables we care about.
+ */
+#define GLOBAL_ENABLES_MASK (IPMI_BMC_EVT_MSG_BUFF | IPMI_BMC_RCV_MSG_INTR | \
+                             IPMI_BMC_EVT_MSG_INTR)
 static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
        unsigned char     msg[3];
@@ -1391,13 +1492,33 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
                        break;
                case SSIF_MULTI_2_PART:
-                        if (ssif_info->max_xmit_msg_size > 64)
+                        if (ssif_info->max_xmit_msg_size > 63)
-                                ssif_info->max_xmit_msg_size = 64;
+                                ssif_info->max_xmit_msg_size = 63;
                        if (ssif_info->max_recv_msg_size > 62)
                                ssif_info->max_recv_msg_size = 62;
                        break;
                case SSIF_MULTI_n_PART:
+                        /*
+                         * The specification is rather confusing at
+                         * this point, but I think I understand what
+                         * is meant.  At least I have a workable
+                         * solution.  With multi-part messages, you
+                         * cannot send a message that is a multiple of
+                         * 32-bytes in length, because the start and
+                         * middle messages are 32-bytes and the end
+                         * message must be at least one byte.  You
+                         * can't fudge on an extra byte, that would
+                         * screw up things like fru data writes.  So
+                         * we limit the length to 63 bytes.  That way
+                         * a 32-byte message gets sent as a single
+                         * part.  A larger message will be a 32-byte
+                         * start and the next message is always going
+                         * to be 1-31 bytes in length.  Not ideal, but
+                         * it should work.
+                         */
+                        if (ssif_info->max_xmit_msg_size > 63)
+                                ssif_info->max_xmit_msg_size = 63;
                        break;
                default:
@@ -1407,7 +1528,7 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
        } else {
 no_support:
                /* Assume no multi-part or PEC support */
-                pr_info(PFX "Error fetching SSIF: %d %d %2.2x, your system probably doesn't support this command so  using defaults\n",
+                pr_info(PFX "Error fetching SSIF: %d %d %2.2x, your system probably doesn't support this command so using defaults\n",
                       rv, len, resp[2]);
                ssif_info->max_xmit_msg_size = 32;
@@ -1436,6 +1557,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
                goto found;
        }
+        ssif_info->global_enables = resp[3];
        if (resp[3] & IPMI_BMC_EVT_MSG_BUFF) {
                ssif_info->has_event_buffer = true;
                /* buffer is already enabled, nothing to do. */
@@ -1444,18 +1567,37 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
        msg[0] = IPMI_NETFN_APP_REQUEST << 2;
        msg[1] = IPMI_SET_BMC_GLOBAL_ENABLES_CMD;
-        msg[2] = resp[3] | IPMI_BMC_EVT_MSG_BUFF;
+        msg[2] = ssif_info->global_enables | IPMI_BMC_EVT_MSG_BUFF;
        rv = do_cmd(client, 3, msg, &len, resp);
        if (rv || (len < 2)) {
-                pr_warn(PFX "Error getting global enables: %d %d %2.2x\n",
+                pr_warn(PFX "Error setting global enables: %d %d %2.2x\n",
                        rv, len, resp[2]);
                rv = 0; /* Not fatal */
                goto found;
        }
-        if (resp[2] == 0)
+        if (resp[2] == 0) {
                /* A successful return means the event buffer is supported. */
                ssif_info->has_event_buffer = true;
+                ssif_info->global_enables |= IPMI_BMC_EVT_MSG_BUFF;
+        }
+        msg[0] = IPMI_NETFN_APP_REQUEST << 2;
+        msg[1] = IPMI_SET_BMC_GLOBAL_ENABLES_CMD;
+        msg[2] = ssif_info->global_enables | IPMI_BMC_RCV_MSG_INTR;
+        rv = do_cmd(client, 3, msg, &len, resp);
+        if (rv || (len < 2)) {
+                pr_warn(PFX "Error setting global enables: %d %d %2.2x\n",
+                        rv, len, resp[2]);
+                rv = 0; /* Not fatal */
+                goto found;
+        }
+        if (resp[2] == 0) {
+                /* A successful return means the alert is supported. */
+                ssif_info->supports_alert = true;
+                ssif_info->global_enables |= IPMI_BMC_RCV_MSG_INTR;
+        }
 found:
        ssif_info->intf_num = atomic_inc_return(&next_intf);
@@ -1813,6 +1955,7 @@ static struct i2c_driver ssif_i2c_driver = {
        },
        .probe          = ssif_probe,
        .remove         = ssif_remove,
+        .alert          = ssif_alert,
        .id_table       = ssif_id,
        .detect         = ssif_detect
 };
@@ -1832,7 +1975,7 @@ static int init_ipmi_ssif(void)
                rv = new_ssif_client(addr[i], adapter_name[i],
                                     dbg[i], slave_addrs[i],
                                     SI_HARDCODED);
-                if (!rv)
+                if (rv)
                        pr_err(PFX
                               "Couldn't add hardcoded device at addr 0x%x\n",
                               addr[i]);
diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c
index de67fce18984..e45d1f13f445 100644
--- a/drivers/extcon/extcon-usb-gpio.c
+++ b/drivers/extcon/extcon-usb-gpio.c
@@ -119,6 +119,18 @@ static int usb_extcon_probe(struct platform_device *pdev)
                return PTR_ERR(info->id_gpiod);
        }
+        info->edev = devm_extcon_dev_allocate(dev, usb_extcon_cable);
+        if (IS_ERR(info->edev)) {
+                dev_err(dev, "failed to allocate extcon device\n");
+                return -ENOMEM;
+        }
+        ret = devm_extcon_dev_register(dev, info->edev);
+        if (ret < 0) {
+                dev_err(dev, "failed to register extcon device\n");
+                return ret;
+        }
        ret = gpiod_set_debounce(info->id_gpiod,
                                 USB_GPIO_DEBOUNCE_MS * 1000);
        if (ret < 0)
@@ -142,18 +154,6 @@ static int usb_extcon_probe(struct platform_device *pdev)
                return ret;
        }
-        info->edev = devm_extcon_dev_allocate(dev, usb_extcon_cable);
-        if (IS_ERR(info->edev)) {
-                dev_err(dev, "failed to allocate extcon device\n");
-                return -ENOMEM;
-        }
-        ret = devm_extcon_dev_register(dev, info->edev);
-        if (ret < 0) {
-                dev_err(dev, "failed to register extcon device\n");
-                return ret;
-        }
        platform_set_drvdata(pdev, info);
        device_init_wakeup(dev, 1);
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 6e45a43ffe84..97b1616aa391 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -499,19 +499,19 @@ static int __init dmi_present(const u8 *buf)
        buf += 16;
        if (memcmp(buf, "_DMI_", 5) == 0 && dmi_checksum(buf, 15)) {
+                if (smbios_ver)
+                        dmi_ver = smbios_ver;
+                else
+                        dmi_ver = (buf[14] & 0xF0) << 4 | (buf[14] & 0x0F);
                dmi_num = get_unaligned_le16(buf + 12);
                dmi_len = get_unaligned_le16(buf + 6);
                dmi_base = get_unaligned_le32(buf + 8);
                if (dmi_walk_early(dmi_decode) == 0) {
                        if (smbios_ver) {
-                                dmi_ver = smbios_ver;
+                                pr_info("SMBIOS %d.%d present.\n",
-                                pr_info("SMBIOS %d.%d%s present.\n",
+                                       dmi_ver >> 8, dmi_ver & 0xFF);
-                                        dmi_ver >> 8, dmi_ver & 0xFF,
-                                        (dmi_ver < 0x0300) ? "" : ".x");
                        } else {
-                                dmi_ver = (buf[14] & 0xF0) << 4 |
-                                           (buf[14] & 0x0F);
                                pr_info("Legacy DMI %d.%d present.\n",
                                       dmi_ver >> 8, dmi_ver & 0xFF);
                        }
diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
index 87b8e3b900d2..5c55227a34c8 100644
--- a/drivers/firmware/efi/runtime-map.c
+++ b/drivers/firmware/efi/runtime-map.c
@@ -120,7 +120,8 @@ add_sysfs_runtime_map_entry(struct kobject *kobj, int nr)
        entry = kzalloc(sizeof(*entry), GFP_KERNEL);
        if (!entry) {
                kset_unregister(map_kset);
-                return entry;
+                map_kset = NULL;
+                return ERR_PTR(-ENOMEM);
        }
        memcpy(&entry->md, efi_runtime_map + nr * efi_memdesc_size,
@@ -132,6 +133,7 @@ add_sysfs_runtime_map_entry(struct kobject *kobj, int nr)
        if (ret) {
                kobject_put(&entry->kobj);
                kset_unregister(map_kset);
+                map_kset = NULL;
                return ERR_PTR(ret);
        }
@@ -195,8 +197,6 @@ out_add_entry:
                entry = *(map_entries + j);
                kobject_put(&entry->kobj);
        }
-        if (map_kset)
-                kset_unregister(map_kset);
 out:
        return ret;
 }
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index cd1d5bf48f36..b232397ad7ec 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1054,38 +1054,8 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
                dev_err(bank->dev, "Could not get gpio dbck\n");
 }
-static void
-omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start,
-                    unsigned int num)
-{
-        struct irq_chip_generic *gc;
-        struct irq_chip_type *ct;
-        gc = irq_alloc_generic_chip("MPUIO", 1, irq_start, bank->base,
-                                    handle_simple_irq);
-        if (!gc) {
-                dev_err(bank->dev, "Memory alloc failed for gc\n");
-                return;
-        }
-        ct = gc->chip_types;
-        /* NOTE: No ack required, reading IRQ status clears it. */
-        ct->chip.irq_mask = irq_gc_mask_set_bit;
-        ct->chip.irq_unmask = irq_gc_mask_clr_bit;
-        ct->chip.irq_set_type = omap_gpio_irq_type;
-        if (bank->regs->wkup_en)
-                ct->chip.irq_set_wake = omap_gpio_wake_enable;
-        ct->regs.mask = OMAP_MPUIO_GPIO_INT / bank->stride;
-        irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,
-                               IRQ_NOREQUEST | IRQ_NOPROBE, 0);
-}
 static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
 {
-        int j;
        static int gpio;
        int irq_base = 0;
        int ret;
@@ -1132,6 +1102,15 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
        }
 #endif
+        /* MPUIO is a bit different, reading IRQ status clears it */
+        if (bank->is_mpuio) {
+                irqc->irq_ack = dummy_irq_chip.irq_ack;
+                irqc->irq_mask = irq_gc_mask_set_bit;
+                irqc->irq_unmask = irq_gc_mask_clr_bit;
+                if (!bank->regs->wkup_en)
+                        irqc->irq_set_wake = NULL;
+        }
        ret = gpiochip_irqchip_add(&bank->chip, irqc,
                                   irq_base, omap_gpio_irq_handler,
                                   IRQ_TYPE_NONE);
@@ -1145,15 +1124,6 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
        gpiochip_set_chained_irqchip(&bank->chip, irqc,
                                     bank->irq, omap_gpio_irq_handler);
-        for (j = 0; j < bank->width; j++) {
-                int irq = irq_find_mapping(bank->chip.irqdomain, j);
-                if (bank->is_mpuio) {
-                        omap_mpuio_alloc_gc(bank, irq, bank->width);
-                        irq_set_chip_and_handler(irq, NULL, NULL);
-                        set_irq_flags(irq, 0);
-                }
-        }
        return 0;
 }
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index d2303d50f561..725d16138b74 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -550,7 +550,7 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
        length = min(agpio->pin_table_length, (u16)(pin_index + bits));
        for (i = pin_index; i < length; ++i) {
-                unsigned pin = agpio->pin_table[i];
+                int pin = agpio->pin_table[i];
                struct acpi_gpio_connection *conn;
                struct gpio_desc *desc;
                bool found;
diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c
index 7722ed53bd65..af3bc7a8033b 100644
--- a/drivers/gpio/gpiolib-sysfs.c
+++ b/drivers/gpio/gpiolib-sysfs.c
@@ -551,6 +551,7 @@ static struct class gpio_class = {
 */
 int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
 {
+        struct gpio_chip        *chip;
        unsigned long           flags;
        int                     status;
        const char              *ioname = NULL;
@@ -568,8 +569,16 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
                return -EINVAL;
        }
+        chip = desc->chip;
        mutex_lock(&sysfs_lock);
+        /* check if chip is being removed */
+        if (!chip || !chip->exported) {
+                status = -ENODEV;
+                goto fail_unlock;
+        }
        spin_lock_irqsave(&gpio_lock, flags);
        if (!test_bit(FLAG_REQUESTED, &desc->flags) ||
             test_bit(FLAG_EXPORT, &desc->flags)) {
@@ -783,12 +792,15 @@ void gpiochip_unexport(struct gpio_chip *chip)
 {
        int                     status;
        struct device           *dev;
+        struct gpio_desc *desc;
+        unsigned int i;
        mutex_lock(&sysfs_lock);
        dev = class_find_device(&gpio_class, NULL, chip, match_export);
        if (dev) {
                put_device(dev);
                device_unregister(dev);
+                /* prevent further gpiod exports */
                chip->exported = false;
                status = 0;
        } else
@@ -797,6 +809,13 @@ void gpiochip_unexport(struct gpio_chip *chip)
        if (status)
                chip_dbg(chip, "%s: status %d\n", __func__, status);
+        /* unregister gpiod class devices owned by sysfs */
+        for (i = 0; i < chip->ngpio; i++) {
+                desc = &chip->desc[i];
+                if (test_and_clear_bit(FLAG_SYSFS, &desc->flags))
+                        gpiod_free(desc);
+        }
 }
 static int __init gpiolib_sysfs_init(void)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index 69af73f15310..596ee5cd3b84 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -430,9 +430,10 @@ static int unregister_process_nocpsch(struct device_queue_manager *dqm,
        BUG_ON(!dqm || !qpd);
-        BUG_ON(!list_empty(&qpd->queues_list));
+        pr_debug("In func %s\n", __func__);
-        pr_debug("kfd: In func %s\n", __func__);
+        pr_debug("qpd->queues_list is %s\n",
+                        list_empty(&qpd->queues_list) ? "empty" : "not empty");
        retval = 0;
        mutex_lock(&dqm->lock);
@@ -882,6 +883,8 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
                return -ENOMEM;
        }
+        init_sdma_vm(dqm, q, qpd);
        retval = mqd->init_mqd(mqd, &q->mqd, &q->mqd_mem_obj,
                                &q->gart_mqd_addr, &q->properties);
        if (retval != 0)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 661c6605d31b..e469c4b2e8cc 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -728,9 +728,9 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr,
                sysfs_show_32bit_prop(buffer, "max_engine_clk_fcompute",
                        dev->gpu->kfd2kgd->get_max_engine_clock_in_mhz(
                                        dev->gpu->kgd));
                sysfs_show_64bit_prop(buffer, "local_mem_size",
-                        dev->gpu->kfd2kgd->get_vmem_size(
+                                (unsigned long long int) 0);
-                                        dev->gpu->kgd));
                sysfs_show_32bit_prop(buffer, "fw_version",
                        dev->gpu->kfd2kgd->get_fw_version(
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index c8a34476570a..af9662e58272 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -131,12 +131,11 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)
        /* Reinitialize corresponding vblank timestamp if high-precision query
         * available. Skip this step if query unsupported or failed. Will
-         * reinitialize delayed at next vblank interrupt in that case.
+         * reinitialize delayed at next vblank interrupt in that case and
+         * assign 0 for now, to mark the vblanktimestamp as invalid.
         */
-        if (rc) {
+        tslot = atomic_read(&vblank->count) + diff;
-                tslot = atomic_read(&vblank->count) + diff;
+        vblanktimestamp(dev, crtc, tslot) = rc ? t_vblank : (struct timeval) {0, 0};
-                vblanktimestamp(dev, crtc, tslot) = t_vblank;
-        }
        smp_mb__before_atomic();
        atomic_add(diff, &vblank->count);
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c302ffb5a168..a19d2c71e205 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -699,6 +699,16 @@ static int i915_drm_resume(struct drm_device *dev)
        intel_init_pch_refclk(dev);
        drm_mode_config_reset(dev);
+        /*
+         * Interrupts have to be enabled before any batches are run. If not the
+         * GPU will hang. i915_gem_init_hw() will initiate batches to
+         * update/restore the context.
+         *
+         * Modeset enabling in intel_modeset_init_hw() also needs working
+         * interrupts.
+         */
+        intel_runtime_pm_enable_interrupts(dev_priv);
        mutex_lock(&dev->struct_mutex);
        if (i915_gem_init_hw(dev)) {
                DRM_ERROR("failed to re-initialize GPU, declaring wedged!\n");
@@ -706,9 +716,6 @@ static int i915_drm_resume(struct drm_device *dev)
        }
        mutex_unlock(&dev->struct_mutex);
-        /* We need working interrupts for modeset enabling ... */
-        intel_runtime_pm_enable_interrupts(dev_priv);
        intel_modeset_init_hw(dev);
        spin_lock_irq(&dev_priv->irq_lock);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d547d9c8dda2..d0f3cbc87474 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13635,9 +13635,6 @@ static const struct intel_dmi_quirk intel_dmi_quirks[] = {
 };
 static struct intel_quirk intel_quirks[] = {
-        /* HP Mini needs pipe A force quirk (LP: #322104) */
-        { 0x27ae, 0x103c, 0x361a, quirk_pipea_force },
        /* Toshiba Protege R-205, S-209 needs pipe A force quirk */
        { 0x2592, 0x1179, 0x0001, quirk_pipea_force },
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index d0237102c27e..f27346e907b1 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1348,7 +1348,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
        pipe_config->has_dp_encoder = true;
        pipe_config->has_drrs = false;
-        pipe_config->has_audio = intel_dp->has_audio;
+        pipe_config->has_audio = intel_dp->has_audio && port != PORT_A;
        if (is_edp(intel_dp) && intel_connector->panel.fixed_mode) {
                intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
@@ -2211,8 +2211,8 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
        int dotclock;
        tmp = I915_READ(intel_dp->output_reg);
-        if (tmp & DP_AUDIO_OUTPUT_ENABLE)
-                pipe_config->has_audio = true;
+        pipe_config->has_audio = tmp & DP_AUDIO_OUTPUT_ENABLE && port != PORT_A;
        if ((port == PORT_A) || !HAS_PCH_CPT(dev)) {
                if (tmp & DP_SYNC_HS_HIGH)
@@ -3812,7 +3812,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
                        if (val == 0)
                                break;
-                        intel_dp->sink_rates[i] = val * 200;
+                        /* Value read is in kHz while drm clock is saved in deca-kHz */
+                        intel_dp->sink_rates[i] = (val * 200) / 10;
                }
                intel_dp->num_sink_rates = i;
        }
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 5abda1d2c018..fbcc7dff0d63 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -813,12 +813,28 @@ static int intel_dual_link_lvds_callback(const struct dmi_system_id *id)
 static const struct dmi_system_id intel_dual_link_lvds[] = {
        {
                .callback = intel_dual_link_lvds_callback,
-                .ident = "Apple MacBook Pro (Core i5/i7 Series)",
+                .ident = "Apple MacBook Pro 15\" (2010)",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro6,2"),
+                },
+        },
+        {
+                .callback = intel_dual_link_lvds_callback,
+                .ident = "Apple MacBook Pro 15\" (2011)",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro8,2"),
                },
        },
+        {
+                .callback = intel_dual_link_lvds_callback,
+                .ident = "Apple MacBook Pro 15\" (2012)",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro9,1"),
+                },
+        },
        { }     /* terminating entry */
 };
@@ -848,6 +864,11 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)
        if (i915.lvds_channel_mode > 0)
                return i915.lvds_channel_mode == 2;
+        /* single channel LVDS is limited to 112 MHz */
+        if (lvds_encoder->attached_connector->base.panel.fixed_mode->clock
+            > 112999)
+                return true;
        if (dmi_check_system(intel_dual_link_lvds))
                return true;
@@ -1111,6 +1132,8 @@ void intel_lvds_init(struct drm_device *dev)
 out:
        mutex_unlock(&dev->mode_config.mutex);
+        intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
        lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder);
        DRM_DEBUG_KMS("detected %s-link lvds configuration\n",
                      lvds_encoder->is_dual_link ? "dual" : "single");
@@ -1125,7 +1148,6 @@ out:
        }
        drm_connector_register(connector);
-        intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
        intel_panel_setup_backlight(connector, INVALID_PIPE);
        return;
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 28faea9996f9..a0c35bbc8546 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -5822,7 +5822,7 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev)
               L2_CACHE_BIGK_FRAGMENT_SIZE(4));
        /* setup context0 */
        WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
-        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
+        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
        WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
        WREG32(VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR,
                        (u32)(rdev->dummy_page.addr >> 12));
@@ -5837,7 +5837,7 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev)
        /* 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);
+        WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn - 1);
        for (i = 1; i < 16; i++) {
                if (i < 8)
                        WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index f848acfd3fc8..05e6d6ef5963 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -2485,7 +2485,7 @@ static int evergreen_pcie_gart_enable(struct radeon_device *rdev)
        WREG32(MC_VM_MB_L1_TLB2_CNTL, tmp);
        WREG32(MC_VM_MB_L1_TLB3_CNTL, tmp);
        WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
-        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
+        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
        WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
        WREG32(VM_CONTEXT0_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(0) |
                                RANGE_PROTECTION_FAULT_ENABLE_DEFAULT);
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index e8a496ff007e..aba2f428c0a8 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1282,7 +1282,7 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev)
               L2_CACHE_BIGK_FRAGMENT_SIZE(6));
        /* setup context0 */
        WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
-        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
+        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
        WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
        WREG32(VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR,
                        (u32)(rdev->dummy_page.addr >> 12));
@@ -1301,7 +1301,8 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev)
         */
        for (i = 1; i < 8; i++) {
                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_END_ADDR + (i << 2),
+                        rdev->vm_manager.max_pfn - 1);
                WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
                       rdev->vm_manager.saved_table_addr[i]);
        }
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 8f6d862a1882..25b4ac967742 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1112,7 +1112,7 @@ static int r600_pcie_gart_enable(struct radeon_device *rdev)
        WREG32(MC_VM_L1_TLB_MCB_RD_SEM_CNTL, tmp | ENABLE_SEMAPHORE_MODE);
        WREG32(MC_VM_L1_TLB_MCB_WR_SEM_CNTL, tmp | ENABLE_SEMAPHORE_MODE);
        WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
-        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
+        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
        WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
        WREG32(VM_CONTEXT0_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(0) |
                                RANGE_PROTECTION_FAULT_ENABLE_DEFAULT);
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index d2abe481954f..46eb0fa75a61 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1673,7 +1673,6 @@ struct radeon_uvd {
        struct radeon_bo        *vcpu_bo;
        void                    *cpu_addr;
        uint64_t                gpu_addr;
-        void                    *saved_bo;
        atomic_t                handles[RADEON_MAX_UVD_HANDLES];
        struct drm_file         *filp[RADEON_MAX_UVD_HANDLES];
        unsigned                img_size[RADEON_MAX_UVD_HANDLES];
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index fafd8ce4d58f..8dbf5083c4ff 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -1202,7 +1202,7 @@ static struct radeon_asic rs780_asic = {
 static struct radeon_asic_ring rv770_uvd_ring = {
        .ib_execute = &uvd_v1_0_ib_execute,
        .emit_fence = &uvd_v2_2_fence_emit,
-        .emit_semaphore = &uvd_v1_0_semaphore_emit,
+        .emit_semaphore = &uvd_v2_2_semaphore_emit,
        .cs_parse = &radeon_uvd_cs_parse,
        .ring_test = &uvd_v1_0_ring_test,
        .ib_test = &uvd_v1_0_ib_test,
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index cf0a90bb61ca..a3ca8cd305c5 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -949,6 +949,10 @@ void uvd_v1_0_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);
 int uvd_v2_2_resume(struct radeon_device *rdev);
 void uvd_v2_2_fence_emit(struct radeon_device *rdev,
                         struct radeon_fence *fence);
+bool uvd_v2_2_semaphore_emit(struct radeon_device *rdev,
+                             struct radeon_ring *ring,
+                             struct radeon_semaphore *semaphore,
+                             bool emit_wait);
 /* uvd v3.1 */
 bool uvd_v3_1_semaphore_emit(struct radeon_device *rdev,
diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
index 8b82abb78df1..dcb779647c57 100644
--- a/drivers/gpu/drm/radeon/radeon_audio.c
+++ b/drivers/gpu/drm/radeon/radeon_audio.c
@@ -464,6 +464,10 @@ void radeon_audio_detect(struct drm_connector *connector,
                return;
        rdev = connector->encoder->dev->dev_private;
+        if (!radeon_audio_chipset_supported(rdev))
+                return;
        radeon_encoder = to_radeon_encoder(connector->encoder);
        dig = radeon_encoder->enc_priv;
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
index 1017338a49d9..2b98ed3e684d 100644
--- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
+++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
@@ -666,6 +666,9 @@ radeon_dp_mst_probe(struct radeon_connector *radeon_connector)
        int ret;
        u8 msg[1];
+        if (!radeon_mst)
+                return 0;
        if (dig_connector->dpcd[DP_DPCD_REV] < 0x12)
                return 0;
diff --git a/drivers/gpu/drm/radeon/radeon_mn.c b/drivers/gpu/drm/radeon/radeon_mn.c
index 535bf404b725..eef006c48584 100644
--- a/drivers/gpu/drm/radeon/radeon_mn.c
+++ b/drivers/gpu/drm/radeon/radeon_mn.c
@@ -142,6 +142,9 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
                list_for_each_entry(bo, &node->bos, mn_list) {
+                        if (!bo->tbo.ttm || bo->tbo.ttm->state != tt_bound)
+                                continue;
                        r = radeon_bo_reserve(bo, true);
                        if (r) {
                                DRM_ERROR("(%ld) failed to reserve user bo\n", r);
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index b292aca0f342..edafd3c2b170 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -591,8 +591,7 @@ static void radeon_ttm_tt_unpin_userptr(struct ttm_tt *ttm)
 {
        struct radeon_device *rdev = radeon_get_rdev(ttm->bdev);
        struct radeon_ttm_tt *gtt = (void *)ttm;
-        struct scatterlist *sg;
+        struct sg_page_iter sg_iter;
-        int i;
        int write = !(gtt->userflags & RADEON_GEM_USERPTR_READONLY);
        enum dma_data_direction direction = write ?
@@ -605,9 +604,8 @@ static void radeon_ttm_tt_unpin_userptr(struct ttm_tt *ttm)
        /* free the sg table and pages again */
        dma_unmap_sg(rdev->dev, ttm->sg->sgl, ttm->sg->nents, direction);
-        for_each_sg(ttm->sg->sgl, sg, ttm->sg->nents, i) {
+        for_each_sg_page(ttm->sg->sgl, &sg_iter, ttm->sg->nents, 0) {
-                struct page *page = sg_page(sg);
+                struct page *page = sg_page_iter_page(&sg_iter);
                if (!(gtt->userflags & RADEON_GEM_USERPTR_READONLY))
                        set_page_dirty(page);
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
index c10b2aec6450..6edcb5485092 100644
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
@@ -204,28 +204,32 @@ void radeon_uvd_fini(struct radeon_device *rdev)
 int radeon_uvd_suspend(struct radeon_device *rdev)
 {
-        unsigned size;
+        int i, r;
-        void *ptr;
-        int i;
        if (rdev->uvd.vcpu_bo == NULL)
                return 0;
-        for (i = 0; i < RADEON_MAX_UVD_HANDLES; ++i)
+        for (i = 0; i < RADEON_MAX_UVD_HANDLES; ++i) {
-                if (atomic_read(&rdev->uvd.handles[i]))
+                uint32_t handle = atomic_read(&rdev->uvd.handles[i]);
-                        break;
+                if (handle != 0) {
+                        struct radeon_fence *fence;
-        if (i == RADEON_MAX_UVD_HANDLES)
+                        radeon_uvd_note_usage(rdev);
-                return 0;
-        size = radeon_bo_size(rdev->uvd.vcpu_bo);
+                        r = radeon_uvd_get_destroy_msg(rdev,
-        size -= rdev->uvd_fw->size;
+                                R600_RING_TYPE_UVD_INDEX, handle, &fence);
+                        if (r) {
+                                DRM_ERROR("Error destroying UVD (%d)!\n", r);
+                                continue;
+                        }
-        ptr = rdev->uvd.cpu_addr;
+                        radeon_fence_wait(fence, false);
-        ptr += rdev->uvd_fw->size;
+                        radeon_fence_unref(&fence);
-        rdev->uvd.saved_bo = kmalloc(size, GFP_KERNEL);
+                        rdev->uvd.filp[i] = NULL;
-        memcpy(rdev->uvd.saved_bo, ptr, size);
+                        atomic_set(&rdev->uvd.handles[i], 0);
+                }
+        }
        return 0;
 }
@@ -246,12 +250,7 @@ int radeon_uvd_resume(struct radeon_device *rdev)
        ptr = rdev->uvd.cpu_addr;
        ptr += rdev->uvd_fw->size;
-        if (rdev->uvd.saved_bo != NULL) {
+        memset(ptr, 0, size);
-                memcpy(ptr, rdev->uvd.saved_bo, size);
-                kfree(rdev->uvd.saved_bo);
-                rdev->uvd.saved_bo = NULL;
-        } else
-                memset(ptr, 0, size);
        return 0;
 }
@@ -396,6 +395,29 @@ static int radeon_uvd_cs_msg_decode(uint32_t *msg, unsigned buf_sizes[])
        return 0;
 }
+static int radeon_uvd_validate_codec(struct radeon_cs_parser *p,
+                                     unsigned stream_type)
+{
+        switch (stream_type) {
+        case 0: /* H264 */
+        case 1: /* VC1 */
+                /* always supported */
+                return 0;
+        case 3: /* MPEG2 */
+        case 4: /* MPEG4 */
+                /* only since UVD 3 */
+                if (p->rdev->family >= CHIP_PALM)
+                        return 0;
+                /* fall through */
+        default:
+                DRM_ERROR("UVD codec not supported by hardware %d!\n",
+                          stream_type);
+                return -EINVAL;
+        }
+}
 static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
                             unsigned offset, unsigned buf_sizes[])
 {
@@ -436,50 +458,70 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
                return -EINVAL;
        }
-        if (msg_type == 1) {
+        switch (msg_type) {
-                /* it's a decode msg, calc buffer sizes */
+        case 0:
-                r = radeon_uvd_cs_msg_decode(msg, buf_sizes);
+                /* it's a create msg, calc image size (width * height) */
-                /* calc image size (width * height) */
+                img_size = msg[7] * msg[8];
-                img_size = msg[6] * msg[7];
+                r = radeon_uvd_validate_codec(p, msg[4]);
                radeon_bo_kunmap(bo);
                if (r)
                        return r;
-        } else if (msg_type == 2) {
+                /* try to alloc a new handle */
+                for (i = 0; i < RADEON_MAX_UVD_HANDLES; ++i) {
+                        if (atomic_read(&p->rdev->uvd.handles[i]) == handle) {
+                                DRM_ERROR("Handle 0x%x already in use!\n", handle);
+                                return -EINVAL;
+                        }
+                        if (!atomic_cmpxchg(&p->rdev->uvd.handles[i], 0, handle)) {
+                                p->rdev->uvd.filp[i] = p->filp;
+                                p->rdev->uvd.img_size[i] = img_size;
+                                return 0;
+                        }
+                }
+                DRM_ERROR("No more free UVD handles!\n");
+                return -EINVAL;
+        case 1:
+                /* it's a decode msg, validate codec and calc buffer sizes */
+                r = radeon_uvd_validate_codec(p, msg[4]);
+                if (!r)
+                        r = radeon_uvd_cs_msg_decode(msg, buf_sizes);
+                radeon_bo_kunmap(bo);
+                if (r)
+                        return r;
+                /* validate the handle */
+                for (i = 0; i < RADEON_MAX_UVD_HANDLES; ++i) {
+                        if (atomic_read(&p->rdev->uvd.handles[i]) == handle) {
+                                if (p->rdev->uvd.filp[i] != p->filp) {
+                                        DRM_ERROR("UVD handle collision detected!\n");
+                                        return -EINVAL;
+                                }
+                                return 0;
+                        }
+                }
+                DRM_ERROR("Invalid UVD handle 0x%x!\n", handle);
+                return -ENOENT;
+        case 2:
                /* it's a destroy msg, free the handle */
                for (i = 0; i < RADEON_MAX_UVD_HANDLES; ++i)
                        atomic_cmpxchg(&p->rdev->uvd.handles[i], handle, 0);
                radeon_bo_kunmap(bo);
                return 0;
-        } else {
-                /* it's a create msg, calc image size (width * height) */
-                img_size = msg[7] * msg[8];
-                radeon_bo_kunmap(bo);
-                if (msg_type != 0) {
+        default:
-                        DRM_ERROR("Illegal UVD message type (%d)!\n", msg_type);
-                        return -EINVAL;
-                }
-                /* it's a create msg, no special handling needed */
-        }
-        /* create or decode, validate the handle */
-        for (i = 0; i < RADEON_MAX_UVD_HANDLES; ++i) {
-                if (atomic_read(&p->rdev->uvd.handles[i]) == handle)
-                        return 0;
-        }
-        /* handle not found try to alloc a new one */
+                DRM_ERROR("Illegal UVD message type (%d)!\n", msg_type);
-        for (i = 0; i < RADEON_MAX_UVD_HANDLES; ++i) {
+                return -EINVAL;
-                if (!atomic_cmpxchg(&p->rdev->uvd.handles[i], 0, handle)) {
-                        p->rdev->uvd.filp[i] = p->filp;
-                        p->rdev->uvd.img_size[i] = img_size;
-                        return 0;
-                }
        }
-        DRM_ERROR("No more free UVD handles!\n");
+        BUG();
        return -EINVAL;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c
index 24f849f888bb..0de5711ac508 100644
--- a/drivers/gpu/drm/radeon/radeon_vce.c
+++ b/drivers/gpu/drm/radeon/radeon_vce.c
@@ -493,18 +493,27 @@ int radeon_vce_cs_reloc(struct radeon_cs_parser *p, int lo, int hi,
 *
 * @p: parser context
 * @handle: handle to validate
+ * @allocated: allocated a new handle?
 *
 * Validates the handle and return the found session index or -EINVAL
 * we we don't have another free session index.
 */
-int radeon_vce_validate_handle(struct radeon_cs_parser *p, uint32_t handle)
+static int radeon_vce_validate_handle(struct radeon_cs_parser *p,
+                                      uint32_t handle, bool *allocated)
 {
        unsigned i;
+        *allocated = false;
        /* validate the handle */
        for (i = 0; i < RADEON_MAX_VCE_HANDLES; ++i) {
-                if (atomic_read(&p->rdev->vce.handles[i]) == handle)
+                if (atomic_read(&p->rdev->vce.handles[i]) == handle) {
+                        if (p->rdev->vce.filp[i] != p->filp) {
+                                DRM_ERROR("VCE handle collision detected!\n");
+                                return -EINVAL;
+                        }
                        return i;
+                }
        }
        /* handle not found try to alloc a new one */
@@ -512,6 +521,7 @@ int radeon_vce_validate_handle(struct radeon_cs_parser *p, uint32_t handle)
                if (!atomic_cmpxchg(&p->rdev->vce.handles[i], 0, handle)) {
                        p->rdev->vce.filp[i] = p->filp;
                        p->rdev->vce.img_size[i] = 0;
+                        *allocated = true;
                        return i;
                }
        }
@@ -529,10 +539,10 @@ int radeon_vce_validate_handle(struct radeon_cs_parser *p, uint32_t handle)
 int radeon_vce_cs_parse(struct radeon_cs_parser *p)
 {
        int session_idx = -1;
-        bool destroyed = false;
+        bool destroyed = false, created = false, allocated = false;
        uint32_t tmp, handle = 0;
        uint32_t *size = &tmp;
-        int i, r;
+        int i, r = 0;
        while (p->idx < p->chunk_ib->length_dw) {
                uint32_t len = radeon_get_ib_value(p, p->idx);
@@ -540,18 +550,21 @@ int radeon_vce_cs_parse(struct radeon_cs_parser *p)
                if ((len < 8) || (len & 3)) {
                        DRM_ERROR("invalid VCE command length (%d)!\n", len);
-                        return -EINVAL;
+                        r = -EINVAL;
+                        goto out;
                }
                if (destroyed) {
                        DRM_ERROR("No other command allowed after destroy!\n");
-                        return -EINVAL;
+                        r = -EINVAL;
+                        goto out;
                }
                switch (cmd) {
                case 0x00000001: // session
                        handle = radeon_get_ib_value(p, p->idx + 2);
-                        session_idx = radeon_vce_validate_handle(p, handle);
+                        session_idx = radeon_vce_validate_handle(p, handle,
+                                                                 &allocated);
                        if (session_idx < 0)
                                return session_idx;
                        size = &p->rdev->vce.img_size[session_idx];
@@ -561,6 +574,13 @@ int radeon_vce_cs_parse(struct radeon_cs_parser *p)
                        break;
                case 0x01000001: // create
+                        created = true;
+                        if (!allocated) {
+                                DRM_ERROR("Handle already in use!\n");
+                                r = -EINVAL;
+                                goto out;
+                        }
                        *size = radeon_get_ib_value(p, p->idx + 8) *
                                radeon_get_ib_value(p, p->idx + 10) *
                                8 * 3 / 2;
@@ -578,12 +598,12 @@ int radeon_vce_cs_parse(struct radeon_cs_parser *p)
                        r = radeon_vce_cs_reloc(p, p->idx + 10, p->idx + 9,
                                                *size);
                        if (r)
-                                return r;
+                                goto out;
                        r = radeon_vce_cs_reloc(p, p->idx + 12, p->idx + 11,
                                                *size / 3);
                        if (r)
-                                return r;
+                                goto out;
                        break;
                case 0x02000001: // destroy
@@ -594,7 +614,7 @@ int radeon_vce_cs_parse(struct radeon_cs_parser *p)
                        r = radeon_vce_cs_reloc(p, p->idx + 3, p->idx + 2,
                                                *size * 2);
                        if (r)
-                                return r;
+                                goto out;
                        break;
                case 0x05000004: // video bitstream buffer
@@ -602,36 +622,47 @@ int radeon_vce_cs_parse(struct radeon_cs_parser *p)
                        r = radeon_vce_cs_reloc(p, p->idx + 3, p->idx + 2,
                                                tmp);
                        if (r)
-                                return r;
+                                goto out;
                        break;
                case 0x05000005: // feedback buffer
                        r = radeon_vce_cs_reloc(p, p->idx + 3, p->idx + 2,
                                                4096);
                        if (r)
-                                return r;
+                                goto out;
                        break;
                default:
                        DRM_ERROR("invalid VCE command (0x%x)!\n", cmd);
-                        return -EINVAL;
+                        r = -EINVAL;
+                        goto out;
                }
                if (session_idx == -1) {
                        DRM_ERROR("no session command at start of IB\n");
-                        return -EINVAL;
+                        r = -EINVAL;
+                        goto out;
                }
                p->idx += len / 4;
        }
-        if (destroyed) {
+        if (allocated && !created) {
-                /* IB contains a destroy msg, free the handle */
+                DRM_ERROR("New session without create command!\n");
+                r = -ENOENT;
+        }
+out:
+        if ((!r && destroyed) || (r && allocated)) {
+                /*
+                 * IB contains a destroy msg or we have allocated an
+                 * handle and got an error, anyway free the handle
+                 */
                for (i = 0; i < RADEON_MAX_VCE_HANDLES; ++i)
                        atomic_cmpxchg(&p->rdev->vce.handles[i], handle, 0);
        }
-        return 0;
+        return r;
 }
 /**
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 01ee96acb398..c54d6313a46d 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -921,7 +921,7 @@ static int rv770_pcie_gart_enable(struct radeon_device *rdev)
        WREG32(MC_VM_MB_L1_TLB2_CNTL, tmp);
        WREG32(MC_VM_MB_L1_TLB3_CNTL, tmp);
        WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
-        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
+        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
        WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
        WREG32(VM_CONTEXT0_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(0) |
                                RANGE_PROTECTION_FAULT_ENABLE_DEFAULT);
diff --git a/drivers/gpu/drm/radeon/rv770d.h b/drivers/gpu/drm/radeon/rv770d.h
index 3cf1e2921545..9ef2064b1c9c 100644
--- a/drivers/gpu/drm/radeon/rv770d.h
+++ b/drivers/gpu/drm/radeon/rv770d.h
@@ -989,6 +989,9 @@
                         ((n) & 0x3FFF) << 16)
 /* UVD */
+#define UVD_SEMA_ADDR_LOW                               0xef00
+#define UVD_SEMA_ADDR_HIGH                              0xef04
+#define UVD_SEMA_CMD                                    0xef08
 #define UVD_GPCOM_VCPU_CMD                              0xef0c
 #define UVD_GPCOM_VCPU_DATA0                            0xef10
 #define UVD_GPCOM_VCPU_DATA1                            0xef14
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index b1d74bc375d8..5326f753e107 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -4303,7 +4303,7 @@ static int si_pcie_gart_enable(struct radeon_device *rdev)
               L2_CACHE_BIGK_FRAGMENT_SIZE(4));
        /* setup context0 */
        WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
-        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
+        WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
        WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
        WREG32(VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR,
                        (u32)(rdev->dummy_page.addr >> 12));
@@ -4318,7 +4318,7 @@ static int si_pcie_gart_enable(struct radeon_device *rdev)
        /* empty 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);
+        WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn - 1);
        /* Assign the pt base to something valid for now; the pts used for
         * the VMs are determined by the application and setup and assigned
         * on the fly in the vm part of radeon_gart.c
diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/uvd_v1_0.c
index e72b3cb59358..c6b1cbca47fc 100644
--- a/drivers/gpu/drm/radeon/uvd_v1_0.c
+++ b/drivers/gpu/drm/radeon/uvd_v1_0.c
@@ -466,18 +466,8 @@ bool uvd_v1_0_semaphore_emit(struct radeon_device *rdev,
                             struct radeon_semaphore *semaphore,
                             bool emit_wait)
 {
-        uint64_t addr = semaphore->gpu_addr;
+        /* disable semaphores for UVD V1 hardware */
+        return false;
-        radeon_ring_write(ring, PACKET0(UVD_SEMA_ADDR_LOW, 0));
-        radeon_ring_write(ring, (addr >> 3) & 0x000FFFFF);
-        radeon_ring_write(ring, PACKET0(UVD_SEMA_ADDR_HIGH, 0));
-        radeon_ring_write(ring, (addr >> 23) & 0x000FFFFF);
-        radeon_ring_write(ring, PACKET0(UVD_SEMA_CMD, 0));
-        radeon_ring_write(ring, emit_wait ? 1 : 0);
-        return true;
 }
 /**
diff --git a/drivers/gpu/drm/radeon/uvd_v2_2.c b/drivers/gpu/drm/radeon/uvd_v2_2.c
index 89193519f8a1..7ed778cec7c6 100644
--- a/drivers/gpu/drm/radeon/uvd_v2_2.c
+++ b/drivers/gpu/drm/radeon/uvd_v2_2.c
@@ -60,6 +60,35 @@ void uvd_v2_2_fence_emit(struct radeon_device *rdev,
 }
 /**
+ * uvd_v2_2_semaphore_emit - emit semaphore command
+ *
+ * @rdev: radeon_device pointer
+ * @ring: radeon_ring pointer
+ * @semaphore: semaphore to emit commands for
+ * @emit_wait: true if we should emit a wait command
+ *
+ * Emit a semaphore command (either wait or signal) to the UVD ring.
+ */
+bool uvd_v2_2_semaphore_emit(struct radeon_device *rdev,
+                             struct radeon_ring *ring,
+                             struct radeon_semaphore *semaphore,
+                             bool emit_wait)
+{
+        uint64_t addr = semaphore->gpu_addr;
+        radeon_ring_write(ring, PACKET0(UVD_SEMA_ADDR_LOW, 0));
+        radeon_ring_write(ring, (addr >> 3) & 0x000FFFFF);
+        radeon_ring_write(ring, PACKET0(UVD_SEMA_ADDR_HIGH, 0));
+        radeon_ring_write(ring, (addr >> 23) & 0x000FFFFF);
+        radeon_ring_write(ring, PACKET0(UVD_SEMA_CMD, 0));
+        radeon_ring_write(ring, emit_wait ? 1 : 0);
+        return true;
+}
+/**
 * uvd_v2_2_resume - memory controller programming
 *
 * @rdev: radeon_device pointer
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 1833abd7d3aa..bfad15a913a0 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -173,7 +173,6 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags)
        drm->irq_enabled = true;
        /* syncpoints are used for full 32-bit hardware VBLANK counters */
-        drm->vblank_disable_immediate = true;
        drm->max_vblank_count = 0xffffffff;
        err = drm_vblank_init(drm, drm->mode_config.num_crtc);
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index a04c49f2a011..39ea67f9b066 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -643,15 +643,6 @@ config BLK_DEV_TC86C001
        help
        This driver adds support for Toshiba TC86C001 GOKU-S chip.
-config BLK_DEV_CELLEB
-        tristate "Toshiba's Cell Reference Set IDE support"
-        depends on PPC_CELLEB
-        select BLK_DEV_IDEDMA_PCI
-        help
-          This driver provides support for the on-board IDE controller on
-          Toshiba Cell Reference Board.
-          If unsure, say Y.
 endif
 # TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index a04ee82f1c8f..2a8c417d4081 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -38,7 +38,6 @@ obj-$(CONFIG_BLK_DEV_AEC62XX)		+= aec62xx.o
 obj-$(CONFIG_BLK_DEV_ALI15X3)           += alim15x3.o
 obj-$(CONFIG_BLK_DEV_AMD74XX)           += amd74xx.o
 obj-$(CONFIG_BLK_DEV_ATIIXP)            += atiixp.o
-obj-$(CONFIG_BLK_DEV_CELLEB)            += scc_pata.o
 obj-$(CONFIG_BLK_DEV_CMD64X)            += cmd64x.o
 obj-$(CONFIG_BLK_DEV_CS5520)            += cs5520.o
 obj-$(CONFIG_BLK_DEV_CS5530)            += cs5530.o
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
deleted file mode 100644
index 2a2d188b5d5b..000000000000
--- a/drivers/ide/scc_pata.c
+++ /dev/null
@@ -1,887 +0,0 @@
-/*
- * Support for IDE interfaces on Celleb platform
- *
- * (C) Copyright 2006 TOSHIBA CORPORATION
- *
- * This code is based on drivers/ide/pci/siimage.c:
- * Copyright (C) 2001-2002      Andre Hedrick <andre@linux-ide.org>
- * Copyright (C) 2003           Red Hat
- *
- * 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.
- */
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/ide.h>
-#include <linux/init.h>
-#define PCI_DEVICE_ID_TOSHIBA_SCC_ATA            0x01b4
-#define SCC_PATA_NAME           "scc IDE"
-#define TDVHSEL_MASTER          0x00000001
-#define TDVHSEL_SLAVE           0x00000004
-#define MODE_JCUSFEN            0x00000080
-#define CCKCTRL_ATARESET        0x00040000
-#define CCKCTRL_BUFCNT          0x00020000
-#define CCKCTRL_CRST            0x00010000
-#define CCKCTRL_OCLKEN          0x00000100
-#define CCKCTRL_ATACLKOEN       0x00000002
-#define CCKCTRL_LCLKEN          0x00000001
-#define QCHCD_IOS_SS            0x00000001
-#define QCHSD_STPDIAG           0x00020000
-#define INTMASK_MSK             0xD1000012
-#define INTSTS_SERROR           0x80000000
-#define INTSTS_PRERR            0x40000000
-#define INTSTS_RERR             0x10000000
-#define INTSTS_ICERR            0x01000000
-#define INTSTS_BMSINT           0x00000010
-#define INTSTS_BMHE             0x00000008
-#define INTSTS_IOIRQS           0x00000004
-#define INTSTS_INTRQ            0x00000002
-#define INTSTS_ACTEINT          0x00000001
-#define ECMODE_VALUE 0x01
-static struct scc_ports {
-        unsigned long ctl, dma;
-        struct ide_host *host;  /* for removing port from system */
-} scc_ports[MAX_HWIFS];
-/* PIO transfer mode  table */
-/* JCHST */
-static unsigned long JCHSTtbl[2][7] = {
-        {0x0E, 0x05, 0x02, 0x03, 0x02, 0x00, 0x00},   /* 100MHz */
-        {0x13, 0x07, 0x04, 0x04, 0x03, 0x00, 0x00}    /* 133MHz */
-};
-/* JCHHT */
-static unsigned long JCHHTtbl[2][7] = {
-        {0x0E, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00},   /* 100MHz */
-        {0x13, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00}    /* 133MHz */
-};
-/* JCHCT */
-static unsigned long JCHCTtbl[2][7] = {
-        {0x1D, 0x1D, 0x1C, 0x0B, 0x06, 0x00, 0x00},   /* 100MHz */
-        {0x27, 0x26, 0x26, 0x0E, 0x09, 0x00, 0x00}    /* 133MHz */
-};
-/* DMA transfer mode  table */
-/* JCHDCTM/JCHDCTS */
-static unsigned long JCHDCTxtbl[2][7] = {
-        {0x0A, 0x06, 0x04, 0x03, 0x01, 0x00, 0x00},   /* 100MHz */
-        {0x0E, 0x09, 0x06, 0x04, 0x02, 0x01, 0x00}    /* 133MHz */
-};
-/* JCSTWTM/JCSTWTS  */
-static unsigned long JCSTWTxtbl[2][7] = {
-        {0x06, 0x04, 0x03, 0x02, 0x02, 0x02, 0x00},   /* 100MHz */
-        {0x09, 0x06, 0x04, 0x02, 0x02, 0x02, 0x02}    /* 133MHz */
-};
-/* JCTSS */
-static unsigned long JCTSStbl[2][7] = {
-        {0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00},   /* 100MHz */
-        {0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05}    /* 133MHz */
-};
-/* JCENVT */
-static unsigned long JCENVTtbl[2][7] = {
-        {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00},   /* 100MHz */
-        {0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}    /* 133MHz */
-};
-/* JCACTSELS/JCACTSELM */
-static unsigned long JCACTSELtbl[2][7] = {
-        {0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00},   /* 100MHz */
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}    /* 133MHz */
-};
-static u8 scc_ide_inb(unsigned long port)
-{
-        u32 data = in_be32((void*)port);
-        return (u8)data;
-}
-static void scc_exec_command(ide_hwif_t *hwif, u8 cmd)
-{
-        out_be32((void *)hwif->io_ports.command_addr, cmd);
-        eieio();
-        in_be32((void *)(hwif->dma_base + 0x01c));
-        eieio();
-}
-static u8 scc_read_status(ide_hwif_t *hwif)
-{
-        return (u8)in_be32((void *)hwif->io_ports.status_addr);
-}
-static u8 scc_read_altstatus(ide_hwif_t *hwif)
-{
-        return (u8)in_be32((void *)hwif->io_ports.ctl_addr);
-}
-static u8 scc_dma_sff_read_status(ide_hwif_t *hwif)
-{
-        return (u8)in_be32((void *)(hwif->dma_base + 4));
-}
-static void scc_write_devctl(ide_hwif_t *hwif, u8 ctl)
-{
-        out_be32((void *)hwif->io_ports.ctl_addr, ctl);
-        eieio();
-        in_be32((void *)(hwif->dma_base + 0x01c));
-        eieio();
-}
-static void scc_ide_insw(unsigned long port, void *addr, u32 count)
-{
-        u16 *ptr = (u16 *)addr;
-        while (count--) {
-                *ptr++ = le16_to_cpu(in_be32((void*)port));
-        }
-}
-static void scc_ide_insl(unsigned long port, void *addr, u32 count)
-{
-        u16 *ptr = (u16 *)addr;
-        while (count--) {
-                *ptr++ = le16_to_cpu(in_be32((void*)port));
-                *ptr++ = le16_to_cpu(in_be32((void*)port));
-        }
-}
-static void scc_ide_outb(u8 addr, unsigned long port)
-{
-        out_be32((void*)port, addr);
-}
-static void
-scc_ide_outsw(unsigned long port, void *addr, u32 count)
-{
-        u16 *ptr = (u16 *)addr;
-        while (count--) {
-                out_be32((void*)port, cpu_to_le16(*ptr++));
-        }
-}
-static void
-scc_ide_outsl(unsigned long port, void *addr, u32 count)
-{
-        u16 *ptr = (u16 *)addr;
-        while (count--) {
-                out_be32((void*)port, cpu_to_le16(*ptr++));
-                out_be32((void*)port, cpu_to_le16(*ptr++));
-        }
-}
-/**
- *      scc_set_pio_mode        -       set host controller for PIO mode
- *      @hwif: port
- *      @drive: drive
- *
- *      Load the timing settings for this device mode into the
- *      controller.
- */
-static void scc_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
-{
-        struct scc_ports *ports = ide_get_hwifdata(hwif);
-        unsigned long ctl_base = ports->ctl;
-        unsigned long cckctrl_port = ctl_base + 0xff0;
-        unsigned long piosht_port = ctl_base + 0x000;
-        unsigned long pioct_port = ctl_base + 0x004;
-        unsigned long reg;
-        int offset;
-        const u8 pio = drive->pio_mode - XFER_PIO_0;
-        reg = in_be32((void __iomem *)cckctrl_port);
-        if (reg & CCKCTRL_ATACLKOEN) {
-                offset = 1; /* 133MHz */
-        } else {
-                offset = 0; /* 100MHz */
-        }
-        reg = JCHSTtbl[offset][pio] << 16 | JCHHTtbl[offset][pio];
-        out_be32((void __iomem *)piosht_port, reg);
-        reg = JCHCTtbl[offset][pio];
-        out_be32((void __iomem *)pioct_port, reg);
-}
-/**
- *      scc_set_dma_mode        -       set host controller for DMA mode
- *      @hwif: port
- *      @drive: drive
- *
- *      Load the timing settings for this device mode into the
- *      controller.
- */
-static void scc_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
-{
-        struct scc_ports *ports = ide_get_hwifdata(hwif);
-        unsigned long ctl_base = ports->ctl;
-        unsigned long cckctrl_port = ctl_base + 0xff0;
-        unsigned long mdmact_port = ctl_base + 0x008;
-        unsigned long mcrcst_port = ctl_base + 0x00c;
-        unsigned long sdmact_port = ctl_base + 0x010;
-        unsigned long scrcst_port = ctl_base + 0x014;
-        unsigned long udenvt_port = ctl_base + 0x018;
-        unsigned long tdvhsel_port   = ctl_base + 0x020;
-        int is_slave = drive->dn & 1;
-        int offset, idx;
-        unsigned long reg;
-        unsigned long jcactsel;
-        const u8 speed = drive->dma_mode;
-        reg = in_be32((void __iomem *)cckctrl_port);
-        if (reg & CCKCTRL_ATACLKOEN) {
-                offset = 1; /* 133MHz */
-        } else {
-                offset = 0; /* 100MHz */
-        }
-        idx = speed - XFER_UDMA_0;
-        jcactsel = JCACTSELtbl[offset][idx];
-        if (is_slave) {
-                out_be32((void __iomem *)sdmact_port, JCHDCTxtbl[offset][idx]);
-                out_be32((void __iomem *)scrcst_port, JCSTWTxtbl[offset][idx]);
-                jcactsel = jcactsel << 2;
-                out_be32((void __iomem *)tdvhsel_port, (in_be32((void __iomem *)tdvhsel_port) & ~TDVHSEL_SLAVE) | jcactsel);
-        } else {
-                out_be32((void __iomem *)mdmact_port, JCHDCTxtbl[offset][idx]);
-                out_be32((void __iomem *)mcrcst_port, JCSTWTxtbl[offset][idx]);
-                out_be32((void __iomem *)tdvhsel_port, (in_be32((void __iomem *)tdvhsel_port) & ~TDVHSEL_MASTER) | jcactsel);
-        }
-        reg = JCTSStbl[offset][idx] << 16 | JCENVTtbl[offset][idx];
-        out_be32((void __iomem *)udenvt_port, reg);
-}
-static void scc_dma_host_set(ide_drive_t *drive, int on)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        u8 unit = drive->dn & 1;
-        u8 dma_stat = scc_dma_sff_read_status(hwif);
-        if (on)
-                dma_stat |= (1 << (5 + unit));
-        else
-                dma_stat &= ~(1 << (5 + unit));
-        scc_ide_outb(dma_stat, hwif->dma_base + 4);
-}
-/**
- *      scc_dma_setup   -       begin a DMA phase
- *      @drive: target device
- *      @cmd: command
- *
- *      Build an IDE DMA PRD (IDE speak for scatter gather table)
- *      and then set up the DMA transfer registers.
- *
- *      Returns 0 on success. If a PIO fallback is required then 1
- *      is returned.
- */
-static int scc_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        u32 rw = (cmd->tf_flags & IDE_TFLAG_WRITE) ? 0 : ATA_DMA_WR;
-        u8 dma_stat;
-        /* fall back to pio! */
-        if (ide_build_dmatable(drive, cmd) == 0)
-                return 1;
-        /* PRD table */
-        out_be32((void __iomem *)(hwif->dma_base + 8), hwif->dmatable_dma);
-        /* specify r/w */
-        out_be32((void __iomem *)hwif->dma_base, rw);
-        /* read DMA status for INTR & ERROR flags */
-        dma_stat = scc_dma_sff_read_status(hwif);
-        /* clear INTR & ERROR flags */
-        out_be32((void __iomem *)(hwif->dma_base + 4), dma_stat | 6);
-        return 0;
-}
-static void scc_dma_start(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        u8 dma_cmd = scc_ide_inb(hwif->dma_base);
-        /* start DMA */
-        scc_ide_outb(dma_cmd | 1, hwif->dma_base);
-}
-static int __scc_dma_end(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        u8 dma_stat, dma_cmd;
-        /* get DMA command mode */
-        dma_cmd = scc_ide_inb(hwif->dma_base);
-        /* stop DMA */
-        scc_ide_outb(dma_cmd & ~1, hwif->dma_base);
-        /* get DMA status */
-        dma_stat = scc_dma_sff_read_status(hwif);
-        /* clear the INTR & ERROR bits */
-        scc_ide_outb(dma_stat | 6, hwif->dma_base + 4);
-        /* verify good DMA status */
-        return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;
-}
-/**
- *      scc_dma_end     -       Stop DMA
- *      @drive: IDE drive
- *
- *      Check and clear INT Status register.
- *      Then call __scc_dma_end().
- */
-static int scc_dma_end(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        void __iomem *dma_base = (void __iomem *)hwif->dma_base;
-        unsigned long intsts_port = hwif->dma_base + 0x014;
-        u32 reg;
-        int dma_stat, data_loss = 0;
-        static int retry = 0;
-        /* errata A308 workaround: Step5 (check data loss) */
-        /* We don't check non ide_disk because it is limited to UDMA4 */
-        if (!(in_be32((void __iomem *)hwif->io_ports.ctl_addr)
-              & ATA_ERR) &&
-            drive->media == ide_disk && drive->current_speed > XFER_UDMA_4) {
-                reg = in_be32((void __iomem *)intsts_port);
-                if (!(reg & INTSTS_ACTEINT)) {
-                        printk(KERN_WARNING "%s: operation failed (transfer data loss)\n",
-                               drive->name);
-                        data_loss = 1;
-                        if (retry++) {
-                                struct request *rq = hwif->rq;
-                                ide_drive_t *drive;
-                                int i;
-                                /* ERROR_RESET and drive->crc_count are needed
-                                 * to reduce DMA transfer mode in retry process.
-                                 */
-                                if (rq)
-                                        rq->errors |= ERROR_RESET;
-                                ide_port_for_each_dev(i, drive, hwif)
-                                        drive->crc_count++;
-                        }
-                }
-        }
-        while (1) {
-                reg = in_be32((void __iomem *)intsts_port);
-                if (reg & INTSTS_SERROR) {
-                        printk(KERN_WARNING "%s: SERROR\n", SCC_PATA_NAME);
-                        out_be32((void __iomem *)intsts_port, INTSTS_SERROR|INTSTS_BMSINT);
-                        out_be32(dma_base, in_be32(dma_base) & ~QCHCD_IOS_SS);
-                        continue;
-                }
-                if (reg & INTSTS_PRERR) {
-                        u32 maea0, maec0;
-                        unsigned long ctl_base = hwif->config_data;
-                        maea0 = in_be32((void __iomem *)(ctl_base + 0xF50));
-                        maec0 = in_be32((void __iomem *)(ctl_base + 0xF54));
-                        printk(KERN_WARNING "%s: PRERR [addr:%x cmd:%x]\n", SCC_PATA_NAME, maea0, maec0);
-                        out_be32((void __iomem *)intsts_port, INTSTS_PRERR|INTSTS_BMSINT);
-                        out_be32(dma_base, in_be32(dma_base) & ~QCHCD_IOS_SS);
-                        continue;
-                }
-                if (reg & INTSTS_RERR) {
-                        printk(KERN_WARNING "%s: Response Error\n", SCC_PATA_NAME);
-                        out_be32((void __iomem *)intsts_port, INTSTS_RERR|INTSTS_BMSINT);
-                        out_be32(dma_base, in_be32(dma_base) & ~QCHCD_IOS_SS);
-                        continue;
-                }
-                if (reg & INTSTS_ICERR) {
-                        out_be32(dma_base, in_be32(dma_base) & ~QCHCD_IOS_SS);
-                        printk(KERN_WARNING "%s: Illegal Configuration\n", SCC_PATA_NAME);
-                        out_be32((void __iomem *)intsts_port, INTSTS_ICERR|INTSTS_BMSINT);
-                        continue;
-                }
-                if (reg & INTSTS_BMSINT) {
-                        printk(KERN_WARNING "%s: Internal Bus Error\n", SCC_PATA_NAME);
-                        out_be32((void __iomem *)intsts_port, INTSTS_BMSINT);
-                        ide_do_reset(drive);
-                        continue;
-                }
-                if (reg & INTSTS_BMHE) {
-                        out_be32((void __iomem *)intsts_port, INTSTS_BMHE);
-                        continue;
-                }
-                if (reg & INTSTS_ACTEINT) {
-                        out_be32((void __iomem *)intsts_port, INTSTS_ACTEINT);
-                        continue;
-                }
-                if (reg & INTSTS_IOIRQS) {
-                        out_be32((void __iomem *)intsts_port, INTSTS_IOIRQS);
-                        continue;
-                }
-                break;
-        }
-        dma_stat = __scc_dma_end(drive);
-        if (data_loss)
-                dma_stat |= 2; /* emulate DMA error (to retry command) */
-        return dma_stat;
-}
-/* returns 1 if dma irq issued, 0 otherwise */
-static int scc_dma_test_irq(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        u32 int_stat = in_be32((void __iomem *)hwif->dma_base + 0x014);
-        /* SCC errata A252,A308 workaround: Step4 */
-        if ((in_be32((void __iomem *)hwif->io_ports.ctl_addr)
-             & ATA_ERR) &&
-            (int_stat & INTSTS_INTRQ))
-                return 1;
-        /* SCC errata A308 workaround: Step5 (polling IOIRQS) */
-        if (int_stat & INTSTS_IOIRQS)
-                return 1;
-        return 0;
-}
-static u8 scc_udma_filter(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        u8 mask = hwif->ultra_mask;
-        /* errata A308 workaround: limit non ide_disk drive to UDMA4 */
-        if ((drive->media != ide_disk) && (mask & 0xE0)) {
-                printk(KERN_INFO "%s: limit %s to UDMA4\n",
-                       SCC_PATA_NAME, drive->name);
-                mask = ATA_UDMA4;
-        }
-        return mask;
-}
-/**
- *      setup_mmio_scc  -       map CTRL/BMID region
- *      @dev: PCI device we are configuring
- *      @name: device name
- *
- */
-static int setup_mmio_scc (struct pci_dev *dev, const char *name)
-{
-        void __iomem *ctl_addr;
-        void __iomem *dma_addr;
-        int i, ret;
-        for (i = 0; i < MAX_HWIFS; i++) {
-                if (scc_ports[i].ctl == 0)
-                        break;
-        }
-        if (i >= MAX_HWIFS)
-                return -ENOMEM;
-        ret = pci_request_selected_regions(dev, (1 << 2) - 1, name);
-        if (ret < 0) {
-                printk(KERN_ERR "%s: can't reserve resources\n", name);
-                return ret;
-        }
-        ctl_addr = pci_ioremap_bar(dev, 0);
-        if (!ctl_addr)
-                goto fail_0;
-        dma_addr = pci_ioremap_bar(dev, 1);
-        if (!dma_addr)
-                goto fail_1;
-        pci_set_master(dev);
-        scc_ports[i].ctl = (unsigned long)ctl_addr;
-        scc_ports[i].dma = (unsigned long)dma_addr;
-        pci_set_drvdata(dev, (void *) &scc_ports[i]);
-        return 1;
- fail_1:
-        iounmap(ctl_addr);
- fail_0:
-        return -ENOMEM;
-}
-static int scc_ide_setup_pci_device(struct pci_dev *dev,
-                                    const struct ide_port_info *d)
-{
-        struct scc_ports *ports = pci_get_drvdata(dev);
-        struct ide_host *host;
-        struct ide_hw hw, *hws[] = { &hw };
-        int i, rc;
-        memset(&hw, 0, sizeof(hw));
-        for (i = 0; i <= 8; i++)
-                hw.io_ports_array[i] = ports->dma + 0x20 + i * 4;
-        hw.irq = dev->irq;
-        hw.dev = &dev->dev;
-        rc = ide_host_add(d, hws, 1, &host);
-        if (rc)
-                return rc;
-        ports->host = host;
-        return 0;
-}
-/**
- *      init_setup_scc  -       set up an SCC PATA Controller
- *      @dev: PCI device
- *      @d: IDE port info
- *
- *      Perform the initial set up for this device.
- */
-static int init_setup_scc(struct pci_dev *dev, const struct ide_port_info *d)
-{
-        unsigned long ctl_base;
-        unsigned long dma_base;
-        unsigned long cckctrl_port;
-        unsigned long intmask_port;
-        unsigned long mode_port;
-        unsigned long ecmode_port;
-        u32 reg = 0;
-        struct scc_ports *ports;
-        int rc;
-        rc = pci_enable_device(dev);
-        if (rc)
-                goto end;
-        rc = setup_mmio_scc(dev, d->name);
-        if (rc < 0)
-                goto end;
-        ports = pci_get_drvdata(dev);
-        ctl_base = ports->ctl;
-        dma_base = ports->dma;
-        cckctrl_port = ctl_base + 0xff0;
-        intmask_port = dma_base + 0x010;
-        mode_port = ctl_base + 0x024;
-        ecmode_port = ctl_base + 0xf00;
-        /* controller initialization */
-        reg = 0;
-        out_be32((void*)cckctrl_port, reg);
-        reg |= CCKCTRL_ATACLKOEN;
-        out_be32((void*)cckctrl_port, reg);
-        reg |= CCKCTRL_LCLKEN | CCKCTRL_OCLKEN;
-        out_be32((void*)cckctrl_port, reg);
-        reg |= CCKCTRL_CRST;
-        out_be32((void*)cckctrl_port, reg);
-        for (;;) {
-                reg = in_be32((void*)cckctrl_port);
-                if (reg & CCKCTRL_CRST)
-                        break;
-                udelay(5000);
-        }
-        reg |= CCKCTRL_ATARESET;
-        out_be32((void*)cckctrl_port, reg);
-        out_be32((void*)ecmode_port, ECMODE_VALUE);
-        out_be32((void*)mode_port, MODE_JCUSFEN);
-        out_be32((void*)intmask_port, INTMASK_MSK);
-        rc = scc_ide_setup_pci_device(dev, d);
- end:
-        return rc;
-}
-static void scc_tf_load(ide_drive_t *drive, struct ide_taskfile *tf, u8 valid)
-{
-        struct ide_io_ports *io_ports = &drive->hwif->io_ports;
-        if (valid & IDE_VALID_FEATURE)
-                scc_ide_outb(tf->feature, io_ports->feature_addr);
-        if (valid & IDE_VALID_NSECT)
-                scc_ide_outb(tf->nsect, io_ports->nsect_addr);
-        if (valid & IDE_VALID_LBAL)
-                scc_ide_outb(tf->lbal, io_ports->lbal_addr);
-        if (valid & IDE_VALID_LBAM)
-                scc_ide_outb(tf->lbam, io_ports->lbam_addr);
-        if (valid & IDE_VALID_LBAH)
-                scc_ide_outb(tf->lbah, io_ports->lbah_addr);
-        if (valid & IDE_VALID_DEVICE)
-                scc_ide_outb(tf->device, io_ports->device_addr);
-}
-static void scc_tf_read(ide_drive_t *drive, struct ide_taskfile *tf, u8 valid)
-{
-        struct ide_io_ports *io_ports = &drive->hwif->io_ports;
-        if (valid & IDE_VALID_ERROR)
-                tf->error  = scc_ide_inb(io_ports->feature_addr);
-        if (valid & IDE_VALID_NSECT)
-                tf->nsect  = scc_ide_inb(io_ports->nsect_addr);
-        if (valid & IDE_VALID_LBAL)
-                tf->lbal   = scc_ide_inb(io_ports->lbal_addr);
-        if (valid & IDE_VALID_LBAM)
-                tf->lbam   = scc_ide_inb(io_ports->lbam_addr);
-        if (valid & IDE_VALID_LBAH)
-                tf->lbah   = scc_ide_inb(io_ports->lbah_addr);
-        if (valid & IDE_VALID_DEVICE)
-                tf->device = scc_ide_inb(io_ports->device_addr);
-}
-static void scc_input_data(ide_drive_t *drive, struct ide_cmd *cmd,
-                           void *buf, unsigned int len)
-{
-        unsigned long data_addr = drive->hwif->io_ports.data_addr;
-        len++;
-        if (drive->io_32bit) {
-                scc_ide_insl(data_addr, buf, len / 4);
-                if ((len & 3) >= 2)
-                        scc_ide_insw(data_addr, (u8 *)buf + (len & ~3), 1);
-        } else
-                scc_ide_insw(data_addr, buf, len / 2);
-}
-static void scc_output_data(ide_drive_t *drive,  struct ide_cmd *cmd,
-                            void *buf, unsigned int len)
-{
-        unsigned long data_addr = drive->hwif->io_ports.data_addr;
-        len++;
-        if (drive->io_32bit) {
-                scc_ide_outsl(data_addr, buf, len / 4);
-                if ((len & 3) >= 2)
-                        scc_ide_outsw(data_addr, (u8 *)buf + (len & ~3), 1);
-        } else
-                scc_ide_outsw(data_addr, buf, len / 2);
-}
-/**
- *      init_mmio_iops_scc      -       set up the iops for MMIO
- *      @hwif: interface to set up
- *
- */
-static void init_mmio_iops_scc(ide_hwif_t *hwif)
-{
-        struct pci_dev *dev = to_pci_dev(hwif->dev);
-        struct scc_ports *ports = pci_get_drvdata(dev);
-        unsigned long dma_base = ports->dma;
-        ide_set_hwifdata(hwif, ports);
-        hwif->dma_base = dma_base;
-        hwif->config_data = ports->ctl;
-}
-/**
- *      init_iops_scc   -       set up iops
- *      @hwif: interface to set up
- *
- *      Do the basic setup for the SCC hardware interface
- *      and then do the MMIO setup.
- */
-static void init_iops_scc(ide_hwif_t *hwif)
-{
-        struct pci_dev *dev = to_pci_dev(hwif->dev);
-        hwif->hwif_data = NULL;
-        if (pci_get_drvdata(dev) == NULL)
-                return;
-        init_mmio_iops_scc(hwif);
-}
-static int scc_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
-{
-        return ide_allocate_dma_engine(hwif);
-}
-static u8 scc_cable_detect(ide_hwif_t *hwif)
-{
-        return ATA_CBL_PATA80;
-}
-/**
- *      init_hwif_scc   -       set up hwif
- *      @hwif: interface to set up
- *
- *      We do the basic set up of the interface structure. The SCC
- *      requires several custom handlers so we override the default
- *      ide DMA handlers appropriately.
- */
-static void init_hwif_scc(ide_hwif_t *hwif)
-{
-        /* PTERADD */
-        out_be32((void __iomem *)(hwif->dma_base + 0x018), hwif->dmatable_dma);
-        if (in_be32((void __iomem *)(hwif->config_data + 0xff0)) & CCKCTRL_ATACLKOEN)
-                hwif->ultra_mask = ATA_UDMA6; /* 133MHz */
-        else
-                hwif->ultra_mask = ATA_UDMA5; /* 100MHz */
-}
-static const struct ide_tp_ops scc_tp_ops = {
-        .exec_command           = scc_exec_command,
-        .read_status            = scc_read_status,
-        .read_altstatus         = scc_read_altstatus,
-        .write_devctl           = scc_write_devctl,
-        .dev_select             = ide_dev_select,
-        .tf_load                = scc_tf_load,
-        .tf_read                = scc_tf_read,
-        .input_data             = scc_input_data,
-        .output_data            = scc_output_data,
-};
-static const struct ide_port_ops scc_port_ops = {
-        .set_pio_mode           = scc_set_pio_mode,
-        .set_dma_mode           = scc_set_dma_mode,
-        .udma_filter            = scc_udma_filter,
-        .cable_detect           = scc_cable_detect,
-};
-static const struct ide_dma_ops scc_dma_ops = {
-        .dma_host_set           = scc_dma_host_set,
-        .dma_setup              = scc_dma_setup,
-        .dma_start              = scc_dma_start,
-        .dma_end                = scc_dma_end,
-        .dma_test_irq           = scc_dma_test_irq,
-        .dma_lost_irq           = ide_dma_lost_irq,
-        .dma_timer_expiry       = ide_dma_sff_timer_expiry,
-        .dma_sff_read_status    = scc_dma_sff_read_status,
-};
-static const struct ide_port_info scc_chipset = {
-        .name           = "sccIDE",
-        .init_iops      = init_iops_scc,
-        .init_dma       = scc_init_dma,
-        .init_hwif      = init_hwif_scc,
-        .tp_ops         = &scc_tp_ops,
-        .port_ops       = &scc_port_ops,
-        .dma_ops        = &scc_dma_ops,
-        .host_flags     = IDE_HFLAG_SINGLE,
-        .irq_flags      = IRQF_SHARED,
-        .pio_mask       = ATA_PIO4,
-        .chipset        = ide_pci,
-};
-/**
- *      scc_init_one    -       pci layer discovery entry
- *      @dev: PCI device
- *      @id: ident table entry
- *
- *      Called by the PCI code when it finds an SCC PATA controller.
- *      We then use the IDE PCI generic helper to do most of the work.
- */
-static int scc_init_one(struct pci_dev *dev, const struct pci_device_id *id)
-{
-        return init_setup_scc(dev, &scc_chipset);
-}
-/**
- *      scc_remove      -       pci layer remove entry
- *      @dev: PCI device
- *
- *      Called by the PCI code when it removes an SCC PATA controller.
- */
-static void scc_remove(struct pci_dev *dev)
-{
-        struct scc_ports *ports = pci_get_drvdata(dev);
-        struct ide_host *host = ports->host;
-        ide_host_remove(host);
-        iounmap((void*)ports->dma);
-        iounmap((void*)ports->ctl);
-        pci_release_selected_regions(dev, (1 << 2) - 1);
-        memset(ports, 0, sizeof(*ports));
-}
-static const struct pci_device_id scc_pci_tbl[] = {
-        { PCI_VDEVICE(TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA), 0 },
-        { 0, },
-};
-MODULE_DEVICE_TABLE(pci, scc_pci_tbl);
-static struct pci_driver scc_pci_driver = {
-        .name = "SCC IDE",
-        .id_table = scc_pci_tbl,
-        .probe = scc_init_one,
-        .remove = scc_remove,
-};
-static int __init scc_ide_init(void)
-{
-        return ide_pci_register_driver(&scc_pci_driver);
-}
-static void __exit scc_ide_exit(void)
-{
-        pci_unregister_driver(&scc_pci_driver);
-}
-module_init(scc_ide_init);
-module_exit(scc_ide_exit);
-MODULE_DESCRIPTION("PCI driver module for Toshiba SCC IDE");
-MODULE_LICENSE("GPL");
diff --git a/drivers/iio/accel/mma9551_core.c b/drivers/iio/accel/mma9551_core.c
index 7f55a6d7cd03..c6d5a3a40b60 100644
--- a/drivers/iio/accel/mma9551_core.c
+++ b/drivers/iio/accel/mma9551_core.c
@@ -389,7 +389,12 @@ int mma9551_read_config_words(struct i2c_client *client, u8 app_id,
 {
        int ret, i;
        int len_words = len / sizeof(u16);
-        __be16 be_buf[MMA9551_MAX_MAILBOX_DATA_REGS];
+        __be16 be_buf[MMA9551_MAX_MAILBOX_DATA_REGS / 2];
+        if (len_words > ARRAY_SIZE(be_buf)) {
+                dev_err(&client->dev, "Invalid buffer size %d\n", len);
+                return -EINVAL;
+        }
        ret = mma9551_transfer(client, app_id, MMA9551_CMD_READ_CONFIG,
                               reg, NULL, 0, (u8 *) be_buf, len);
@@ -424,7 +429,12 @@ int mma9551_read_status_words(struct i2c_client *client, u8 app_id,
 {
        int ret, i;
        int len_words = len / sizeof(u16);
-        __be16 be_buf[MMA9551_MAX_MAILBOX_DATA_REGS];
+        __be16 be_buf[MMA9551_MAX_MAILBOX_DATA_REGS / 2];
+        if (len_words > ARRAY_SIZE(be_buf)) {
+                dev_err(&client->dev, "Invalid buffer size %d\n", len);
+                return -EINVAL;
+        }
        ret = mma9551_transfer(client, app_id, MMA9551_CMD_READ_STATUS,
                               reg, NULL, 0, (u8 *) be_buf, len);
@@ -459,7 +469,12 @@ int mma9551_write_config_words(struct i2c_client *client, u8 app_id,
 {
        int i;
        int len_words = len / sizeof(u16);
-        __be16 be_buf[MMA9551_MAX_MAILBOX_DATA_REGS];
+        __be16 be_buf[(MMA9551_MAX_MAILBOX_DATA_REGS - 1) / 2];
+        if (len_words > ARRAY_SIZE(be_buf)) {
+                dev_err(&client->dev, "Invalid buffer size %d\n", len);
+                return -EINVAL;
+        }
        for (i = 0; i < len_words; i++)
                be_buf[i] = cpu_to_be16(buf[i]);
diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c
index 2df1af7d43fc..365a109aaaef 100644
--- a/drivers/iio/accel/mma9553.c
+++ b/drivers/iio/accel/mma9553.c
@@ -54,6 +54,7 @@
 #define MMA9553_MASK_CONF_STEPCOALESCE          GENMASK(7, 0)
 #define MMA9553_REG_CONF_ACTTHD                 0x0E
+#define MMA9553_MAX_ACTTHD                      GENMASK(15, 0)
 /* Pedometer status registers (R-only) */
 #define MMA9553_REG_STATUS                      0x00
@@ -316,22 +317,19 @@ static int mma9553_set_config(struct mma9553_data *data, u16 reg,
 static int mma9553_read_activity_stepcnt(struct mma9553_data *data,
                                         u8 *activity, u16 *stepcnt)
 {
-        u32 status_stepcnt;
+        u16 buf[2];
-        u16 status;
        int ret;
        ret = mma9551_read_status_words(data->client, MMA9551_APPID_PEDOMETER,
-                                        MMA9553_REG_STATUS, sizeof(u32),
+                                        MMA9553_REG_STATUS, sizeof(u32), buf);
-                                        (u16 *) &status_stepcnt);
        if (ret < 0) {
                dev_err(&data->client->dev,
                        "error reading status and stepcnt\n");
                return ret;
        }
-        status = status_stepcnt & MMA9553_MASK_CONF_WORD;
+        *activity = mma9553_get_bits(buf[0], MMA9553_MASK_STATUS_ACTIVITY);
-        *activity = mma9553_get_bits(status, MMA9553_MASK_STATUS_ACTIVITY);
+        *stepcnt = buf[1];
-        *stepcnt = status_stepcnt >> 16;
        return 0;
 }
@@ -872,6 +870,9 @@ static int mma9553_write_event_value(struct iio_dev *indio_dev,
        case IIO_EV_INFO_PERIOD:
                switch (chan->type) {
                case IIO_ACTIVITY:
+                        if (val < 0 || val > MMA9553_ACTIVITY_THD_TO_SEC(
+                            MMA9553_MAX_ACTTHD))
+                                return -EINVAL;
                        mutex_lock(&data->mutex);
                        ret = mma9553_set_config(data, MMA9553_REG_CONF_ACTTHD,
                                                 &data->conf.actthd,
@@ -971,7 +972,8 @@ static const struct iio_chan_spec_ext_info mma9553_ext_info[] = {
        .modified = 1,                                                  \
        .channel2 = _chan2,                                             \
        .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),             \
-        .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_CALIBHEIGHT),     \
+        .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_CALIBHEIGHT) |    \
+                                    BIT(IIO_CHAN_INFO_ENABLE),          \
        .event_spec = mma9553_activity_events,                          \
        .num_event_specs = ARRAY_SIZE(mma9553_activity_events),         \
        .ext_info = mma9553_ext_info,                                   \
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 58d1d13d552a..211b13271c61 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -546,6 +546,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &accel_info;
+        mutex_init(&adata->tb.buf_lock);
        st_sensors_power_enable(indio_dev);
diff --git a/drivers/iio/adc/axp288_adc.c b/drivers/iio/adc/axp288_adc.c
index 08bcfb061ca5..56008a86b78f 100644
--- a/drivers/iio/adc/axp288_adc.c
+++ b/drivers/iio/adc/axp288_adc.c
@@ -53,39 +53,42 @@ static const struct iio_chan_spec const axp288_adc_channels[] = {
                .channel = 0,
                .address = AXP288_TS_ADC_H,
                .datasheet_name = "TS_PIN",
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
        }, {
                .indexed = 1,
                .type = IIO_TEMP,
                .channel = 1,
                .address = AXP288_PMIC_ADC_H,
                .datasheet_name = "PMIC_TEMP",
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
        }, {
                .indexed = 1,
                .type = IIO_TEMP,
                .channel = 2,
                .address = AXP288_GP_ADC_H,
                .datasheet_name = "GPADC",
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
        }, {
                .indexed = 1,
                .type = IIO_CURRENT,
                .channel = 3,
                .address = AXP20X_BATT_CHRG_I_H,
                .datasheet_name = "BATT_CHG_I",
-                .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
        }, {
                .indexed = 1,
                .type = IIO_CURRENT,
                .channel = 4,
                .address = AXP20X_BATT_DISCHRG_I_H,
                .datasheet_name = "BATT_DISCHRG_I",
-                .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
        }, {
                .indexed = 1,
                .type = IIO_VOLTAGE,
                .channel = 5,
                .address = AXP20X_BATT_V_H,
                .datasheet_name = "BATT_V",
-                .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
        },
 };
@@ -151,9 +154,6 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev,
                                                chan->address))
                        dev_err(&indio_dev->dev, "TS pin restore\n");
                break;
-        case IIO_CHAN_INFO_PROCESSED:
-                ret = axp288_adc_read_channel(val, chan->address, info->regmap);
-                break;
        default:
                ret = -EINVAL;
        }
diff --git a/drivers/iio/adc/cc10001_adc.c b/drivers/iio/adc/cc10001_adc.c
index 51e2a83c9404..115f6e99a7fa 100644
--- a/drivers/iio/adc/cc10001_adc.c
+++ b/drivers/iio/adc/cc10001_adc.c
@@ -35,8 +35,9 @@
 #define CC10001_ADC_EOC_SET             BIT(0)
 #define CC10001_ADC_CHSEL_SAMPLED       0x0c
-#define CC10001_ADC_POWER_UP            0x10
+#define CC10001_ADC_POWER_DOWN          0x10
-#define CC10001_ADC_POWER_UP_SET        BIT(0)
+#define CC10001_ADC_POWER_DOWN_SET      BIT(0)
 #define CC10001_ADC_DEBUG               0x14
 #define CC10001_ADC_DATA_COUNT          0x20
@@ -62,7 +63,6 @@ struct cc10001_adc_device {
        u16 *buf;
        struct mutex lock;
-        unsigned long channel_map;
        unsigned int start_delay_ns;
        unsigned int eoc_delay_ns;
 };
@@ -79,6 +79,18 @@ static inline u32 cc10001_adc_read_reg(struct cc10001_adc_device *adc_dev,
        return readl(adc_dev->reg_base + reg);
 }
+static void cc10001_adc_power_up(struct cc10001_adc_device *adc_dev)
+{
+        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_DOWN, 0);
+        ndelay(adc_dev->start_delay_ns);
+}
+static void cc10001_adc_power_down(struct cc10001_adc_device *adc_dev)
+{
+        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_DOWN,
+                              CC10001_ADC_POWER_DOWN_SET);
+}
 static void cc10001_adc_start(struct cc10001_adc_device *adc_dev,
                              unsigned int channel)
 {
@@ -88,6 +100,7 @@ static void cc10001_adc_start(struct cc10001_adc_device *adc_dev,
        val = (channel & CC10001_ADC_CH_MASK) | CC10001_ADC_MODE_SINGLE_CONV;
        cc10001_adc_write_reg(adc_dev, CC10001_ADC_CONFIG, val);
+        udelay(1);
        val = cc10001_adc_read_reg(adc_dev, CC10001_ADC_CONFIG);
        val = val | CC10001_ADC_START_CONV;
        cc10001_adc_write_reg(adc_dev, CC10001_ADC_CONFIG, val);
@@ -129,6 +142,7 @@ static irqreturn_t cc10001_adc_trigger_h(int irq, void *p)
        struct iio_dev *indio_dev;
        unsigned int delay_ns;
        unsigned int channel;
+        unsigned int scan_idx;
        bool sample_invalid;
        u16 *data;
        int i;
@@ -139,20 +153,17 @@ static irqreturn_t cc10001_adc_trigger_h(int irq, void *p)
        mutex_lock(&adc_dev->lock);
-        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_UP,
+        cc10001_adc_power_up(adc_dev);
-                              CC10001_ADC_POWER_UP_SET);
-        /* Wait for 8 (6+2) clock cycles before activating START */
-        ndelay(adc_dev->start_delay_ns);
        /* Calculate delay step for eoc and sampled data */
        delay_ns = adc_dev->eoc_delay_ns / CC10001_MAX_POLL_COUNT;
        i = 0;
        sample_invalid = false;
-        for_each_set_bit(channel, indio_dev->active_scan_mask,
+        for_each_set_bit(scan_idx, indio_dev->active_scan_mask,
                                  indio_dev->masklength) {
+                channel = indio_dev->channels[scan_idx].channel;
                cc10001_adc_start(adc_dev, channel);
                data[i] = cc10001_adc_poll_done(indio_dev, channel, delay_ns);
@@ -166,7 +177,7 @@ static irqreturn_t cc10001_adc_trigger_h(int irq, void *p)
        }
 done:
-        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_UP, 0);
+        cc10001_adc_power_down(adc_dev);
        mutex_unlock(&adc_dev->lock);
@@ -185,11 +196,7 @@ static u16 cc10001_adc_read_raw_voltage(struct iio_dev *indio_dev,
        unsigned int delay_ns;
        u16 val;
-        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_UP,
+        cc10001_adc_power_up(adc_dev);
-                              CC10001_ADC_POWER_UP_SET);
-        /* Wait for 8 (6+2) clock cycles before activating START */
-        ndelay(adc_dev->start_delay_ns);
        /* Calculate delay step for eoc and sampled data */
        delay_ns = adc_dev->eoc_delay_ns / CC10001_MAX_POLL_COUNT;
@@ -198,7 +205,7 @@ static u16 cc10001_adc_read_raw_voltage(struct iio_dev *indio_dev,
        val = cc10001_adc_poll_done(indio_dev, chan->channel, delay_ns);
-        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_UP, 0);
+        cc10001_adc_power_down(adc_dev);
        return val;
 }
@@ -224,7 +231,7 @@ static int cc10001_adc_read_raw(struct iio_dev *indio_dev,
        case IIO_CHAN_INFO_SCALE:
                ret = regulator_get_voltage(adc_dev->reg);
-                if (ret)
+                if (ret < 0)
                        return ret;
                *val = ret / 1000;
@@ -255,22 +262,22 @@ static const struct iio_info cc10001_adc_info = {
        .update_scan_mode = &cc10001_update_scan_mode,
 };
-static int cc10001_adc_channel_init(struct iio_dev *indio_dev)
+static int cc10001_adc_channel_init(struct iio_dev *indio_dev,
+                                    unsigned long channel_map)
 {
-        struct cc10001_adc_device *adc_dev = iio_priv(indio_dev);
        struct iio_chan_spec *chan_array, *timestamp;
        unsigned int bit, idx = 0;
-        indio_dev->num_channels = bitmap_weight(&adc_dev->channel_map,
+        indio_dev->num_channels = bitmap_weight(&channel_map,
-                                                CC10001_ADC_NUM_CHANNELS);
+                                                CC10001_ADC_NUM_CHANNELS) + 1;
-        chan_array = devm_kcalloc(&indio_dev->dev, indio_dev->num_channels + 1,
+        chan_array = devm_kcalloc(&indio_dev->dev, indio_dev->num_channels,
                                  sizeof(struct iio_chan_spec),
                                  GFP_KERNEL);
        if (!chan_array)
                return -ENOMEM;
-        for_each_set_bit(bit, &adc_dev->channel_map, CC10001_ADC_NUM_CHANNELS) {
+        for_each_set_bit(bit, &channel_map, CC10001_ADC_NUM_CHANNELS) {
                struct iio_chan_spec *chan = &chan_array[idx];
                chan->type = IIO_VOLTAGE;
@@ -305,6 +312,7 @@ static int cc10001_adc_probe(struct platform_device *pdev)
        unsigned long adc_clk_rate;
        struct resource *res;
        struct iio_dev *indio_dev;
+        unsigned long channel_map;
        int ret;
        indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*adc_dev));
@@ -313,9 +321,9 @@ static int cc10001_adc_probe(struct platform_device *pdev)
        adc_dev = iio_priv(indio_dev);
-        adc_dev->channel_map = GENMASK(CC10001_ADC_NUM_CHANNELS - 1, 0);
+        channel_map = GENMASK(CC10001_ADC_NUM_CHANNELS - 1, 0);
        if (!of_property_read_u32(node, "adc-reserved-channels", &ret))
-                adc_dev->channel_map &= ~ret;
+                channel_map &= ~ret;
        adc_dev->reg = devm_regulator_get(&pdev->dev, "vref");
        if (IS_ERR(adc_dev->reg))
@@ -361,7 +369,7 @@ static int cc10001_adc_probe(struct platform_device *pdev)
        adc_dev->start_delay_ns = adc_dev->eoc_delay_ns * CC10001_WAIT_CYCLES;
        /* Setup the ADC channels available on the device */
-        ret = cc10001_adc_channel_init(indio_dev);
+        ret = cc10001_adc_channel_init(indio_dev, channel_map);
        if (ret < 0)
                goto err_disable_clk;
diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
index efbfd12a4bfd..8d9c9b9215dd 100644
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@ -60,12 +60,12 @@ struct mcp320x {
        struct spi_message msg;
        struct spi_transfer transfer[2];
-        u8 tx_buf;
-        u8 rx_buf[2];
        struct regulator *reg;
        struct mutex lock;
        const struct mcp320x_chip_info *chip_info;
+        u8 tx_buf ____cacheline_aligned;
+        u8 rx_buf[2];
 };
 static int mcp320x_channel_to_tx_data(int device_index,
diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c
index 3211729bcb0b..0c4618b4d515 100644
--- a/drivers/iio/adc/qcom-spmi-vadc.c
+++ b/drivers/iio/adc/qcom-spmi-vadc.c
@@ -18,6 +18,7 @@
 #include <linux/iio/iio.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
+#include <linux/math64.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
@@ -471,11 +472,11 @@ static s32 vadc_calibrate(struct vadc_priv *vadc,
                          const struct vadc_channel_prop *prop, u16 adc_code)
 {
        const struct vadc_prescale_ratio *prescale;
-        s32 voltage;
+        s64 voltage;
        voltage = adc_code - vadc->graph[prop->calibration].gnd;
        voltage *= vadc->graph[prop->calibration].dx;
-        voltage = voltage / vadc->graph[prop->calibration].dy;
+        voltage = div64_s64(voltage, vadc->graph[prop->calibration].dy);
        if (prop->calibration == VADC_CALIB_ABSOLUTE)
                voltage += vadc->graph[prop->calibration].dx;
@@ -487,7 +488,7 @@ static s32 vadc_calibrate(struct vadc_priv *vadc,
        voltage = voltage * prescale->den;
-        return voltage / prescale->num;
+        return div64_s64(voltage, prescale->num);
 }
 static int vadc_decimation_from_dt(u32 value)
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
index a221f7329b79..ce93bd8e3f68 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -856,6 +856,7 @@ static int xadc_read_raw(struct iio_dev *indio_dev,
                        switch (chan->address) {
                        case XADC_REG_VCCINT:
                        case XADC_REG_VCCAUX:
+                        case XADC_REG_VREFP:
                        case XADC_REG_VCCBRAM:
                        case XADC_REG_VCCPINT:
                        case XADC_REG_VCCPAUX:
@@ -996,7 +997,7 @@ static const struct iio_event_spec xadc_voltage_events[] = {
        .num_event_specs = (_alarm) ? ARRAY_SIZE(xadc_voltage_events) : 0, \
        .scan_index = (_scan_index), \
        .scan_type = { \
-                .sign = 'u', \
+                .sign = ((_addr) == XADC_REG_VREFN) ? 's' : 'u', \
                .realbits = 12, \
                .storagebits = 16, \
                .shift = 4, \
@@ -1008,7 +1009,7 @@ static const struct iio_event_spec xadc_voltage_events[] = {
 static const struct iio_chan_spec xadc_channels[] = {
        XADC_CHAN_TEMP(0, 8, XADC_REG_TEMP),
        XADC_CHAN_VOLTAGE(0, 9, XADC_REG_VCCINT, "vccint", true),
-        XADC_CHAN_VOLTAGE(1, 10, XADC_REG_VCCINT, "vccaux", true),
+        XADC_CHAN_VOLTAGE(1, 10, XADC_REG_VCCAUX, "vccaux", true),
        XADC_CHAN_VOLTAGE(2, 14, XADC_REG_VCCBRAM, "vccbram", true),
        XADC_CHAN_VOLTAGE(3, 5, XADC_REG_VCCPINT, "vccpint", true),
        XADC_CHAN_VOLTAGE(4, 6, XADC_REG_VCCPAUX, "vccpaux", true),
diff --git a/drivers/iio/adc/xilinx-xadc.h b/drivers/iio/adc/xilinx-xadc.h
index c7487e8d7f80..54adc5087210 100644
--- a/drivers/iio/adc/xilinx-xadc.h
+++ b/drivers/iio/adc/xilinx-xadc.h
@@ -145,9 +145,9 @@ static inline int xadc_write_adc_reg(struct xadc *xadc, unsigned int reg,
 #define XADC_REG_MAX_VCCPINT    0x28
 #define XADC_REG_MAX_VCCPAUX    0x29
 #define XADC_REG_MAX_VCCO_DDR   0x2a
-#define XADC_REG_MIN_VCCPINT    0x2b
+#define XADC_REG_MIN_VCCPINT    0x2c
-#define XADC_REG_MIN_VCCPAUX    0x2c
+#define XADC_REG_MIN_VCCPAUX    0x2d
-#define XADC_REG_MIN_VCCO_DDR   0x2d
+#define XADC_REG_MIN_VCCO_DDR   0x2e
 #define XADC_REG_CONF0          0x40
 #define XADC_REG_CONF1          0x41
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index edd13d2b4121..8dd0477e201c 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -304,8 +304,6 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
        struct st_sensors_platform_data *of_pdata;
        int err = 0;
-        mutex_init(&sdata->tb.buf_lock);
        /* If OF/DT pdata exists, it will take precedence of anything else */
        of_pdata = st_sensors_of_probe(indio_dev->dev.parent, pdata);
        if (of_pdata)
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index 21395f26d227..ffe96642b6d0 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -400,6 +400,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev)
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &gyro_info;
+        mutex_init(&gdata->tb.buf_lock);
        st_sensors_power_enable(indio_dev);
diff --git a/drivers/iio/kfifo_buf.c b/drivers/iio/kfifo_buf.c
index 847ca561afe0..55c267bbfd2f 100644
--- a/drivers/iio/kfifo_buf.c
+++ b/drivers/iio/kfifo_buf.c
@@ -38,7 +38,8 @@ static int iio_request_update_kfifo(struct iio_buffer *r)
                kfifo_free(&buf->kf);
                ret = __iio_allocate_kfifo(buf, buf->buffer.bytes_per_datum,
                                   buf->buffer.length);
-                buf->update_needed = false;
+                if (ret >= 0)
+                        buf->update_needed = false;
        } else {
                kfifo_reset_out(&buf->kf);
        }
diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c
index 91ecc46ffeaa..ef60bae738e3 100644
--- a/drivers/iio/light/hid-sensor-prox.c
+++ b/drivers/iio/light/hid-sensor-prox.c
@@ -43,8 +43,6 @@ struct prox_state {
 static const struct iio_chan_spec prox_channels[] = {
        {
                .type = IIO_PROXIMITY,
-                .modified = 1,
-                .channel2 = IIO_NO_MOD,
                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
                BIT(IIO_CHAN_INFO_SCALE) |
@@ -253,7 +251,6 @@ static int hid_prox_probe(struct platform_device *pdev)
        struct iio_dev *indio_dev;
        struct prox_state *prox_state;
        struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
-        struct iio_chan_spec *channels;
        indio_dev = devm_iio_device_alloc(&pdev->dev,
                                sizeof(struct prox_state));
@@ -272,20 +269,21 @@ static int hid_prox_probe(struct platform_device *pdev)
                return ret;
        }
-        channels = kmemdup(prox_channels, sizeof(prox_channels), GFP_KERNEL);
+        indio_dev->channels = kmemdup(prox_channels, sizeof(prox_channels),
-        if (!channels) {
+                                      GFP_KERNEL);
+        if (!indio_dev->channels) {
                dev_err(&pdev->dev, "failed to duplicate channels\n");
                return -ENOMEM;
        }
-        ret = prox_parse_report(pdev, hsdev, channels,
+        ret = prox_parse_report(pdev, hsdev,
+                                (struct iio_chan_spec *)indio_dev->channels,
                                HID_USAGE_SENSOR_PROX, prox_state);
        if (ret) {
                dev_err(&pdev->dev, "failed to setup attributes\n");
                goto error_free_dev_mem;
        }
-        indio_dev->channels = channels;
        indio_dev->num_channels =
                                ARRAY_SIZE(prox_channels);
        indio_dev->dev.parent = &pdev->dev;
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 8ade473f99fe..2e56f812a644 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -369,6 +369,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev)
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &magn_info;
+        mutex_init(&mdata->tb.buf_lock);
        st_sensors_power_enable(indio_dev);
diff --git a/drivers/iio/pressure/bmp280.c b/drivers/iio/pressure/bmp280.c
index 7c623e2bd633..a2602d8dd6d5 100644
--- a/drivers/iio/pressure/bmp280.c
+++ b/drivers/iio/pressure/bmp280.c
@@ -172,6 +172,7 @@ static s32 bmp280_compensate_temp(struct bmp280_data *data,
        var2 = (((((adc_temp >> 4) - ((s32)le16_to_cpu(buf[T1]))) *
                  ((adc_temp >> 4) - ((s32)le16_to_cpu(buf[T1])))) >> 12) *
                ((s32)(s16)le16_to_cpu(buf[T3]))) >> 14;
+        data->t_fine = var1 + var2;
        return (data->t_fine * 5 + 128) >> 8;
 }
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c
index 7bb8d4c1f7df..3cf0bd67d24c 100644
--- a/drivers/iio/pressure/hid-sensor-press.c
+++ b/drivers/iio/pressure/hid-sensor-press.c
@@ -47,8 +47,6 @@ struct press_state {
 static const struct iio_chan_spec press_channels[] = {
        {
                .type = IIO_PRESSURE,
-                .modified = 1,
-                .channel2 = IIO_NO_MOD,
                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
                BIT(IIO_CHAN_INFO_SCALE) |
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 97baf40d424b..e881fa6291e9 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -417,6 +417,7 @@ int st_press_common_probe(struct iio_dev *indio_dev)
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &press_info;
+        mutex_init(&press_data->tb.buf_lock);
        st_sensors_power_enable(indio_dev);
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index f80da50d84a5..38339d220d7f 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -472,13 +472,8 @@ int rdma_addr_find_dmac_by_grh(union ib_gid *sgid, union ib_gid *dgid, u8 *dmac,
        } sgid_addr, dgid_addr;
-        ret = rdma_gid2ip(&sgid_addr._sockaddr, sgid);
+        rdma_gid2ip(&sgid_addr._sockaddr, sgid);
-        if (ret)
+        rdma_gid2ip(&dgid_addr._sockaddr, dgid);
-                return ret;
-        ret = rdma_gid2ip(&dgid_addr._sockaddr, dgid);
-        if (ret)
-                return ret;
        memset(&dev_addr, 0, sizeof(dev_addr));
@@ -512,10 +507,8 @@ int rdma_addr_find_smac_by_sgid(union ib_gid *sgid, u8 *smac, u16 *vlan_id)
                struct sockaddr_in6 _sockaddr_in6;
        } gid_addr;
-        ret = rdma_gid2ip(&gid_addr._sockaddr, sgid);
+        rdma_gid2ip(&gid_addr._sockaddr, sgid);
-        if (ret)
-                return ret;
        memset(&dev_addr, 0, sizeof(dev_addr));
        ret = rdma_translate_ip(&gid_addr._sockaddr, &dev_addr, vlan_id);
        if (ret)
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index e28a494e2a3a..0c1419105ff0 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -437,39 +437,38 @@ static struct cm_id_private * cm_acquire_id(__be32 local_id, __be32 remote_id)
        return cm_id_priv;
 }
-static void cm_mask_copy(u8 *dst, u8 *src, u8 *mask)
+static void cm_mask_copy(u32 *dst, const u32 *src, const u32 *mask)
 {
        int i;
-        for (i = 0; i < IB_CM_COMPARE_SIZE / sizeof(unsigned long); i++)
+        for (i = 0; i < IB_CM_COMPARE_SIZE; i++)
-                ((unsigned long *) dst)[i] = ((unsigned long *) src)[i] &
+                dst[i] = src[i] & mask[i];
-                                             ((unsigned long *) mask)[i];
 }
 static int cm_compare_data(struct ib_cm_compare_data *src_data,
                           struct ib_cm_compare_data *dst_data)
 {
-        u8 src[IB_CM_COMPARE_SIZE];
+        u32 src[IB_CM_COMPARE_SIZE];
-        u8 dst[IB_CM_COMPARE_SIZE];
+        u32 dst[IB_CM_COMPARE_SIZE];
        if (!src_data || !dst_data)
                return 0;
        cm_mask_copy(src, src_data->data, dst_data->mask);
        cm_mask_copy(dst, dst_data->data, src_data->mask);
-        return memcmp(src, dst, IB_CM_COMPARE_SIZE);
+        return memcmp(src, dst, sizeof(src));
 }
-static int cm_compare_private_data(u8 *private_data,
+static int cm_compare_private_data(u32 *private_data,
                                   struct ib_cm_compare_data *dst_data)
 {
-        u8 src[IB_CM_COMPARE_SIZE];
+        u32 src[IB_CM_COMPARE_SIZE];
        if (!dst_data)
                return 0;
        cm_mask_copy(src, private_data, dst_data->mask);
-        return memcmp(src, dst_data->data, IB_CM_COMPARE_SIZE);
+        return memcmp(src, dst_data->data, sizeof(src));
 }
 /*
@@ -538,7 +537,7 @@ static struct cm_id_private * cm_insert_listen(struct cm_id_private *cm_id_priv)
 static struct cm_id_private * cm_find_listen(struct ib_device *device,
                                             __be64 service_id,
-                                             u8 *private_data)
+                                             u32 *private_data)
 {
        struct rb_node *node = cm.listen_service_table.rb_node;
        struct cm_id_private *cm_id_priv;
@@ -953,7 +952,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask,
                cm_mask_copy(cm_id_priv->compare_data->data,
                             compare_data->data, compare_data->mask);
                memcpy(cm_id_priv->compare_data->mask, compare_data->mask,
-                       IB_CM_COMPARE_SIZE);
+                       sizeof(compare_data->mask));
        }
        cm_id->state = IB_CM_LISTEN;
diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h
index be068f47e47e..8b76f0ef965e 100644
--- a/drivers/infiniband/core/cm_msgs.h
+++ b/drivers/infiniband/core/cm_msgs.h
@@ -103,7 +103,7 @@ struct cm_req_msg {
        /* local ACK timeout:5, rsvd:3 */
        u8 alt_offset139;
-        u8 private_data[IB_CM_REQ_PRIVATE_DATA_SIZE];
+        u32 private_data[IB_CM_REQ_PRIVATE_DATA_SIZE / sizeof(u32)];
 } __attribute__ ((packed));
@@ -801,7 +801,7 @@ struct cm_sidr_req_msg {
        __be16 rsvd;
        __be64 service_id;
-        u8 private_data[IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE];
+        u32 private_data[IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE / sizeof(u32)];
 } __attribute__ ((packed));
 struct cm_sidr_rep_msg {
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index d570030d899c..06441a43c3aa 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -859,19 +859,27 @@ static void cma_save_ib_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id
        memcpy(&ib->sib_addr, &path->dgid, 16);
 }
+static __be16 ss_get_port(const struct sockaddr_storage *ss)
+{
+        if (ss->ss_family == AF_INET)
+                return ((struct sockaddr_in *)ss)->sin_port;
+        else if (ss->ss_family == AF_INET6)
+                return ((struct sockaddr_in6 *)ss)->sin6_port;
+        BUG();
+}
 static void cma_save_ip4_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id,
                              struct cma_hdr *hdr)
 {
-        struct sockaddr_in *listen4, *ip4;
+        struct sockaddr_in *ip4;
-        listen4 = (struct sockaddr_in *) &listen_id->route.addr.src_addr;
        ip4 = (struct sockaddr_in *) &id->route.addr.src_addr;
-        ip4->sin_family = listen4->sin_family;
+        ip4->sin_family = AF_INET;
        ip4->sin_addr.s_addr = hdr->dst_addr.ip4.addr;
-        ip4->sin_port = listen4->sin_port;
+        ip4->sin_port = ss_get_port(&listen_id->route.addr.src_addr);
        ip4 = (struct sockaddr_in *) &id->route.addr.dst_addr;
-        ip4->sin_family = listen4->sin_family;
+        ip4->sin_family = AF_INET;
        ip4->sin_addr.s_addr = hdr->src_addr.ip4.addr;
        ip4->sin_port = hdr->port;
 }
@@ -879,16 +887,15 @@ static void cma_save_ip4_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_i
 static void cma_save_ip6_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_id,
                              struct cma_hdr *hdr)
 {
-        struct sockaddr_in6 *listen6, *ip6;
+        struct sockaddr_in6 *ip6;
-        listen6 = (struct sockaddr_in6 *) &listen_id->route.addr.src_addr;
        ip6 = (struct sockaddr_in6 *) &id->route.addr.src_addr;
-        ip6->sin6_family = listen6->sin6_family;
+        ip6->sin6_family = AF_INET6;
        ip6->sin6_addr = hdr->dst_addr.ip6;
-        ip6->sin6_port = listen6->sin6_port;
+        ip6->sin6_port = ss_get_port(&listen_id->route.addr.src_addr);
        ip6 = (struct sockaddr_in6 *) &id->route.addr.dst_addr;
-        ip6->sin6_family = listen6->sin6_family;
+        ip6->sin6_family = AF_INET6;
        ip6->sin6_addr = hdr->src_addr.ip6;
        ip6->sin6_port = hdr->port;
 }
diff --git a/drivers/infiniband/core/iwpm_msg.c b/drivers/infiniband/core/iwpm_msg.c
index b85ddbc979e0..e6ffa2e66c1a 100644
--- a/drivers/infiniband/core/iwpm_msg.c
+++ b/drivers/infiniband/core/iwpm_msg.c
@@ -33,7 +33,7 @@
 #include "iwpm_util.h"
-static const char iwpm_ulib_name[] = "iWarpPortMapperUser";
+static const char iwpm_ulib_name[IWPM_ULIBNAME_SIZE] = "iWarpPortMapperUser";
 static int iwpm_ulib_version = 3;
 static int iwpm_user_pid = IWPM_PID_UNDEFINED;
 static atomic_t echo_nlmsg_seq;
@@ -468,7 +468,8 @@ add_mapping_response_exit:
 }
 EXPORT_SYMBOL(iwpm_add_mapping_cb);
-/* netlink attribute policy for the response to add and query mapping request */
+/* netlink attribute policy for the response to add and query mapping request
+ * and response with remote address info */
 static const struct nla_policy resp_query_policy[IWPM_NLA_RQUERY_MAPPING_MAX] = {
        [IWPM_NLA_QUERY_MAPPING_SEQ]      = { .type = NLA_U32 },
        [IWPM_NLA_QUERY_LOCAL_ADDR]       = { .len = sizeof(struct sockaddr_storage) },
@@ -559,6 +560,76 @@ query_mapping_response_exit:
 }
 EXPORT_SYMBOL(iwpm_add_and_query_mapping_cb);
+/*
+ * iwpm_remote_info_cb - Process a port mapper message, containing
+ *                        the remote connecting peer address info
+ */
+int iwpm_remote_info_cb(struct sk_buff *skb, struct netlink_callback *cb)
+{
+        struct nlattr *nltb[IWPM_NLA_RQUERY_MAPPING_MAX];
+        struct sockaddr_storage *local_sockaddr, *remote_sockaddr;
+        struct sockaddr_storage *mapped_loc_sockaddr, *mapped_rem_sockaddr;
+        struct iwpm_remote_info *rem_info;
+        const char *msg_type;
+        u8 nl_client;
+        int ret = -EINVAL;
+        msg_type = "Remote Mapping info";
+        if (iwpm_parse_nlmsg(cb, IWPM_NLA_RQUERY_MAPPING_MAX,
+                                resp_query_policy, nltb, msg_type))
+                return ret;
+        nl_client = RDMA_NL_GET_CLIENT(cb->nlh->nlmsg_type);
+        if (!iwpm_valid_client(nl_client)) {
+                pr_info("%s: Invalid port mapper client = %d\n",
+                                __func__, nl_client);
+                return ret;
+        }
+        atomic_set(&echo_nlmsg_seq, cb->nlh->nlmsg_seq);
+        local_sockaddr = (struct sockaddr_storage *)
+                        nla_data(nltb[IWPM_NLA_QUERY_LOCAL_ADDR]);
+        remote_sockaddr = (struct sockaddr_storage *)
+                        nla_data(nltb[IWPM_NLA_QUERY_REMOTE_ADDR]);
+        mapped_loc_sockaddr = (struct sockaddr_storage *)
+                        nla_data(nltb[IWPM_NLA_RQUERY_MAPPED_LOC_ADDR]);
+        mapped_rem_sockaddr = (struct sockaddr_storage *)
+                        nla_data(nltb[IWPM_NLA_RQUERY_MAPPED_REM_ADDR]);
+        if (mapped_loc_sockaddr->ss_family != local_sockaddr->ss_family ||
+                mapped_rem_sockaddr->ss_family != remote_sockaddr->ss_family) {
+                pr_info("%s: Sockaddr family doesn't match the requested one\n",
+                                __func__);
+                return ret;
+        }
+        rem_info = kzalloc(sizeof(struct iwpm_remote_info), GFP_ATOMIC);
+        if (!rem_info) {
+                pr_err("%s: Unable to allocate a remote info\n", __func__);
+                ret = -ENOMEM;
+                return ret;
+        }
+        memcpy(&rem_info->mapped_loc_sockaddr, mapped_loc_sockaddr,
+               sizeof(struct sockaddr_storage));
+        memcpy(&rem_info->remote_sockaddr, remote_sockaddr,
+               sizeof(struct sockaddr_storage));
+        memcpy(&rem_info->mapped_rem_sockaddr, mapped_rem_sockaddr,
+               sizeof(struct sockaddr_storage));
+        rem_info->nl_client = nl_client;
+        iwpm_add_remote_info(rem_info);
+        iwpm_print_sockaddr(local_sockaddr,
+                        "remote_info: Local sockaddr:");
+        iwpm_print_sockaddr(mapped_loc_sockaddr,
+                        "remote_info: Mapped local sockaddr:");
+        iwpm_print_sockaddr(remote_sockaddr,
+                        "remote_info: Remote sockaddr:");
+        iwpm_print_sockaddr(mapped_rem_sockaddr,
+                        "remote_info: Mapped remote sockaddr:");
+        return ret;
+}
+EXPORT_SYMBOL(iwpm_remote_info_cb);
 /* netlink attribute policy for the received request for mapping info */
 static const struct nla_policy resp_mapinfo_policy[IWPM_NLA_MAPINFO_REQ_MAX] = {
        [IWPM_NLA_MAPINFO_ULIB_NAME] = { .type = NLA_STRING,
diff --git a/drivers/infiniband/core/iwpm_util.c b/drivers/infiniband/core/iwpm_util.c
index 69e9f84c1605..a626795bf9c7 100644
--- a/drivers/infiniband/core/iwpm_util.c
+++ b/drivers/infiniband/core/iwpm_util.c
@@ -33,8 +33,10 @@
 #include "iwpm_util.h"
-#define IWPM_HASH_BUCKET_SIZE   512
+#define IWPM_MAPINFO_HASH_SIZE  512
-#define IWPM_HASH_BUCKET_MASK   (IWPM_HASH_BUCKET_SIZE - 1)
+#define IWPM_MAPINFO_HASH_MASK  (IWPM_MAPINFO_HASH_SIZE - 1)
+#define IWPM_REMINFO_HASH_SIZE  64
+#define IWPM_REMINFO_HASH_MASK  (IWPM_REMINFO_HASH_SIZE - 1)
 static LIST_HEAD(iwpm_nlmsg_req_list);
 static DEFINE_SPINLOCK(iwpm_nlmsg_req_lock);
@@ -42,31 +44,49 @@ static DEFINE_SPINLOCK(iwpm_nlmsg_req_lock);
 static struct hlist_head *iwpm_hash_bucket;
 static DEFINE_SPINLOCK(iwpm_mapinfo_lock);
+static struct hlist_head *iwpm_reminfo_bucket;
+static DEFINE_SPINLOCK(iwpm_reminfo_lock);
 static DEFINE_MUTEX(iwpm_admin_lock);
 static struct iwpm_admin_data iwpm_admin;
 int iwpm_init(u8 nl_client)
 {
+        int ret = 0;
        if (iwpm_valid_client(nl_client))
                return -EINVAL;
        mutex_lock(&iwpm_admin_lock);
        if (atomic_read(&iwpm_admin.refcount) == 0) {
-                iwpm_hash_bucket = kzalloc(IWPM_HASH_BUCKET_SIZE *
+                iwpm_hash_bucket = kzalloc(IWPM_MAPINFO_HASH_SIZE *
                                        sizeof(struct hlist_head), GFP_KERNEL);
                if (!iwpm_hash_bucket) {
-                        mutex_unlock(&iwpm_admin_lock);
+                        ret = -ENOMEM;
                        pr_err("%s Unable to create mapinfo hash table\n", __func__);
-                        return -ENOMEM;
+                        goto init_exit;
+                }
+                iwpm_reminfo_bucket = kzalloc(IWPM_REMINFO_HASH_SIZE *
+                                        sizeof(struct hlist_head), GFP_KERNEL);
+                if (!iwpm_reminfo_bucket) {
+                        kfree(iwpm_hash_bucket);
+                        ret = -ENOMEM;
+                        pr_err("%s Unable to create reminfo hash table\n", __func__);
+                        goto init_exit;
                }
        }
        atomic_inc(&iwpm_admin.refcount);
+init_exit:
        mutex_unlock(&iwpm_admin_lock);
-        iwpm_set_valid(nl_client, 1);
+        if (!ret) {
-        return 0;
+                iwpm_set_valid(nl_client, 1);
+                pr_debug("%s: Mapinfo and reminfo tables are created\n",
+                                __func__);
+        }
+        return ret;
 }
 EXPORT_SYMBOL(iwpm_init);
 static void free_hash_bucket(void);
+static void free_reminfo_bucket(void);
 int iwpm_exit(u8 nl_client)
 {
@@ -81,7 +101,8 @@ int iwpm_exit(u8 nl_client)
        }
        if (atomic_dec_and_test(&iwpm_admin.refcount)) {
                free_hash_bucket();
-                pr_debug("%s: Mapinfo hash table is destroyed\n", __func__);
+                free_reminfo_bucket();
+                pr_debug("%s: Resources are destroyed\n", __func__);
        }
        mutex_unlock(&iwpm_admin_lock);
        iwpm_set_valid(nl_client, 0);
@@ -89,7 +110,7 @@ int iwpm_exit(u8 nl_client)
 }
 EXPORT_SYMBOL(iwpm_exit);
-static struct hlist_head *get_hash_bucket_head(struct sockaddr_storage *,
+static struct hlist_head *get_mapinfo_hash_bucket(struct sockaddr_storage *,
                                               struct sockaddr_storage *);
 int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr,
@@ -99,9 +120,10 @@ int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr,
        struct hlist_head *hash_bucket_head;
        struct iwpm_mapping_info *map_info;
        unsigned long flags;
+        int ret = -EINVAL;
        if (!iwpm_valid_client(nl_client))
-                return -EINVAL;
+                return ret;
        map_info = kzalloc(sizeof(struct iwpm_mapping_info), GFP_KERNEL);
        if (!map_info) {
                pr_err("%s: Unable to allocate a mapping info\n", __func__);
@@ -115,13 +137,16 @@ int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr,
        spin_lock_irqsave(&iwpm_mapinfo_lock, flags);
        if (iwpm_hash_bucket) {
-                hash_bucket_head = get_hash_bucket_head(
+                hash_bucket_head = get_mapinfo_hash_bucket(
                                        &map_info->local_sockaddr,
                                        &map_info->mapped_sockaddr);
-                hlist_add_head(&map_info->hlist_node, hash_bucket_head);
+                if (hash_bucket_head) {
+                        hlist_add_head(&map_info->hlist_node, hash_bucket_head);
+                        ret = 0;
+                }
        }
        spin_unlock_irqrestore(&iwpm_mapinfo_lock, flags);
-        return 0;
+        return ret;
 }
 EXPORT_SYMBOL(iwpm_create_mapinfo);
@@ -136,9 +161,12 @@ int iwpm_remove_mapinfo(struct sockaddr_storage *local_sockaddr,
        spin_lock_irqsave(&iwpm_mapinfo_lock, flags);
        if (iwpm_hash_bucket) {
-                hash_bucket_head = get_hash_bucket_head(
+                hash_bucket_head = get_mapinfo_hash_bucket(
                                        local_sockaddr,
                                        mapped_local_addr);
+                if (!hash_bucket_head)
+                        goto remove_mapinfo_exit;
                hlist_for_each_entry_safe(map_info, tmp_hlist_node,
                                        hash_bucket_head, hlist_node) {
@@ -152,6 +180,7 @@ int iwpm_remove_mapinfo(struct sockaddr_storage *local_sockaddr,
                        }
                }
        }
+remove_mapinfo_exit:
        spin_unlock_irqrestore(&iwpm_mapinfo_lock, flags);
        return ret;
 }
@@ -166,7 +195,7 @@ static void free_hash_bucket(void)
        /* remove all the mapinfo data from the list */
        spin_lock_irqsave(&iwpm_mapinfo_lock, flags);
-        for (i = 0; i < IWPM_HASH_BUCKET_SIZE; i++) {
+        for (i = 0; i < IWPM_MAPINFO_HASH_SIZE; i++) {
                hlist_for_each_entry_safe(map_info, tmp_hlist_node,
                        &iwpm_hash_bucket[i], hlist_node) {
@@ -180,6 +209,96 @@ static void free_hash_bucket(void)
        spin_unlock_irqrestore(&iwpm_mapinfo_lock, flags);
 }
+static void free_reminfo_bucket(void)
+{
+        struct hlist_node *tmp_hlist_node;
+        struct iwpm_remote_info *rem_info;
+        unsigned long flags;
+        int i;
+        /* remove all the remote info from the list */
+        spin_lock_irqsave(&iwpm_reminfo_lock, flags);
+        for (i = 0; i < IWPM_REMINFO_HASH_SIZE; i++) {
+                hlist_for_each_entry_safe(rem_info, tmp_hlist_node,
+                        &iwpm_reminfo_bucket[i], hlist_node) {
+                                hlist_del_init(&rem_info->hlist_node);
+                                kfree(rem_info);
+                        }
+        }
+        /* free the hash list */
+        kfree(iwpm_reminfo_bucket);
+        iwpm_reminfo_bucket = NULL;
+        spin_unlock_irqrestore(&iwpm_reminfo_lock, flags);
+}
+static struct hlist_head *get_reminfo_hash_bucket(struct sockaddr_storage *,
+                                                struct sockaddr_storage *);
+void iwpm_add_remote_info(struct iwpm_remote_info *rem_info)
+{
+        struct hlist_head *hash_bucket_head;
+        unsigned long flags;
+        spin_lock_irqsave(&iwpm_reminfo_lock, flags);
+        if (iwpm_reminfo_bucket) {
+                hash_bucket_head = get_reminfo_hash_bucket(
+                                        &rem_info->mapped_loc_sockaddr,
+                                        &rem_info->mapped_rem_sockaddr);
+                if (hash_bucket_head)
+                        hlist_add_head(&rem_info->hlist_node, hash_bucket_head);
+        }
+        spin_unlock_irqrestore(&iwpm_reminfo_lock, flags);
+}
+int iwpm_get_remote_info(struct sockaddr_storage *mapped_loc_addr,
+                                struct sockaddr_storage *mapped_rem_addr,
+                                struct sockaddr_storage *remote_addr,
+                                u8 nl_client)
+{
+        struct hlist_node *tmp_hlist_node;
+        struct hlist_head *hash_bucket_head;
+        struct iwpm_remote_info *rem_info = NULL;
+        unsigned long flags;
+        int ret = -EINVAL;
+        if (!iwpm_valid_client(nl_client)) {
+                pr_info("%s: Invalid client = %d\n", __func__, nl_client);
+                return ret;
+        }
+        spin_lock_irqsave(&iwpm_reminfo_lock, flags);
+        if (iwpm_reminfo_bucket) {
+                hash_bucket_head = get_reminfo_hash_bucket(
+                                        mapped_loc_addr,
+                                        mapped_rem_addr);
+                if (!hash_bucket_head)
+                        goto get_remote_info_exit;
+                hlist_for_each_entry_safe(rem_info, tmp_hlist_node,
+                                        hash_bucket_head, hlist_node) {
+                        if (!iwpm_compare_sockaddr(&rem_info->mapped_loc_sockaddr,
+                                mapped_loc_addr) &&
+                                !iwpm_compare_sockaddr(&rem_info->mapped_rem_sockaddr,
+                                mapped_rem_addr)) {
+                                memcpy(remote_addr, &rem_info->remote_sockaddr,
+                                        sizeof(struct sockaddr_storage));
+                                iwpm_print_sockaddr(remote_addr,
+                                                "get_remote_info: Remote sockaddr:");
+                                hlist_del_init(&rem_info->hlist_node);
+                                kfree(rem_info);
+                                ret = 0;
+                                break;
+                        }
+                }
+        }
+get_remote_info_exit:
+        spin_unlock_irqrestore(&iwpm_reminfo_lock, flags);
+        return ret;
+}
+EXPORT_SYMBOL(iwpm_get_remote_info);
 struct iwpm_nlmsg_request *iwpm_get_nlmsg_request(__u32 nlmsg_seq,
                                        u8 nl_client, gfp_t gfp)
 {
@@ -409,31 +528,54 @@ static u32 iwpm_ipv4_jhash(struct sockaddr_in *ipv4_sockaddr)
        return hash;
 }
-static struct hlist_head *get_hash_bucket_head(struct sockaddr_storage
+static int get_hash_bucket(struct sockaddr_storage *a_sockaddr,
-                                               *local_sockaddr,
+                                struct sockaddr_storage *b_sockaddr, u32 *hash)
-                                               struct sockaddr_storage
-                                               *mapped_sockaddr)
 {
-        u32 local_hash, mapped_hash, hash;
+        u32 a_hash, b_hash;
-        if (local_sockaddr->ss_family == AF_INET) {
+        if (a_sockaddr->ss_family == AF_INET) {
-                local_hash = iwpm_ipv4_jhash((struct sockaddr_in *) local_sockaddr);
+                a_hash = iwpm_ipv4_jhash((struct sockaddr_in *) a_sockaddr);
-                mapped_hash = iwpm_ipv4_jhash((struct sockaddr_in *) mapped_sockaddr);
+                b_hash = iwpm_ipv4_jhash((struct sockaddr_in *) b_sockaddr);
-        } else if (local_sockaddr->ss_family == AF_INET6) {
+        } else if (a_sockaddr->ss_family == AF_INET6) {
-                local_hash = iwpm_ipv6_jhash((struct sockaddr_in6 *) local_sockaddr);
+                a_hash = iwpm_ipv6_jhash((struct sockaddr_in6 *) a_sockaddr);
-                mapped_hash = iwpm_ipv6_jhash((struct sockaddr_in6 *) mapped_sockaddr);
+                b_hash = iwpm_ipv6_jhash((struct sockaddr_in6 *) b_sockaddr);
        } else {
                pr_err("%s: Invalid sockaddr family\n", __func__);
-                return NULL;
+                return -EINVAL;
        }
-        if (local_hash == mapped_hash) /* if port mapper isn't available */
+        if (a_hash == b_hash) /* if port mapper isn't available */
-                hash = local_hash;
+                *hash = a_hash;
        else
-                hash = jhash_2words(local_hash, mapped_hash, 0);
+                *hash = jhash_2words(a_hash, b_hash, 0);
+        return 0;
+}
+static struct hlist_head *get_mapinfo_hash_bucket(struct sockaddr_storage
+                                *local_sockaddr, struct sockaddr_storage
+                                *mapped_sockaddr)
+{
+        u32 hash;
+        int ret;
-        return &iwpm_hash_bucket[hash & IWPM_HASH_BUCKET_MASK];
+        ret = get_hash_bucket(local_sockaddr, mapped_sockaddr, &hash);
+        if (ret)
+                return NULL;
+        return &iwpm_hash_bucket[hash & IWPM_MAPINFO_HASH_MASK];
+}
+static struct hlist_head *get_reminfo_hash_bucket(struct sockaddr_storage
+                                *mapped_loc_sockaddr, struct sockaddr_storage
+                                *mapped_rem_sockaddr)
+{
+        u32 hash;
+        int ret;
+        ret = get_hash_bucket(mapped_loc_sockaddr, mapped_rem_sockaddr, &hash);
+        if (ret)
+                return NULL;
+        return &iwpm_reminfo_bucket[hash & IWPM_REMINFO_HASH_MASK];
 }
 static int send_mapinfo_num(u32 mapping_num, u8 nl_client, int iwpm_pid)
@@ -512,7 +654,7 @@ int iwpm_send_mapinfo(u8 nl_client, int iwpm_pid)
        }
        skb_num++;
        spin_lock_irqsave(&iwpm_mapinfo_lock, flags);
-        for (i = 0; i < IWPM_HASH_BUCKET_SIZE; i++) {
+        for (i = 0; i < IWPM_MAPINFO_HASH_SIZE; i++) {
                hlist_for_each_entry(map_info, &iwpm_hash_bucket[i],
                                     hlist_node) {
                        if (map_info->nl_client != nl_client)
@@ -595,7 +737,7 @@ int iwpm_mapinfo_available(void)
        spin_lock_irqsave(&iwpm_mapinfo_lock, flags);
        if (iwpm_hash_bucket) {
-                for (i = 0; i < IWPM_HASH_BUCKET_SIZE; i++) {
+                for (i = 0; i < IWPM_MAPINFO_HASH_SIZE; i++) {
                        if (!hlist_empty(&iwpm_hash_bucket[i])) {
                                full_bucket = 1;
                                break;
diff --git a/drivers/infiniband/core/iwpm_util.h b/drivers/infiniband/core/iwpm_util.h
index 9777c869a140..ee2d9ff095be 100644
--- a/drivers/infiniband/core/iwpm_util.h
+++ b/drivers/infiniband/core/iwpm_util.h
@@ -76,6 +76,14 @@ struct iwpm_mapping_info {
        u8     nl_client;
 };
+struct iwpm_remote_info {
+        struct hlist_node hlist_node;
+        struct sockaddr_storage remote_sockaddr;
+        struct sockaddr_storage mapped_loc_sockaddr;
+        struct sockaddr_storage mapped_rem_sockaddr;
+        u8     nl_client;
+};
 struct iwpm_admin_data {
        atomic_t refcount;
        atomic_t nlmsg_seq;
@@ -128,6 +136,13 @@ int iwpm_wait_complete_req(struct iwpm_nlmsg_request *nlmsg_request);
 int iwpm_get_nlmsg_seq(void);
 /**
+ * iwpm_add_reminfo - Add remote address info of the connecting peer
+ *                    to the remote info hash table
+ * @reminfo: The remote info to be added
+ */
+void iwpm_add_remote_info(struct iwpm_remote_info *reminfo);
+/**
 * iwpm_valid_client - Check if the port mapper client is valid
 * @nl_client: The index of the netlink client
 *
diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c
index 8b8cc6fa0ab0..40becdb3196e 100644
--- a/drivers/infiniband/core/umem_odp.c
+++ b/drivers/infiniband/core/umem_odp.c
@@ -446,7 +446,6 @@ static int ib_umem_odp_map_dma_single_page(
        int remove_existing_mapping = 0;
        int ret = 0;
-        mutex_lock(&umem->odp_data->umem_mutex);
        /*
         * Note: we avoid writing if seq is different from the initial seq, to
         * handle case of a racing notifier. This check also allows us to bail
@@ -479,8 +478,6 @@ static int ib_umem_odp_map_dma_single_page(
        }
 out:
-        mutex_unlock(&umem->odp_data->umem_mutex);
        /* On Demand Paging - avoid pinning the page */
        if (umem->context->invalidate_range || !stored_page)
                put_page(page);
@@ -586,6 +583,7 @@ int ib_umem_odp_map_dma_pages(struct ib_umem *umem, u64 user_virt, u64 bcnt,
                bcnt -= min_t(size_t, npages << PAGE_SHIFT, bcnt);
                user_virt += npages << PAGE_SHIFT;
+                mutex_lock(&umem->odp_data->umem_mutex);
                for (j = 0; j < npages; ++j) {
                        ret = ib_umem_odp_map_dma_single_page(
                                umem, k, base_virt_addr, local_page_list[j],
@@ -594,6 +592,7 @@ int ib_umem_odp_map_dma_pages(struct ib_umem *umem, u64 user_virt, u64 bcnt,
                                break;
                        k++;
                }
+                mutex_unlock(&umem->odp_data->umem_mutex);
                if (ret < 0) {
                        /* Release left over pages when handling errors. */
@@ -633,12 +632,11 @@ void ib_umem_odp_unmap_dma_pages(struct ib_umem *umem, u64 virt,
         * faults from completion. We might be racing with other
         * invalidations, so we must make sure we free each page only
         * once. */
+        mutex_lock(&umem->odp_data->umem_mutex);
        for (addr = virt; addr < bound; addr += (u64)umem->page_size) {
                idx = (addr - ib_umem_start(umem)) / PAGE_SIZE;
-                mutex_lock(&umem->odp_data->umem_mutex);
                if (umem->odp_data->page_list[idx]) {
                        struct page *page = umem->odp_data->page_list[idx];
-                        struct page *head_page = compound_head(page);
                        dma_addr_t dma = umem->odp_data->dma_list[idx];
                        dma_addr_t dma_addr = dma & ODP_DMA_ADDR_MASK;
@@ -646,7 +644,8 @@ void ib_umem_odp_unmap_dma_pages(struct ib_umem *umem, u64 virt,
                        ib_dma_unmap_page(dev, dma_addr, PAGE_SIZE,
                                          DMA_BIDIRECTIONAL);
-                        if (dma & ODP_WRITE_ALLOWED_BIT)
+                        if (dma & ODP_WRITE_ALLOWED_BIT) {
+                                struct page *head_page = compound_head(page);
                                /*
                                 * set_page_dirty prefers being called with
                                 * the page lock. However, MMU notifiers are
@@ -657,13 +656,14 @@ void ib_umem_odp_unmap_dma_pages(struct ib_umem *umem, u64 virt,
                                 * be removed.
                                 */
                                set_page_dirty(head_page);
+                        }
                        /* on demand pinning support */
                        if (!umem->context->invalidate_range)
                                put_page(page);
                        umem->odp_data->page_list[idx] = NULL;
                        umem->odp_data->dma_list[idx] = 0;
                }
-                mutex_unlock(&umem->odp_data->umem_mutex);
        }
+        mutex_unlock(&umem->odp_data->umem_mutex);
 }
 EXPORT_SYMBOL(ib_umem_odp_unmap_dma_pages);
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 57176ddd4c50..3ad8dc798f52 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -583,6 +583,22 @@ static void c4iw_record_pm_msg(struct c4iw_ep *ep,
                sizeof(ep->com.mapped_remote_addr));
 }
+static int get_remote_addr(struct c4iw_ep *parent_ep, struct c4iw_ep *child_ep)
+{
+        int ret;
+        print_addr(&parent_ep->com, __func__, "get_remote_addr parent_ep ");
+        print_addr(&child_ep->com, __func__, "get_remote_addr child_ep ");
+        ret = iwpm_get_remote_info(&parent_ep->com.mapped_local_addr,
+                                   &child_ep->com.mapped_remote_addr,
+                                   &child_ep->com.remote_addr, RDMA_NL_C4IW);
+        if (ret)
+                PDBG("Unable to find remote peer addr info - err %d\n", ret);
+        return ret;
+}
 static void best_mtu(const unsigned short *mtus, unsigned short mtu,
                     unsigned int *idx, int use_ts, int ipv6)
 {
@@ -675,7 +691,7 @@ static int send_connect(struct c4iw_ep *ep)
        if (is_t5(ep->com.dev->rdev.lldi.adapter_type)) {
                opt2 |= T5_OPT_2_VALID_F;
                opt2 |= CONG_CNTRL_V(CONG_ALG_TAHOE);
-                opt2 |= CONG_CNTRL_VALID; /* OPT_2_ISS for T5 */
+                opt2 |= T5_ISS_F;
        }
        t4_set_arp_err_handler(skb, ep, act_open_req_arp_failure);
@@ -2042,9 +2058,12 @@ static int act_open_rpl(struct c4iw_dev *dev, struct sk_buff *skb)
             status, status2errno(status));
        if (is_neg_adv(status)) {
-                dev_warn(&dev->rdev.lldi.pdev->dev,
+                PDBG("%s Connection problems for atid %u status %u (%s)\n",
-                         "Connection problems for atid %u status %u (%s)\n",
+                     __func__, atid, status, neg_adv_str(status));
-                         atid, status, neg_adv_str(status));
+                ep->stats.connect_neg_adv++;
+                mutex_lock(&dev->rdev.stats.lock);
+                dev->rdev.stats.neg_adv++;
+                mutex_unlock(&dev->rdev.stats.lock);
                return 0;
        }
@@ -2214,7 +2233,7 @@ static void accept_cr(struct c4iw_ep *ep, struct sk_buff *skb,
                u32 isn = (prandom_u32() & ~7UL) - 1;
                opt2 |= T5_OPT_2_VALID_F;
                opt2 |= CONG_CNTRL_V(CONG_ALG_TAHOE);
-                opt2 |= CONG_CNTRL_VALID; /* OPT_2_ISS for T5 */
+                opt2 |= T5_ISS_F;
                rpl5 = (void *)rpl;
                memset(&rpl5->iss, 0, roundup(sizeof(*rpl5)-sizeof(*rpl), 16));
                if (peer2peer)
@@ -2352,27 +2371,57 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
        state_set(&child_ep->com, CONNECTING);
        child_ep->com.dev = dev;
        child_ep->com.cm_id = NULL;
+        /*
+         * The mapped_local and mapped_remote addresses get setup with
+         * the actual 4-tuple.  The local address will be based on the
+         * actual local address of the connection, but on the port number
+         * of the parent listening endpoint.  The remote address is
+         * setup based on a query to the IWPM since we don't know what it
+         * originally was before mapping.  If no mapping was done, then
+         * mapped_remote == remote, and mapped_local == local.
+         */
        if (iptype == 4) {
                struct sockaddr_in *sin = (struct sockaddr_in *)
-                        &child_ep->com.local_addr;
+                        &child_ep->com.mapped_local_addr;
                sin->sin_family = PF_INET;
                sin->sin_port = local_port;
                sin->sin_addr.s_addr = *(__be32 *)local_ip;
-                sin = (struct sockaddr_in *)&child_ep->com.remote_addr;
+                sin = (struct sockaddr_in *)&child_ep->com.local_addr;
+                sin->sin_family = PF_INET;
+                sin->sin_port = ((struct sockaddr_in *)
+                                 &parent_ep->com.local_addr)->sin_port;
+                sin->sin_addr.s_addr = *(__be32 *)local_ip;
+                sin = (struct sockaddr_in *)&child_ep->com.mapped_remote_addr;
                sin->sin_family = PF_INET;
                sin->sin_port = peer_port;
                sin->sin_addr.s_addr = *(__be32 *)peer_ip;
        } else {
                struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)
-                        &child_ep->com.local_addr;
+                        &child_ep->com.mapped_local_addr;
                sin6->sin6_family = PF_INET6;
                sin6->sin6_port = local_port;
                memcpy(sin6->sin6_addr.s6_addr, local_ip, 16);
-                sin6 = (struct sockaddr_in6 *)&child_ep->com.remote_addr;
+                sin6 = (struct sockaddr_in6 *)&child_ep->com.local_addr;
+                sin6->sin6_family = PF_INET6;
+                sin6->sin6_port = ((struct sockaddr_in6 *)
+                                   &parent_ep->com.local_addr)->sin6_port;
+                memcpy(sin6->sin6_addr.s6_addr, local_ip, 16);
+                sin6 = (struct sockaddr_in6 *)&child_ep->com.mapped_remote_addr;
                sin6->sin6_family = PF_INET6;
                sin6->sin6_port = peer_port;
                memcpy(sin6->sin6_addr.s6_addr, peer_ip, 16);
        }
+        memcpy(&child_ep->com.remote_addr, &child_ep->com.mapped_remote_addr,
+               sizeof(child_ep->com.remote_addr));
+        get_remote_addr(parent_ep, child_ep);
        c4iw_get_ep(&parent_ep->com);
        child_ep->parent_ep = parent_ep;
        child_ep->tos = PASS_OPEN_TOS_G(ntohl(req->tos_stid));
@@ -2520,9 +2569,13 @@ static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb)
        ep = lookup_tid(t, tid);
        if (is_neg_adv(req->status)) {
-                dev_warn(&dev->rdev.lldi.pdev->dev,
+                PDBG("%s Negative advice on abort- tid %u status %d (%s)\n",
-                         "Negative advice on abort - tid %u status %d (%s)\n",
+                     __func__, ep->hwtid, req->status,
-                         ep->hwtid, req->status, neg_adv_str(req->status));
+                     neg_adv_str(req->status));
+                ep->stats.abort_neg_adv++;
+                mutex_lock(&dev->rdev.stats.lock);
+                dev->rdev.stats.neg_adv++;
+                mutex_unlock(&dev->rdev.stats.lock);
                return 0;
        }
        PDBG("%s ep %p tid %u state %u\n", __func__, ep, ep->hwtid,
@@ -3571,7 +3624,7 @@ static void send_fw_pass_open_req(struct c4iw_dev *dev, struct sk_buff *skb,
         * TP will ignore any value > 0 for MSS index.
         */
        req->tcb.opt0 = cpu_to_be64(MSS_IDX_V(0xF));
-        req->cookie = (unsigned long)skb;
+        req->cookie = (uintptr_t)skb;
        set_wr_txq(req_skb, CPL_PRIORITY_CONTROL, port_id);
        ret = cxgb4_ofld_send(dev->rdev.lldi.ports[0], req_skb);
@@ -3931,9 +3984,11 @@ static int peer_abort_intr(struct c4iw_dev *dev, struct sk_buff *skb)
                return 0;
        }
        if (is_neg_adv(req->status)) {
-                dev_warn(&dev->rdev.lldi.pdev->dev,
+                PDBG("%s Negative advice on abort- tid %u status %d (%s)\n",
-                         "Negative advice on abort - tid %u status %d (%s)\n",
+                     __func__, ep->hwtid, req->status,
-                         ep->hwtid, req->status, neg_adv_str(req->status));
+                     neg_adv_str(req->status));
+                ep->stats.abort_neg_adv++;
+                dev->rdev.stats.neg_adv++;
                kfree_skb(skb);
                return 0;
        }
diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index ab7692ac2044..68ddb3710215 100644
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -55,7 +55,7 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
                        FW_RI_RES_WR_NRES_V(1) |
                        FW_WR_COMPL_F);
        res_wr->len16_pkd = cpu_to_be32(DIV_ROUND_UP(wr_len, 16));
-        res_wr->cookie = (unsigned long) &wr_wait;
+        res_wr->cookie = (uintptr_t)&wr_wait;
        res = res_wr->res;
        res->u.cq.restype = FW_RI_RES_TYPE_CQ;
        res->u.cq.op = FW_RI_RES_OP_RESET;
@@ -125,7 +125,7 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
                        FW_RI_RES_WR_NRES_V(1) |
                        FW_WR_COMPL_F);
        res_wr->len16_pkd = cpu_to_be32(DIV_ROUND_UP(wr_len, 16));
-        res_wr->cookie = (unsigned long) &wr_wait;
+        res_wr->cookie = (uintptr_t)&wr_wait;
        res = res_wr->res;
        res->u.cq.restype = FW_RI_RES_TYPE_CQ;
        res->u.cq.op = FW_RI_RES_OP_WRITE;
@@ -156,12 +156,19 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
                goto err4;
        cq->gen = 1;
-        cq->gts = rdev->lldi.gts_reg;
        cq->rdev = rdev;
        if (user) {
-                cq->ugts = (u64)pci_resource_start(rdev->lldi.pdev, 2) +
+                u32 off = (cq->cqid << rdev->cqshift) & PAGE_MASK;
-                                        (cq->cqid << rdev->cqshift);
-                cq->ugts &= PAGE_MASK;
+                cq->ugts = (u64)rdev->bar2_pa + off;
+        } else if (is_t4(rdev->lldi.adapter_type)) {
+                cq->gts = rdev->lldi.gts_reg;
+                cq->qid_mask = -1U;
+        } else {
+                u32 off = ((cq->cqid << rdev->cqshift) & PAGE_MASK) + 12;
+                cq->gts = rdev->bar2_kva + off;
+                cq->qid_mask = rdev->qpmask;
        }
        return 0;
 err4:
@@ -970,8 +977,7 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, int entries,
        }
        PDBG("%s cqid 0x%0x chp %p size %u memsize %zu, dma_addr 0x%0llx\n",
             __func__, chp->cq.cqid, chp, chp->cq.size,
-             chp->cq.memsize,
+             chp->cq.memsize, (unsigned long long) chp->cq.dma_addr);
-             (unsigned long long) chp->cq.dma_addr);
        return &chp->ibcq;
 err5:
        kfree(mm2);
diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index 8fb295e4a9ab..7e895d714b19 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -93,6 +93,7 @@ static struct ibnl_client_cbs c4iw_nl_cb_table[] = {
        [RDMA_NL_IWPM_ADD_MAPPING] = {.dump = iwpm_add_mapping_cb},
        [RDMA_NL_IWPM_QUERY_MAPPING] = {.dump = iwpm_add_and_query_mapping_cb},
        [RDMA_NL_IWPM_HANDLE_ERR] = {.dump = iwpm_mapping_error_cb},
+        [RDMA_NL_IWPM_REMOTE_INFO] = {.dump = iwpm_remote_info_cb},
        [RDMA_NL_IWPM_MAPINFO] = {.dump = iwpm_mapping_info_cb},
        [RDMA_NL_IWPM_MAPINFO_NUM] = {.dump = iwpm_ack_mapping_info_cb}
 };
@@ -151,7 +152,7 @@ static int wr_log_show(struct seq_file *seq, void *v)
        int prev_ts_set = 0;
        int idx, end;
-#define ts2ns(ts) div64_ul((ts) * dev->rdev.lldi.cclk_ps, 1000)
+#define ts2ns(ts) div64_u64((ts) * dev->rdev.lldi.cclk_ps, 1000)
        idx = atomic_read(&dev->rdev.wr_log_idx) &
                (dev->rdev.wr_log_size - 1);
@@ -489,6 +490,7 @@ static int stats_show(struct seq_file *seq, void *v)
                   dev->rdev.stats.act_ofld_conn_fails);
        seq_printf(seq, "PAS_OFLD_CONN_FAILS: %10llu\n",
                   dev->rdev.stats.pas_ofld_conn_fails);
+        seq_printf(seq, "NEG_ADV_RCVD: %10llu\n", dev->rdev.stats.neg_adv);
        seq_printf(seq, "AVAILABLE IRD: %10u\n", dev->avail_ird);
        return 0;
 }
@@ -560,10 +562,13 @@ static int dump_ep(int id, void *p, void *data)
                cc = snprintf(epd->buf + epd->pos, space,
                              "ep %p cm_id %p qp %p state %d flags 0x%lx "
                              "history 0x%lx hwtid %d atid %d "
+                              "conn_na %u abort_na %u "
                              "%pI4:%d/%d <-> %pI4:%d/%d\n",
                              ep, ep->com.cm_id, ep->com.qp,
                              (int)ep->com.state, ep->com.flags,
                              ep->com.history, ep->hwtid, ep->atid,
+                              ep->stats.connect_neg_adv,
+                              ep->stats.abort_neg_adv,
                              &lsin->sin_addr, ntohs(lsin->sin_port),
                              ntohs(mapped_lsin->sin_port),
                              &rsin->sin_addr, ntohs(rsin->sin_port),
@@ -581,10 +586,13 @@ static int dump_ep(int id, void *p, void *data)
                cc = snprintf(epd->buf + epd->pos, space,
                              "ep %p cm_id %p qp %p state %d flags 0x%lx "
                              "history 0x%lx hwtid %d atid %d "
+                              "conn_na %u abort_na %u "
                              "%pI6:%d/%d <-> %pI6:%d/%d\n",
                              ep, ep->com.cm_id, ep->com.qp,
                              (int)ep->com.state, ep->com.flags,
                              ep->com.history, ep->hwtid, ep->atid,
+                              ep->stats.connect_neg_adv,
+                              ep->stats.abort_neg_adv,
                              &lsin6->sin6_addr, ntohs(lsin6->sin6_port),
                              ntohs(mapped_lsin6->sin6_port),
                              &rsin6->sin6_addr, ntohs(rsin6->sin6_port),
@@ -765,6 +773,29 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev)
        c4iw_init_dev_ucontext(rdev, &rdev->uctx);
        /*
+         * This implementation assumes udb_density == ucq_density!  Eventually
+         * we might need to support this but for now fail the open. Also the
+         * cqid and qpid range must match for now.
+         */
+        if (rdev->lldi.udb_density != rdev->lldi.ucq_density) {
+                pr_err(MOD "%s: unsupported udb/ucq densities %u/%u\n",
+                       pci_name(rdev->lldi.pdev), rdev->lldi.udb_density,
+                       rdev->lldi.ucq_density);
+                err = -EINVAL;
+                goto err1;
+        }
+        if (rdev->lldi.vr->qp.start != rdev->lldi.vr->cq.start ||
+            rdev->lldi.vr->qp.size != rdev->lldi.vr->cq.size) {
+                pr_err(MOD "%s: unsupported qp and cq id ranges "
+                       "qp start %u size %u cq start %u size %u\n",
+                       pci_name(rdev->lldi.pdev), rdev->lldi.vr->qp.start,
+                       rdev->lldi.vr->qp.size, rdev->lldi.vr->cq.size,
+                       rdev->lldi.vr->cq.size);
+                err = -EINVAL;
+                goto err1;
+        }
+        /*
         * qpshift is the number of bits to shift the qpid left in order
         * to get the correct address of the doorbell for that qp.
         */
@@ -784,10 +815,10 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev)
             rdev->lldi.vr->qp.size,
             rdev->lldi.vr->cq.start,
             rdev->lldi.vr->cq.size);
-        PDBG("udb len 0x%x udb base %llx db_reg %p gts_reg %p qpshift %lu "
+        PDBG("udb len 0x%x udb base %p db_reg %p gts_reg %p qpshift %lu "
             "qpmask 0x%x cqshift %lu cqmask 0x%x\n",
             (unsigned)pci_resource_len(rdev->lldi.pdev, 2),
-             (u64)pci_resource_start(rdev->lldi.pdev, 2),
+             (void *)pci_resource_start(rdev->lldi.pdev, 2),
             rdev->lldi.db_reg,
             rdev->lldi.gts_reg,
             rdev->qpshift, rdev->qpmask,
@@ -1355,7 +1386,7 @@ static void recover_lost_dbs(struct uld_ctx *ctx, struct qp_list *qp_list)
                                          t4_sq_host_wq_pidx(&qp->wq),
                                          t4_sq_wq_size(&qp->wq));
                if (ret) {
-                        pr_err(KERN_ERR MOD "%s: Fatal error - "
+                        pr_err(MOD "%s: Fatal error - "
                               "DB overflow recovery failed - "
                               "error syncing SQ qid %u\n",
                               pci_name(ctx->lldi.pdev), qp->wq.sq.qid);
@@ -1371,7 +1402,7 @@ static void recover_lost_dbs(struct uld_ctx *ctx, struct qp_list *qp_list)
                                          t4_rq_wq_size(&qp->wq));
                if (ret) {
-                        pr_err(KERN_ERR MOD "%s: Fatal error - "
+                        pr_err(MOD "%s: Fatal error - "
                               "DB overflow recovery failed - "
                               "error syncing RQ qid %u\n",
                               pci_name(ctx->lldi.pdev), qp->wq.rq.qid);
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index d87e1650f643..97bb5550a6cf 100644
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -137,6 +137,7 @@ struct c4iw_stats {
        u64  tcam_full;
        u64  act_ofld_conn_fails;
        u64  pas_ofld_conn_fails;
+        u64  neg_adv;
 };
 struct c4iw_hw_queue {
@@ -814,6 +815,11 @@ struct c4iw_listen_ep {
        int backlog;
 };
+struct c4iw_ep_stats {
+        unsigned connect_neg_adv;
+        unsigned abort_neg_adv;
+};
 struct c4iw_ep {
        struct c4iw_ep_common com;
        struct c4iw_ep *parent_ep;
@@ -846,6 +852,7 @@ struct c4iw_ep {
        unsigned int retry_count;
        int snd_win;
        int rcv_win;
+        struct c4iw_ep_stats stats;
 };
 static inline void print_addr(struct c4iw_ep_common *epc, const char *func,
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index 3ef0cf9f5c44..cff815b91707 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -144,7 +144,7 @@ static int _c4iw_write_mem_inline(struct c4iw_rdev *rdev, u32 addr, u32 len,
                if (i == (num_wqe-1)) {
                        req->wr.wr_hi = cpu_to_be32(FW_WR_OP_V(FW_ULPTX_WR) |
                                                    FW_WR_COMPL_F);
-                        req->wr.wr_lo = (__force __be64)(unsigned long) &wr_wait;
+                        req->wr.wr_lo = (__force __be64)&wr_wait;
                } else
                        req->wr.wr_hi = cpu_to_be32(FW_WR_OP_V(FW_ULPTX_WR));
                req->wr.wr_mid = cpu_to_be32(
@@ -676,12 +676,12 @@ struct ib_mr *c4iw_get_dma_mr(struct ib_pd *pd, int acc)
        mhp->attr.zbva = 0;
        mhp->attr.va_fbo = 0;
        mhp->attr.page_size = 0;
-        mhp->attr.len = ~0UL;
+        mhp->attr.len = ~0ULL;
        mhp->attr.pbl_size = 0;
        ret = write_tpt_entry(&rhp->rdev, 0, &stag, 1, php->pdid,
                              FW_RI_STAG_NSMR, mhp->attr.perms,
-                              mhp->attr.mw_bind_enable, 0, 0, ~0UL, 0, 0, 0);
+                              mhp->attr.mw_bind_enable, 0, 0, ~0ULL, 0, 0, 0);
        if (ret)
                goto err1;
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 15cae5a31018..389ced335bc5 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -275,7 +275,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
                        FW_RI_RES_WR_NRES_V(2) |
                        FW_WR_COMPL_F);
        res_wr->len16_pkd = cpu_to_be32(DIV_ROUND_UP(wr_len, 16));
-        res_wr->cookie = (unsigned long) &wr_wait;
+        res_wr->cookie = (uintptr_t)&wr_wait;
        res = res_wr->res;
        res->u.sqrq.restype = FW_RI_RES_TYPE_SQ;
        res->u.sqrq.op = FW_RI_RES_OP_WRITE;
@@ -1209,7 +1209,7 @@ static int rdma_fini(struct c4iw_dev *rhp, struct c4iw_qp *qhp,
        wqe->flowid_len16 = cpu_to_be32(
                FW_WR_FLOWID_V(ep->hwtid) |
                FW_WR_LEN16_V(DIV_ROUND_UP(sizeof(*wqe), 16)));
-        wqe->cookie = (unsigned long) &ep->com.wr_wait;
+        wqe->cookie = (uintptr_t)&ep->com.wr_wait;
        wqe->u.fini.type = FW_RI_TYPE_FINI;
        ret = c4iw_ofld_send(&rhp->rdev, skb);
@@ -1279,7 +1279,7 @@ static int rdma_init(struct c4iw_dev *rhp, struct c4iw_qp *qhp)
                FW_WR_FLOWID_V(qhp->ep->hwtid) |
                FW_WR_LEN16_V(DIV_ROUND_UP(sizeof(*wqe), 16)));
-        wqe->cookie = (unsigned long) &qhp->ep->com.wr_wait;
+        wqe->cookie = (uintptr_t)&qhp->ep->com.wr_wait;
        wqe->u.init.type = FW_RI_TYPE_INIT;
        wqe->u.init.mpareqbit_p2ptype =
@@ -1766,11 +1766,11 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs,
                mm2->len = PAGE_ALIGN(qhp->wq.rq.memsize);
                insert_mmap(ucontext, mm2);
                mm3->key = uresp.sq_db_gts_key;
-                mm3->addr = (__force unsigned long) qhp->wq.sq.udb;
+                mm3->addr = (__force unsigned long)qhp->wq.sq.udb;
                mm3->len = PAGE_SIZE;
                insert_mmap(ucontext, mm3);
                mm4->key = uresp.rq_db_gts_key;
-                mm4->addr = (__force unsigned long) qhp->wq.rq.udb;
+                mm4->addr = (__force unsigned long)qhp->wq.rq.udb;
                mm4->len = PAGE_SIZE;
                insert_mmap(ucontext, mm4);
                if (mm5) {
diff --git a/drivers/infiniband/hw/cxgb4/t4.h b/drivers/infiniband/hw/cxgb4/t4.h
index 871cdcac7be2..7f2a6c244d25 100644
--- a/drivers/infiniband/hw/cxgb4/t4.h
+++ b/drivers/infiniband/hw/cxgb4/t4.h
@@ -539,6 +539,7 @@ struct t4_cq {
        size_t memsize;
        __be64 bits_type_ts;
        u32 cqid;
+        u32 qid_mask;
        int vector;
        u16 size; /* including status page */
        u16 cidx;
@@ -563,12 +564,12 @@ static inline int t4_arm_cq(struct t4_cq *cq, int se)
        set_bit(CQ_ARMED, &cq->flags);
        while (cq->cidx_inc > CIDXINC_M) {
                val = SEINTARM_V(0) | CIDXINC_V(CIDXINC_M) | TIMERREG_V(7) |
-                      INGRESSQID_V(cq->cqid);
+                      INGRESSQID_V(cq->cqid & cq->qid_mask);
                writel(val, cq->gts);
                cq->cidx_inc -= CIDXINC_M;
        }
        val = SEINTARM_V(se) | CIDXINC_V(cq->cidx_inc) | TIMERREG_V(6) |
-              INGRESSQID_V(cq->cqid);
+              INGRESSQID_V(cq->cqid & cq->qid_mask);
        writel(val, cq->gts);
        cq->cidx_inc = 0;
        return 0;
@@ -601,7 +602,7 @@ static inline void t4_hwcq_consume(struct t4_cq *cq)
                u32 val;
                val = SEINTARM_V(0) | CIDXINC_V(cq->cidx_inc) | TIMERREG_V(7) |
-                      INGRESSQID_V(cq->cqid);
+                      INGRESSQID_V(cq->cqid & cq->qid_mask);
                writel(val, cq->gts);
                cq->cidx_inc = 0;
        }
diff --git a/drivers/infiniband/hw/cxgb4/t4fw_ri_api.h b/drivers/infiniband/hw/cxgb4/t4fw_ri_api.h
index 5e53327fc647..343e8daf2270 100644
--- a/drivers/infiniband/hw/cxgb4/t4fw_ri_api.h
+++ b/drivers/infiniband/hw/cxgb4/t4fw_ri_api.h
@@ -848,6 +848,8 @@ enum {                     /* TCP congestion control algorithms */
 #define CONG_CNTRL_V(x) ((x) << CONG_CNTRL_S)
 #define CONG_CNTRL_G(x) (((x) >> CONG_CNTRL_S) & CONG_CNTRL_M)
-#define CONG_CNTRL_VALID   (1 << 18)
+#define T5_ISS_S    18
+#define T5_ISS_V(x) ((x) << T5_ISS_S)
+#define T5_ISS_F    T5_ISS_V(1U)
 #endif /* _T4FW_RI_API_H_ */
diff --git a/drivers/infiniband/hw/ehca/ehca_mcast.c b/drivers/infiniband/hw/ehca/ehca_mcast.c
index 120aedf9f989..cec181532924 100644
--- a/drivers/infiniband/hw/ehca/ehca_mcast.c
+++ b/drivers/infiniband/hw/ehca/ehca_mcast.c
@@ -77,7 +77,7 @@ int ehca_attach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                return -EINVAL;
        }
-        memcpy(&my_gid.raw, gid->raw, sizeof(union ib_gid));
+        memcpy(&my_gid, gid->raw, sizeof(union ib_gid));
        subnet_prefix = be64_to_cpu(my_gid.global.subnet_prefix);
        interface_id = be64_to_cpu(my_gid.global.interface_id);
@@ -114,7 +114,7 @@ int ehca_detach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                return -EINVAL;
        }
-        memcpy(&my_gid.raw, gid->raw, sizeof(union ib_gid));
+        memcpy(&my_gid, gid->raw, sizeof(union ib_gid));
        subnet_prefix = be64_to_cpu(my_gid.global.subnet_prefix);
        interface_id = be64_to_cpu(my_gid.global.interface_id);
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 57070c529dfb..cc64400d41ac 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1569,8 +1569,7 @@ static void reset_gids_task(struct work_struct *work)
                               MLX4_CMD_TIME_CLASS_B,
                               MLX4_CMD_WRAPPED);
                if (err)
-                        pr_warn(KERN_WARNING
+                        pr_warn("set port %d command failed\n", gw->port);
-                                "set port %d command failed\n", gw->port);
        }
        mlx4_free_cmd_mailbox(dev, mailbox);
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 4d7024b899cb..d35f62d4f4c5 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -1392,7 +1392,7 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, const struct ib_ah_attr *ah,
        if (ah->ah_flags & IB_AH_GRH) {
                if (ah->grh.sgid_index >= gen->port[port - 1].gid_table_len) {
-                        pr_err(KERN_ERR "sgid_index (%u) too large. max is %d\n",
+                        pr_err("sgid_index (%u) too large. max is %d\n",
                               ah->grh.sgid_index, gen->port[port - 1].gid_table_len);
                        return -EINVAL;
                }
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index 3b2a6dc8ea99..9f9d5c563a61 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -116,6 +116,7 @@ static struct ibnl_client_cbs nes_nl_cb_table[] = {
        [RDMA_NL_IWPM_REG_PID] = {.dump = iwpm_register_pid_cb},
        [RDMA_NL_IWPM_ADD_MAPPING] = {.dump = iwpm_add_mapping_cb},
        [RDMA_NL_IWPM_QUERY_MAPPING] = {.dump = iwpm_add_and_query_mapping_cb},
+        [RDMA_NL_IWPM_REMOTE_INFO] = {.dump = iwpm_remote_info_cb},
        [RDMA_NL_IWPM_HANDLE_ERR] = {.dump = iwpm_mapping_error_cb},
        [RDMA_NL_IWPM_MAPINFO] = {.dump = iwpm_mapping_info_cb},
        [RDMA_NL_IWPM_MAPINFO_NUM] = {.dump = iwpm_ack_mapping_info_cb}
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 6f09a72e78d7..72b43417cbe3 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -596,27 +596,52 @@ static void nes_form_reg_msg(struct nes_vnic *nesvnic,
        memcpy(pm_msg->if_name, nesvnic->netdev->name, IWPM_IFNAME_SIZE);
 }
+static void record_sockaddr_info(struct sockaddr_storage *addr_info,
+                                        nes_addr_t *ip_addr, u16 *port_num)
+{
+        struct sockaddr_in *in_addr = (struct sockaddr_in *)addr_info;
+        if (in_addr->sin_family == AF_INET) {
+                *ip_addr = ntohl(in_addr->sin_addr.s_addr);
+                *port_num = ntohs(in_addr->sin_port);
+        }
+}
 /*
 * nes_record_pm_msg - Save the received mapping info
 */
 static void nes_record_pm_msg(struct nes_cm_info *cm_info,
                        struct iwpm_sa_data *pm_msg)
 {
-        struct sockaddr_in *mapped_loc_addr =
+        record_sockaddr_info(&pm_msg->mapped_loc_addr,
-                        (struct sockaddr_in *)&pm_msg->mapped_loc_addr;
+                &cm_info->mapped_loc_addr, &cm_info->mapped_loc_port);
-        struct sockaddr_in *mapped_rem_addr =
-                        (struct sockaddr_in *)&pm_msg->mapped_rem_addr;
+        record_sockaddr_info(&pm_msg->mapped_rem_addr,
+                &cm_info->mapped_rem_addr, &cm_info->mapped_rem_port);
-        if (mapped_loc_addr->sin_family == AF_INET) {
+}
-                cm_info->mapped_loc_addr =
-                        ntohl(mapped_loc_addr->sin_addr.s_addr);
+/*
-                cm_info->mapped_loc_port = ntohs(mapped_loc_addr->sin_port);
+ * nes_get_reminfo - Get the address info of the remote connecting peer
-        }
+ */
-        if (mapped_rem_addr->sin_family == AF_INET) {
+static int nes_get_remote_addr(struct nes_cm_node *cm_node)
-                cm_info->mapped_rem_addr =
+{
-                        ntohl(mapped_rem_addr->sin_addr.s_addr);
+        struct sockaddr_storage mapped_loc_addr, mapped_rem_addr;
-                cm_info->mapped_rem_port = ntohs(mapped_rem_addr->sin_port);
+        struct sockaddr_storage remote_addr;
-        }
+        int ret;
+        nes_create_sockaddr(htonl(cm_node->mapped_loc_addr),
+                        htons(cm_node->mapped_loc_port), &mapped_loc_addr);
+        nes_create_sockaddr(htonl(cm_node->mapped_rem_addr),
+                        htons(cm_node->mapped_rem_port), &mapped_rem_addr);
+        ret = iwpm_get_remote_info(&mapped_loc_addr, &mapped_rem_addr,
+                                &remote_addr, RDMA_NL_NES);
+        if (ret)
+                nes_debug(NES_DBG_CM, "Unable to find remote peer address info\n");
+        else
+                record_sockaddr_info(&remote_addr, &cm_node->rem_addr,
+                                &cm_node->rem_port);
+        return ret;
 }
 /**
@@ -1566,9 +1591,14 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
                return NULL;
        /* set our node specific transport info */
-        cm_node->loc_addr = cm_info->loc_addr;
+        if (listener) {
+                cm_node->loc_addr = listener->loc_addr;
+                cm_node->loc_port = listener->loc_port;
+        } else {
+                cm_node->loc_addr = cm_info->loc_addr;
+                cm_node->loc_port = cm_info->loc_port;
+        }
        cm_node->rem_addr = cm_info->rem_addr;
-        cm_node->loc_port = cm_info->loc_port;
        cm_node->rem_port = cm_info->rem_port;
        cm_node->mapped_loc_addr = cm_info->mapped_loc_addr;
@@ -2151,6 +2181,7 @@ static int handle_ack_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
                cm_node->state = NES_CM_STATE_ESTABLISHED;
                if (datasize) {
                        cm_node->tcp_cntxt.rcv_nxt = inc_sequence + datasize;
+                        nes_get_remote_addr(cm_node);
                        handle_rcv_mpa(cm_node, skb);
                } else { /* rcvd ACK only */
                        dev_kfree_skb_any(skb);
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
index ffd48bfc4923..7df16f74bb45 100644
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -903,7 +903,7 @@ struct qib_devdata {
        /* PCI Device ID (here for NodeInfo) */
        u16 deviceid;
        /* for write combining settings */
-        unsigned long wc_cookie;
+        int wc_cookie;
        unsigned long wc_base;
        unsigned long wc_len;
@@ -1136,7 +1136,6 @@ extern struct qib_devdata *qib_lookup(int unit);
 extern u32 qib_cpulist_count;
 extern unsigned long *qib_cpulist;
-extern unsigned qib_wc_pat;
 extern unsigned qib_cc_table_size;
 int qib_init(struct qib_devdata *, int);
 int init_chip_wc_pat(struct qib_devdata *dd, u32);
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index 9ea6c440a00c..725881890c4a 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -835,7 +835,8 @@ static int mmap_piobufs(struct vm_area_struct *vma,
        vma->vm_flags &= ~VM_MAYREAD;
        vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND;
-        if (qib_wc_pat)
+        /* We used PAT if wc_cookie == 0 */
+        if (!dd->wc_cookie)
                vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
        ret = io_remap_pfn_range(vma, vma->vm_start, phys >> PAGE_SHIFT,
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c
index 0d2ba59af30a..4b927809d1a1 100644
--- a/drivers/infiniband/hw/qib/qib_iba6120.c
+++ b/drivers/infiniband/hw/qib/qib_iba6120.c
@@ -3315,11 +3315,9 @@ static int init_6120_variables(struct qib_devdata *dd)
        qib_6120_config_ctxts(dd);
        qib_set_ctxtcnt(dd);
-        if (qib_wc_pat) {
+        ret = init_chip_wc_pat(dd, 0);
-                ret = init_chip_wc_pat(dd, 0);
+        if (ret)
-                if (ret)
+                goto bail;
-                        goto bail;
-        }
        set_6120_baseaddrs(dd); /* set chip access pointers now */
        ret = 0;
diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c
index 22affda8af88..00b2af211157 100644
--- a/drivers/infiniband/hw/qib/qib_iba7220.c
+++ b/drivers/infiniband/hw/qib/qib_iba7220.c
@@ -4126,11 +4126,9 @@ static int qib_init_7220_variables(struct qib_devdata *dd)
        qib_7220_config_ctxts(dd);
        qib_set_ctxtcnt(dd);  /* needed for PAT setup */
-        if (qib_wc_pat) {
+        ret = init_chip_wc_pat(dd, 0);
-                ret = init_chip_wc_pat(dd, 0);
+        if (ret)
-                if (ret)
+                goto bail;
-                        goto bail;
-        }
        set_7220_baseaddrs(dd); /* set chip access pointers now */
        ret = 0;
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c
index ef97b71c8f7d..f32b4628e991 100644
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@ -6429,6 +6429,7 @@ static int qib_init_7322_variables(struct qib_devdata *dd)
        unsigned features, pidx, sbufcnt;
        int ret, mtu;
        u32 sbufs, updthresh;
+        resource_size_t vl15off;
        /* pport structs are contiguous, allocated after devdata */
        ppd = (struct qib_pportdata *)(dd + 1);
@@ -6677,29 +6678,27 @@ static int qib_init_7322_variables(struct qib_devdata *dd)
        qib_7322_config_ctxts(dd);
        qib_set_ctxtcnt(dd);
-        if (qib_wc_pat) {
+        /*
-                resource_size_t vl15off;
+         * We do not set WC on the VL15 buffers to avoid
-                /*
+         * a rare problem with unaligned writes from
-                 * We do not set WC on the VL15 buffers to avoid
+         * interrupt-flushed store buffers, so we need
-                 * a rare problem with unaligned writes from
+         * to map those separately here.  We can't solve
-                 * interrupt-flushed store buffers, so we need
+         * this for the rarely used mtrr case.
-                 * to map those separately here.  We can't solve
+         */
-                 * this for the rarely used mtrr case.
+        ret = init_chip_wc_pat(dd, 0);
-                 */
+        if (ret)
-                ret = init_chip_wc_pat(dd, 0);
+                goto bail;
-                if (ret)
-                        goto bail;
-                /* vl15 buffers start just after the 4k buffers */
+        /* vl15 buffers start just after the 4k buffers */
-                vl15off = dd->physaddr + (dd->piobufbase >> 32) +
+        vl15off = dd->physaddr + (dd->piobufbase >> 32) +
-                        dd->piobcnt4k * dd->align4k;
+                  dd->piobcnt4k * dd->align4k;
-                dd->piovl15base = ioremap_nocache(vl15off,
+        dd->piovl15base = ioremap_nocache(vl15off,
-                                                  NUM_VL15_BUFS * dd->align4k);
+                                          NUM_VL15_BUFS * dd->align4k);
-                if (!dd->piovl15base) {
+        if (!dd->piovl15base) {
-                        ret = -ENOMEM;
+                ret = -ENOMEM;
-                        goto bail;
+                goto bail;
-                }
        }
        qib_7322_set_baseaddrs(dd); /* set chip access pointers now */
        ret = 0;
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c
index 2ee36953e234..7e00470adc30 100644
--- a/drivers/infiniband/hw/qib/qib_init.c
+++ b/drivers/infiniband/hw/qib/qib_init.c
@@ -91,15 +91,6 @@ MODULE_PARM_DESC(krcvqs, "number of kernel receive queues per IB port");
 unsigned qib_cc_table_size;
 module_param_named(cc_table_size, qib_cc_table_size, uint, S_IRUGO);
 MODULE_PARM_DESC(cc_table_size, "Congestion control table entries 0 (CCA disabled - default), min = 128, max = 1984");
-/*
- * qib_wc_pat parameter:
- *      0 is WC via MTRR
- *      1 is WC via PAT
- *      If PAT initialization fails, code reverts back to MTRR
- */
-unsigned qib_wc_pat = 1; /* default (1) is to use PAT, not MTRR */
-module_param_named(wc_pat, qib_wc_pat, uint, S_IRUGO);
-MODULE_PARM_DESC(wc_pat, "enable write-combining via PAT mechanism");
 static void verify_interrupt(unsigned long);
@@ -1377,8 +1368,7 @@ static void cleanup_device_data(struct qib_devdata *dd)
                spin_unlock(&dd->pport[pidx].cc_shadow_lock);
        }
-        if (!qib_wc_pat)
+        qib_disable_wc(dd);
-                qib_disable_wc(dd);
        if (dd->pioavailregs_dma) {
                dma_free_coherent(&dd->pcidev->dev, PAGE_SIZE,
@@ -1547,14 +1537,12 @@ static int qib_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto bail;
        }
-        if (!qib_wc_pat) {
+        ret = qib_enable_wc(dd);
-                ret = qib_enable_wc(dd);
+        if (ret) {
-                if (ret) {
+                qib_dev_err(dd,
-                        qib_dev_err(dd,
+                        "Write combining not enabled (err %d): performance may be poor\n",
-                                "Write combining not enabled (err %d): performance may be poor\n",
+                        -ret);
-                                -ret);
+                ret = 0;
-                        ret = 0;
-                }
        }
        qib_verify_pioperf(dd);
diff --git a/drivers/infiniband/hw/qib/qib_wc_x86_64.c b/drivers/infiniband/hw/qib/qib_wc_x86_64.c
index 81b225f2300a..edd0ddbd4481 100644
--- a/drivers/infiniband/hw/qib/qib_wc_x86_64.c
+++ b/drivers/infiniband/hw/qib/qib_wc_x86_64.c
@@ -116,21 +116,10 @@ int qib_enable_wc(struct qib_devdata *dd)
        }
        if (!ret) {
-                int cookie;
+                dd->wc_cookie = arch_phys_wc_add(pioaddr, piolen);
+                if (dd->wc_cookie < 0)
-                cookie = mtrr_add(pioaddr, piolen, MTRR_TYPE_WRCOMB, 0);
+                        /* use error from routine */
-                if (cookie < 0) {
+                        ret = dd->wc_cookie;
-                        {
-                                qib_devinfo(dd->pcidev,
-                                         "mtrr_add()  WC for PIO bufs failed (%d)\n",
-                                         cookie);
-                                ret = -EINVAL;
-                        }
-                } else {
-                        dd->wc_cookie = cookie;
-                        dd->wc_base = (unsigned long) pioaddr;
-                        dd->wc_len = (unsigned long) piolen;
-                }
        }
        return ret;
@@ -142,18 +131,7 @@ int qib_enable_wc(struct qib_devdata *dd)
 */
 void qib_disable_wc(struct qib_devdata *dd)
 {
-        if (dd->wc_cookie) {
+        arch_phys_wc_del(dd->wc_cookie);
-                int r;
-                r = mtrr_del(dd->wc_cookie, dd->wc_base,
-                             dd->wc_len);
-                if (r < 0)
-                        qib_devinfo(dd->pcidev,
-                                 "mtrr_del(%lx, %lx, %lx) failed: %d\n",
-                                 dd->wc_cookie, dd->wc_base,
-                                 dd->wc_len, r);
-                dd->wc_cookie = 0; /* even on failure */
-        }
 }
 /**
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 56959adb6c7d..cf32a778e7d0 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -386,8 +386,8 @@ static int ipoib_cm_nonsrq_init_rx(struct net_device *dev, struct ib_cm_id *cm_i
                                           rx->rx_ring[i].mapping,
                                           GFP_KERNEL)) {
                        ipoib_warn(priv, "failed to allocate receive buffer %d\n", i);
-                                ret = -ENOMEM;
+                        ret = -ENOMEM;
-                                goto err_count;
+                        goto err_count;
                }
                ret = ipoib_cm_post_receive_nonsrq(dev, rx, &t->wr, t->sge, i);
                if (ret) {
diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c
index a1cbba9056fd..3465faf1809e 100644
--- a/drivers/iommu/amd_iommu_v2.c
+++ b/drivers/iommu/amd_iommu_v2.c
@@ -266,6 +266,7 @@ static void put_pasid_state(struct pasid_state *pasid_state)
 static void put_pasid_state_wait(struct pasid_state *pasid_state)
 {
+        atomic_dec(&pasid_state->count);
        wait_event(pasid_state->wq, !atomic_read(&pasid_state->count));
        free_pasid_state(pasid_state);
 }
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 9f7e1d34a32b..66a803b9dd3a 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -224,14 +224,7 @@
 #define RESUME_TERMINATE                (1 << 0)
 #define TTBCR2_SEP_SHIFT                15
-#define TTBCR2_SEP_MASK                 0x7
+#define TTBCR2_SEP_UPSTREAM             (0x7 << TTBCR2_SEP_SHIFT)
-#define TTBCR2_ADDR_32                  0
-#define TTBCR2_ADDR_36                  1
-#define TTBCR2_ADDR_40                  2
-#define TTBCR2_ADDR_42                  3
-#define TTBCR2_ADDR_44                  4
-#define TTBCR2_ADDR_48                  5
 #define TTBRn_HI_ASID_SHIFT            16
@@ -793,26 +786,7 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain,
                writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBCR);
                if (smmu->version > ARM_SMMU_V1) {
                        reg = pgtbl_cfg->arm_lpae_s1_cfg.tcr >> 32;
-                        switch (smmu->va_size) {
+                        reg |= TTBCR2_SEP_UPSTREAM;
-                        case 32:
-                                reg |= (TTBCR2_ADDR_32 << TTBCR2_SEP_SHIFT);
-                                break;
-                        case 36:
-                                reg |= (TTBCR2_ADDR_36 << TTBCR2_SEP_SHIFT);
-                                break;
-                        case 40:
-                                reg |= (TTBCR2_ADDR_40 << TTBCR2_SEP_SHIFT);
-                                break;
-                        case 42:
-                                reg |= (TTBCR2_ADDR_42 << TTBCR2_SEP_SHIFT);
-                                break;
-                        case 44:
-                                reg |= (TTBCR2_ADDR_44 << TTBCR2_SEP_SHIFT);
-                                break;
-                        case 48:
-                                reg |= (TTBCR2_ADDR_48 << TTBCR2_SEP_SHIFT);
-                                break;
-                        }
                        writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBCR2);
                }
        } else {
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 4015560bf486..cab214544237 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1004,20 +1004,18 @@ static int rk_iommu_remove(struct platform_device *pdev)
        return 0;
 }
-#ifdef CONFIG_OF
 static const struct of_device_id rk_iommu_dt_ids[] = {
        { .compatible = "rockchip,iommu" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, rk_iommu_dt_ids);
-#endif
 static struct platform_driver rk_iommu_driver = {
        .probe = rk_iommu_probe,
        .remove = rk_iommu_remove,
        .driver = {
                   .name = "rk_iommu",
-                   .of_match_table = of_match_ptr(rk_iommu_dt_ids),
+                   .of_match_table = rk_iommu_dt_ids,
        },
 };
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 7b315e385ba3..01999d74bd3a 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -82,19 +82,6 @@ static DEFINE_RAW_SPINLOCK(irq_controller_lock);
 #define NR_GIC_CPU_IF 8
 static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
-/*
- * Supported arch specific GIC irq extension.
- * Default make them NULL.
- */
-struct irq_chip gic_arch_extn = {
-        .irq_eoi        = NULL,
-        .irq_mask       = NULL,
-        .irq_unmask     = NULL,
-        .irq_retrigger  = NULL,
-        .irq_set_type   = NULL,
-        .irq_set_wake   = NULL,
-};
 #ifndef MAX_GIC_NR
 #define MAX_GIC_NR      1
 #endif
@@ -167,34 +154,16 @@ static int gic_peek_irq(struct irq_data *d, u32 offset)
 static void gic_mask_irq(struct irq_data *d)
 {
-        unsigned long flags;
-        raw_spin_lock_irqsave(&irq_controller_lock, flags);
        gic_poke_irq(d, GIC_DIST_ENABLE_CLEAR);
-        if (gic_arch_extn.irq_mask)
-                gic_arch_extn.irq_mask(d);
-        raw_spin_unlock_irqrestore(&irq_controller_lock, flags);
 }
 static void gic_unmask_irq(struct irq_data *d)
 {
-        unsigned long flags;
-        raw_spin_lock_irqsave(&irq_controller_lock, flags);
-        if (gic_arch_extn.irq_unmask)
-                gic_arch_extn.irq_unmask(d);
        gic_poke_irq(d, GIC_DIST_ENABLE_SET);
-        raw_spin_unlock_irqrestore(&irq_controller_lock, flags);
 }
 static void gic_eoi_irq(struct irq_data *d)
 {
-        if (gic_arch_extn.irq_eoi) {
-                raw_spin_lock(&irq_controller_lock);
-                gic_arch_extn.irq_eoi(d);
-                raw_spin_unlock(&irq_controller_lock);
-        }
        writel_relaxed(gic_irq(d), gic_cpu_base(d) + GIC_CPU_EOI);
 }
@@ -251,8 +220,6 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
 {
        void __iomem *base = gic_dist_base(d);
        unsigned int gicirq = gic_irq(d);
-        unsigned long flags;
-        int ret;
        /* Interrupt configuration for SGIs can't be changed */
        if (gicirq < 16)
@@ -263,25 +230,7 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
                            type != IRQ_TYPE_EDGE_RISING)
                return -EINVAL;
-        raw_spin_lock_irqsave(&irq_controller_lock, flags);
+        return gic_configure_irq(gicirq, type, base, NULL);
-        if (gic_arch_extn.irq_set_type)
-                gic_arch_extn.irq_set_type(d, type);
-        ret = gic_configure_irq(gicirq, type, base, NULL);
-        raw_spin_unlock_irqrestore(&irq_controller_lock, flags);
-        return ret;
-}
-static int gic_retrigger(struct irq_data *d)
-{
-        if (gic_arch_extn.irq_retrigger)
-                return gic_arch_extn.irq_retrigger(d);
-        /* the genirq layer expects 0 if we can't retrigger in hardware */
-        return 0;
 }
 #ifdef CONFIG_SMP
@@ -312,21 +261,6 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
 }
 #endif
-#ifdef CONFIG_PM
-static int gic_set_wake(struct irq_data *d, unsigned int on)
-{
-        int ret = -ENXIO;
-        if (gic_arch_extn.irq_set_wake)
-                ret = gic_arch_extn.irq_set_wake(d, on);
-        return ret;
-}
-#else
-#define gic_set_wake    NULL
-#endif
 static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)
 {
        u32 irqstat, irqnr;
@@ -385,11 +319,9 @@ static struct irq_chip gic_chip = {
        .irq_unmask             = gic_unmask_irq,
        .irq_eoi                = gic_eoi_irq,
        .irq_set_type           = gic_set_type,
-        .irq_retrigger          = gic_retrigger,
 #ifdef CONFIG_SMP
        .irq_set_affinity       = gic_set_affinity,
 #endif
-        .irq_set_wake           = gic_set_wake,
        .irq_get_irqchip_state  = gic_irq_get_irqchip_state,
        .irq_set_irqchip_state  = gic_irq_set_irqchip_state,
 };
@@ -1055,7 +987,6 @@ void __init gic_init_bases(unsigned int gic_nr, int irq_start,
                set_handle_irq(gic_handle_irq);
        }
-        gic_chip.flags |= gic_arch_extn.flags;
        gic_dist_init(gic);
        gic_cpu_init(gic);
        gic_pm_init(gic);
diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c
index 51c485d9a877..f67bbd80433e 100644
--- a/drivers/irqchip/irq-tegra.c
+++ b/drivers/irqchip/irq-tegra.c
@@ -264,7 +264,7 @@ static int tegra_ictlr_domain_alloc(struct irq_domain *domain,
                irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i,
                                              &tegra_ictlr_chip,
-                                              &info->base[ictlr]);
+                                              info->base[ictlr]);
        }
        parent_args = *args;
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 9eeea196328a..5503e43e5f28 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -925,10 +925,11 @@ static int crypt_convert(struct crypt_config *cc,
                switch (r) {
                /* async */
-                case -EINPROGRESS:
                case -EBUSY:
                        wait_for_completion(&ctx->restart);
                        reinit_completion(&ctx->restart);
+                        /* fall through*/
+                case -EINPROGRESS:
                        ctx->req = NULL;
                        ctx->cc_sector++;
                        continue;
@@ -1345,8 +1346,10 @@ static void kcryptd_async_done(struct crypto_async_request *async_req,
        struct dm_crypt_io *io = container_of(ctx, struct dm_crypt_io, ctx);
        struct crypt_config *cc = io->cc;
-        if (error == -EINPROGRESS)
+        if (error == -EINPROGRESS) {
+                complete(&ctx->restart);
                return;
+        }
        if (!error && cc->iv_gen_ops && cc->iv_gen_ops->post)
                error = cc->iv_gen_ops->post(cc, iv_of_dmreq(cc, dmreq), dmreq);
@@ -1357,15 +1360,12 @@ static void kcryptd_async_done(struct crypto_async_request *async_req,
        crypt_free_req(cc, req_of_dmreq(cc, dmreq), io->base_bio);
        if (!atomic_dec_and_test(&ctx->cc_pending))
-                goto done;
+                return;
        if (bio_data_dir(io->base_bio) == READ)
                kcryptd_crypt_read_done(io);
        else
                kcryptd_crypt_write_io_submit(io, 1);
-done:
-        if (!completion_done(&ctx->restart))
-                complete(&ctx->restart);
 }
 static void kcryptd_crypt(struct work_struct *work)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index d4f31e195e26..593a02476c78 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4818,12 +4818,12 @@ static void md_free(struct kobject *ko)
        if (mddev->sysfs_state)
                sysfs_put(mddev->sysfs_state);
+        if (mddev->queue)
+                blk_cleanup_queue(mddev->queue);
        if (mddev->gendisk) {
                del_gendisk(mddev->gendisk);
                put_disk(mddev->gendisk);
        }
-        if (mddev->queue)
-                blk_cleanup_queue(mddev->queue);
        kfree(mddev);
 }
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 2cb59a641cd2..6a68ef5246d4 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -188,8 +188,9 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
                }
                dev[j] = rdev1;
-                disk_stack_limits(mddev->gendisk, rdev1->bdev,
+                if (mddev->queue)
-                                  rdev1->data_offset << 9);
+                        disk_stack_limits(mddev->gendisk, rdev1->bdev,
+                                          rdev1->data_offset << 9);
                if (rdev1->bdev->bd_disk->queue->merge_bvec_fn)
                        conf->has_merge_bvec = 1;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 77dfd720aaa0..1ba97fdc6df1 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1078,9 +1078,6 @@ again:
                        pr_debug("skip op %ld on disc %d for sector %llu\n",
                                bi->bi_rw, i, (unsigned long long)sh->sector);
                        clear_bit(R5_LOCKED, &sh->dev[i].flags);
-                        if (sh->batch_head)
-                                set_bit(STRIPE_BATCH_ERR,
-                                        &sh->batch_head->state);
                        set_bit(STRIPE_HANDLE, &sh->state);
                }
@@ -1971,17 +1968,30 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
        put_cpu();
 }
+static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp)
+{
+        struct stripe_head *sh;
+        sh = kmem_cache_zalloc(sc, gfp);
+        if (sh) {
+                spin_lock_init(&sh->stripe_lock);
+                spin_lock_init(&sh->batch_lock);
+                INIT_LIST_HEAD(&sh->batch_list);
+                INIT_LIST_HEAD(&sh->lru);
+                atomic_set(&sh->count, 1);
+        }
+        return sh;
+}
 static int grow_one_stripe(struct r5conf *conf, gfp_t gfp)
 {
        struct stripe_head *sh;
-        sh = kmem_cache_zalloc(conf->slab_cache, gfp);
+        sh = alloc_stripe(conf->slab_cache, gfp);
        if (!sh)
                return 0;
        sh->raid_conf = conf;
-        spin_lock_init(&sh->stripe_lock);
        if (grow_buffers(sh, gfp)) {
                shrink_buffers(sh);
                kmem_cache_free(conf->slab_cache, sh);
@@ -1990,13 +2000,8 @@ static int grow_one_stripe(struct r5conf *conf, gfp_t gfp)
        sh->hash_lock_index =
                conf->max_nr_stripes % NR_STRIPE_HASH_LOCKS;
        /* we just created an active stripe so... */
-        atomic_set(&sh->count, 1);
        atomic_inc(&conf->active_stripes);
-        INIT_LIST_HEAD(&sh->lru);
-        spin_lock_init(&sh->batch_lock);
-        INIT_LIST_HEAD(&sh->batch_list);
-        sh->batch_head = NULL;
        release_stripe(sh);
        conf->max_nr_stripes++;
        return 1;
@@ -2060,6 +2065,35 @@ static struct flex_array *scribble_alloc(int num, int cnt, gfp_t flags)
        return ret;
 }
+static int resize_chunks(struct r5conf *conf, int new_disks, int new_sectors)
+{
+        unsigned long cpu;
+        int err = 0;
+        mddev_suspend(conf->mddev);
+        get_online_cpus();
+        for_each_present_cpu(cpu) {
+                struct raid5_percpu *percpu;
+                struct flex_array *scribble;
+                percpu = per_cpu_ptr(conf->percpu, cpu);
+                scribble = scribble_alloc(new_disks,
+                                          new_sectors / STRIPE_SECTORS,
+                                          GFP_NOIO);
+                if (scribble) {
+                        flex_array_free(percpu->scribble);
+                        percpu->scribble = scribble;
+                } else {
+                        err = -ENOMEM;
+                        break;
+                }
+        }
+        put_online_cpus();
+        mddev_resume(conf->mddev);
+        return err;
+}
 static int resize_stripes(struct r5conf *conf, int newsize)
 {
        /* Make all the stripes able to hold 'newsize' devices.
@@ -2088,7 +2122,6 @@ static int resize_stripes(struct r5conf *conf, int newsize)
        struct stripe_head *osh, *nsh;
        LIST_HEAD(newstripes);
        struct disk_info *ndisks;
-        unsigned long cpu;
        int err;
        struct kmem_cache *sc;
        int i;
@@ -2109,13 +2142,11 @@ static int resize_stripes(struct r5conf *conf, int newsize)
                return -ENOMEM;
        for (i = conf->max_nr_stripes; i; i--) {
-                nsh = kmem_cache_zalloc(sc, GFP_KERNEL);
+                nsh = alloc_stripe(sc, GFP_KERNEL);
                if (!nsh)
                        break;
                nsh->raid_conf = conf;
-                spin_lock_init(&nsh->stripe_lock);
                list_add(&nsh->lru, &newstripes);
        }
        if (i) {
@@ -2142,13 +2173,11 @@ static int resize_stripes(struct r5conf *conf, int newsize)
                                    lock_device_hash_lock(conf, hash));
                osh = get_free_stripe(conf, hash);
                unlock_device_hash_lock(conf, hash);
-                atomic_set(&nsh->count, 1);
                for(i=0; i<conf->pool_size; i++) {
                        nsh->dev[i].page = osh->dev[i].page;
                        nsh->dev[i].orig_page = osh->dev[i].page;
                }
-                for( ; i<newsize; i++)
-                        nsh->dev[i].page = NULL;
                nsh->hash_lock_index = hash;
                kmem_cache_free(conf->slab_cache, osh);
                cnt++;
@@ -2174,25 +2203,6 @@ static int resize_stripes(struct r5conf *conf, int newsize)
        } else
                err = -ENOMEM;
-        get_online_cpus();
-        for_each_present_cpu(cpu) {
-                struct raid5_percpu *percpu;
-                struct flex_array *scribble;
-                percpu = per_cpu_ptr(conf->percpu, cpu);
-                scribble = scribble_alloc(newsize, conf->chunk_sectors /
-                        STRIPE_SECTORS, GFP_NOIO);
-                if (scribble) {
-                        flex_array_free(percpu->scribble);
-                        percpu->scribble = scribble;
-                } else {
-                        err = -ENOMEM;
-                        break;
-                }
-        }
-        put_online_cpus();
        /* Step 4, return new stripes to service */
        while(!list_empty(&newstripes)) {
                nsh = list_entry(newstripes.next, struct stripe_head, lru);
@@ -2212,7 +2222,8 @@ static int resize_stripes(struct r5conf *conf, int newsize)
        conf->slab_cache = sc;
        conf->active_name = 1-conf->active_name;
-        conf->pool_size = newsize;
+        if (!err)
+                conf->pool_size = newsize;
        return err;
 }
@@ -2434,7 +2445,7 @@ static void raid5_end_write_request(struct bio *bi, int error)
        }
        rdev_dec_pending(rdev, conf->mddev);
-        if (sh->batch_head && !uptodate)
+        if (sh->batch_head && !uptodate && !replacement)
                set_bit(STRIPE_BATCH_ERR, &sh->batch_head->state);
        if (!test_and_clear_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags))
@@ -3278,7 +3289,9 @@ static int need_this_block(struct stripe_head *sh, struct stripe_head_state *s,
                /* reconstruct-write isn't being forced */
                return 0;
        for (i = 0; i < s->failed; i++) {
-                if (!test_bit(R5_UPTODATE, &fdev[i]->flags) &&
+                if (s->failed_num[i] != sh->pd_idx &&
+                    s->failed_num[i] != sh->qd_idx &&
+                    !test_bit(R5_UPTODATE, &fdev[i]->flags) &&
                    !test_bit(R5_OVERWRITE, &fdev[i]->flags))
                        return 1;
        }
@@ -3298,6 +3311,7 @@ static int fetch_block(struct stripe_head *sh, struct stripe_head_state *s,
                 */
                BUG_ON(test_bit(R5_Wantcompute, &dev->flags));
                BUG_ON(test_bit(R5_Wantread, &dev->flags));
+                BUG_ON(sh->batch_head);
                if ((s->uptodate == disks - 1) &&
                    (s->failed && (disk_idx == s->failed_num[0] ||
                                   disk_idx == s->failed_num[1]))) {
@@ -3366,7 +3380,6 @@ static void handle_stripe_fill(struct stripe_head *sh,
 {
        int i;
-        BUG_ON(sh->batch_head);
        /* look for blocks to read/compute, skip this if a compute
         * is already in flight, or if the stripe contents are in the
         * midst of changing due to a write
@@ -4198,15 +4211,9 @@ static void check_break_stripe_batch_list(struct stripe_head *sh)
                return;
        head_sh = sh;
-        do {
-                sh = list_first_entry(&sh->batch_list,
-                                      struct stripe_head, batch_list);
-                BUG_ON(sh == head_sh);
-        } while (!test_bit(STRIPE_DEGRADED, &sh->state));
-        while (sh != head_sh) {
+        list_for_each_entry_safe(sh, next, &head_sh->batch_list, batch_list) {
-                next = list_first_entry(&sh->batch_list,
-                                        struct stripe_head, batch_list);
                list_del_init(&sh->batch_list);
                set_mask_bits(&sh->state, ~STRIPE_EXPAND_SYNC_FLAG,
@@ -4226,8 +4233,6 @@ static void check_break_stripe_batch_list(struct stripe_head *sh)
                set_bit(STRIPE_HANDLE, &sh->state);
                release_stripe(sh);
-                sh = next;
        }
 }
@@ -6221,8 +6226,11 @@ static int alloc_scratch_buffer(struct r5conf *conf, struct raid5_percpu *percpu
                percpu->spare_page = alloc_page(GFP_KERNEL);
        if (!percpu->scribble)
                percpu->scribble = scribble_alloc(max(conf->raid_disks,
-                        conf->previous_raid_disks), conf->chunk_sectors /
+                                                      conf->previous_raid_disks),
-                        STRIPE_SECTORS, GFP_KERNEL);
+                                                  max(conf->chunk_sectors,
+                                                      conf->prev_chunk_sectors)
+                                                   / STRIPE_SECTORS,
+                                                  GFP_KERNEL);
        if (!percpu->scribble || (conf->level == 6 && !percpu->spare_page)) {
                free_scratch_buffer(conf, percpu);
@@ -7198,6 +7206,15 @@ static int check_reshape(struct mddev *mddev)
        if (!check_stripe_cache(mddev))
                return -ENOSPC;
+        if (mddev->new_chunk_sectors > mddev->chunk_sectors ||
+            mddev->delta_disks > 0)
+                if (resize_chunks(conf,
+                                  conf->previous_raid_disks
+                                  + max(0, mddev->delta_disks),
+                                  max(mddev->new_chunk_sectors,
+                                      mddev->chunk_sectors)
+                            ) < 0)
+                        return -ENOMEM;
        return resize_stripes(conf, (conf->previous_raid_disks
                                     + mddev->delta_disks));
 }
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index 9c64b5d01c6a..110fd70c7326 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -116,8 +116,8 @@ static struct mcam_format_struct {
                .planar         = false,
        },
        {
-                .desc           = "UYVY 4:2:2",
+                .desc           = "YVYU 4:2:2",
-                .pixelformat    = V4L2_PIX_FMT_UYVY,
+                .pixelformat    = V4L2_PIX_FMT_YVYU,
                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                .bpp            = 2,
                .planar         = false,
@@ -748,7 +748,7 @@ static void mcam_ctlr_image(struct mcam_camera *cam)
        switch (fmt->pixelformat) {
        case V4L2_PIX_FMT_YUYV:
-        case V4L2_PIX_FMT_UYVY:
+        case V4L2_PIX_FMT_YVYU:
                widthy = fmt->width * 2;
                widthuv = 0;
                break;
@@ -784,15 +784,15 @@ static void mcam_ctlr_image(struct mcam_camera *cam)
        case V4L2_PIX_FMT_YUV420:
        case V4L2_PIX_FMT_YVU420:
                mcam_reg_write_mask(cam, REG_CTRL0,
-                        C0_DF_YUV | C0_YUV_420PL | C0_YUVE_YVYU, C0_DF_MASK);
+                        C0_DF_YUV | C0_YUV_420PL | C0_YUVE_VYUY, C0_DF_MASK);
                break;
        case V4L2_PIX_FMT_YUYV:
                mcam_reg_write_mask(cam, REG_CTRL0,
-                        C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_UYVY, C0_DF_MASK);
+                        C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_NOSWAP, C0_DF_MASK);
                break;
-        case V4L2_PIX_FMT_UYVY:
+        case V4L2_PIX_FMT_YVYU:
                mcam_reg_write_mask(cam, REG_CTRL0,
-                        C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_YUYV, C0_DF_MASK);
+                        C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_SWAP24, C0_DF_MASK);
                break;
        case V4L2_PIX_FMT_JPEG:
                mcam_reg_write_mask(cam, REG_CTRL0,
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h
index aa0c6eac254a..7ffdf4dbaf8c 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -330,10 +330,10 @@ int mccic_resume(struct mcam_camera *cam);
 #define   C0_YUVE_YVYU    0x00010000    /* Y1CrY0Cb             */
 #define   C0_YUVE_VYUY    0x00020000    /* CrY1CbY0             */
 #define   C0_YUVE_UYVY    0x00030000    /* CbY1CrY0             */
-#define   C0_YUVE_XYUV    0x00000000    /* 420: .YUV            */
+#define   C0_YUVE_NOSWAP  0x00000000    /* no bytes swapping    */
-#define   C0_YUVE_XYVU    0x00010000    /* 420: .YVU            */
+#define   C0_YUVE_SWAP13  0x00010000    /* swap byte 1 and 3    */
-#define   C0_YUVE_XUVY    0x00020000    /* 420: .UVY            */
+#define   C0_YUVE_SWAP24  0x00020000    /* swap byte 2 and 4    */
-#define   C0_YUVE_XVUY    0x00030000    /* 420: .VUY            */
+#define   C0_YUVE_SWAP1324 0x00030000   /* swap bytes 1&3 and 2&4 */
 /* Bayer bits 18,19 if needed */
 #define   C0_EOF_VSYNC    0x00400000    /* Generate EOF by VSYNC */
 #define   C0_VEDGE_CTRL   0x00800000    /* Detect falling edge of VSYNC */
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 9351f64dee7b..6460f8e1b07f 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -135,6 +135,8 @@
 #define VIN_MAX_WIDTH           2048
 #define VIN_MAX_HEIGHT          2048
+#define TIMEOUT_MS              100
 enum chip_id {
        RCAR_GEN2,
        RCAR_H1,
@@ -820,7 +822,10 @@ static void rcar_vin_wait_stop_streaming(struct rcar_vin_priv *priv)
                if (priv->state == STOPPING) {
                        priv->request_to_stop = true;
                        spin_unlock_irq(&priv->lock);
-                        wait_for_completion(&priv->capture_stop);
+                        if (!wait_for_completion_timeout(
+                                        &priv->capture_stop,
+                                        msecs_to_jiffies(TIMEOUT_MS)))
+                                priv->state = STOPPED;
                        spin_lock_irq(&priv->lock);
                }
        }
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 2c25271f8c41..60f7141a6b02 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1029,6 +1029,18 @@ static inline void mmc_blk_reset_success(struct mmc_blk_data *md, int type)
        md->reset_done &= ~type;
 }
+int mmc_access_rpmb(struct mmc_queue *mq)
+{
+        struct mmc_blk_data *md = mq->data;
+        /*
+         * If this is a RPMB partition access, return ture
+         */
+        if (md && md->part_type == EXT_CSD_PART_CONFIG_ACC_RPMB)
+                return true;
+        return false;
+}
 static int mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
 {
        struct mmc_blk_data *md = mq->data;
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 236d194c2883..8efa3684aef8 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -38,7 +38,7 @@ static int mmc_prep_request(struct request_queue *q, struct request *req)
                return BLKPREP_KILL;
        }
-        if (mq && mmc_card_removed(mq->card))
+        if (mq && (mmc_card_removed(mq->card) || mmc_access_rpmb(mq)))
                return BLKPREP_KILL;
        req->cmd_flags |= REQ_DONTPREP;
diff --git a/drivers/mmc/card/queue.h b/drivers/mmc/card/queue.h
index 5752d50049a3..99e6521e6169 100644
--- a/drivers/mmc/card/queue.h
+++ b/drivers/mmc/card/queue.h
@@ -73,4 +73,6 @@ extern void mmc_queue_bounce_post(struct mmc_queue_req *);
 extern int mmc_packed_init(struct mmc_queue *, struct mmc_card *);
 extern void mmc_packed_clean(struct mmc_queue *);
+extern int mmc_access_rpmb(struct mmc_queue *);
 #endif
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index c296bc098fe2..92e7671426eb 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2651,6 +2651,7 @@ int mmc_pm_notify(struct notifier_block *notify_block,
        switch (mode) {
        case PM_HIBERNATION_PREPARE:
        case PM_SUSPEND_PREPARE:
+        case PM_RESTORE_PREPARE:
                spin_lock_irqsave(&host->lock, flags);
                host->rescan_disable = 1;
                spin_unlock_irqrestore(&host->lock, flags);
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 38b29265cc7c..5f5adafb253a 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -589,9 +589,11 @@ static int dw_mci_idmac_init(struct dw_mci *host)
                host->ring_size = PAGE_SIZE / sizeof(struct idmac_desc);
                /* Forward link the descriptor list */
-                for (i = 0, p = host->sg_cpu; i < host->ring_size - 1; i++, p++)
+                for (i = 0, p = host->sg_cpu; i < host->ring_size - 1; i++, p++) {
                        p->des3 = cpu_to_le32(host->sg_dma +
                                        (sizeof(struct idmac_desc) * (i + 1)));
+                        p->des1 = 0;
+                }
                /* Set the last descriptor as the end-of-ring descriptor */
                p->des3 = cpu_to_le32(host->sg_dma);
@@ -1300,7 +1302,8 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
        int gpio_cd = mmc_gpio_get_cd(mmc);
        /* Use platform get_cd function, else try onboard card detect */
-        if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
+        if ((brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION) ||
+            (mmc->caps & MMC_CAP_NONREMOVABLE))
                present = 1;
        else if (!IS_ERR_VALUE(gpio_cd))
                present = gpio_cd;
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 2b6ef6bd5d5f..7eff087cf515 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1408,7 +1408,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
        host            = mmc_priv(mmc);
        host->mmc       = mmc;
        host->addr      = reg;
-        host->timeout   = msecs_to_jiffies(1000);
+        host->timeout   = msecs_to_jiffies(10000);
        host->ccs_enable = !pd || !pd->ccs_unsupported;
        host->clk_ctrl2_enable = pd && pd->clk_ctrl2_present;
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index db2c05b6fe7f..c9eb78f10a0d 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -310,6 +310,8 @@ static void ubiblock_do_work(struct work_struct *work)
        blk_rq_map_sg(req->q, req, pdu->usgl.sg);
        ret = ubiblock_read(pdu);
+        rq_flush_dcache_pages(req);
        blk_mq_end_request(req, ret);
 }
diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
index 6bddfe062b51..fc55e8e0351d 100644
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -509,10 +509,11 @@ static int xcan_rx(struct net_device *ndev)
                        cf->can_id |= CAN_RTR_FLAG;
        }
-        if (!(id_xcan & XCAN_IDR_SRR_MASK)) {
+        /* DW1/DW2 must always be read to remove message from RXFIFO */
-                data[0] = priv->read_reg(priv, XCAN_RXFIFO_DW1_OFFSET);
+        data[0] = priv->read_reg(priv, XCAN_RXFIFO_DW1_OFFSET);
-                data[1] = priv->read_reg(priv, XCAN_RXFIFO_DW2_OFFSET);
+        data[1] = priv->read_reg(priv, XCAN_RXFIFO_DW2_OFFSET);
+        if (!(cf->can_id & CAN_RTR_FLAG)) {
                /* Change Xilinx CAN data format to socketCAN data format */
                if (cf->can_dlc > 0)
                        *(__be32 *)(cf->data) = cpu_to_be32(data[0]);
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index af639ab4c55b..cf309aa92802 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -1469,6 +1469,9 @@ static void __exit mv88e6xxx_cleanup(void)
 #if IS_ENABLED(CONFIG_NET_DSA_MV88E6171)
        unregister_switch_driver(&mv88e6171_switch_driver);
 #endif
+#if IS_ENABLED(CONFIG_NET_DSA_MV88E6352)
+        unregister_switch_driver(&mv88e6352_switch_driver);
+#endif
 #if IS_ENABLED(CONFIG_NET_DSA_MV88E6123_61_65)
        unregister_switch_driver(&mv88e6123_61_65_switch_driver);
 #endif
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index 089c269637b7..426916036151 100644
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -180,6 +180,7 @@ config SUNLANCE
 config AMD_XGBE
        tristate "AMD 10GbE Ethernet driver"
        depends on (OF_NET || ACPI) && HAS_IOMEM && HAS_DMA
+        depends on ARM64 || COMPILE_TEST
        select PHYLIB
        select AMD_XGBE_PHY
        select BITREVERSE
diff --git a/drivers/net/ethernet/apm/xgene/Kconfig b/drivers/net/ethernet/apm/xgene/Kconfig
index f4054d242f3c..19e38afbc5ee 100644
--- a/drivers/net/ethernet/apm/xgene/Kconfig
+++ b/drivers/net/ethernet/apm/xgene/Kconfig
@@ -1,6 +1,7 @@
 config NET_XGENE
        tristate "APM X-Gene SoC Ethernet Driver"
        depends on HAS_DMA
+        depends on ARCH_XGENE || COMPILE_TEST
        select PHYLIB
        help
          This is the Ethernet driver for the on-chip ethernet interface on the
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index a8bb8f664d3d..ec56a9b65dc3 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -4786,6 +4786,11 @@ int bnx2x_change_mtu(struct net_device *dev, int new_mtu)
 {
        struct bnx2x *bp = netdev_priv(dev);
+        if (pci_num_vf(bp->pdev)) {
+                DP(BNX2X_MSG_IOV, "VFs are enabled, can not change MTU\n");
+                return -EPERM;
+        }
        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
                BNX2X_ERR("Can't perform change MTU during parity recovery\n");
                return -EAGAIN;
@@ -4938,11 +4943,6 @@ int bnx2x_resume(struct pci_dev *pdev)
        }
        bp = netdev_priv(dev);
-        if (pci_num_vf(bp->pdev)) {
-                DP(BNX2X_MSG_IOV, "VFs are enabled, can not change MTU\n");
-                return -EPERM;
-        }
        if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
                BNX2X_ERR("Handling parity error recovery. Try again later\n");
                return -EAGAIN;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 556dcc162a62..fd52ce95127e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -13371,8 +13371,13 @@ static int bnx2x_init_one(struct pci_dev *pdev,
        /* Management FW 'remembers' living interfaces. Allow it some time
         * to forget previously living interfaces, allowing a proper re-load.
         */
-        if (is_kdump_kernel())
+        if (is_kdump_kernel()) {
-                msleep(5000);
+                ktime_t now = ktime_get_boottime();
+                ktime_t fw_ready_time = ktime_set(5, 0);
+                if (ktime_before(now, fw_ready_time))
+                        msleep(ktime_ms_delta(fw_ready_time, now));
+        }
        /* An estimated maximum supported CoS number according to the chip
         * version.
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 4104d49f005d..61aa570aad9a 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -981,7 +981,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
        struct macb_queue *queue = dev_id;
        struct macb *bp = queue->bp;
        struct net_device *dev = bp->dev;
-        u32 status;
+        u32 status, ctrl;
        status = queue_readl(queue, ISR);
@@ -1037,6 +1037,15 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
                 * add that if/when we get our hands on a full-blown MII PHY.
                 */
+                if (status & MACB_BIT(RXUBR)) {
+                        ctrl = macb_readl(bp, NCR);
+                        macb_writel(bp, NCR, ctrl & ~MACB_BIT(RE));
+                        macb_writel(bp, NCR, ctrl | MACB_BIT(RE));
+                        if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE)
+                                macb_writel(bp, ISR, MACB_BIT(RXUBR));
+                }
                if (status & MACB_BIT(ISR_ROVR)) {
                        /* We missed at least one packet */
                        if (macb_is_gem(bp))
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index 5d9ceb17b4cb..0abc942c966e 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -40,6 +40,7 @@
 #include <linux/ptp_classify.h>
 #include <linux/mii.h>
 #include <linux/mdio.h>
+#include <linux/pm_qos.h>
 #include "hw.h"
 struct e1000_info;
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 1b0661e3573b..c754b2027281 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -610,7 +610,7 @@ static bool fm10k_clean_rx_irq(struct fm10k_q_vector *q_vector,
        unsigned int total_bytes = 0, total_packets = 0;
        u16 cleaned_count = fm10k_desc_unused(rx_ring);
-        do {
+        while (likely(total_packets < budget)) {
                union fm10k_rx_desc *rx_desc;
                /* return some buffers to hardware, one at a time is too slow */
@@ -659,7 +659,7 @@ static bool fm10k_clean_rx_irq(struct fm10k_q_vector *q_vector,
                /* update budget accounting */
                total_packets++;
-        } while (likely(total_packets < budget));
+        }
        /* place incomplete frames back on ring for completion */
        rx_ring->skb = skb;
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 8457d0306e3a..a0a9b1fcb5e8 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1036,7 +1036,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
                adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL;
        if (q_vector->rx.ring)
-                adapter->tx_ring[q_vector->rx.ring->queue_index] = NULL;
+                adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
        netif_napi_del(&q_vector->napi);
@@ -1207,6 +1207,8 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
        q_vector = adapter->q_vector[v_idx];
        if (!q_vector)
                q_vector = kzalloc(size, GFP_KERNEL);
+        else
+                memset(q_vector, 0, size);
        if (!q_vector)
                return -ENOMEM;
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index a16d267fbce4..e71cdde9cb01 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -3612,7 +3612,7 @@ static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        u8 *dst_mac = skb_header_pointer(skb, 0, 0, NULL);
        if (!dst_mac || is_link_local_ether_addr(dst_mac)) {
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_port.c b/drivers/net/ethernet/mellanox/mlx4/en_port.c
index 54f0e5ab2e55..0a56f010c846 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_port.c
@@ -139,7 +139,7 @@ static unsigned long en_stats_adder(__be64 *start, __be64 *next, int num)
        int i;
        int offset = next - start;
-        for (i = 0; i <= num; i++) {
+        for (i = 0; i < num; i++) {
                ret += be64_to_cpu(*curr);
                curr += offset;
        }
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index c7f28bf4b8e2..92fce1b98558 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -2845,7 +2845,7 @@ int mlx4_SW2HW_EQ_wrapper(struct mlx4_dev *dev, int slave,
 {
        int err;
        int eqn = vhcr->in_modifier;
-        int res_id = (slave << 8) | eqn;
+        int res_id = (slave << 10) | eqn;
        struct mlx4_eq_context *eqc = inbox->buf;
        int mtt_base = eq_get_mtt_addr(eqc) / dev->caps.mtt_entry_sz;
        int mtt_size = eq_get_mtt_size(eqc);
@@ -3051,7 +3051,7 @@ int mlx4_HW2SW_EQ_wrapper(struct mlx4_dev *dev, int slave,
                          struct mlx4_cmd_info *cmd)
 {
        int eqn = vhcr->in_modifier;
-        int res_id = eqn | (slave << 8);
+        int res_id = eqn | (slave << 10);
        struct res_eq *eq;
        int err;
@@ -3108,7 +3108,7 @@ int mlx4_GEN_EQE(struct mlx4_dev *dev, int slave, struct mlx4_eqe *eqe)
                return 0;
        mutex_lock(&priv->mfunc.master.gen_eqe_mutex[slave]);
-        res_id = (slave << 8) | event_eq->eqn;
+        res_id = (slave << 10) | event_eq->eqn;
        err = get_res(dev, slave, res_id, RES_EQ, &req);
        if (err)
                goto unlock;
@@ -3131,7 +3131,7 @@ int mlx4_GEN_EQE(struct mlx4_dev *dev, int slave, struct mlx4_eqe *eqe)
        memcpy(mailbox->buf, (u8 *) eqe, 28);
-        in_modifier = (slave & 0xff) | ((event_eq->eqn & 0xff) << 16);
+        in_modifier = (slave & 0xff) | ((event_eq->eqn & 0x3ff) << 16);
        err = mlx4_cmd(dev, mailbox->dma, in_modifier, 0,
                       MLX4_CMD_GEN_EQE, MLX4_CMD_TIME_CLASS_B,
@@ -3157,7 +3157,7 @@ int mlx4_QUERY_EQ_wrapper(struct mlx4_dev *dev, int slave,
                          struct mlx4_cmd_info *cmd)
 {
        int eqn = vhcr->in_modifier;
-        int res_id = eqn | (slave << 8);
+        int res_id = eqn | (slave << 10);
        struct res_eq *eq;
        int err;
@@ -4714,13 +4714,13 @@ static void rem_slave_eqs(struct mlx4_dev *dev, int slave)
                                        break;
                                case RES_EQ_HW:
-                                        err = mlx4_cmd(dev, slave, eqn & 0xff,
+                                        err = mlx4_cmd(dev, slave, eqn & 0x3ff,
                                                       1, MLX4_CMD_HW2SW_EQ,
                                                       MLX4_CMD_TIME_CLASS_A,
                                                       MLX4_CMD_NATIVE);
                                        if (err)
                                                mlx4_dbg(dev, "rem_slave_eqs: failed to move slave %d eqs %d to SW ownership\n",
-                                                         slave, eqn);
+                                                         slave, eqn & 0x3ff);
                                        atomic_dec(&eq->mtt->ref_count);
                                        state = RES_EQ_RESERVED;
                                        break;
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index 8da7c3faf817..7b43a3b4abdc 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -1764,7 +1764,7 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter)
        int done = 0;
        struct nx_host_tx_ring *tx_ring = adapter->tx_ring;
-        if (!spin_trylock(&adapter->tx_clean_lock))
+        if (!spin_trylock_bh(&adapter->tx_clean_lock))
                return 1;
        sw_consumer = tx_ring->sw_consumer;
@@ -1819,7 +1819,7 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter)
         */
        hw_consumer = le32_to_cpu(*(tx_ring->hw_consumer));
        done = (sw_consumer == hw_consumer);
-        spin_unlock(&adapter->tx_clean_lock);
+        spin_unlock_bh(&adapter->tx_clean_lock);
        return done;
 }
diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c
index f66641d961e3..6af028d5f9bc 100644
--- a/drivers/net/ethernet/qualcomm/qca_spi.c
+++ b/drivers/net/ethernet/qualcomm/qca_spi.c
@@ -912,6 +912,8 @@ qca_spi_probe(struct spi_device *spi_device)
        qca->spi_dev = spi_device;
        qca->legacy_mode = legacy_mode;
+        spi_set_drvdata(spi_device, qcaspi_devs);
        mac = of_get_mac_address(spi_device->dev.of_node);
        if (mac)
@@ -944,8 +946,6 @@ qca_spi_probe(struct spi_device *spi_device)
                return -EFAULT;
        }
-        spi_set_drvdata(spi_device, qcaspi_devs);
        qcaspi_init_device_debugfs(qca);
        return 0;
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index c70ab40d8698..3df51faf18ae 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -6884,7 +6884,7 @@ static void r8169_csum_workaround(struct rtl8169_private *tp,
                        rtl8169_start_xmit(nskb, tp->dev);
                } while (segs);
-                dev_kfree_skb(skb);
+                dev_consume_skb_any(skb);
        } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
                if (skb_checksum_help(skb) < 0)
                        goto drop;
@@ -6896,7 +6896,7 @@ static void r8169_csum_workaround(struct rtl8169_private *tp,
 drop:
                stats = &tp->dev->stats;
                stats->tx_dropped++;
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
        }
 }
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 14b363a25c02..630f0b7800e4 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -2238,9 +2238,10 @@ static int smc_drv_probe(struct platform_device *pdev)
        const struct of_device_id *match = NULL;
        struct smc_local *lp;
        struct net_device *ndev;
-        struct resource *res, *ires;
+        struct resource *res;
        unsigned int __iomem *addr;
        unsigned long irq_flags = SMC_IRQ_FLAGS;
+        unsigned long irq_resflags;
        int ret;
        ndev = alloc_etherdev(sizeof(struct smc_local));
@@ -2332,16 +2333,19 @@ static int smc_drv_probe(struct platform_device *pdev)
                goto out_free_netdev;
        }
-        ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        ndev->irq = platform_get_irq(pdev, 0);
-        if (!ires) {
+        if (ndev->irq <= 0) {
                ret = -ENODEV;
                goto out_release_io;
        }
+        /*
-        ndev->irq = ires->start;
+         * If this platform does not specify any special irqflags, or if
+         * the resource supplies a trigger, override the irqflags with
-        if (irq_flags == -1 || ires->flags & IRQF_TRIGGER_MASK)
+         * the trigger flags from the resource.
-                irq_flags = ires->flags & IRQF_TRIGGER_MASK;
+         */
+        irq_resflags = irqd_get_trigger_type(irq_get_irq_data(ndev->irq));
+        if (irq_flags == -1 || irq_resflags & IRQF_TRIGGER_MASK)
+                irq_flags = irq_resflags & IRQF_TRIGGER_MASK;
        ret = smc_request_attrib(pdev, ndev);
        if (ret)
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 41047c9143d0..959aeeade0c9 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -2418,9 +2418,9 @@ static int smsc911x_drv_probe(struct platform_device *pdev)
        struct net_device *dev;
        struct smsc911x_data *pdata;
        struct smsc911x_platform_config *config = dev_get_platdata(&pdev->dev);
-        struct resource *res, *irq_res;
+        struct resource *res;
        unsigned int intcfg = 0;
-        int res_size, irq_flags;
+        int res_size, irq, irq_flags;
        int retval;
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -2434,8 +2434,8 @@ static int smsc911x_drv_probe(struct platform_device *pdev)
        }
        res_size = resource_size(res);
-        irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        irq = platform_get_irq(pdev, 0);
-        if (!irq_res) {
+        if (irq <= 0) {
                pr_warn("Could not allocate irq resource\n");
                retval = -ENODEV;
                goto out_0;
@@ -2455,8 +2455,8 @@ static int smsc911x_drv_probe(struct platform_device *pdev)
        SET_NETDEV_DEV(dev, &pdev->dev);
        pdata = netdev_priv(dev);
-        dev->irq = irq_res->start;
+        dev->irq = irq;
-        irq_flags = irq_res->flags & IRQF_TRIGGER_MASK;
+        irq_flags = irq_get_trigger_type(irq);
        pdata->ioaddr = ioremap_nocache(res->start, res_size);
        pdata->dev = dev;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 705bbdf93940..68aec5c460db 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -23,6 +23,7 @@
 *******************************************************************************/
 #include <linux/platform_device.h>
+#include <linux/module.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_net.h>
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 690a4c36b316..af2694dc6f90 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -707,8 +707,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
        cur_p->app0 |= STS_CTRL_APP0_SOP;
        cur_p->len = skb_headlen(skb);
-        cur_p->phys = dma_map_single(ndev->dev.parent, skb->data, skb->len,
+        cur_p->phys = dma_map_single(ndev->dev.parent, skb->data,
-                                     DMA_TO_DEVICE);
+                                     skb_headlen(skb), DMA_TO_DEVICE);
        cur_p->app4 = (unsigned long)skb;
        for (ii = 0; ii < num_frag; ii++) {
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 2d9ef533cc48..ea091bc5ff09 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -826,7 +826,6 @@ int netvsc_send(struct hv_device *device,
        u16 q_idx = packet->q_idx;
        u32 pktlen = packet->total_data_buflen, msd_len = 0;
        unsigned int section_index = NETVSC_INVALID_INDEX;
-        struct sk_buff *skb = NULL;
        unsigned long flag;
        struct multi_send_data *msdp;
        struct hv_netvsc_packet *msd_send = NULL, *cur_send = NULL;
@@ -924,12 +923,8 @@ int netvsc_send(struct hv_device *device,
        if (cur_send)
                ret = netvsc_send_pkt(cur_send, net_device);
-        if (ret != 0) {
+        if (ret != 0 && section_index != NETVSC_INVALID_INDEX)
-                if (section_index != NETVSC_INVALID_INDEX)
+                netvsc_free_send_slot(net_device, section_index);
-                        netvsc_free_send_slot(net_device, section_index);
-        } else if (skb) {
-                dev_kfree_skb_any(skb);
-        }
        return ret;
 }
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 38026650c038..67d00fbc2e0e 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -85,6 +85,7 @@ struct at86rf230_local {
        struct ieee802154_hw *hw;
        struct at86rf2xx_chip_data *data;
        struct regmap *regmap;
+        int slp_tr;
        struct completion state_complete;
        struct at86rf230_state_change state;
@@ -95,163 +96,164 @@ struct at86rf230_local {
        unsigned long cal_timeout;
        s8 max_frame_retries;
        bool is_tx;
+        bool is_tx_from_off;
        u8 tx_retry;
        struct sk_buff *tx_skb;
        struct at86rf230_state_change tx;
 };
-#define RG_TRX_STATUS   (0x01)
+#define RG_TRX_STATUS   (0x01)
-#define SR_TRX_STATUS           0x01, 0x1f, 0
+#define SR_TRX_STATUS           0x01, 0x1f, 0
-#define SR_RESERVED_01_3        0x01, 0x20, 5
+#define SR_RESERVED_01_3        0x01, 0x20, 5
-#define SR_CCA_STATUS           0x01, 0x40, 6
+#define SR_CCA_STATUS           0x01, 0x40, 6
-#define SR_CCA_DONE             0x01, 0x80, 7
+#define SR_CCA_DONE             0x01, 0x80, 7
-#define RG_TRX_STATE    (0x02)
+#define RG_TRX_STATE    (0x02)
-#define SR_TRX_CMD              0x02, 0x1f, 0
+#define SR_TRX_CMD              0x02, 0x1f, 0
-#define SR_TRAC_STATUS          0x02, 0xe0, 5
+#define SR_TRAC_STATUS          0x02, 0xe0, 5
-#define RG_TRX_CTRL_0   (0x03)
+#define RG_TRX_CTRL_0   (0x03)
-#define SR_CLKM_CTRL            0x03, 0x07, 0
+#define SR_CLKM_CTRL            0x03, 0x07, 0
-#define SR_CLKM_SHA_SEL         0x03, 0x08, 3
+#define SR_CLKM_SHA_SEL         0x03, 0x08, 3
-#define SR_PAD_IO_CLKM          0x03, 0x30, 4
+#define SR_PAD_IO_CLKM          0x03, 0x30, 4
-#define SR_PAD_IO               0x03, 0xc0, 6
+#define SR_PAD_IO               0x03, 0xc0, 6
-#define RG_TRX_CTRL_1   (0x04)
+#define RG_TRX_CTRL_1   (0x04)
-#define SR_IRQ_POLARITY         0x04, 0x01, 0
+#define SR_IRQ_POLARITY         0x04, 0x01, 0
-#define SR_IRQ_MASK_MODE        0x04, 0x02, 1
+#define SR_IRQ_MASK_MODE        0x04, 0x02, 1
-#define SR_SPI_CMD_MODE         0x04, 0x0c, 2
+#define SR_SPI_CMD_MODE         0x04, 0x0c, 2
-#define SR_RX_BL_CTRL           0x04, 0x10, 4
+#define SR_RX_BL_CTRL           0x04, 0x10, 4
-#define SR_TX_AUTO_CRC_ON       0x04, 0x20, 5
+#define SR_TX_AUTO_CRC_ON       0x04, 0x20, 5
-#define SR_IRQ_2_EXT_EN         0x04, 0x40, 6
+#define SR_IRQ_2_EXT_EN         0x04, 0x40, 6
-#define SR_PA_EXT_EN            0x04, 0x80, 7
+#define SR_PA_EXT_EN            0x04, 0x80, 7
-#define RG_PHY_TX_PWR   (0x05)
+#define RG_PHY_TX_PWR   (0x05)
-#define SR_TX_PWR               0x05, 0x0f, 0
+#define SR_TX_PWR               0x05, 0x0f, 0
-#define SR_PA_LT                0x05, 0x30, 4
+#define SR_PA_LT                0x05, 0x30, 4
-#define SR_PA_BUF_LT            0x05, 0xc0, 6
+#define SR_PA_BUF_LT            0x05, 0xc0, 6
-#define RG_PHY_RSSI     (0x06)
+#define RG_PHY_RSSI     (0x06)
-#define SR_RSSI                 0x06, 0x1f, 0
+#define SR_RSSI                 0x06, 0x1f, 0
-#define SR_RND_VALUE            0x06, 0x60, 5
+#define SR_RND_VALUE            0x06, 0x60, 5
-#define SR_RX_CRC_VALID         0x06, 0x80, 7
+#define SR_RX_CRC_VALID         0x06, 0x80, 7
-#define RG_PHY_ED_LEVEL (0x07)
+#define RG_PHY_ED_LEVEL (0x07)
-#define SR_ED_LEVEL             0x07, 0xff, 0
+#define SR_ED_LEVEL             0x07, 0xff, 0
-#define RG_PHY_CC_CCA   (0x08)
+#define RG_PHY_CC_CCA   (0x08)
-#define SR_CHANNEL              0x08, 0x1f, 0
+#define SR_CHANNEL              0x08, 0x1f, 0
-#define SR_CCA_MODE             0x08, 0x60, 5
+#define SR_CCA_MODE             0x08, 0x60, 5
-#define SR_CCA_REQUEST          0x08, 0x80, 7
+#define SR_CCA_REQUEST          0x08, 0x80, 7
-#define RG_CCA_THRES    (0x09)
+#define RG_CCA_THRES    (0x09)
-#define SR_CCA_ED_THRES         0x09, 0x0f, 0
+#define SR_CCA_ED_THRES         0x09, 0x0f, 0
-#define SR_RESERVED_09_1        0x09, 0xf0, 4
+#define SR_RESERVED_09_1        0x09, 0xf0, 4
-#define RG_RX_CTRL      (0x0a)
+#define RG_RX_CTRL      (0x0a)
-#define SR_PDT_THRES            0x0a, 0x0f, 0
+#define SR_PDT_THRES            0x0a, 0x0f, 0
-#define SR_RESERVED_0a_1        0x0a, 0xf0, 4
+#define SR_RESERVED_0a_1        0x0a, 0xf0, 4
-#define RG_SFD_VALUE    (0x0b)
+#define RG_SFD_VALUE    (0x0b)
-#define SR_SFD_VALUE            0x0b, 0xff, 0
+#define SR_SFD_VALUE            0x0b, 0xff, 0
-#define RG_TRX_CTRL_2   (0x0c)
+#define RG_TRX_CTRL_2   (0x0c)
-#define SR_OQPSK_DATA_RATE      0x0c, 0x03, 0
+#define SR_OQPSK_DATA_RATE      0x0c, 0x03, 0
-#define SR_SUB_MODE             0x0c, 0x04, 2
+#define SR_SUB_MODE             0x0c, 0x04, 2
-#define SR_BPSK_QPSK            0x0c, 0x08, 3
+#define SR_BPSK_QPSK            0x0c, 0x08, 3
-#define SR_OQPSK_SUB1_RC_EN     0x0c, 0x10, 4
+#define SR_OQPSK_SUB1_RC_EN     0x0c, 0x10, 4
-#define SR_RESERVED_0c_5        0x0c, 0x60, 5
+#define SR_RESERVED_0c_5        0x0c, 0x60, 5
-#define SR_RX_SAFE_MODE         0x0c, 0x80, 7
+#define SR_RX_SAFE_MODE         0x0c, 0x80, 7
-#define RG_ANT_DIV      (0x0d)
+#define RG_ANT_DIV      (0x0d)
-#define SR_ANT_CTRL             0x0d, 0x03, 0
+#define SR_ANT_CTRL             0x0d, 0x03, 0
-#define SR_ANT_EXT_SW_EN        0x0d, 0x04, 2
+#define SR_ANT_EXT_SW_EN        0x0d, 0x04, 2
-#define SR_ANT_DIV_EN           0x0d, 0x08, 3
+#define SR_ANT_DIV_EN           0x0d, 0x08, 3
-#define SR_RESERVED_0d_2        0x0d, 0x70, 4
+#define SR_RESERVED_0d_2        0x0d, 0x70, 4
-#define SR_ANT_SEL              0x0d, 0x80, 7
+#define SR_ANT_SEL              0x0d, 0x80, 7
-#define RG_IRQ_MASK     (0x0e)
+#define RG_IRQ_MASK     (0x0e)
-#define SR_IRQ_MASK             0x0e, 0xff, 0
+#define SR_IRQ_MASK             0x0e, 0xff, 0
-#define RG_IRQ_STATUS   (0x0f)
+#define RG_IRQ_STATUS   (0x0f)
-#define SR_IRQ_0_PLL_LOCK       0x0f, 0x01, 0
+#define SR_IRQ_0_PLL_LOCK       0x0f, 0x01, 0
-#define SR_IRQ_1_PLL_UNLOCK     0x0f, 0x02, 1
+#define SR_IRQ_1_PLL_UNLOCK     0x0f, 0x02, 1
-#define SR_IRQ_2_RX_START       0x0f, 0x04, 2
+#define SR_IRQ_2_RX_START       0x0f, 0x04, 2
-#define SR_IRQ_3_TRX_END        0x0f, 0x08, 3
+#define SR_IRQ_3_TRX_END        0x0f, 0x08, 3
-#define SR_IRQ_4_CCA_ED_DONE    0x0f, 0x10, 4
+#define SR_IRQ_4_CCA_ED_DONE    0x0f, 0x10, 4
-#define SR_IRQ_5_AMI            0x0f, 0x20, 5
+#define SR_IRQ_5_AMI            0x0f, 0x20, 5
-#define SR_IRQ_6_TRX_UR         0x0f, 0x40, 6
+#define SR_IRQ_6_TRX_UR         0x0f, 0x40, 6
-#define SR_IRQ_7_BAT_LOW        0x0f, 0x80, 7
+#define SR_IRQ_7_BAT_LOW        0x0f, 0x80, 7
-#define RG_VREG_CTRL    (0x10)
+#define RG_VREG_CTRL    (0x10)
-#define SR_RESERVED_10_6        0x10, 0x03, 0
+#define SR_RESERVED_10_6        0x10, 0x03, 0
-#define SR_DVDD_OK              0x10, 0x04, 2
+#define SR_DVDD_OK              0x10, 0x04, 2
-#define SR_DVREG_EXT            0x10, 0x08, 3
+#define SR_DVREG_EXT            0x10, 0x08, 3
-#define SR_RESERVED_10_3        0x10, 0x30, 4
+#define SR_RESERVED_10_3        0x10, 0x30, 4
-#define SR_AVDD_OK              0x10, 0x40, 6
+#define SR_AVDD_OK              0x10, 0x40, 6
-#define SR_AVREG_EXT            0x10, 0x80, 7
+#define SR_AVREG_EXT            0x10, 0x80, 7
-#define RG_BATMON       (0x11)
+#define RG_BATMON       (0x11)
-#define SR_BATMON_VTH           0x11, 0x0f, 0
+#define SR_BATMON_VTH           0x11, 0x0f, 0
-#define SR_BATMON_HR            0x11, 0x10, 4
+#define SR_BATMON_HR            0x11, 0x10, 4
-#define SR_BATMON_OK            0x11, 0x20, 5
+#define SR_BATMON_OK            0x11, 0x20, 5
-#define SR_RESERVED_11_1        0x11, 0xc0, 6
+#define SR_RESERVED_11_1        0x11, 0xc0, 6
-#define RG_XOSC_CTRL    (0x12)
+#define RG_XOSC_CTRL    (0x12)
-#define SR_XTAL_TRIM            0x12, 0x0f, 0
+#define SR_XTAL_TRIM            0x12, 0x0f, 0
-#define SR_XTAL_MODE            0x12, 0xf0, 4
+#define SR_XTAL_MODE            0x12, 0xf0, 4
-#define RG_RX_SYN       (0x15)
+#define RG_RX_SYN       (0x15)
-#define SR_RX_PDT_LEVEL         0x15, 0x0f, 0
+#define SR_RX_PDT_LEVEL         0x15, 0x0f, 0
-#define SR_RESERVED_15_2        0x15, 0x70, 4
+#define SR_RESERVED_15_2        0x15, 0x70, 4
-#define SR_RX_PDT_DIS           0x15, 0x80, 7
+#define SR_RX_PDT_DIS           0x15, 0x80, 7
-#define RG_XAH_CTRL_1   (0x17)
+#define RG_XAH_CTRL_1   (0x17)
-#define SR_RESERVED_17_8        0x17, 0x01, 0
+#define SR_RESERVED_17_8        0x17, 0x01, 0
-#define SR_AACK_PROM_MODE       0x17, 0x02, 1
+#define SR_AACK_PROM_MODE       0x17, 0x02, 1
-#define SR_AACK_ACK_TIME        0x17, 0x04, 2
+#define SR_AACK_ACK_TIME        0x17, 0x04, 2
-#define SR_RESERVED_17_5        0x17, 0x08, 3
+#define SR_RESERVED_17_5        0x17, 0x08, 3
-#define SR_AACK_UPLD_RES_FT     0x17, 0x10, 4
+#define SR_AACK_UPLD_RES_FT     0x17, 0x10, 4
-#define SR_AACK_FLTR_RES_FT     0x17, 0x20, 5
+#define SR_AACK_FLTR_RES_FT     0x17, 0x20, 5
-#define SR_CSMA_LBT_MODE        0x17, 0x40, 6
+#define SR_CSMA_LBT_MODE        0x17, 0x40, 6
-#define SR_RESERVED_17_1        0x17, 0x80, 7
+#define SR_RESERVED_17_1        0x17, 0x80, 7
-#define RG_FTN_CTRL     (0x18)
+#define RG_FTN_CTRL     (0x18)
-#define SR_RESERVED_18_2        0x18, 0x7f, 0
+#define SR_RESERVED_18_2        0x18, 0x7f, 0
-#define SR_FTN_START            0x18, 0x80, 7
+#define SR_FTN_START            0x18, 0x80, 7
-#define RG_PLL_CF       (0x1a)
+#define RG_PLL_CF       (0x1a)
-#define SR_RESERVED_1a_2        0x1a, 0x7f, 0
+#define SR_RESERVED_1a_2        0x1a, 0x7f, 0
-#define SR_PLL_CF_START         0x1a, 0x80, 7
+#define SR_PLL_CF_START         0x1a, 0x80, 7
-#define RG_PLL_DCU      (0x1b)
+#define RG_PLL_DCU      (0x1b)
-#define SR_RESERVED_1b_3        0x1b, 0x3f, 0
+#define SR_RESERVED_1b_3        0x1b, 0x3f, 0
-#define SR_RESERVED_1b_2        0x1b, 0x40, 6
+#define SR_RESERVED_1b_2        0x1b, 0x40, 6
-#define SR_PLL_DCU_START        0x1b, 0x80, 7
+#define SR_PLL_DCU_START        0x1b, 0x80, 7
-#define RG_PART_NUM     (0x1c)
+#define RG_PART_NUM     (0x1c)
-#define SR_PART_NUM             0x1c, 0xff, 0
+#define SR_PART_NUM             0x1c, 0xff, 0
-#define RG_VERSION_NUM  (0x1d)
+#define RG_VERSION_NUM  (0x1d)
-#define SR_VERSION_NUM          0x1d, 0xff, 0
+#define SR_VERSION_NUM          0x1d, 0xff, 0
-#define RG_MAN_ID_0     (0x1e)
+#define RG_MAN_ID_0     (0x1e)
-#define SR_MAN_ID_0             0x1e, 0xff, 0
+#define SR_MAN_ID_0             0x1e, 0xff, 0
-#define RG_MAN_ID_1     (0x1f)
+#define RG_MAN_ID_1     (0x1f)
-#define SR_MAN_ID_1             0x1f, 0xff, 0
+#define SR_MAN_ID_1             0x1f, 0xff, 0
-#define RG_SHORT_ADDR_0 (0x20)
+#define RG_SHORT_ADDR_0 (0x20)
-#define SR_SHORT_ADDR_0         0x20, 0xff, 0
+#define SR_SHORT_ADDR_0         0x20, 0xff, 0
-#define RG_SHORT_ADDR_1 (0x21)
+#define RG_SHORT_ADDR_1 (0x21)
-#define SR_SHORT_ADDR_1         0x21, 0xff, 0
+#define SR_SHORT_ADDR_1         0x21, 0xff, 0
-#define RG_PAN_ID_0     (0x22)
+#define RG_PAN_ID_0     (0x22)
-#define SR_PAN_ID_0             0x22, 0xff, 0
+#define SR_PAN_ID_0             0x22, 0xff, 0
-#define RG_PAN_ID_1     (0x23)
+#define RG_PAN_ID_1     (0x23)
-#define SR_PAN_ID_1             0x23, 0xff, 0
+#define SR_PAN_ID_1             0x23, 0xff, 0
-#define RG_IEEE_ADDR_0  (0x24)
+#define RG_IEEE_ADDR_0  (0x24)
-#define SR_IEEE_ADDR_0          0x24, 0xff, 0
+#define SR_IEEE_ADDR_0          0x24, 0xff, 0
-#define RG_IEEE_ADDR_1  (0x25)
+#define RG_IEEE_ADDR_1  (0x25)
-#define SR_IEEE_ADDR_1          0x25, 0xff, 0
+#define SR_IEEE_ADDR_1          0x25, 0xff, 0
-#define RG_IEEE_ADDR_2  (0x26)
+#define RG_IEEE_ADDR_2  (0x26)
-#define SR_IEEE_ADDR_2          0x26, 0xff, 0
+#define SR_IEEE_ADDR_2          0x26, 0xff, 0
-#define RG_IEEE_ADDR_3  (0x27)
+#define RG_IEEE_ADDR_3  (0x27)
-#define SR_IEEE_ADDR_3          0x27, 0xff, 0
+#define SR_IEEE_ADDR_3          0x27, 0xff, 0
-#define RG_IEEE_ADDR_4  (0x28)
+#define RG_IEEE_ADDR_4  (0x28)
-#define SR_IEEE_ADDR_4          0x28, 0xff, 0
+#define SR_IEEE_ADDR_4          0x28, 0xff, 0
-#define RG_IEEE_ADDR_5  (0x29)
+#define RG_IEEE_ADDR_5  (0x29)
-#define SR_IEEE_ADDR_5          0x29, 0xff, 0
+#define SR_IEEE_ADDR_5          0x29, 0xff, 0
-#define RG_IEEE_ADDR_6  (0x2a)
+#define RG_IEEE_ADDR_6  (0x2a)
-#define SR_IEEE_ADDR_6          0x2a, 0xff, 0
+#define SR_IEEE_ADDR_6          0x2a, 0xff, 0
-#define RG_IEEE_ADDR_7  (0x2b)
+#define RG_IEEE_ADDR_7  (0x2b)
-#define SR_IEEE_ADDR_7          0x2b, 0xff, 0
+#define SR_IEEE_ADDR_7          0x2b, 0xff, 0
-#define RG_XAH_CTRL_0   (0x2c)
+#define RG_XAH_CTRL_0   (0x2c)
-#define SR_SLOTTED_OPERATION    0x2c, 0x01, 0
+#define SR_SLOTTED_OPERATION    0x2c, 0x01, 0
-#define SR_MAX_CSMA_RETRIES     0x2c, 0x0e, 1
+#define SR_MAX_CSMA_RETRIES     0x2c, 0x0e, 1
-#define SR_MAX_FRAME_RETRIES    0x2c, 0xf0, 4
+#define SR_MAX_FRAME_RETRIES    0x2c, 0xf0, 4
-#define RG_CSMA_SEED_0  (0x2d)
+#define RG_CSMA_SEED_0  (0x2d)
-#define SR_CSMA_SEED_0          0x2d, 0xff, 0
+#define SR_CSMA_SEED_0          0x2d, 0xff, 0
-#define RG_CSMA_SEED_1  (0x2e)
+#define RG_CSMA_SEED_1  (0x2e)
-#define SR_CSMA_SEED_1          0x2e, 0x07, 0
+#define SR_CSMA_SEED_1          0x2e, 0x07, 0
-#define SR_AACK_I_AM_COORD      0x2e, 0x08, 3
+#define SR_AACK_I_AM_COORD      0x2e, 0x08, 3
-#define SR_AACK_DIS_ACK         0x2e, 0x10, 4
+#define SR_AACK_DIS_ACK         0x2e, 0x10, 4
-#define SR_AACK_SET_PD          0x2e, 0x20, 5
+#define SR_AACK_SET_PD          0x2e, 0x20, 5
-#define SR_AACK_FVN_MODE        0x2e, 0xc0, 6
+#define SR_AACK_FVN_MODE        0x2e, 0xc0, 6
-#define RG_CSMA_BE      (0x2f)
+#define RG_CSMA_BE      (0x2f)
-#define SR_MIN_BE               0x2f, 0x0f, 0
+#define SR_MIN_BE               0x2f, 0x0f, 0
-#define SR_MAX_BE               0x2f, 0xf0, 4
+#define SR_MAX_BE               0x2f, 0xf0, 4
 #define CMD_REG         0x80
 #define CMD_REG_MASK    0x3f
@@ -292,6 +294,8 @@ struct at86rf230_local {
 #define STATE_BUSY_RX_AACK_NOCLK 0x1E
 #define STATE_TRANSITION_IN_PROGRESS 0x1F
+#define TRX_STATE_MASK          (0x1F)
 #define AT86RF2XX_NUMREGS 0x3F
 static void
@@ -336,6 +340,14 @@ at86rf230_write_subreg(struct at86rf230_local *lp,
        return regmap_update_bits(lp->regmap, addr, mask, data << shift);
 }
+static inline void
+at86rf230_slp_tr_rising_edge(struct at86rf230_local *lp)
+{
+        gpio_set_value(lp->slp_tr, 1);
+        udelay(1);
+        gpio_set_value(lp->slp_tr, 0);
+}
 static bool
 at86rf230_reg_writeable(struct device *dev, unsigned int reg)
 {
@@ -509,7 +521,7 @@ at86rf230_async_state_assert(void *context)
        struct at86rf230_state_change *ctx = context;
        struct at86rf230_local *lp = ctx->lp;
        const u8 *buf = ctx->buf;
-        const u8 trx_state = buf[1] & 0x1f;
+        const u8 trx_state = buf[1] & TRX_STATE_MASK;
        /* Assert state change */
        if (trx_state != ctx->to_state) {
@@ -609,11 +621,17 @@ at86rf230_async_state_delay(void *context)
                switch (ctx->to_state) {
                case STATE_RX_AACK_ON:
                        tim = ktime_set(0, c->t_off_to_aack * NSEC_PER_USEC);
+                        /* state change from TRX_OFF to RX_AACK_ON to do a
+                         * calibration, we need to reset the timeout for the
+                         * next one.
+                         */
+                        lp->cal_timeout = jiffies + AT86RF2XX_CAL_LOOP_TIMEOUT;
                        goto change;
+                case STATE_TX_ARET_ON:
                case STATE_TX_ON:
                        tim = ktime_set(0, c->t_off_to_tx_on * NSEC_PER_USEC);
-                        /* state change from TRX_OFF to TX_ON to do a
+                        /* state change from TRX_OFF to TX_ON or ARET_ON to do
-                         * calibration, we need to reset the timeout for the
+                         * a calibration, we need to reset the timeout for the
                         * next one.
                         */
                        lp->cal_timeout = jiffies + AT86RF2XX_CAL_LOOP_TIMEOUT;
@@ -667,7 +685,7 @@ at86rf230_async_state_change_start(void *context)
        struct at86rf230_state_change *ctx = context;
        struct at86rf230_local *lp = ctx->lp;
        u8 *buf = ctx->buf;
-        const u8 trx_state = buf[1] & 0x1f;
+        const u8 trx_state = buf[1] & TRX_STATE_MASK;
        int rc;
        /* Check for "possible" STATE_TRANSITION_IN_PROGRESS */
@@ -773,16 +791,6 @@ at86rf230_tx_on(void *context)
 }
 static void
-at86rf230_tx_trac_error(void *context)
-{
-        struct at86rf230_state_change *ctx = context;
-        struct at86rf230_local *lp = ctx->lp;
-        at86rf230_async_state_change(lp, ctx, STATE_TX_ON,
-                                     at86rf230_tx_on, true);
-}
-static void
 at86rf230_tx_trac_check(void *context)
 {
        struct at86rf230_state_change *ctx = context;
@@ -791,12 +799,12 @@ at86rf230_tx_trac_check(void *context)
        const u8 trac = (buf[1] & 0xe0) >> 5;
        /* If trac status is different than zero we need to do a state change
-         * to STATE_FORCE_TRX_OFF then STATE_TX_ON to recover the transceiver
+         * to STATE_FORCE_TRX_OFF then STATE_RX_AACK_ON to recover the
-         * state to TX_ON.
+         * transceiver.
         */
        if (trac)
                at86rf230_async_state_change(lp, ctx, STATE_FORCE_TRX_OFF,
-                                             at86rf230_tx_trac_error, true);
+                                             at86rf230_tx_on, true);
        else
                at86rf230_tx_on(context);
 }
@@ -941,13 +949,18 @@ at86rf230_write_frame_complete(void *context)
        u8 *buf = ctx->buf;
        int rc;
-        buf[0] = (RG_TRX_STATE & CMD_REG_MASK) | CMD_REG | CMD_WRITE;
-        buf[1] = STATE_BUSY_TX;
        ctx->trx.len = 2;
-        ctx->msg.complete = NULL;
-        rc = spi_async(lp->spi, &ctx->msg);
+        if (gpio_is_valid(lp->slp_tr)) {
-        if (rc)
+                at86rf230_slp_tr_rising_edge(lp);
-                at86rf230_async_error(lp, ctx, rc);
+        } else {
+                buf[0] = (RG_TRX_STATE & CMD_REG_MASK) | CMD_REG | CMD_WRITE;
+                buf[1] = STATE_BUSY_TX;
+                ctx->msg.complete = NULL;
+                rc = spi_async(lp->spi, &ctx->msg);
+                if (rc)
+                        at86rf230_async_error(lp, ctx, rc);
+        }
 }
 static void
@@ -993,12 +1006,21 @@ at86rf230_xmit_start(void *context)
         * are in STATE_TX_ON. The pfad differs here, so we change
         * the complete handler.
         */
-        if (lp->tx_aret)
+        if (lp->tx_aret) {
-                at86rf230_async_state_change(lp, ctx, STATE_TX_ON,
+                if (lp->is_tx_from_off) {
-                                             at86rf230_xmit_tx_on, false);
+                        lp->is_tx_from_off = false;
-        else
+                        at86rf230_async_state_change(lp, ctx, STATE_TX_ARET_ON,
+                                                     at86rf230_xmit_tx_on,
+                                                     false);
+                } else {
+                        at86rf230_async_state_change(lp, ctx, STATE_TX_ON,
+                                                     at86rf230_xmit_tx_on,
+                                                     false);
+                }
+        } else {
                at86rf230_async_state_change(lp, ctx, STATE_TX_ON,
                                             at86rf230_write_frame, false);
+        }
 }
 static int
@@ -1017,11 +1039,13 @@ at86rf230_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
         * to TX_ON, the lp->cal_timeout should be reinit by state_delay
         * function then to start in the next 5 minutes.
         */
-        if (time_is_before_jiffies(lp->cal_timeout))
+        if (time_is_before_jiffies(lp->cal_timeout)) {
+                lp->is_tx_from_off = true;
                at86rf230_async_state_change(lp, ctx, STATE_TRX_OFF,
                                             at86rf230_xmit_start, false);
-        else
+        } else {
                at86rf230_xmit_start(ctx);
+        }
        return 0;
 }
@@ -1037,9 +1061,6 @@ at86rf230_ed(struct ieee802154_hw *hw, u8 *level)
 static int
 at86rf230_start(struct ieee802154_hw *hw)
 {
-        struct at86rf230_local *lp = hw->priv;
-        lp->cal_timeout = jiffies + AT86RF2XX_CAL_LOOP_TIMEOUT;
        return at86rf230_sync_state_change(hw->priv, STATE_RX_AACK_ON);
 }
@@ -1673,6 +1694,7 @@ static int at86rf230_probe(struct spi_device *spi)
        lp = hw->priv;
        lp->hw = hw;
        lp->spi = spi;
+        lp->slp_tr = slp_tr;
        hw->parent = &spi->dev;
        hw->vif_data_size = sizeof(*lp);
        ieee802154_random_extended_addr(&hw->phy->perm_extended_addr);
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index b227a13f6473..9f59f17dc317 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -599,10 +599,18 @@ static int macvlan_open(struct net_device *dev)
                        goto del_unicast;
        }
+        if (dev->flags & IFF_PROMISC) {
+                err = dev_set_promiscuity(lowerdev, 1);
+                if (err < 0)
+                        goto clear_multi;
+        }
 hash_add:
        macvlan_hash_add(vlan);
        return 0;
+clear_multi:
+        dev_set_allmulti(lowerdev, -1);
 del_unicast:
        dev_uc_del(lowerdev, dev->dev_addr);
 out:
@@ -638,6 +646,9 @@ static int macvlan_stop(struct net_device *dev)
        if (dev->flags & IFF_ALLMULTI)
                dev_set_allmulti(lowerdev, -1);
+        if (dev->flags & IFF_PROMISC)
+                dev_set_promiscuity(lowerdev, -1);
        dev_uc_del(lowerdev, dev->dev_addr);
 hash_del:
@@ -696,6 +707,10 @@ static void macvlan_change_rx_flags(struct net_device *dev, int change)
        if (dev->flags & IFF_UP) {
                if (change & IFF_ALLMULTI)
                        dev_set_allmulti(lowerdev, dev->flags & IFF_ALLMULTI ? 1 : -1);
+                if (change & IFF_PROMISC)
+                        dev_set_promiscuity(lowerdev,
+                                            dev->flags & IFF_PROMISC ? 1 : -1);
        }
 }
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 8fadaa14b9f0..70641d2c0429 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -27,6 +27,7 @@ config AMD_PHY
 config AMD_XGBE_PHY
        tristate "Driver for the AMD 10GbE (amd-xgbe) PHYs"
        depends on (OF || ACPI) && HAS_IOMEM
+        depends on ARM64 || COMPILE_TEST
        ---help---
          Currently supports the AMD 10GbE PHY
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index c9cb486c753d..53d18150f4e2 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -168,7 +168,10 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev,
                if (!new_bus->irq[i])
                        new_bus->irq[i] = PHY_POLL;
-        snprintf(new_bus->id, MII_BUS_ID_SIZE, "gpio-%x", bus_id);
+        if (bus_id != -1)
+                snprintf(new_bus->id, MII_BUS_ID_SIZE, "gpio-%x", bus_id);
+        else
+                strncpy(new_bus->id, "gpio", MII_BUS_ID_SIZE);
        if (devm_gpio_request(dev, bitbang->mdc, "mdc"))
                goto out_free_bus;
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 1190fd8f0088..ebdc357c5131 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -548,7 +548,8 @@ static int kszphy_probe(struct phy_device *phydev)
        }
        clk = devm_clk_get(&phydev->dev, "rmii-ref");
-        if (!IS_ERR(clk)) {
+        /* NOTE: clk may be NULL if building without CONFIG_HAVE_CLK */
+        if (!IS_ERR_OR_NULL(clk)) {
                unsigned long rate = clk_get_rate(clk);
                bool rmii_ref_clk_sel_25_mhz;
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index aa1dd926623a..b62a5e3a1c65 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -465,6 +465,10 @@ static void pppoe_unbind_sock_work(struct work_struct *work)
        struct sock *sk = sk_pppox(po);
        lock_sock(sk);
+        if (po->pppoe_dev) {
+                dev_put(po->pppoe_dev);
+                po->pppoe_dev = NULL;
+        }
        pppox_unbind_sock(sk);
        release_sock(sk);
        sock_put(sk);
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index ac4d03b328b1..aafa1a1898e4 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -4116,6 +4116,7 @@ static struct usb_device_id rtl8152_table[] = {
        {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
        {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
        {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7205)},
+        {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x304f)},
        {}
 };
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 733f4feb2ef3..3c86b107275a 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1285,7 +1285,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
                                     struct net_device *net)
 {
        struct usbnet           *dev = netdev_priv(net);
-        int                     length;
+        unsigned int                    length;
        struct urb              *urb = NULL;
        struct skb_data         *entry;
        struct driver_info      *info = dev->driver_info;
@@ -1413,7 +1413,7 @@ not_drop:
                }
        } else
                netif_dbg(dev, tx_queued, dev->net,
-                          "> tx, len %d, type 0x%x\n", length, skb->protocol);
+                          "> tx, len %u, type 0x%x\n", length, skb->protocol);
 #ifdef CONFIG_PM
 deferred:
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 0acd079ba96b..3ad79bb4f2c2 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1103,28 +1103,14 @@ static u8 ath_get_rate_txpower(struct ath_softc *sc, struct ath_buf *bf,
        struct sk_buff *skb;
        struct ath_frame_info *fi;
        struct ieee80211_tx_info *info;
-        struct ieee80211_vif *vif;
        struct ath_hw *ah = sc->sc_ah;
        if (sc->tx99_state || !ah->tpc_enabled)
                return MAX_RATE_POWER;
        skb = bf->bf_mpdu;
-        info = IEEE80211_SKB_CB(skb);
-        vif = info->control.vif;
-        if (!vif) {
-                max_power = sc->cur_chan->cur_txpower;
-                goto out;
-        }
-        if (vif->bss_conf.txpower_type != NL80211_TX_POWER_LIMITED) {
-                max_power = min_t(u8, sc->cur_chan->cur_txpower,
-                                  2 * vif->bss_conf.txpower);
-                goto out;
-        }
        fi = get_frame_info(skb);
+        info = IEEE80211_SKB_CB(skb);
        if (!AR_SREV_9300_20_OR_LATER(ah)) {
                int txpower = fi->tx_power;
@@ -1161,25 +1147,26 @@ static u8 ath_get_rate_txpower(struct ath_softc *sc, struct ath_buf *bf,
                        txpower -= 2;
                txpower = max(txpower, 0);
-                max_power = min_t(u8, ah->tx_power[rateidx],
+                max_power = min_t(u8, ah->tx_power[rateidx], txpower);
-                                  2 * vif->bss_conf.txpower);
-                max_power = min_t(u8, max_power, txpower);
+                /* XXX: clamp minimum TX power at 1 for AR9160 since if
+                 * max_power is set to 0, frames are transmitted at max
+                 * TX power
+                 */
+                if (!max_power && !AR_SREV_9280_20_OR_LATER(ah))
+                        max_power = 1;
        } else if (!bf->bf_state.bfs_paprd) {
                if (rateidx < 8 && (info->flags & IEEE80211_TX_CTL_STBC))
                        max_power = min_t(u8, ah->tx_power_stbc[rateidx],
-                                          2 * vif->bss_conf.txpower);
+                                          fi->tx_power);
                else
                        max_power = min_t(u8, ah->tx_power[rateidx],
-                                          2 * vif->bss_conf.txpower);
+                                          fi->tx_power);
-                max_power = min(max_power, fi->tx_power);
        } else {
                max_power = ah->paprd_training_power;
        }
-out:
-        /* XXX: clamp minimum TX power at 1 for AR9160 since if max_power
+        return max_power;
-         * is set to 0, frames are transmitted at max TX power
-         */
-        return (!max_power && !AR_SREV_9280_20_OR_LATER(ah)) ? 1 : max_power;
 }
 static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,
@@ -2129,6 +2116,7 @@ static void setup_frame_info(struct ieee80211_hw *hw,
        struct ath_node *an = NULL;
        enum ath9k_key_type keytype;
        bool short_preamble = false;
+        u8 txpower;
        /*
         * We check if Short Preamble is needed for the CTS rate by
@@ -2145,6 +2133,16 @@ static void setup_frame_info(struct ieee80211_hw *hw,
        if (sta)
                an = (struct ath_node *) sta->drv_priv;
+        if (tx_info->control.vif) {
+                struct ieee80211_vif *vif = tx_info->control.vif;
+                txpower = 2 * vif->bss_conf.txpower;
+        } else {
+                struct ath_softc *sc = hw->priv;
+                txpower = sc->cur_chan->cur_txpower;
+        }
        memset(fi, 0, sizeof(*fi));
        fi->txq = -1;
        if (hw_key)
@@ -2155,7 +2153,7 @@ static void setup_frame_info(struct ieee80211_hw *hw,
                fi->keyix = ATH9K_TXKEYIX_INVALID;
        fi->keytype = keytype;
        fi->framelen = framelen;
-        fi->tx_power = MAX_RATE_POWER;
+        fi->tx_power = txpower;
        if (!rate)
                return;
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
index bfdf3faa6c47..62db2e5e45eb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw-file.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
@@ -244,6 +244,7 @@ enum iwl_ucode_tlv_flag {
 *      longer than the passive one, which is essential for fragmented scan.
 * @IWL_UCODE_TLV_API_WIFI_MCC_UPDATE: ucode supports MCC updates with source.
 * IWL_UCODE_TLV_API_HDC_PHASE_0: ucode supports finer configuration of LTR
+ * @IWL_UCODE_TLV_API_TX_POWER_DEV: new API for tx power.
 * @IWL_UCODE_TLV_API_BASIC_DWELL: use only basic dwell time in scan command,
 *      regardless of the band or the number of the probes. FW will calculate
 *      the actual dwell time.
@@ -260,6 +261,7 @@ enum iwl_ucode_tlv_api {
        IWL_UCODE_TLV_API_FRAGMENTED_SCAN       = BIT(8),
        IWL_UCODE_TLV_API_WIFI_MCC_UPDATE       = BIT(9),
        IWL_UCODE_TLV_API_HDC_PHASE_0           = BIT(10),
+        IWL_UCODE_TLV_API_TX_POWER_DEV          = BIT(11),
        IWL_UCODE_TLV_API_BASIC_DWELL           = BIT(13),
        IWL_UCODE_TLV_API_SCD_CFG               = BIT(15),
        IWL_UCODE_TLV_API_SINGLE_SCAN_EBS       = BIT(16),
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 6dfed1259260..56254a837214 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -6,7 +6,7 @@
 * GPL LICENSE SUMMARY
 *
 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
 * BSD LICENSE
 *
 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -421,8 +421,9 @@ struct iwl_trans_txq_scd_cfg {
 *
 * All the handlers MUST be implemented
 *
- * @start_hw: starts the HW- from that point on, the HW can send interrupts
+ * @start_hw: starts the HW. If low_power is true, the NIC needs to be taken
- *      May sleep
+ *      out of a low power state. From that point on, the HW can send
+ *      interrupts. May sleep.
 * @op_mode_leave: Turn off the HW RF kill indication if on
 *      May sleep
 * @start_fw: allocates and inits all the resources for the transport
@@ -432,10 +433,11 @@ struct iwl_trans_txq_scd_cfg {
 *      the SCD base address in SRAM, then provide it here, or 0 otherwise.
 *      May sleep
 * @stop_device: stops the whole device (embedded CPU put to reset) and stops
- *      the HW. From that point on, the HW will be in low power but will still
+ *      the HW. If low_power is true, the NIC will be put in low power state.
- *      issue interrupt if the HW RF kill is triggered. This callback must do
+ *      From that point on, the HW will be stopped but will still issue an
- *      the right thing and not crash even if start_hw() was called but not
+ *      interrupt if the HW RF kill switch is triggered.
- *      start_fw(). May sleep
+ *      This callback must do the right thing and not crash even if %start_hw()
+ *      was called but not &start_fw(). May sleep.
 * @d3_suspend: put the device into the correct mode for WoWLAN during
 *      suspend. This is optional, if not implemented WoWLAN will not be
 *      supported. This callback may sleep.
@@ -491,14 +493,14 @@ struct iwl_trans_txq_scd_cfg {
 */
 struct iwl_trans_ops {
-        int (*start_hw)(struct iwl_trans *iwl_trans);
+        int (*start_hw)(struct iwl_trans *iwl_trans, bool low_power);
        void (*op_mode_leave)(struct iwl_trans *iwl_trans);
        int (*start_fw)(struct iwl_trans *trans, const struct fw_img *fw,
                        bool run_in_rfkill);
        int (*update_sf)(struct iwl_trans *trans,
                         struct iwl_sf_region *st_fwrd_space);
        void (*fw_alive)(struct iwl_trans *trans, u32 scd_addr);
-        void (*stop_device)(struct iwl_trans *trans);
+        void (*stop_device)(struct iwl_trans *trans, bool low_power);
        void (*d3_suspend)(struct iwl_trans *trans, bool test);
        int (*d3_resume)(struct iwl_trans *trans, enum iwl_d3_status *status,
@@ -652,11 +654,16 @@ static inline void iwl_trans_configure(struct iwl_trans *trans,
        trans->ops->configure(trans, trans_cfg);
 }
-static inline int iwl_trans_start_hw(struct iwl_trans *trans)
+static inline int _iwl_trans_start_hw(struct iwl_trans *trans, bool low_power)
 {
        might_sleep();
-        return trans->ops->start_hw(trans);
+        return trans->ops->start_hw(trans, low_power);
+}
+static inline int iwl_trans_start_hw(struct iwl_trans *trans)
+{
+        return trans->ops->start_hw(trans, true);
 }
 static inline void iwl_trans_op_mode_leave(struct iwl_trans *trans)
@@ -703,15 +710,21 @@ static inline int iwl_trans_update_sf(struct iwl_trans *trans,
        return 0;
 }
-static inline void iwl_trans_stop_device(struct iwl_trans *trans)
+static inline void _iwl_trans_stop_device(struct iwl_trans *trans,
+                                          bool low_power)
 {
        might_sleep();
-        trans->ops->stop_device(trans);
+        trans->ops->stop_device(trans, low_power);
        trans->state = IWL_TRANS_NO_FW;
 }
+static inline void iwl_trans_stop_device(struct iwl_trans *trans)
+{
+        _iwl_trans_stop_device(trans, true);
+}
 static inline void iwl_trans_d3_suspend(struct iwl_trans *trans, bool test)
 {
        might_sleep();
diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c
index a6c48c7b1e16..1b1b2bf26819 100644
--- a/drivers/net/wireless/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/iwlwifi/mvm/d3.c
@@ -1726,7 +1726,7 @@ iwl_mvm_netdetect_query_results(struct iwl_mvm *mvm,
        results->matched_profiles = le32_to_cpu(query->matched_profiles);
        memcpy(results->matches, query->matches, sizeof(results->matches));
-#ifdef CPTCFG_IWLWIFI_DEBUGFS
+#ifdef CONFIG_IWLWIFI_DEBUGFS
        mvm->last_netdetect_scans = le32_to_cpu(query->n_scans_done);
 #endif
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
index 4fc0938b3fb6..b1baa33cc19b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
@@ -298,6 +298,40 @@ struct iwl_uapsd_misbehaving_ap_notif {
 } __packed;
 /**
+ * struct iwl_reduce_tx_power_cmd - TX power reduction command
+ * REDUCE_TX_POWER_CMD = 0x9f
+ * @flags: (reserved for future implementation)
+ * @mac_context_id: id of the mac ctx for which we are reducing TX power.
+ * @pwr_restriction: TX power restriction in dBms.
+ */
+struct iwl_reduce_tx_power_cmd {
+        u8 flags;
+        u8 mac_context_id;
+        __le16 pwr_restriction;
+} __packed; /* TX_REDUCED_POWER_API_S_VER_1 */
+/**
+ * struct iwl_dev_tx_power_cmd - TX power reduction command
+ * REDUCE_TX_POWER_CMD = 0x9f
+ * @set_mode: 0 - MAC tx power, 1 - device tx power
+ * @mac_context_id: id of the mac ctx for which we are reducing TX power.
+ * @pwr_restriction: TX power restriction in 1/8 dBms.
+ * @dev_24: device TX power restriction in 1/8 dBms
+ * @dev_52_low: device TX power restriction upper band - low
+ * @dev_52_high: device TX power restriction upper band - high
+ */
+struct iwl_dev_tx_power_cmd {
+        __le32 set_mode;
+        __le32 mac_context_id;
+        __le16 pwr_restriction;
+        __le16 dev_24;
+        __le16 dev_52_low;
+        __le16 dev_52_high;
+} __packed; /* TX_REDUCED_POWER_API_S_VER_2 */
+#define IWL_DEV_MAX_TX_POWER 0x7FFF
+/**
 * struct iwl_beacon_filter_cmd
 * REPLY_BEACON_FILTERING_CMD = 0xd2 (command)
 * @id_and_color: MAC contex identifier
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
index 4f81dcf57a73..d6cced47d561 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
@@ -122,46 +122,6 @@ enum iwl_scan_complete_status {
        SCAN_COMP_STATUS_ERR_ALLOC_TE = 0x0C,
 };
-/**
- * struct iwl_scan_results_notif - scan results for one channel
- * ( SCAN_RESULTS_NOTIFICATION = 0x83 )
- * @channel: which channel the results are from
- * @band: 0 for 5.2 GHz, 1 for 2.4 GHz
- * @probe_status: SCAN_PROBE_STATUS_*, indicates success of probe request
- * @num_probe_not_sent: # of request that weren't sent due to not enough time
- * @duration: duration spent in channel, in usecs
- * @statistics: statistics gathered for this channel
- */
-struct iwl_scan_results_notif {
-        u8 channel;
-        u8 band;
-        u8 probe_status;
-        u8 num_probe_not_sent;
-        __le32 duration;
-        __le32 statistics[SCAN_RESULTS_STATISTICS];
-} __packed; /* SCAN_RESULT_NTF_API_S_VER_2 */
-/**
- * struct iwl_scan_complete_notif - notifies end of scanning (all channels)
- * ( SCAN_COMPLETE_NOTIFICATION = 0x84 )
- * @scanned_channels: number of channels scanned (and number of valid results)
- * @status: one of SCAN_COMP_STATUS_*
- * @bt_status: BT on/off status
- * @last_channel: last channel that was scanned
- * @tsf_low: TSF timer (lower half) in usecs
- * @tsf_high: TSF timer (higher half) in usecs
- * @results: array of scan results, only "scanned_channels" of them are valid
- */
-struct iwl_scan_complete_notif {
-        u8 scanned_channels;
-        u8 status;
-        u8 bt_status;
-        u8 last_channel;
-        __le32 tsf_low;
-        __le32 tsf_high;
-        struct iwl_scan_results_notif results[];
-} __packed; /* SCAN_COMPLETE_NTF_API_S_VER_2 */
 /* scan offload */
 #define IWL_SCAN_MAX_BLACKLIST_LEN      64
 #define IWL_SCAN_SHORT_BLACKLIST_LEN    16
@@ -554,7 +514,7 @@ struct iwl_scan_req_unified_lmac {
 } __packed;
 /**
- * struct iwl_lmac_scan_results_notif - scan results for one channel -
+ * struct iwl_scan_results_notif - scan results for one channel -
 *      SCAN_RESULT_NTF_API_S_VER_3
 * @channel: which channel the results are from
 * @band: 0 for 5.2 GHz, 1 for 2.4 GHz
@@ -562,7 +522,7 @@ struct iwl_scan_req_unified_lmac {
 * @num_probe_not_sent: # of request that weren't sent due to not enough time
 * @duration: duration spent in channel, in usecs
 */
-struct iwl_lmac_scan_results_notif {
+struct iwl_scan_results_notif {
        u8 channel;
        u8 band;
        u8 probe_status;
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
index aab68cbae754..01b1da6ad359 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
@@ -281,19 +281,6 @@ struct iwl_tx_ant_cfg_cmd {
        __le32 valid;
 } __packed;
-/**
- * struct iwl_reduce_tx_power_cmd - TX power reduction command
- * REDUCE_TX_POWER_CMD = 0x9f
- * @flags: (reserved for future implementation)
- * @mac_context_id: id of the mac ctx for which we are reducing TX power.
- * @pwr_restriction: TX power restriction in dBms.
- */
-struct iwl_reduce_tx_power_cmd {
-        u8 flags;
-        u8 mac_context_id;
-        __le16 pwr_restriction;
-} __packed; /* TX_REDUCED_POWER_API_S_VER_1 */
 /*
 * Calibration control struct.
 * Sent as part of the phy configuration command.
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index bc5eac4960e1..df869633f4dd 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -6,7 +6,7 @@
 * GPL LICENSE SUMMARY
 *
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
 * BSD LICENSE
 *
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -322,7 +322,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
        lockdep_assert_held(&mvm->mutex);
-        if (WARN_ON_ONCE(mvm->init_ucode_complete || mvm->calibrating))
+        if (WARN_ON_ONCE(mvm->calibrating))
                return 0;
        iwl_init_notification_wait(&mvm->notif_wait,
@@ -396,8 +396,6 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
         */
        ret = iwl_wait_notification(&mvm->notif_wait, &calib_wait,
                        MVM_UCODE_CALIB_TIMEOUT);
-        if (!ret)
-                mvm->init_ucode_complete = true;
        if (ret && iwl_mvm_is_radio_killed(mvm)) {
                IWL_DEBUG_RF_KILL(mvm, "RFKILL while calibrating.\n");
@@ -494,15 +492,6 @@ int iwl_mvm_fw_dbg_collect_desc(struct iwl_mvm *mvm,
        mvm->fw_dump_desc = desc;
-        /* stop recording */
-        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000) {
-                iwl_set_bits_prph(mvm->trans, MON_BUFF_SAMPLE_CTL, 0x100);
-        } else {
-                iwl_write_prph(mvm->trans, DBGC_IN_SAMPLE, 0);
-                /* wait before we collect the data till the DBGC stop */
-                udelay(100);
-        }
        queue_delayed_work(system_wq, &mvm->fw_dump_wk, delay);
        return 0;
@@ -658,25 +647,24 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
         * module loading, load init ucode now
         * (for example, if we were in RFKILL)
         */
-        if (!mvm->init_ucode_complete) {
+        ret = iwl_run_init_mvm_ucode(mvm, false);
-                ret = iwl_run_init_mvm_ucode(mvm, false);
+        if (ret && !iwlmvm_mod_params.init_dbg) {
-                if (ret && !iwlmvm_mod_params.init_dbg) {
+                IWL_ERR(mvm, "Failed to run INIT ucode: %d\n", ret);
-                        IWL_ERR(mvm, "Failed to run INIT ucode: %d\n", ret);
+                /* this can't happen */
-                        /* this can't happen */
+                if (WARN_ON(ret > 0))
-                        if (WARN_ON(ret > 0))
+                        ret = -ERFKILL;
-                                ret = -ERFKILL;
+                goto error;
-                        goto error;
+        }
-                }
+        if (!iwlmvm_mod_params.init_dbg) {
-                if (!iwlmvm_mod_params.init_dbg) {
+                /*
-                        /*
+                 * Stop and start the transport without entering low power
-                         * should stop and start HW since that INIT
+                 * mode. This will save the state of other components on the
-                         * image just loaded
+                 * device that are triggered by the INIT firwmare (MFUART).
-                         */
+                 */
-                        iwl_trans_stop_device(mvm->trans);
+                _iwl_trans_stop_device(mvm->trans, false);
-                        ret = iwl_trans_start_hw(mvm->trans);
+                _iwl_trans_start_hw(mvm->trans, false);
-                        if (ret)
+                if (ret)
-                                return ret;
+                        return ret;
-                }
        }
        if (iwlmvm_mod_params.init_dbg)
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 84555170b6f7..40265b9c66ae 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -1322,7 +1322,7 @@ static void iwl_mvm_restart_complete(struct iwl_mvm *mvm)
        clear_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);
        iwl_mvm_d0i3_enable_tx(mvm, NULL);
-        ret = iwl_mvm_update_quotas(mvm, false, NULL);
+        ret = iwl_mvm_update_quotas(mvm, true, NULL);
        if (ret)
                IWL_ERR(mvm, "Failed to update quotas after restart (%d)\n",
                        ret);
@@ -1471,8 +1471,8 @@ static struct iwl_mvm_phy_ctxt *iwl_mvm_get_free_phy_ctxt(struct iwl_mvm *mvm)
        return NULL;
 }
-static int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+static int iwl_mvm_set_tx_power_old(struct iwl_mvm *mvm,
-                                s8 tx_power)
+                                    struct ieee80211_vif *vif, s8 tx_power)
 {
        /* FW is in charge of regulatory enforcement */
        struct iwl_reduce_tx_power_cmd reduce_txpwr_cmd = {
@@ -1485,6 +1485,26 @@ static int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                                    &reduce_txpwr_cmd);
 }
+static int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
+                                s16 tx_power)
+{
+        struct iwl_dev_tx_power_cmd cmd = {
+                .set_mode = 0,
+                .mac_context_id =
+                        cpu_to_le32(iwl_mvm_vif_from_mac80211(vif)->id),
+                .pwr_restriction = cpu_to_le16(8 * tx_power),
+        };
+        if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_TX_POWER_DEV))
+                return iwl_mvm_set_tx_power_old(mvm, vif, tx_power);
+        if (tx_power == IWL_DEFAULT_MAX_TX_POWER)
+                cmd.pwr_restriction = cpu_to_le16(IWL_DEV_MAX_TX_POWER);
+        return iwl_mvm_send_cmd_pdu(mvm, REDUCE_TX_POWER_CMD, 0,
+                                    sizeof(cmd), &cmd);
+}
 static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
                                     struct ieee80211_vif *vif)
 {
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index d5522a161242..cf70f681d1ac 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -603,7 +603,6 @@ struct iwl_mvm {
        enum iwl_ucode_type cur_ucode;
        bool ucode_loaded;
-        bool init_ucode_complete;
        bool calibrating;
        u32 error_event_table;
        u32 log_event_table;
diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c
index a08b03d58d4b..1c66297d82c0 100644
--- a/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@ -865,6 +865,16 @@ static void iwl_mvm_fw_error_dump_wk(struct work_struct *work)
                return;
        mutex_lock(&mvm->mutex);
+        /* stop recording */
+        if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_7000) {
+                iwl_set_bits_prph(mvm->trans, MON_BUFF_SAMPLE_CTL, 0x100);
+        } else {
+                iwl_write_prph(mvm->trans, DBGC_IN_SAMPLE, 0);
+                /* wait before we collect the data till the DBGC stop */
+                udelay(100);
+        }
        iwl_mvm_fw_error_dump(mvm);
        /* start recording again if the firmware is not crashed */
diff --git a/drivers/net/wireless/iwlwifi/mvm/rx.c b/drivers/net/wireless/iwlwifi/mvm/rx.c
index 78ec7db64ba5..d6314ddf57b5 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rx.c
@@ -478,6 +478,11 @@ static void iwl_mvm_stat_iterator(void *_data, u8 *mac,
        if (vif->type != NL80211_IFTYPE_STATION)
                return;
+        if (sig == 0) {
+                IWL_DEBUG_RX(mvm, "RSSI is 0 - skip signal based decision\n");
+                return;
+        }
        mvmvif->bf_data.ave_beacon_signal = sig;
        /* BT Coex */
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 74e1c86289dc..1075a213bd6a 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -319,7 +319,7 @@ int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,
                                                struct iwl_device_cmd *cmd)
 {
        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-        struct iwl_scan_complete_notif *notif = (void *)pkt->data;
+        struct iwl_lmac_scan_complete_notif *notif = (void *)pkt->data;
        IWL_DEBUG_SCAN(mvm,
                       "Scan offload iteration complete: status=0x%x scanned channels=%d\n",
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 2de8fbfe4edf..47bbf573fdc8 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -5,8 +5,8 @@
 *
 * GPL LICENSE SUMMARY
 *
- * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2015 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of version 2 of the GNU General Public License as
@@ -31,8 +31,8 @@
 *
 * BSD LICENSE
 *
- * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2015 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -104,7 +104,7 @@ static void iwl_pcie_free_fw_monitor(struct iwl_trans *trans)
 static void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans)
 {
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        struct page *page;
+        struct page *page = NULL;
        dma_addr_t phys;
        u32 size;
        u8 power;
@@ -131,6 +131,7 @@ static void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans)
                                    DMA_FROM_DEVICE);
                if (dma_mapping_error(trans->dev, phys)) {
                        __free_pages(page, order);
+                        page = NULL;
                        continue;
                }
                IWL_INFO(trans,
@@ -1020,7 +1021,7 @@ static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans, u32 scd_addr)
        iwl_pcie_tx_start(trans, scd_addr);
 }
-static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
+static void iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
 {
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
        bool hw_rfkill, was_hw_rfkill;
@@ -1115,7 +1116,7 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 void iwl_trans_pcie_rf_kill(struct iwl_trans *trans, bool state)
 {
        if (iwl_op_mode_hw_rf_kill(trans->op_mode, state))
-                iwl_trans_pcie_stop_device(trans);
+                iwl_trans_pcie_stop_device(trans, true);
 }
 static void iwl_trans_pcie_d3_suspend(struct iwl_trans *trans, bool test)
@@ -1200,7 +1201,7 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
        return 0;
 }
-static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
+static int iwl_trans_pcie_start_hw(struct iwl_trans *trans, bool low_power)
 {
        bool hw_rfkill;
        int err;
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index f0188c83c79f..2721cf89fb16 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -126,7 +126,7 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request,
        do {
                status = usb_control_msg(udev, pipe, request, reqtype, value,
-                                         index, pdata, len, 0); /*max. timeout*/
+                                         index, pdata, len, 1000);
                if (status < 0) {
                        /* firmware download is checksumed, don't retry */
                        if ((value >= FW_8192C_START_ADDRESS &&
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 8be2096c8423..deeaed544222 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -348,7 +348,7 @@ int superio_fixup_irq(struct pci_dev *pcidev)
                BUG();
                return -1;
        }
-        printk("superio_fixup_irq(%s) ven 0x%x dev 0x%x from %pf\n",
+        printk(KERN_DEBUG "superio_fixup_irq(%s) ven 0x%x dev 0x%x from %ps\n",
                pci_name(pcidev),
                pcidev->vendor, pcidev->device,
                __builtin_return_address(0));
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 89dca77ca038..18ee2089df4a 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -1110,7 +1110,7 @@ void devm_pinctrl_put(struct pinctrl *p)
 EXPORT_SYMBOL_GPL(devm_pinctrl_put);
 int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps,
-                         bool dup, bool locked)
+                         bool dup)
 {
        int i, ret;
        struct pinctrl_maps *maps_node;
@@ -1178,11 +1178,9 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps,
                maps_node->maps = maps;
        }
-        if (!locked)
+        mutex_lock(&pinctrl_maps_mutex);
-                mutex_lock(&pinctrl_maps_mutex);
        list_add_tail(&maps_node->node, &pinctrl_maps);
-        if (!locked)
+        mutex_unlock(&pinctrl_maps_mutex);
-                mutex_unlock(&pinctrl_maps_mutex);
        return 0;
 }
@@ -1197,7 +1195,7 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps,
 int pinctrl_register_mappings(struct pinctrl_map const *maps,
                              unsigned num_maps)
 {
-        return pinctrl_register_map(maps, num_maps, true, false);
+        return pinctrl_register_map(maps, num_maps, true);
 }
 void pinctrl_unregister_map(struct pinctrl_map const *map)
diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h
index 75476b3d87da..b24ea846c867 100644
--- a/drivers/pinctrl/core.h
+++ b/drivers/pinctrl/core.h
@@ -183,7 +183,7 @@ static inline struct pin_desc *pin_desc_get(struct pinctrl_dev *pctldev,
 }
 int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps,
-                         bool dup, bool locked);
+                         bool dup);
 void pinctrl_unregister_map(struct pinctrl_map const *map);
 extern int pinctrl_force_sleep(struct pinctrl_dev *pctldev);
diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c
index eda13de2e7c0..0bbf7d71b281 100644
--- a/drivers/pinctrl/devicetree.c
+++ b/drivers/pinctrl/devicetree.c
@@ -92,7 +92,7 @@ static int dt_remember_or_free_map(struct pinctrl *p, const char *statename,
        dt_map->num_maps = num_maps;
        list_add_tail(&dt_map->node, &p->dt_maps);
-        return pinctrl_register_map(map, num_maps, false, true);
+        return pinctrl_register_map(map, num_maps, false);
 }
 struct pinctrl_dev *of_pinctrl_get(struct device_node *np)
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 493294c0ebe6..474812e2b0cb 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -881,6 +881,8 @@ static int mtk_gpio_set_debounce(struct gpio_chip *chip, unsigned offset,
        if (!mtk_eint_get_mask(pctl, eint_num)) {
                mtk_eint_mask(d);
                unmask = 1;
+        } else {
+                unmask = 0;
        }
        clr_bit = 0xff << eint_offset;
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-370.c b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
index 42f930f70de3..03aa58c4cb85 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-370.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
@@ -364,7 +364,7 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
           MPP_FUNCTION(0x5, "audio", "mclk"),
           MPP_FUNCTION(0x6, "uart0", "cts")),
        MPP_MODE(63,
-           MPP_FUNCTION(0x0, "gpo", NULL),
+           MPP_FUNCTION(0x0, "gpio", NULL),
           MPP_FUNCTION(0x1, "spi0", "sck"),
           MPP_FUNCTION(0x2, "tclk", NULL)),
        MPP_MODE(64,
diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
index b2d22218a258..ae4115e4b4ef 100644
--- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
+++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
@@ -260,6 +260,7 @@ static int pmic_gpio_set_mux(struct pinctrl_dev *pctldev, unsigned function,
                        val = 1;
        }
+        val = val << PMIC_GPIO_REG_MODE_DIR_SHIFT;
        val |= pad->function << PMIC_GPIO_REG_MODE_FUNCTION_SHIFT;
        val |= pad->out_value & PMIC_GPIO_REG_MODE_VALUE_SHIFT;
@@ -417,7 +418,7 @@ static int pmic_gpio_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
                return ret;
        val = pad->buffer_type << PMIC_GPIO_REG_OUT_TYPE_SHIFT;
-        val = pad->strength << PMIC_GPIO_REG_OUT_STRENGTH_SHIFT;
+        val |= pad->strength << PMIC_GPIO_REG_OUT_STRENGTH_SHIFT;
        ret = pmic_gpio_write(state, pad, PMIC_GPIO_REG_DIG_OUT_CTL, val);
        if (ret < 0)
@@ -466,12 +467,13 @@ static void pmic_gpio_config_dbg_show(struct pinctrl_dev *pctldev,
                seq_puts(s, " ---");
        } else {
-                if (!pad->input_enabled) {
+                if (pad->input_enabled) {
                        ret = pmic_gpio_read(state, pad, PMIC_MPP_REG_RT_STS);
-                        if (!ret) {
+                        if (ret < 0)
-                                ret &= PMIC_MPP_REG_RT_STS_VAL_MASK;
+                                return;
-                                pad->out_value = ret;
-                        }
+                        ret &= PMIC_MPP_REG_RT_STS_VAL_MASK;
+                        pad->out_value = ret;
                }
                seq_printf(s, " %-4s", pad->output_enabled ? "out" : "in");
diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c b/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
index 8f36c5f91949..211b942ad6d5 100644
--- a/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
+++ b/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
@@ -370,6 +370,7 @@ static int pmic_mpp_set_mux(struct pinctrl_dev *pctldev, unsigned function,
                }
        }
+        val = val << PMIC_MPP_REG_MODE_DIR_SHIFT;
        val |= pad->function << PMIC_MPP_REG_MODE_FUNCTION_SHIFT;
        val |= pad->out_value & PMIC_MPP_REG_MODE_VALUE_MASK;
@@ -576,10 +577,11 @@ static void pmic_mpp_config_dbg_show(struct pinctrl_dev *pctldev,
                if (pad->input_enabled) {
                        ret = pmic_mpp_read(state, pad, PMIC_MPP_REG_RT_STS);
-                        if (!ret) {
+                        if (ret < 0)
-                                ret &= PMIC_MPP_REG_RT_STS_VAL_MASK;
+                                return;
-                                pad->out_value = ret;
-                        }
+                        ret &= PMIC_MPP_REG_RT_STS_VAL_MASK;
+                        pad->out_value = ret;
                }
                seq_printf(s, " %-4s", pad->output_enabled ? "out" : "in");
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index b3d419a84723..b496db87bc05 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -830,6 +830,13 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)
 */
 static const struct dmi_system_id no_hw_rfkill_list[] = {
        {
+                .ident = "Lenovo G40-30",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G40-30"),
+                },
+        },
+        {
                .ident = "Lenovo Yoga 2 11 / 13 / Pro",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 7769575345d8..9bb9ad6d4a1b 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2115,7 +2115,7 @@ static int hotkey_mask_get(void)
        return 0;
 }
-void static hotkey_mask_warn_incomplete_mask(void)
+static void hotkey_mask_warn_incomplete_mask(void)
 {
        /* log only what the user can fix... */
        const u32 wantedmask = hotkey_driver_mask &
diff --git a/drivers/power/axp288_fuel_gauge.c b/drivers/power/axp288_fuel_gauge.c
index ca1cc5a47eb1..bd1dbfee2515 100644
--- a/drivers/power/axp288_fuel_gauge.c
+++ b/drivers/power/axp288_fuel_gauge.c
@@ -1149,6 +1149,7 @@ static struct platform_driver axp288_fuel_gauge_driver = {
 module_platform_driver(axp288_fuel_gauge_driver);
+MODULE_AUTHOR("Ramakrishna Pallala <ramakrishna.pallala@intel.com>");
 MODULE_AUTHOR("Todd Brandt <todd.e.brandt@linux.intel.com>");
 MODULE_DESCRIPTION("Xpower AXP288 Fuel Gauge Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index a57433de5c24..b6b98378faa3 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -1109,6 +1109,14 @@ static void __exit bq27x00_battery_exit(void)
 }
 module_exit(bq27x00_battery_exit);
+#ifdef CONFIG_BATTERY_BQ27X00_PLATFORM
+MODULE_ALIAS("platform:bq27000-battery");
+#endif
+#ifdef CONFIG_BATTERY_BQ27X00_I2C
+MODULE_ALIAS("i2c:bq27000-battery");
+#endif
 MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
 MODULE_DESCRIPTION("BQ27x00 battery monitor driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
index 2da9ed8ccbb5..8a971b3dbe58 100644
--- a/drivers/power/collie_battery.c
+++ b/drivers/power/collie_battery.c
@@ -347,7 +347,7 @@ static int collie_bat_probe(struct ucb1x00_dev *dev)
                goto err_psy_reg_main;
        }
-        psy_main_cfg.drv_data = &collie_bat_bu;
+        psy_bu_cfg.drv_data = &collie_bat_bu;
        collie_bat_bu.psy = power_supply_register(&dev->ucb->dev,
                                                  &collie_bat_bu_desc,
                                                  &psy_bu_cfg);
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index aad9c3318c02..17d93a73c513 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -41,6 +41,7 @@ config POWER_RESET_AXXIA
 config POWER_RESET_BRCMSTB
        bool "Broadcom STB reset driver"
        depends on ARM || MIPS || COMPILE_TEST
+        depends on MFD_SYSCON
        default ARCH_BRCMSTB
        help
          This driver provides restart support for Broadcom STB boards.
diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
index 01c7055c4200..ca461ebc7ae8 100644
--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -212,9 +212,9 @@ static int at91_reset_platform_probe(struct platform_device *pdev)
                res = platform_get_resource(pdev, IORESOURCE_MEM, idx + 1 );
                at91_ramc_base[idx] = devm_ioremap(&pdev->dev, res->start,
                                                   resource_size(res));
-                if (IS_ERR(at91_ramc_base[idx])) {
+                if (!at91_ramc_base[idx]) {
                        dev_err(&pdev->dev, "Could not map ram controller address\n");
-                        return PTR_ERR(at91_ramc_base[idx]);
+                        return -ENOMEM;
                }
        }
diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c
index 7ef193b6f7fe..1e08195551fe 100644
--- a/drivers/power/reset/ltc2952-poweroff.c
+++ b/drivers/power/reset/ltc2952-poweroff.c
@@ -120,18 +120,7 @@ static enum hrtimer_restart ltc2952_poweroff_timer_wde(struct hrtimer *timer)
 static void ltc2952_poweroff_start_wde(struct ltc2952_poweroff *data)
 {
-        if (hrtimer_start(&data->timer_wde, data->wde_interval,
+        hrtimer_start(&data->timer_wde, data->wde_interval, HRTIMER_MODE_REL);
-                          HRTIMER_MODE_REL)) {
-                /*
-                 * The device will not toggle the watchdog reset,
-                 * thus shut down is only safe if the PowerPath controller
-                 * has a long enough time-off before triggering a hardware
-                 * power-off.
-                 *
-                 * Only sending a warning as the system will power-off anyway
-                 */
-                dev_err(data->dev, "unable to start the timer\n");
-        }
 }
 static enum hrtimer_restart
@@ -165,9 +154,8 @@ static irqreturn_t ltc2952_poweroff_handler(int irq, void *dev_id)
        }
        if (gpiod_get_value(data->gpio_trigger)) {
-                if (hrtimer_start(&data->timer_trigger, data->trigger_delay,
+                hrtimer_start(&data->timer_trigger, data->trigger_delay,
-                                  HRTIMER_MODE_REL))
+                              HRTIMER_MODE_REL);
-                        dev_err(data->dev, "unable to start the wait timer\n");
        } else {
                hrtimer_cancel(&data->timer_trigger);
                /* omitting return value check, timer should have been valid */
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 6149ae01e11f..0fe4ad8826b2 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -164,6 +164,16 @@ config RTC_DRV_ABB5ZES3
          This driver can also be built as a module. If so, the module
          will be called rtc-ab-b5ze-s3.
+config RTC_DRV_ABX80X
+        tristate "Abracon ABx80x"
+        help
+          If you say yes here you get support for Abracon AB080X and AB180X
+          families of ultra-low-power  battery- and capacitor-backed real-time
+          clock chips.
+          This driver can also be built as a module. If so, the module
+          will be called rtc-abx80x.
 config RTC_DRV_AS3722
        tristate "ams AS3722 RTC driver"
        depends on MFD_AS3722
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index c31731c29762..2b82e2b0311b 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_RTC_DRV_88PM80X)	+= rtc-88pm80x.o
 obj-$(CONFIG_RTC_DRV_AB3100)    += rtc-ab3100.o
 obj-$(CONFIG_RTC_DRV_AB8500)    += rtc-ab8500.o
 obj-$(CONFIG_RTC_DRV_ABB5ZES3)  += rtc-ab-b5ze-s3.o
+obj-$(CONFIG_RTC_DRV_ABX80X)    += rtc-abx80x.o
 obj-$(CONFIG_RTC_DRV_ARMADA38X) += rtc-armada38x.o
 obj-$(CONFIG_RTC_DRV_AS3722)    += rtc-as3722.o
 obj-$(CONFIG_RTC_DRV_AT32AP700X)+= rtc-at32ap700x.o
diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c
new file mode 100644
index 000000000000..4337c3bc6ace
--- /dev/null
+++ b/drivers/rtc/rtc-abx80x.c
@@ -0,0 +1,307 @@
+/*
+ * A driver for the I2C members of the Abracon AB x8xx RTC family,
+ * and compatible: AB 1805 and AB 0805
+ *
+ * Copyright 2014-2015 Macq S.A.
+ *
+ * Author: Philippe De Muyter <phdm@macqel.be>
+ * Author: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/bcd.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/rtc.h>
+#define ABX8XX_REG_HTH          0x00
+#define ABX8XX_REG_SC           0x01
+#define ABX8XX_REG_MN           0x02
+#define ABX8XX_REG_HR           0x03
+#define ABX8XX_REG_DA           0x04
+#define ABX8XX_REG_MO           0x05
+#define ABX8XX_REG_YR           0x06
+#define ABX8XX_REG_WD           0x07
+#define ABX8XX_REG_CTRL1        0x10
+#define ABX8XX_CTRL_WRITE       BIT(1)
+#define ABX8XX_CTRL_12_24       BIT(6)
+#define ABX8XX_REG_CFG_KEY      0x1f
+#define ABX8XX_CFG_KEY_MISC     0x9d
+#define ABX8XX_REG_ID0          0x28
+#define ABX8XX_REG_TRICKLE      0x20
+#define ABX8XX_TRICKLE_CHARGE_ENABLE    0xa0
+#define ABX8XX_TRICKLE_STANDARD_DIODE   0x8
+#define ABX8XX_TRICKLE_SCHOTTKY_DIODE   0x4
+static u8 trickle_resistors[] = {0, 3, 6, 11};
+enum abx80x_chip {AB0801, AB0803, AB0804, AB0805,
+        AB1801, AB1803, AB1804, AB1805, ABX80X};
+struct abx80x_cap {
+        u16 pn;
+        bool has_tc;
+};
+static struct abx80x_cap abx80x_caps[] = {
+        [AB0801] = {.pn = 0x0801},
+        [AB0803] = {.pn = 0x0803},
+        [AB0804] = {.pn = 0x0804, .has_tc = true},
+        [AB0805] = {.pn = 0x0805, .has_tc = true},
+        [AB1801] = {.pn = 0x1801},
+        [AB1803] = {.pn = 0x1803},
+        [AB1804] = {.pn = 0x1804, .has_tc = true},
+        [AB1805] = {.pn = 0x1805, .has_tc = true},
+        [ABX80X] = {.pn = 0}
+};
+static struct i2c_driver abx80x_driver;
+static int abx80x_enable_trickle_charger(struct i2c_client *client,
+                                         u8 trickle_cfg)
+{
+        int err;
+        /*
+         * Write the configuration key register to enable access to the Trickle
+         * register
+         */
+        err = i2c_smbus_write_byte_data(client, ABX8XX_REG_CFG_KEY,
+                                        ABX8XX_CFG_KEY_MISC);
+        if (err < 0) {
+                dev_err(&client->dev, "Unable to write configuration key\n");
+                return -EIO;
+        }
+        err = i2c_smbus_write_byte_data(client, ABX8XX_REG_TRICKLE,
+                                        ABX8XX_TRICKLE_CHARGE_ENABLE |
+                                        trickle_cfg);
+        if (err < 0) {
+                dev_err(&client->dev, "Unable to write trickle register\n");
+                return -EIO;
+        }
+        return 0;
+}
+static int abx80x_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        unsigned char buf[8];
+        int err;
+        err = i2c_smbus_read_i2c_block_data(client, ABX8XX_REG_HTH,
+                                            sizeof(buf), buf);
+        if (err < 0) {
+                dev_err(&client->dev, "Unable to read date\n");
+                return -EIO;
+        }
+        tm->tm_sec = bcd2bin(buf[ABX8XX_REG_SC] & 0x7F);
+        tm->tm_min = bcd2bin(buf[ABX8XX_REG_MN] & 0x7F);
+        tm->tm_hour = bcd2bin(buf[ABX8XX_REG_HR] & 0x3F);
+        tm->tm_wday = buf[ABX8XX_REG_WD] & 0x7;
+        tm->tm_mday = bcd2bin(buf[ABX8XX_REG_DA] & 0x3F);
+        tm->tm_mon = bcd2bin(buf[ABX8XX_REG_MO] & 0x1F) - 1;
+        tm->tm_year = bcd2bin(buf[ABX8XX_REG_YR]) + 100;
+        err = rtc_valid_tm(tm);
+        if (err < 0)
+                dev_err(&client->dev, "retrieved date/time is not valid.\n");
+        return err;
+}
+static int abx80x_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        unsigned char buf[8];
+        int err;
+        if (tm->tm_year < 100)
+                return -EINVAL;
+        buf[ABX8XX_REG_HTH] = 0;
+        buf[ABX8XX_REG_SC] = bin2bcd(tm->tm_sec);
+        buf[ABX8XX_REG_MN] = bin2bcd(tm->tm_min);
+        buf[ABX8XX_REG_HR] = bin2bcd(tm->tm_hour);
+        buf[ABX8XX_REG_DA] = bin2bcd(tm->tm_mday);
+        buf[ABX8XX_REG_MO] = bin2bcd(tm->tm_mon + 1);
+        buf[ABX8XX_REG_YR] = bin2bcd(tm->tm_year - 100);
+        buf[ABX8XX_REG_WD] = tm->tm_wday;
+        err = i2c_smbus_write_i2c_block_data(client, ABX8XX_REG_HTH,
+                                             sizeof(buf), buf);
+        if (err < 0) {
+                dev_err(&client->dev, "Unable to write to date registers\n");
+                return -EIO;
+        }
+        return 0;
+}
+static const struct rtc_class_ops abx80x_rtc_ops = {
+        .read_time      = abx80x_rtc_read_time,
+        .set_time       = abx80x_rtc_set_time,
+};
+static int abx80x_dt_trickle_cfg(struct device_node *np)
+{
+        const char *diode;
+        int trickle_cfg = 0;
+        int i, ret;
+        u32 tmp;
+        ret = of_property_read_string(np, "abracon,tc-diode", &diode);
+        if (ret)
+                return ret;
+        if (!strcmp(diode, "standard"))
+                trickle_cfg |= ABX8XX_TRICKLE_STANDARD_DIODE;
+        else if (!strcmp(diode, "schottky"))
+                trickle_cfg |= ABX8XX_TRICKLE_SCHOTTKY_DIODE;
+        else
+                return -EINVAL;
+        ret = of_property_read_u32(np, "abracon,tc-resistor", &tmp);
+        if (ret)
+                return ret;
+        for (i = 0; i < sizeof(trickle_resistors); i++)
+                if (trickle_resistors[i] == tmp)
+                        break;
+        if (i == sizeof(trickle_resistors))
+                return -EINVAL;
+        return (trickle_cfg | i);
+}
+static int abx80x_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        struct device_node *np = client->dev.of_node;
+        struct rtc_device *rtc;
+        int i, data, err, trickle_cfg = -EINVAL;
+        char buf[7];
+        unsigned int part = id->driver_data;
+        unsigned int partnumber;
+        unsigned int majrev, minrev;
+        unsigned int lot;
+        unsigned int wafer;
+        unsigned int uid;
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
+                return -ENODEV;
+        err = i2c_smbus_read_i2c_block_data(client, ABX8XX_REG_ID0,
+                                            sizeof(buf), buf);
+        if (err < 0) {
+                dev_err(&client->dev, "Unable to read partnumber\n");
+                return -EIO;
+        }
+        partnumber = (buf[0] << 8) | buf[1];
+        majrev = buf[2] >> 3;
+        minrev = buf[2] & 0x7;
+        lot = ((buf[4] & 0x80) << 2) | ((buf[6] & 0x80) << 1) | buf[3];
+        uid = ((buf[4] & 0x7f) << 8) | buf[5];
+        wafer = (buf[6] & 0x7c) >> 2;
+        dev_info(&client->dev, "model %04x, revision %u.%u, lot %x, wafer %x, uid %x\n",
+                 partnumber, majrev, minrev, lot, wafer, uid);
+        data = i2c_smbus_read_byte_data(client, ABX8XX_REG_CTRL1);
+        if (data < 0) {
+                dev_err(&client->dev, "Unable to read control register\n");
+                return -EIO;
+        }
+        err = i2c_smbus_write_byte_data(client, ABX8XX_REG_CTRL1,
+                                        ((data & ~ABX8XX_CTRL_12_24) |
+                                         ABX8XX_CTRL_WRITE));
+        if (err < 0) {
+                dev_err(&client->dev, "Unable to write control register\n");
+                return -EIO;
+        }
+        /* part autodetection */
+        if (part == ABX80X) {
+                for (i = 0; abx80x_caps[i].pn; i++)
+                        if (partnumber == abx80x_caps[i].pn)
+                                break;
+                if (abx80x_caps[i].pn == 0) {
+                        dev_err(&client->dev, "Unknown part: %04x\n",
+                                partnumber);
+                        return -EINVAL;
+                }
+                part = i;
+        }
+        if (partnumber != abx80x_caps[part].pn) {
+                dev_err(&client->dev, "partnumber mismatch %04x != %04x\n",
+                        partnumber, abx80x_caps[part].pn);
+                return -EINVAL;
+        }
+        if (np && abx80x_caps[part].has_tc)
+                trickle_cfg = abx80x_dt_trickle_cfg(np);
+        if (trickle_cfg > 0) {
+                dev_info(&client->dev, "Enabling trickle charger: %02x\n",
+                         trickle_cfg);
+                abx80x_enable_trickle_charger(client, trickle_cfg);
+        }
+        rtc = devm_rtc_device_register(&client->dev, abx80x_driver.driver.name,
+                                       &abx80x_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
+        i2c_set_clientdata(client, rtc);
+        return 0;
+}
+static int abx80x_remove(struct i2c_client *client)
+{
+        return 0;
+}
+static const struct i2c_device_id abx80x_id[] = {
+        { "abx80x", ABX80X },
+        { "ab0801", AB0801 },
+        { "ab0803", AB0803 },
+        { "ab0804", AB0804 },
+        { "ab0805", AB0805 },
+        { "ab1801", AB1801 },
+        { "ab1803", AB1803 },
+        { "ab1804", AB1804 },
+        { "ab1805", AB1805 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, abx80x_id);
+static struct i2c_driver abx80x_driver = {
+        .driver         = {
+                .name   = "rtc-abx80x",
+        },
+        .probe          = abx80x_probe,
+        .remove         = abx80x_remove,
+        .id_table       = abx80x_id,
+};
+module_i2c_driver(abx80x_driver);
+MODULE_AUTHOR("Philippe De Muyter <phdm@macqel.be>");
+MODULE_AUTHOR("Alexandre Belloni <alexandre.belloni@free-electrons.com>");
+MODULE_DESCRIPTION("Abracon ABX80X RTC driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/rtc/rtc-armada38x.c b/drivers/rtc/rtc-armada38x.c
index 43e04af39e09..4b62d1a875e4 100644
--- a/drivers/rtc/rtc-armada38x.c
+++ b/drivers/rtc/rtc-armada38x.c
@@ -40,6 +40,13 @@ struct armada38x_rtc {
        void __iomem        *regs;
        void __iomem        *regs_soc;
        spinlock_t          lock;
+        /*
+         * While setting the time, the RTC TIME register should not be
+         * accessed. Setting the RTC time involves sleeping during
+         * 100ms, so a mutex instead of a spinlock is used to protect
+         * it
+         */
+        struct mutex        mutex_time;
        int                 irq;
 };
@@ -57,10 +64,9 @@ static void rtc_delayed_write(u32 val, struct armada38x_rtc *rtc, int offset)
 static int armada38x_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
        struct armada38x_rtc *rtc = dev_get_drvdata(dev);
-        unsigned long time, time_check, flags;
+        unsigned long time, time_check;
-        spin_lock_irqsave(&rtc->lock, flags);
+        mutex_lock(&rtc->mutex_time);
        time = readl(rtc->regs + RTC_TIME);
        /*
         * WA for failing time set attempts. As stated in HW ERRATA if
@@ -71,7 +77,7 @@ static int armada38x_rtc_read_time(struct device *dev, struct rtc_time *tm)
        if ((time_check - time) > 1)
                time_check = readl(rtc->regs + RTC_TIME);
-        spin_unlock_irqrestore(&rtc->lock, flags);
+        mutex_unlock(&rtc->mutex_time);
        rtc_time_to_tm(time_check, tm);
@@ -94,19 +100,12 @@ static int armada38x_rtc_set_time(struct device *dev, struct rtc_time *tm)
         * then wait for 100ms before writing to the time register to be
         * sure that the data will be taken into account.
         */
-        spin_lock_irqsave(&rtc->lock, flags);
+        mutex_lock(&rtc->mutex_time);
        rtc_delayed_write(0, rtc, RTC_STATUS);
-        spin_unlock_irqrestore(&rtc->lock, flags);
        msleep(100);
-        spin_lock_irqsave(&rtc->lock, flags);
        rtc_delayed_write(time, rtc, RTC_TIME);
+        mutex_unlock(&rtc->mutex_time);
-        spin_unlock_irqrestore(&rtc->lock, flags);
 out:
        return ret;
 }
@@ -230,6 +229,7 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)
                return -ENOMEM;
        spin_lock_init(&rtc->lock);
+        mutex_init(&rtc->mutex_time);
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rtc");
        rtc->regs = devm_ioremap_resource(&pdev->dev, res);
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 198f96b7fb45..72b059081559 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -78,6 +78,7 @@ config SPI_ATMEL
 config SPI_BCM2835
        tristate "BCM2835 SPI controller"
        depends on ARCH_BCM2835 || COMPILE_TEST
+        depends on GPIOLIB
        help
          This selects a driver for the Broadcom BCM2835 SPI master.
@@ -302,7 +303,7 @@ config SPI_FSL_SPI
 config SPI_FSL_DSPI
        tristate "Freescale DSPI controller"
        select REGMAP_MMIO
-        depends on SOC_VF610 || COMPILE_TEST
+        depends on SOC_VF610 || SOC_LS1021A || COMPILE_TEST
        help
          This enables support for the Freescale DSPI controller in master
          mode. VF610 platform uses the controller.
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index f63864a893c5..37875cf942f7 100644
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -164,13 +164,12 @@ static int bcm2835_spi_transfer_one_poll(struct spi_master *master,
                                         unsigned long xfer_time_us)
 {
        struct bcm2835_spi *bs = spi_master_get_devdata(master);
-        unsigned long timeout = jiffies +
+        /* set timeout to 1 second of maximum polling */
-                max(4 * xfer_time_us * HZ / 1000000, 2uL);
+        unsigned long timeout = jiffies + HZ;
        /* enable HW block without interrupts */
        bcm2835_wr(bs, BCM2835_SPI_CS, cs | BCM2835_SPI_CS_TA);
-        /* set timeout to 4x the expected time, or 2 jiffies */
        /* loop until finished the transfer */
        while (bs->rx_len) {
                /* read from fifo as much as possible */
diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c
index 5ef6638d5e8a..840a4984d365 100644
--- a/drivers/spi/spi-bitbang.c
+++ b/drivers/spi/spi-bitbang.c
@@ -180,7 +180,6 @@ int spi_bitbang_setup(struct spi_device *spi)
 {
        struct spi_bitbang_cs   *cs = spi->controller_state;
        struct spi_bitbang      *bitbang;
-        int                     retval;
        unsigned long           flags;
        bitbang = spi_master_get_devdata(spi->master);
@@ -197,9 +196,11 @@ int spi_bitbang_setup(struct spi_device *spi)
        if (!cs->txrx_word)
                return -EINVAL;
-        retval = bitbang->setup_transfer(spi, NULL);
+        if (bitbang->setup_transfer) {
-        if (retval < 0)
+                int retval = bitbang->setup_transfer(spi, NULL);
-                return retval;
+                if (retval < 0)
+                        return retval;
+        }
        dev_dbg(&spi->dev, "%s, %u nsec/bit\n", __func__, 2 * cs->nsecs);
@@ -295,9 +296,11 @@ static int spi_bitbang_transfer_one(struct spi_master *master,
                /* init (-1) or override (1) transfer params */
                if (do_setup != 0) {
-                        status = bitbang->setup_transfer(spi, t);
+                        if (bitbang->setup_transfer) {
-                        if (status < 0)
+                                status = bitbang->setup_transfer(spi, t);
-                                break;
+                                if (status < 0)
+                                        break;
+                        }
                        if (do_setup == -1)
                                do_setup = 0;
                }
diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c
index 9c46a3058743..896add8cfd3b 100644
--- a/drivers/spi/spi-fsl-cpm.c
+++ b/drivers/spi/spi-fsl-cpm.c
@@ -24,6 +24,7 @@
 #include <linux/of_address.h>
 #include <linux/spi/spi.h>
 #include <linux/types.h>
+#include <linux/platform_device.h>
 #include "spi-fsl-cpm.h"
 #include "spi-fsl-lib.h"
@@ -269,17 +270,6 @@ static unsigned long fsl_spi_cpm_get_pram(struct mpc8xxx_spi *mspi)
        if (mspi->flags & SPI_CPM2) {
                pram_ofs = cpm_muram_alloc(SPI_PRAM_SIZE, 64);
                out_be16(spi_base, pram_ofs);
-        } else {
-                struct spi_pram __iomem *pram = spi_base;
-                u16 rpbase = in_be16(&pram->rpbase);
-                /* Microcode relocation patch applied? */
-                if (rpbase) {
-                        pram_ofs = rpbase;
-                } else {
-                        pram_ofs = cpm_muram_alloc(SPI_PRAM_SIZE, 64);
-                        out_be16(spi_base, pram_ofs);
-                }
        }
        iounmap(spi_base);
@@ -292,7 +282,6 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi)
        struct device_node *np = dev->of_node;
        const u32 *iprop;
        int size;
-        unsigned long pram_ofs;
        unsigned long bds_ofs;
        if (!(mspi->flags & SPI_CPM_MODE))
@@ -319,8 +308,26 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi)
                }
        }
-        pram_ofs = fsl_spi_cpm_get_pram(mspi);
+        if (mspi->flags & SPI_CPM1) {
-        if (IS_ERR_VALUE(pram_ofs)) {
+                struct resource *res;
+                void *pram;
+                res = platform_get_resource(to_platform_device(dev),
+                                            IORESOURCE_MEM, 1);
+                pram = devm_ioremap_resource(dev, res);
+                if (IS_ERR(pram))
+                        mspi->pram = NULL;
+                else
+                        mspi->pram = pram;
+        } else {
+                unsigned long pram_ofs = fsl_spi_cpm_get_pram(mspi);
+                if (IS_ERR_VALUE(pram_ofs))
+                        mspi->pram = NULL;
+                else
+                        mspi->pram = cpm_muram_addr(pram_ofs);
+        }
+        if (mspi->pram == NULL) {
                dev_err(dev, "can't allocate spi parameter ram\n");
                goto err_pram;
        }
@@ -346,8 +353,6 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi)
                goto err_dummy_rx;
        }
-        mspi->pram = cpm_muram_addr(pram_ofs);
        mspi->tx_bd = cpm_muram_addr(bds_ofs);
        mspi->rx_bd = cpm_muram_addr(bds_ofs + sizeof(*mspi->tx_bd));
@@ -375,7 +380,8 @@ err_dummy_rx:
 err_dummy_tx:
        cpm_muram_free(bds_ofs);
 err_bds:
-        cpm_muram_free(pram_ofs);
+        if (!(mspi->flags & SPI_CPM1))
+                cpm_muram_free(cpm_muram_offset(mspi->pram));
 err_pram:
        fsl_spi_free_dummy_rx();
        return -ENOMEM;
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index d0a73a09a9bd..80d245ac846f 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -359,14 +359,16 @@ static void fsl_espi_rw_trans(struct spi_message *m,
                                struct fsl_espi_transfer *trans, u8 *rx_buff)
 {
        struct fsl_espi_transfer *espi_trans = trans;
-        unsigned int n_tx = espi_trans->n_tx;
+        unsigned int total_len = espi_trans->len;
-        unsigned int n_rx = espi_trans->n_rx;
        struct spi_transfer *t;
        u8 *local_buf;
        u8 *rx_buf = rx_buff;
        unsigned int trans_len;
        unsigned int addr;
-        int i, pos, loop;
+        unsigned int tx_only;
+        unsigned int rx_pos = 0;
+        unsigned int pos;
+        int i, loop;
        local_buf = kzalloc(SPCOM_TRANLEN_MAX, GFP_KERNEL);
        if (!local_buf) {
@@ -374,36 +376,48 @@ static void fsl_espi_rw_trans(struct spi_message *m,
                return;
        }
-        for (pos = 0, loop = 0; pos < n_rx; pos += trans_len, loop++) {
+        for (pos = 0, loop = 0; pos < total_len; pos += trans_len, loop++) {
-                trans_len = n_rx - pos;
+                trans_len = total_len - pos;
-                if (trans_len > SPCOM_TRANLEN_MAX - n_tx)
-                        trans_len = SPCOM_TRANLEN_MAX - n_tx;
                i = 0;
+                tx_only = 0;
                list_for_each_entry(t, &m->transfers, transfer_list) {
                        if (t->tx_buf) {
                                memcpy(local_buf + i, t->tx_buf, t->len);
                                i += t->len;
+                                if (!t->rx_buf)
+                                        tx_only += t->len;
                        }
                }
+                /* Add additional TX bytes to compensate SPCOM_TRANLEN_MAX */
+                if (loop > 0)
+                        trans_len += tx_only;
+                if (trans_len > SPCOM_TRANLEN_MAX)
+                        trans_len = SPCOM_TRANLEN_MAX;
+                /* Update device offset */
                if (pos > 0) {
                        addr = fsl_espi_cmd2addr(local_buf);
-                        addr += pos;
+                        addr += rx_pos;
                        fsl_espi_addr2cmd(addr, local_buf);
                }
-                espi_trans->n_tx = n_tx;
+                espi_trans->len = trans_len;
-                espi_trans->n_rx = trans_len;
-                espi_trans->len = trans_len + n_tx;
                espi_trans->tx_buf = local_buf;
                espi_trans->rx_buf = local_buf;
                fsl_espi_do_trans(m, espi_trans);
-                memcpy(rx_buf + pos, espi_trans->rx_buf + n_tx, trans_len);
+                /* If there is at least one RX byte then copy it to rx_buf */
+                if (tx_only < SPCOM_TRANLEN_MAX)
+                        memcpy(rx_buf + rx_pos, espi_trans->rx_buf + tx_only,
+                                        trans_len - tx_only);
+                rx_pos += trans_len - tx_only;
                if (loop > 0)
-                        espi_trans->actual_length += espi_trans->len - n_tx;
+                        espi_trans->actual_length += espi_trans->len - tx_only;
                else
                        espi_trans->actual_length += espi_trans->len;
        }
@@ -418,6 +432,7 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
        u8 *rx_buf = NULL;
        unsigned int n_tx = 0;
        unsigned int n_rx = 0;
+        unsigned int xfer_len = 0;
        struct fsl_espi_transfer espi_trans;
        list_for_each_entry(t, &m->transfers, transfer_list) {
@@ -427,11 +442,13 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
                        n_rx += t->len;
                        rx_buf = t->rx_buf;
                }
+                if ((t->tx_buf) || (t->rx_buf))
+                        xfer_len += t->len;
        }
        espi_trans.n_tx = n_tx;
        espi_trans.n_rx = n_rx;
-        espi_trans.len = n_tx + n_rx;
+        espi_trans.len = xfer_len;
        espi_trans.actual_length = 0;
        espi_trans.status = 0;
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 4df8942058de..d1a5b9fc3eba 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1210,6 +1210,7 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master,
        struct omap2_mcspi      *mcspi;
        struct omap2_mcspi_dma  *mcspi_dma;
        struct spi_transfer     *t;
+        int status;
        spi = m->spi;
        mcspi = spi_master_get_devdata(master);
@@ -1229,7 +1230,8 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master,
                                        tx_buf ? "tx" : "",
                                        rx_buf ? "rx" : "",
                                        t->bits_per_word);
-                        return -EINVAL;
+                        status = -EINVAL;
+                        goto out;
                }
                if (m->is_dma_mapped || len < DMA_MIN_BYTES)
@@ -1241,7 +1243,8 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master,
                        if (dma_mapping_error(mcspi->dev, t->tx_dma)) {
                                dev_dbg(mcspi->dev, "dma %cX %d bytes error\n",
                                                'T', len);
-                                return -EINVAL;
+                                status = -EINVAL;
+                                goto out;
                        }
                }
                if (mcspi_dma->dma_rx && rx_buf != NULL) {
@@ -1253,14 +1256,19 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master,
                                if (tx_buf != NULL)
                                        dma_unmap_single(mcspi->dev, t->tx_dma,
                                                        len, DMA_TO_DEVICE);
-                                return -EINVAL;
+                                status = -EINVAL;
+                                goto out;
                        }
                }
        }
        omap2_mcspi_work(mcspi, m);
+        /* spi_finalize_current_message() changes the status inside the
+         * spi_message, save the status here. */
+        status = m->status;
+out:
        spi_finalize_current_message(master);
-        return 0;
+        return status;
 }
 static int omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index d5d7d2235163..50910d85df5a 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -583,6 +583,15 @@ static int spi_unmap_msg(struct spi_master *master, struct spi_message *msg)
        rx_dev = master->dma_rx->device->dev;
        list_for_each_entry(xfer, &msg->transfers, transfer_list) {
+                /*
+                 * Restore the original value of tx_buf or rx_buf if they are
+                 * NULL.
+                 */
+                if (xfer->tx_buf == master->dummy_tx)
+                        xfer->tx_buf = NULL;
+                if (xfer->rx_buf == master->dummy_rx)
+                        xfer->rx_buf = NULL;
                if (!master->can_dma(master, msg->spi, xfer))
                        continue;
diff --git a/drivers/staging/gdm724x/gdm_mux.c b/drivers/staging/gdm724x/gdm_mux.c
index 8199b0a697bb..1cf24e4edf25 100644
--- a/drivers/staging/gdm724x/gdm_mux.c
+++ b/drivers/staging/gdm724x/gdm_mux.c
@@ -158,7 +158,7 @@ static int up_to_host(struct mux_rx *r)
        unsigned int start_flag;
        unsigned int payload_size;
        unsigned short packet_type;
-        int dummy_cnt;
+        int total_len;
        u32 packet_size_sum = r->offset;
        int index;
        int ret = TO_HOST_INVALID_PACKET;
@@ -176,10 +176,10 @@ static int up_to_host(struct mux_rx *r)
                        break;
                }
-                dummy_cnt = ALIGN(MUX_HEADER_SIZE + payload_size, 4);
+                total_len = ALIGN(MUX_HEADER_SIZE + payload_size, 4);
                if (len - packet_size_sum <
-                        MUX_HEADER_SIZE + payload_size + dummy_cnt) {
+                        total_len) {
                        pr_err("invalid payload : %d %d %04x\n",
                               payload_size, len, packet_type);
                        break;
@@ -202,7 +202,7 @@ static int up_to_host(struct mux_rx *r)
                        break;
                }
-                packet_size_sum += MUX_HEADER_SIZE + payload_size + dummy_cnt;
+                packet_size_sum += total_len;
                if (len - packet_size_sum <= MUX_HEADER_SIZE + 2) {
                        ret = r->callback(NULL,
                                        0,
@@ -361,7 +361,6 @@ static int gdm_mux_send(void *priv_dev, void *data, int len, int tty_index,
        struct mux_pkt_header *mux_header;
        struct mux_tx *t = NULL;
        static u32 seq_num = 1;
-        int dummy_cnt;
        int total_len;
        int ret;
        unsigned long flags;
@@ -374,9 +373,7 @@ static int gdm_mux_send(void *priv_dev, void *data, int len, int tty_index,
        spin_lock_irqsave(&mux_dev->write_lock, flags);
-        dummy_cnt = ALIGN(MUX_HEADER_SIZE + len, 4);
+        total_len = ALIGN(MUX_HEADER_SIZE + len, 4);
-        total_len = len + MUX_HEADER_SIZE + dummy_cnt;
        t = alloc_mux_tx(total_len);
        if (!t) {
@@ -392,7 +389,8 @@ static int gdm_mux_send(void *priv_dev, void *data, int len, int tty_index,
        mux_header->packet_type = __cpu_to_le16(packet_type[tty_index]);
        memcpy(t->buf+MUX_HEADER_SIZE, data, len);
-        memset(t->buf+MUX_HEADER_SIZE+len, 0, dummy_cnt);
+        memset(t->buf+MUX_HEADER_SIZE+len, 0, total_len - MUX_HEADER_SIZE -
+               len);
        t->len = total_len;
        t->callback = cb;
diff --git a/drivers/staging/media/omap4iss/Kconfig b/drivers/staging/media/omap4iss/Kconfig
index b78643f907e7..072dac04a750 100644
--- a/drivers/staging/media/omap4iss/Kconfig
+++ b/drivers/staging/media/omap4iss/Kconfig
@@ -2,6 +2,7 @@ config VIDEO_OMAP4
        bool "OMAP 4 Camera support"
        depends on VIDEO_V4L2=y && VIDEO_V4L2_SUBDEV_API && I2C=y && ARCH_OMAP4
        depends on HAS_DMA
+        select MFD_SYSCON
        select VIDEOBUF2_DMA_CONTIG
        ---help---
          Driver for an OMAP 4 ISS controller.
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index e0ad5e520e2d..7ced940bd807 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -17,6 +17,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
+#include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
@@ -1386,6 +1387,16 @@ static int iss_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, iss);
+        /*
+         * TODO: When implementing DT support switch to syscon regmap lookup by
+         * phandle.
+         */
+        iss->syscon = syscon_regmap_lookup_by_compatible("syscon");
+        if (IS_ERR(iss->syscon)) {
+                ret = PTR_ERR(iss->syscon);
+                goto error;
+        }
        /* Clocks */
        ret = iss_map_mem_resource(pdev, iss, OMAP4_ISS_MEM_TOP);
        if (ret < 0)
diff --git a/drivers/staging/media/omap4iss/iss.h b/drivers/staging/media/omap4iss/iss.h
index 734cfeeb0314..35df8b4709e6 100644
--- a/drivers/staging/media/omap4iss/iss.h
+++ b/drivers/staging/media/omap4iss/iss.h
@@ -29,6 +29,8 @@
 #include "iss_ipipe.h"
 #include "iss_resizer.h"
+struct regmap;
 #define to_iss_device(ptr_module)                               \
        container_of(ptr_module, struct iss_device, ptr_module)
 #define to_device(ptr_module)                                           \
@@ -79,6 +81,7 @@ struct iss_reg {
 /*
 * struct iss_device - ISS device structure.
+ * @syscon: Regmap for the syscon register space
 * @crashed: Bitmask of crashed entities (indexed by entity ID)
 */
 struct iss_device {
@@ -93,6 +96,7 @@ struct iss_device {
        struct resource *res[OMAP4_ISS_MEM_LAST];
        void __iomem *regs[OMAP4_ISS_MEM_LAST];
+        struct regmap *syscon;
        u64 raw_dmamask;
diff --git a/drivers/staging/media/omap4iss/iss_csiphy.c b/drivers/staging/media/omap4iss/iss_csiphy.c
index 7c3d55d811ef..748607f8918f 100644
--- a/drivers/staging/media/omap4iss/iss_csiphy.c
+++ b/drivers/staging/media/omap4iss/iss_csiphy.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/regmap.h>
 #include "../../../../arch/arm/mach-omap2/control.h"
@@ -140,9 +141,11 @@ int omap4iss_csiphy_config(struct iss_device *iss,
         * - bit [18] : CSIPHY1 CTRLCLK enable
         * - bit [17:16] : CSIPHY1 config: 00 d-phy, 01/10 ccp2
         */
-        cam_rx_ctrl = omap4_ctrl_pad_readl(
+        /*
-                        OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_CAMERA_RX);
+         * TODO: When implementing DT support specify the CONTROL_CAMERA_RX
+         * register offset in the syscon property instead of hardcoding it.
+         */
+        regmap_read(iss->syscon, 0x68, &cam_rx_ctrl);
        if (subdevs->interface == ISS_INTERFACE_CSI2A_PHY1) {
                cam_rx_ctrl &= ~(OMAP4_CAMERARX_CSI21_LANEENABLE_MASK |
@@ -166,8 +169,7 @@ int omap4iss_csiphy_config(struct iss_device *iss,
                cam_rx_ctrl |= OMAP4_CAMERARX_CSI22_CTRLCLKEN_MASK;
        }
-        omap4_ctrl_pad_writel(cam_rx_ctrl,
+        regmap_write(iss->syscon, 0x68, cam_rx_ctrl);
-                 OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_CAMERA_RX);
        /* Reset used lane count */
        csi2->phy->used_data_lanes = 0;
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 42fba3f5b593..cb0b6387789f 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -1900,23 +1900,20 @@ static int r871x_mp_ioctl_hdl(struct net_device *dev,
        struct mp_ioctl_handler *phandler;
        struct mp_ioctl_param *poidparam;
        unsigned long BytesRead, BytesWritten, BytesNeeded;
-        u8 *pparmbuf = NULL, bset;
+        u8 *pparmbuf, bset;
        u16 len;
        uint status;
        int ret = 0;
-        if ((!p->length) || (!p->pointer)) {
+        if ((!p->length) || (!p->pointer))
-                ret = -EINVAL;
+                return -EINVAL;
-                goto _r871x_mp_ioctl_hdl_exit;
-        }
        bset = (u8)(p->flags & 0xFFFF);
        len = p->length;
-        pparmbuf = NULL;
        pparmbuf = memdup_user(p->pointer, len);
-        if (IS_ERR(pparmbuf)) {
+        if (IS_ERR(pparmbuf))
-                ret = PTR_ERR(pparmbuf);
+                return PTR_ERR(pparmbuf);
-                goto _r871x_mp_ioctl_hdl_exit;
-        }
        poidparam = (struct mp_ioctl_param *)pparmbuf;
        if (poidparam->subcode >= MAX_MP_IOCTL_SUBCODE) {
                ret = -EINVAL;
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 3c7ea95dd9f9..dbbb2f879a29 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -1250,7 +1250,7 @@ err_enable:
        return -ENODEV;
 }
-static void __exit lynxfb_pci_remove(struct pci_dev *pdev)
+static void lynxfb_pci_remove(struct pci_dev *pdev)
 {
        struct fb_info *info;
        struct lynx_share *share;
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 1cdcf49b2445..e00c0605d154 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -362,12 +362,16 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, u8 bb_type)
 * Return Value: none
 */
 bool CARDbUpdateTSF(struct vnt_private *pDevice, unsigned char byRxRate,
-                    u64 qwBSSTimestamp, u64 qwLocalTSF)
+                    u64 qwBSSTimestamp)
 {
+        u64 local_tsf;
        u64 qwTSFOffset = 0;
-        if (qwBSSTimestamp != qwLocalTSF) {
+        CARDbGetCurrentTSF(pDevice, &local_tsf);
-                qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp, qwLocalTSF);
+        if (qwBSSTimestamp != local_tsf) {
+                qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp,
+                                                local_tsf);
                /* adjust TSF, HW's TSF add TSF Offset reg */
                VNSvOutPortD(pDevice->PortOffset + MAC_REG_TSFOFST, (u32)qwTSFOffset);
                VNSvOutPortD(pDevice->PortOffset + MAC_REG_TSFOFST + 4, (u32)(qwTSFOffset >> 32));
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index 2dfc41952271..16cca49e680a 100644
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -83,7 +83,7 @@ bool CARDbRadioPowerOff(struct vnt_private *);
 bool CARDbRadioPowerOn(struct vnt_private *);
 bool CARDbSetPhyParameter(struct vnt_private *, u8);
 bool CARDbUpdateTSF(struct vnt_private *, unsigned char byRxRate,
-                    u64 qwBSSTimestamp, u64 qwLocalTSF);
+                    u64 qwBSSTimestamp);
 bool CARDbSetBeaconPeriod(struct vnt_private *, unsigned short wBeaconInterval);
 #endif /* __CARD_H__ */
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 4bb4f8ee4132..0343ae386f03 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -912,7 +912,11 @@ static int vnt_int_report_rate(struct vnt_private *priv,
        if (!(tsr1 & TSR1_TERR)) {
                info->status.rates[0].idx = idx;
-                info->flags |= IEEE80211_TX_STAT_ACK;
+                if (info->flags & IEEE80211_TX_CTL_NO_ACK)
+                        info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED;
+                else
+                        info->flags |= IEEE80211_TX_STAT_ACK;
        }
        return 0;
@@ -937,9 +941,6 @@ static int device_tx_srv(struct vnt_private *pDevice, unsigned int uIdx)
                /* Only the status of first TD in the chain is correct */
                if (pTD->m_td1TD1.byTCR & TCR_STP) {
                        if ((pTD->pTDInfo->byFlags & TD_FLAGS_NETIF_SKB) != 0) {
-                                vnt_int_report_rate(pDevice, pTD->pTDInfo, byTsr0, byTsr1);
                                if (!(byTsr1 & TSR1_TERR)) {
                                        if (byTsr0 != 0) {
                                                pr_debug(" Tx[%d] OK but has error. tsr1[%02X] tsr0[%02X]\n",
@@ -958,6 +959,9 @@ static int device_tx_srv(struct vnt_private *pDevice, unsigned int uIdx)
                                                 (int)uIdx, byTsr1, byTsr0);
                                }
                        }
+                        vnt_int_report_rate(pDevice, pTD->pTDInfo, byTsr0, byTsr1);
                        device_free_tx_buf(pDevice, pTD);
                        pDevice->iTDUsed[uIdx]--;
                }
@@ -989,10 +993,8 @@ static void device_free_tx_buf(struct vnt_private *pDevice, PSTxDesc pDesc)
                                 skb->len, DMA_TO_DEVICE);
        }
-        if (pTDInfo->byFlags & TD_FLAGS_NETIF_SKB)
+        if (skb)
                ieee80211_tx_status_irqsafe(pDevice->hw, skb);
-        else
-                dev_kfree_skb_irq(skb);
        pTDInfo->skb_dma = 0;
        pTDInfo->skb = NULL;
@@ -1204,14 +1206,6 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
        if (dma_idx == TYPE_AC0DMA)
                head_td->pTDInfo->byFlags = TD_FLAGS_NETIF_SKB;
-        priv->iTDUsed[dma_idx]++;
-        /* Take ownership */
-        wmb();
-        head_td->m_td0TD0.f1Owner = OWNED_BY_NIC;
-        /* get Next */
-        wmb();
        priv->apCurrTD[dma_idx] = head_td->next;
        spin_unlock_irqrestore(&priv->lock, flags);
@@ -1232,11 +1226,18 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
        head_td->buff_addr = cpu_to_le32(head_td->pTDInfo->skb_dma);
+        /* Poll Transmit the adapter */
+        wmb();
+        head_td->m_td0TD0.f1Owner = OWNED_BY_NIC;
+        wmb(); /* second memory barrier */
        if (head_td->pTDInfo->byFlags & TD_FLAGS_NETIF_SKB)
                MACvTransmitAC0(priv->PortOffset);
        else
                MACvTransmit0(priv->PortOffset);
+        priv->iTDUsed[dma_idx]++;
        spin_unlock_irqrestore(&priv->lock, flags);
        return 0;
@@ -1416,9 +1417,16 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
        priv->current_aid = conf->aid;
-        if (changed & BSS_CHANGED_BSSID)
+        if (changed & BSS_CHANGED_BSSID) {
+                unsigned long flags;
+                spin_lock_irqsave(&priv->lock, flags);
                MACvWriteBSSIDAddress(priv->PortOffset, (u8 *)conf->bssid);
+                spin_unlock_irqrestore(&priv->lock, flags);
+        }
        if (changed & BSS_CHANGED_BASIC_RATES) {
                priv->basic_rates = conf->basic_rates;
@@ -1477,7 +1485,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
        if (changed & BSS_CHANGED_ASSOC && priv->op_mode != NL80211_IFTYPE_AP) {
                if (conf->assoc) {
                        CARDbUpdateTSF(priv, conf->beacon_rate->hw_value,
-                                       conf->sync_device_ts, conf->sync_tsf);
+                                       conf->sync_tsf);
                        CARDbSetBeaconPeriod(priv, conf->beacon_int);
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index f6c2cf8590c4..5c589962a1e8 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -805,10 +805,18 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
                vnt_schedule_command(priv, WLAN_CMD_SETPOWER);
        }
-        if (current_rate > RATE_11M)
+        if (current_rate > RATE_11M) {
-                pkt_type = priv->packet_type;
+                if (info->band == IEEE80211_BAND_5GHZ) {
-        else
+                        pkt_type = PK_TYPE_11A;
+                } else {
+                        if (tx_rate->flags & IEEE80211_TX_RC_USE_CTS_PROTECT)
+                                pkt_type = PK_TYPE_11GB;
+                        else
+                                pkt_type = PK_TYPE_11GA;
+                }
+        } else {
                pkt_type = PK_TYPE_11B;
+        }
        spin_lock_irqsave(&priv->lock, flags);
diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c
index 12623bc02f46..725718e97a0b 100644
--- a/drivers/thermal/intel_powerclamp.c
+++ b/drivers/thermal/intel_powerclamp.c
@@ -206,51 +206,57 @@ static void find_target_mwait(void)
 }
+struct pkg_cstate_info {
+        bool skip;
+        int msr_index;
+        int cstate_id;
+};
+#define PKG_CSTATE_INIT(id) {                           \
+                .msr_index = MSR_PKG_C##id##_RESIDENCY, \
+                .cstate_id = id                         \
+                        }
+static struct pkg_cstate_info pkg_cstates[] = {
+        PKG_CSTATE_INIT(2),
+        PKG_CSTATE_INIT(3),
+        PKG_CSTATE_INIT(6),
+        PKG_CSTATE_INIT(7),
+        PKG_CSTATE_INIT(8),
+        PKG_CSTATE_INIT(9),
+        PKG_CSTATE_INIT(10),
+        {NULL},
+};
 static bool has_pkg_state_counter(void)
 {
-        u64 tmp;
+        u64 val;
-        return !rdmsrl_safe(MSR_PKG_C2_RESIDENCY, &tmp) ||
+        struct pkg_cstate_info *info = pkg_cstates;
-               !rdmsrl_safe(MSR_PKG_C3_RESIDENCY, &tmp) ||
-               !rdmsrl_safe(MSR_PKG_C6_RESIDENCY, &tmp) ||
+        /* check if any one of the counter msrs exists */
-               !rdmsrl_safe(MSR_PKG_C7_RESIDENCY, &tmp);
+        while (info->msr_index) {
+                if (!rdmsrl_safe(info->msr_index, &val))
+                        return true;
+                info++;
+        }
+        return false;
 }
 static u64 pkg_state_counter(void)
 {
        u64 val;
        u64 count = 0;
+        struct pkg_cstate_info *info = pkg_cstates;
-        static bool skip_c2;
-        static bool skip_c3;
+        while (info->msr_index) {
-        static bool skip_c6;
+                if (!info->skip) {
-        static bool skip_c7;
+                        if (!rdmsrl_safe(info->msr_index, &val))
+                                count += val;
-        if (!skip_c2) {
+                        else
-                if (!rdmsrl_safe(MSR_PKG_C2_RESIDENCY, &val))
+                                info->skip = true;
-                        count += val;
+                }
-                else
+                info++;
-                        skip_c2 = true;
-        }
-        if (!skip_c3) {
-                if (!rdmsrl_safe(MSR_PKG_C3_RESIDENCY, &val))
-                        count += val;
-                else
-                        skip_c3 = true;
-        }
-        if (!skip_c6) {
-                if (!rdmsrl_safe(MSR_PKG_C6_RESIDENCY, &val))
-                        count += val;
-                else
-                        skip_c6 = true;
-        }
-        if (!skip_c7) {
-                if (!rdmsrl_safe(MSR_PKG_C7_RESIDENCY, &val))
-                        count += val;
-                else
-                        skip_c7 = true;
        }
        return count;
@@ -667,7 +673,7 @@ static struct thermal_cooling_device_ops powerclamp_cooling_ops = {
 };
 /* runs on Nehalem and later */
-static const struct x86_cpu_id intel_powerclamp_ids[] = {
+static const struct x86_cpu_id intel_powerclamp_ids[] __initconst = {
        { X86_VENDOR_INTEL, 6, 0x1a},
        { X86_VENDOR_INTEL, 6, 0x1c},
        { X86_VENDOR_INTEL, 6, 0x1e},
@@ -689,12 +695,13 @@ static const struct x86_cpu_id intel_powerclamp_ids[] = {
        { X86_VENDOR_INTEL, 6, 0x46},
        { X86_VENDOR_INTEL, 6, 0x4c},
        { X86_VENDOR_INTEL, 6, 0x4d},
+        { X86_VENDOR_INTEL, 6, 0x4f},
        { X86_VENDOR_INTEL, 6, 0x56},
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_powerclamp_ids);
-static int powerclamp_probe(void)
+static int __init powerclamp_probe(void)
 {
        if (!x86_match_cpu(intel_powerclamp_ids)) {
                pr_err("Intel powerclamp does not run on family %d model %d\n",
@@ -760,7 +767,7 @@ file_error:
        debugfs_remove_recursive(debug_dir);
 }
-static int powerclamp_init(void)
+static int __init powerclamp_init(void)
 {
        int retval;
        int bitmap_size;
@@ -809,7 +816,7 @@ exit_free:
 }
 module_init(powerclamp_init);
-static void powerclamp_exit(void)
+static void __exit powerclamp_exit(void)
 {
        unregister_hotcpu_notifier(&powerclamp_cpu_notifier);
        end_power_clamp();
diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index 3aa46ac7cdbc..cd8f5f93b42c 100644
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -529,7 +529,7 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
        thermal->pclk = devm_clk_get(&pdev->dev, "apb_pclk");
        if (IS_ERR(thermal->pclk)) {
-                error = PTR_ERR(thermal->clk);
+                error = PTR_ERR(thermal->pclk);
                dev_err(&pdev->dev, "failed to get apb_pclk clock: %d\n",
                        error);
                return error;
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index 0531c752fbbb..8e391812e503 100644
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -103,7 +103,7 @@ static inline int of_thermal_get_ntrips(struct thermal_zone_device *tz)
 static inline bool of_thermal_is_trip_valid(struct thermal_zone_device *tz,
                                            int trip)
 {
-        return 0;
+        return false;
 }
 static inline const struct thermal_trip *
 of_thermal_get_trip_points(struct thermal_zone_device *tz)
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index f1e57425e39f..5bab1c684bb1 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -299,11 +299,27 @@ static int xen_initial_domain_console_init(void)
        return 0;
 }
+static void xen_console_update_evtchn(struct xencons_info *info)
+{
+        if (xen_hvm_domain()) {
+                uint64_t v;
+                int err;
+                err = hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v);
+                if (!err && v)
+                        info->evtchn = v;
+        } else
+                info->evtchn = xen_start_info->console.domU.evtchn;
+}
 void xen_console_resume(void)
 {
        struct xencons_info *info = vtermno_to_xencons(HVC_COOKIE);
-        if (info != NULL && info->irq)
+        if (info != NULL && info->irq) {
+                if (!xen_initial_domain())
+                        xen_console_update_evtchn(info);
                rebind_evtchn_irq(info->evtchn, info->irq);
+        }
 }
 static void xencons_disconnect_backend(struct xencons_info *info)
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 69fab0fd15ae..e9851add6f4e 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -907,8 +907,14 @@ static void vfio_pci_request(void *device_data, unsigned int count)
        mutex_lock(&vdev->igate);
        if (vdev->req_trigger) {
-                dev_dbg(&vdev->pdev->dev, "Requesting device from user\n");
+                if (!(count % 10))
+                        dev_notice_ratelimited(&vdev->pdev->dev,
+                                "Relaying device request to user (#%u)\n",
+                                count);
                eventfd_signal(vdev->req_trigger, 1);
+        } else if (count == 0) {
+                dev_warn(&vdev->pdev->dev,
+                        "No device request channel registered, blocked until released by user\n");
        }
        mutex_unlock(&vdev->igate);
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 0d336625ac71..e1278fe04b1e 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -710,6 +710,8 @@ void *vfio_del_group_dev(struct device *dev)
        void *device_data = device->device_data;
        struct vfio_unbound_dev *unbound;
        unsigned int i = 0;
+        long ret;
+        bool interrupted = false;
        /*
         * The group exists so long as we have a device reference.  Get
@@ -755,9 +757,22 @@ void *vfio_del_group_dev(struct device *dev)
                vfio_device_put(device);
-        } while (wait_event_interruptible_timeout(vfio.release_q,
+                if (interrupted) {
-                                                  !vfio_dev_present(group, dev),
+                        ret = wait_event_timeout(vfio.release_q,
-                                                  HZ * 10) <= 0);
+                                        !vfio_dev_present(group, dev), HZ * 10);
+                } else {
+                        ret = wait_event_interruptible_timeout(vfio.release_q,
+                                        !vfio_dev_present(group, dev), HZ * 10);
+                        if (ret == -ERESTARTSYS) {
+                                interrupted = true;
+                                dev_warn(dev,
+                                         "Device is currently in use, task"
+                                         " \"%s\" (%d) "
+                                         "blocked until device is released",
+                                         current->comm, task_pid_nr(current));
+                        }
+                }
+        } while (ret <= 0);
        vfio_group_put(group);
diff --git a/drivers/xen/events/events_2l.c b/drivers/xen/events/events_2l.c
index 5db43fc100a4..7dd46312c180 100644
--- a/drivers/xen/events/events_2l.c
+++ b/drivers/xen/events/events_2l.c
@@ -345,6 +345,15 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
+static void evtchn_2l_resume(void)
+{
+        int i;
+        for_each_online_cpu(i)
+                memset(per_cpu(cpu_evtchn_mask, i), 0, sizeof(xen_ulong_t) *
+                                EVTCHN_2L_NR_CHANNELS/BITS_PER_EVTCHN_WORD);
+}
 static const struct evtchn_ops evtchn_ops_2l = {
        .max_channels      = evtchn_2l_max_channels,
        .nr_channels       = evtchn_2l_max_channels,
@@ -356,6 +365,7 @@ static const struct evtchn_ops evtchn_ops_2l = {
        .mask              = evtchn_2l_mask,
        .unmask            = evtchn_2l_unmask,
        .handle_events     = evtchn_2l_handle_events,
+        .resume            = evtchn_2l_resume,
 };
 void __init xen_evtchn_2l_init(void)
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 70fba973a107..2b8553bd8715 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -529,8 +529,8 @@ static unsigned int __startup_pirq(unsigned int irq)
        if (rc)
                goto err;
-        bind_evtchn_to_cpu(evtchn, 0);
        info->evtchn = evtchn;
+        bind_evtchn_to_cpu(evtchn, 0);
        rc = xen_evtchn_port_setup(info);
        if (rc)
@@ -1279,8 +1279,9 @@ void rebind_evtchn_irq(int evtchn, int irq)
        mutex_unlock(&irq_mapping_update_lock);
-        /* new event channels are always bound to cpu 0 */
+        bind_evtchn_to_cpu(evtchn, info->cpu);
-        irq_set_affinity(irq, cpumask_of(0));
+        /* This will be deferred until interrupt is processed */
+        irq_set_affinity(irq, cpumask_of(info->cpu));
        /* Unmask the event channel. */
        enable_irq(irq);
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index d5bb1a33d0a3..89274850741b 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -327,30 +327,10 @@ static int map_grant_pages(struct grant_map *map)
        return err;
 }
-struct unmap_grant_pages_callback_data
-{
-        struct completion completion;
-        int result;
-};
-static void unmap_grant_callback(int result,
-                                 struct gntab_unmap_queue_data *data)
-{
-        struct unmap_grant_pages_callback_data* d = data->data;
-        d->result = result;
-        complete(&d->completion);
-}
 static int __unmap_grant_pages(struct grant_map *map, int offset, int pages)
 {
        int i, err = 0;
        struct gntab_unmap_queue_data unmap_data;
-        struct unmap_grant_pages_callback_data data;
-        init_completion(&data.completion);
-        unmap_data.data = &data;
-        unmap_data.done= &unmap_grant_callback;
        if (map->notify.flags & UNMAP_NOTIFY_CLEAR_BYTE) {
                int pgno = (map->notify.addr >> PAGE_SHIFT);
@@ -367,11 +347,9 @@ static int __unmap_grant_pages(struct grant_map *map, int offset, int pages)
        unmap_data.pages = map->pages + offset;
        unmap_data.count = pages;
-        gnttab_unmap_refs_async(&unmap_data);
+        err = gnttab_unmap_refs_sync(&unmap_data);
+        if (err)
-        wait_for_completion(&data.completion);
+                return err;
-        if (data.result)
-                return data.result;
        for (i = 0; i < pages; i++) {
                if (map->unmap_ops[offset+i].status)
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 17972fbacddc..b1c7170e5c9e 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -123,6 +123,11 @@ struct gnttab_ops {
        int (*query_foreign_access)(grant_ref_t ref);
 };
+struct unmap_refs_callback_data {
+        struct completion completion;
+        int result;
+};
 static struct gnttab_ops *gnttab_interface;
 static int grant_table_version;
@@ -863,6 +868,29 @@ void gnttab_unmap_refs_async(struct gntab_unmap_queue_data* item)
 }
 EXPORT_SYMBOL_GPL(gnttab_unmap_refs_async);
+static void unmap_refs_callback(int result,
+                struct gntab_unmap_queue_data *data)
+{
+        struct unmap_refs_callback_data *d = data->data;
+        d->result = result;
+        complete(&d->completion);
+}
+int gnttab_unmap_refs_sync(struct gntab_unmap_queue_data *item)
+{
+        struct unmap_refs_callback_data data;
+        init_completion(&data.completion);
+        item->data = &data;
+        item->done = &unmap_refs_callback;
+        gnttab_unmap_refs_async(item);
+        wait_for_completion(&data.completion);
+        return data.result;
+}
+EXPORT_SYMBOL_GPL(gnttab_unmap_refs_sync);
 static int gnttab_map_frames_v1(xen_pfn_t *frames, unsigned int nr_gframes)
 {
        int rc;
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index bf1940706422..9e6a85104a20 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -131,6 +131,8 @@ static void do_suspend(void)
                goto out_resume;
        }
+        xen_arch_suspend();
        si.cancelled = 1;
        err = stop_machine(xen_suspend, &si, cpumask_of(0));
@@ -148,11 +150,12 @@ static void do_suspend(void)
                si.cancelled = 1;
        }
+        xen_arch_resume();
 out_resume:
-        if (!si.cancelled) {
+        if (!si.cancelled)
-                xen_arch_resume();
                xs_resume();
-        } else
+        else
                xs_suspend_cancel();
        dpm_resume_end(si.cancelled ? PMSG_THAW : PMSG_RESTORE);
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 810ad419e34c..4c549323c605 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -235,7 +235,7 @@ retry:
 #define SLABS_PER_PAGE (1 << (PAGE_SHIFT - IO_TLB_SHIFT))
 #define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT)
                while ((SLABS_PER_PAGE << order) > IO_TLB_MIN_SLABS) {
-                        xen_io_tlb_start = (void *)__get_free_pages(__GFP_NOWARN, order);
+                        xen_io_tlb_start = (void *)xen_get_swiotlb_free_pages(order);
                        if (xen_io_tlb_start)
                                break;
                        order--;
diff --git a/drivers/xen/xen-pciback/conf_space.c b/drivers/xen/xen-pciback/conf_space.c
index 75fe3d466515..9c234209d8b5 100644
--- a/drivers/xen/xen-pciback/conf_space.c
+++ b/drivers/xen/xen-pciback/conf_space.c
@@ -16,8 +16,8 @@
 #include "conf_space.h"
 #include "conf_space_quirks.h"
-bool permissive;
+bool xen_pcibk_permissive;
-module_param(permissive, bool, 0644);
+module_param_named(permissive, xen_pcibk_permissive, bool, 0644);
 /* This is where xen_pcibk_read_config_byte, xen_pcibk_read_config_word,
 * xen_pcibk_write_config_word, and xen_pcibk_write_config_byte are created. */
@@ -262,7 +262,7 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value)
                 * This means that some fields may still be read-only because
                 * they have entries in the config_field list that intercept
                 * the write and do nothing. */
-                if (dev_data->permissive || permissive) {
+                if (dev_data->permissive || xen_pcibk_permissive) {
                        switch (size) {
                        case 1:
                                err = pci_write_config_byte(dev, offset,
diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h
index 2e1d73d1d5d0..62461a8ba1d6 100644
--- a/drivers/xen/xen-pciback/conf_space.h
+++ b/drivers/xen/xen-pciback/conf_space.h
@@ -64,7 +64,7 @@ struct config_field_entry {
        void *data;
 };
-extern bool permissive;
+extern bool xen_pcibk_permissive;
 #define OFFSET(cfg_entry) ((cfg_entry)->base_offset+(cfg_entry)->field->offset)
diff --git a/drivers/xen/xen-pciback/conf_space_header.c b/drivers/xen/xen-pciback/conf_space_header.c
index c2260a0456c9..ad3d17d29c81 100644
--- a/drivers/xen/xen-pciback/conf_space_header.c
+++ b/drivers/xen/xen-pciback/conf_space_header.c
@@ -118,7 +118,7 @@ static int command_write(struct pci_dev *dev, int offset, u16 value, void *data)
        cmd->val = value;
-        if (!permissive && (!dev_data || !dev_data->permissive))
+        if (!xen_pcibk_permissive && (!dev_data || !dev_data->permissive))
                return 0;
        /* Only allow the guest to control certain bits. */
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 564b31584860..5390a674b5e3 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -57,6 +57,7 @@
 #include <xen/xen.h>
 #include <xen/xenbus.h>
 #include <xen/events.h>
+#include <xen/xen-ops.h>
 #include <xen/page.h>
 #include <xen/hvm.h>
@@ -735,6 +736,30 @@ static int __init xenstored_local_init(void)
        return err;
 }
+static int xenbus_resume_cb(struct notifier_block *nb,
+                            unsigned long action, void *data)
+{
+        int err = 0;
+        if (xen_hvm_domain()) {
+                uint64_t v;
+                err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v);
+                if (!err && v)
+                        xen_store_evtchn = v;
+                else
+                        pr_warn("Cannot update xenstore event channel: %d\n",
+                                err);
+        } else
+                xen_store_evtchn = xen_start_info->store_evtchn;
+        return err;
+}
+static struct notifier_block xenbus_resume_nb = {
+        .notifier_call = xenbus_resume_cb,
+};
 static int __init xenbus_init(void)
 {
        int err = 0;
@@ -793,6 +818,10 @@ static int __init xenbus_init(void)
                goto out_error;
        }
+        if ((xen_store_domain_type != XS_LOCAL) &&
+            (xen_store_domain_type != XS_UNKNOWN))
+                xen_resume_notifier_register(&xenbus_resume_nb);
 #ifdef CONFIG_XEN_COMPAT_XENFS
        /*
         * Create xenfs mountpoint in /proc for compatibility with