25 files changed, 177 insertions, 81 deletions

diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig
index 45e14760c16e..d6c42e69bdbd 100644
--- a/drivers/net/wireless/rtlwifi/Kconfig
+++ b/drivers/net/wireless/rtlwifi/Kconfig
@@ -12,7 +12,7 @@ config RTL8192CE
 
 config RTL8192SE
         tristate "Realtek RTL8192SE/RTL8191SE PCIe Wireless Network Adapter"
-        depends on MAC80211 && EXPERIMENTAL
+        depends on MAC80211 && EXPERIMENTAL && PCI
         select FW_LOADER
         select RTLWIFI
         ---help---
@@ -23,7 +23,7 @@ config RTL8192SE
 
 config RTL8192DE
         tristate "Realtek RTL8192DE/RTL8188DE PCIe Wireless Network Adapter"
-        depends on MAC80211 && EXPERIMENTAL
+        depends on MAC80211 && EXPERIMENTAL && PCI
         select FW_LOADER
         select RTLWIFI
         ---help---
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index d4fdd2a5a739..d81a6021a30f 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/ip.h>
+#include <linux/module.h>
 #include "wifi.h"
 #include "rc.h"
 #include "base.h"
@@ -344,9 +345,9 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
         if (is_valid_ether_addr(rtlefuse->dev_addr)) {
                 SET_IEEE80211_PERM_ADDR(hw, rtlefuse->dev_addr);
         } else {
-                u8 rtlmac[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 };
-                get_random_bytes((rtlmac + (ETH_ALEN - 1)), 1);
-                SET_IEEE80211_PERM_ADDR(hw, rtlmac);
+                u8 rtlmac1[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 };
+                get_random_bytes((rtlmac1 + (ETH_ALEN - 1)), 1);
+                SET_IEEE80211_PERM_ADDR(hw, rtlmac1);
         }
 
 }
@@ -447,12 +448,11 @@ int rtl_init_core(struct ieee80211_hw *hw)
 
         /* <4> locks */
         mutex_init(&rtlpriv->locks.conf_mutex);
-        spin_lock_init(&rtlpriv->locks.ips_lock);
+        mutex_init(&rtlpriv->locks.ps_mutex);
         spin_lock_init(&rtlpriv->locks.irq_th_lock);
         spin_lock_init(&rtlpriv->locks.h2c_lock);
         spin_lock_init(&rtlpriv->locks.rf_ps_lock);
         spin_lock_init(&rtlpriv->locks.rf_lock);
-        spin_lock_init(&rtlpriv->locks.lps_lock);
         spin_lock_init(&rtlpriv->locks.waitq_lock);
         spin_lock_init(&rtlpriv->locks.cck_and_rw_pagea_lock);
 
diff --git a/drivers/net/wireless/rtlwifi/base.h b/drivers/net/wireless/rtlwifi/base.h
index 4ae905983d0d..f66b5757f6b9 100644
--- a/drivers/net/wireless/rtlwifi/base.h
+++ b/drivers/net/wireless/rtlwifi/base.h
@@ -76,7 +76,7 @@ enum ap_peer {
         SET_BITS_TO_LE_2BYTE(_hdr, 8, 1, _val)
 
 #define SET_80211_PS_POLL_AID(_hdr, _val)               \
-        (*(u16 *)((u8 *)(_hdr) + 2) = le16_to_cpu(_val))
+        (*(u16 *)((u8 *)(_hdr) + 2) = _val)
 #define SET_80211_PS_POLL_BSSID(_hdr, _val)             \
         memcpy(((u8 *)(_hdr)) + 4, (u8 *)(_val), ETH_ALEN)
 #define SET_80211_PS_POLL_TA(_hdr, _val)                \
diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index 7babb6acd957..dc36d7461caa 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -29,6 +29,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/export.h>
 #include "wifi.h"
 #include "cam.h"
 
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index 3fc21f60bb04..ed1058b71587 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/export.h>
 #include "wifi.h"
 #include "efuse.h"
 
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 177a8e669241..0d4d242849b4 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/export.h>
 #include "core.h"
 #include "wifi.h"
 #include "pci.h"
@@ -609,7 +610,7 @@ tx_status_ok:
         if (((rtlpriv->link_info.num_rx_inperiod +
                 rtlpriv->link_info.num_tx_inperiod) > 8) ||
                 (rtlpriv->link_info.num_rx_inperiod > 2)) {
-                tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
+                schedule_work(&rtlpriv->works.lps_leave_work);
         }
 }
 
@@ -735,7 +736,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
                 if (((rtlpriv->link_info.num_rx_inperiod +
                         rtlpriv->link_info.num_tx_inperiod) > 8) ||
                         (rtlpriv->link_info.num_rx_inperiod > 2)) {
-                        tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
+                        schedule_work(&rtlpriv->works.lps_leave_work);
                 }
 
                 dev_kfree_skb_any(skb);
@@ -779,6 +780,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
         unsigned long flags;
         u32 inta = 0;
         u32 intb = 0;
+        irqreturn_t ret = IRQ_HANDLED;
 
         spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
 
@@ -786,8 +788,10 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
         rtlpriv->cfg->ops->interrupt_recognized(hw, &inta, &intb);
 
         /*Shared IRQ or HW disappared */
-        if (!inta || inta == 0xffff)
+        if (!inta || inta == 0xffff) {
+                ret = IRQ_NONE;
                 goto done;
+        }
 
         /*<1> beacon related */
         if (inta & rtlpriv->cfg->maps[RTL_IMR_TBDOK]) {
@@ -889,12 +893,9 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
         if (rtlpriv->rtlhal.earlymode_enable)
                 tasklet_schedule(&rtlpriv->works.irq_tasklet);
 
-        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
-        return IRQ_HANDLED;
-
 done:
         spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
-        return IRQ_HANDLED;
+        return ret;
 }
 
 static void _rtl_pci_irq_tasklet(struct ieee80211_hw *hw)
@@ -902,11 +903,6 @@ static void _rtl_pci_irq_tasklet(struct ieee80211_hw *hw)
         _rtl_pci_tx_chk_waitq(hw);
 }
 
-static void _rtl_pci_ips_leave_tasklet(struct ieee80211_hw *hw)
-{
-        rtl_lps_leave(hw);
-}
-
 static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -944,6 +940,15 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
         return;
 }
 
+static void rtl_lps_leave_work_callback(struct work_struct *work)
+{
+        struct rtl_works *rtlworks =
+            container_of(work, struct rtl_works, lps_leave_work);
+        struct ieee80211_hw *hw = rtlworks->hw;
+
+        rtl_lps_leave(hw);
+}
+
 static void _rtl_pci_init_trx_var(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -1005,9 +1010,7 @@ static void _rtl_pci_init_struct(struct ieee80211_hw *hw,
         tasklet_init(&rtlpriv->works.irq_prepare_bcn_tasklet,
                      (void (*)(unsigned long))_rtl_pci_prepare_bcn_tasklet,
                      (unsigned long)hw);
-        tasklet_init(&rtlpriv->works.ips_leave_tasklet,
-                     (void (*)(unsigned long))_rtl_pci_ips_leave_tasklet,
-                     (unsigned long)hw);
+        INIT_WORK(&rtlpriv->works.lps_leave_work, rtl_lps_leave_work_callback);
 }
 
 static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
@@ -1477,7 +1480,7 @@ static void rtl_pci_deinit(struct ieee80211_hw *hw)
 
         synchronize_irq(rtlpci->pdev->irq);
         tasklet_kill(&rtlpriv->works.irq_tasklet);
-        tasklet_kill(&rtlpriv->works.ips_leave_tasklet);
+        cancel_work_sync(&rtlpriv->works.lps_leave_work);
 
         flush_workqueue(rtlpriv->works.rtl_wq);
         destroy_workqueue(rtlpriv->works.rtl_wq);
@@ -1552,7 +1555,7 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)
         set_hal_stop(rtlhal);
 
         rtlpriv->cfg->ops->disable_interrupt(hw);
-        tasklet_kill(&rtlpriv->works.ips_leave_tasklet);
+        cancel_work_sync(&rtlpriv->works.lps_leave_work);
 
         spin_lock_irqsave(&rtlpriv->locks.rf_ps_lock, flags);
         while (ppsc->rfchange_inprogress) {
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index a693feffbe72..a14a68b24635 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/export.h>
 #include "wifi.h"
 #include "base.h"
 #include "ps.h"
@@ -240,7 +241,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
         if (mac->opmode != NL80211_IFTYPE_STATION)
                 return;
 
-        spin_lock(&rtlpriv->locks.ips_lock);
+        mutex_lock(&rtlpriv->locks.ps_mutex);
 
         if (ppsc->inactiveps) {
                 rtstate = ppsc->rfpwr_state;
@@ -256,7 +257,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
                 }
         }
 
-        spin_unlock(&rtlpriv->locks.ips_lock);
+        mutex_unlock(&rtlpriv->locks.ps_mutex);
 }
 
 /*for FW LPS*/
@@ -394,7 +395,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)
         if (mac->link_state != MAC80211_LINKED)
                 return;
 
-        spin_lock(&rtlpriv->locks.lps_lock);
+        mutex_lock(&rtlpriv->locks.ps_mutex);
 
         /* Idle for a while if we connect to AP a while ago. */
         if (mac->cnt_after_linked >= 2) {
@@ -406,7 +407,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)
                 }
         }
 
-        spin_unlock(&rtlpriv->locks.lps_lock);
+        mutex_unlock(&rtlpriv->locks.ps_mutex);
 }
 
 /*Leave the leisure power save mode.*/
@@ -416,7 +417,7 @@ void rtl_lps_leave(struct ieee80211_hw *hw)
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
-        spin_lock(&rtlpriv->locks.lps_lock);
+        mutex_lock(&rtlpriv->locks.ps_mutex);
 
         if (ppsc->fwctrl_lps) {
                 if (ppsc->dot11_psmode != EACTIVE) {
@@ -437,7 +438,7 @@ void rtl_lps_leave(struct ieee80211_hw *hw)
                         rtl_lps_set_psmode(hw, EACTIVE);
                 }
         }
-        spin_unlock(&rtlpriv->locks.lps_lock);
+        mutex_unlock(&rtlpriv->locks.ps_mutex);
 }
 
 /* For sw LPS*/
@@ -538,9 +539,9 @@ void rtl_swlps_rf_awake(struct ieee80211_hw *hw)
                 RT_CLEAR_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM);
         }
 
-        spin_lock(&rtlpriv->locks.lps_lock);
+        mutex_lock(&rtlpriv->locks.ps_mutex);
         rtl_ps_set_rf_state(hw, ERFON, RF_CHANGE_BY_PS);
-        spin_unlock(&rtlpriv->locks.lps_lock);
+        mutex_unlock(&rtlpriv->locks.ps_mutex);
 }
 
 void rtl_swlps_rfon_wq_callback(void *data)
@@ -573,9 +574,9 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)
         if (rtlpriv->link_info.busytraffic)
                 return;
 
-        spin_lock(&rtlpriv->locks.lps_lock);
+        mutex_lock(&rtlpriv->locks.ps_mutex);
         rtl_ps_set_rf_state(hw, ERFSLEEP, RF_CHANGE_BY_PS);
-        spin_unlock(&rtlpriv->locks.lps_lock);
+        mutex_unlock(&rtlpriv->locks.ps_mutex);
 
         if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_ASPM &&
                 !RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index a00774e7090d..72a98cab6f69 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/export.h>
 #include "dm_common.h"
 #include "phy_common.h"
 #include "../pci.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 49a064bdbce6..931d97979b04 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/firmware.h>
+#include <linux/export.h>
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
@@ -72,6 +73,34 @@ static void _rtl92c_enable_fw_download(struct ieee80211_hw *hw, bool enable)
         }
 }
 
+static void rtl_block_fw_writeN(struct ieee80211_hw *hw, const u8 *buffer,
+                                u32 size)
+{
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        u32 blockSize = REALTEK_USB_VENQT_MAX_BUF_SIZE - 20;
+        u8 *bufferPtr = (u8 *) buffer;
+        u32 i, offset, blockCount, remainSize;
+
+        blockCount = size / blockSize;
+        remainSize = size % blockSize;
+
+        for (i = 0; i < blockCount; i++) {
+                offset = i * blockSize;
+                rtlpriv->io.writeN_sync(rtlpriv,
+                                        (FW_8192C_START_ADDRESS + offset),
+                                        (void *)(bufferPtr + offset),
+                                        blockSize);
+        }
+
+        if (remainSize) {
+                offset = blockCount * blockSize;
+                rtlpriv->io.writeN_sync(rtlpriv,
+                                        (FW_8192C_START_ADDRESS + offset),
+                                        (void *)(bufferPtr + offset),
+                                        remainSize);
+        }
+}
+
 static void _rtl92c_fw_block_write(struct ieee80211_hw *hw,
                                    const u8 *buffer, u32 size)
 {
@@ -80,23 +109,30 @@ static void _rtl92c_fw_block_write(struct ieee80211_hw *hw,
         u8 *bufferPtr = (u8 *) buffer;
         u32 *pu4BytePtr = (u32 *) buffer;
         u32 i, offset, blockCount, remainSize;
+        u32 data;
 
+        if (rtlpriv->io.writeN_sync) {
+                rtl_block_fw_writeN(hw, buffer, size);
+                return;
+        }
         blockCount = size / blockSize;
         remainSize = size % blockSize;
+        if (remainSize) {
+                /* the last word is < 4 bytes - pad it with zeros */
+                for (i = 0; i < 4 - remainSize; i++)
+                        *(bufferPtr + size + i) = 0;
+                blockCount++;
+        }
 
         for (i = 0; i < blockCount; i++) {
                 offset = i * blockSize;
+                /* for big-endian platforms, the firmware data need to be byte
+                 * swapped as it was read as a byte string and will be written
+                 * as 32-bit dwords and byte swapped when written
+                 */
+                data = le32_to_cpu(*(__le32 *)(pu4BytePtr + i));
                 rtl_write_dword(rtlpriv, (FW_8192C_START_ADDRESS + offset),
-                                *(pu4BytePtr + i));
-        }
-
-        if (remainSize) {
-                offset = blockCount * blockSize;
-                bufferPtr += offset;
-                for (i = 0; i < remainSize; i++) {
-                        rtl_write_byte(rtlpriv, (FW_8192C_START_ADDRESS +
-                                                 offset + i), *(bufferPtr + i));
-                }
+                                data);
         }
 }
 
@@ -226,10 +262,10 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
         u32 fwsize;
         enum version_8192c version = rtlhal->version;
 
-        pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
         if (!rtlhal->pfirmware)
                 return 1;
 
+        pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
         pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
         pfwdata = (u8 *) rtlhal->pfirmware;
         fwsize = rtlhal->fwsize;
@@ -237,8 +273,9 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
         if (IS_FW_HEADER_EXIST(pfwheader)) {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
                          ("Firmware Version(%d), Signature(%#x),Size(%d)\n",
-                          pfwheader->version, pfwheader->signature,
-                          (uint)sizeof(struct rtl92c_firmware_header)));
+                         le16_to_cpu(pfwheader->version),
+                         le16_to_cpu(pfwheader->signature),
+                         (uint)sizeof(struct rtl92c_firmware_header)));
 
                 pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
                 fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
index 3d5823c12621..cec5a3a1cc53 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
@@ -32,32 +32,32 @@
 
 #define FW_8192C_SIZE                           0x3000
 #define FW_8192C_START_ADDRESS                  0x1000
-#define FW_8192C_END_ADDRESS                    0x3FFF
+#define FW_8192C_END_ADDRESS                    0x1FFF
 #define FW_8192C_PAGE_SIZE                      4096
 #define FW_8192C_POLLING_DELAY                  5
 #define FW_8192C_POLLING_TIMEOUT_COUNT          100
 
 #define IS_FW_HEADER_EXIST(_pfwhdr)     \
-        ((_pfwhdr->signature&0xFFF0) == 0x92C0 ||\
-        (_pfwhdr->signature&0xFFF0) == 0x88C0)
+        ((le16_to_cpu(_pfwhdr->signature)&0xFFF0) == 0x92C0 ||\
+        (le16_to_cpu(_pfwhdr->signature)&0xFFF0) == 0x88C0)
 
 struct rtl92c_firmware_header {
-        u16 signature;
+        __le16 signature;
         u8 category;
         u8 function;
-        u16 version;
+        __le16 version;
         u8 subversion;
         u8 rsvd1;
         u8 month;
         u8 date;
         u8 hour;
         u8 minute;
-        u16 ramcodeSize;
-        u16 rsvd2;
-        u32 svnindex;
-        u32 rsvd3;
-        u32 rsvd4;
-        u32 rsvd5;
+        __le16 ramcodeSize;
+        __le16 rsvd2;
+        __le32 svnindex;
+        __le32 rsvd3;
+        __le32 rsvd4;
+        __le32 rsvd5;
 };
 
 enum rtl8192c_h2c_cmd {
@@ -94,5 +94,6 @@ void rtl92c_firmware_selfreset(struct ieee80211_hw *hw);
 void rtl92c_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
 void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
 void rtl92c_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus);
+void usb_writeN_async(struct rtl_priv *rtlpriv, u32 addr, void *data, u16 len);
 
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/main.c b/drivers/net/wireless/rtlwifi/rtl8192c/main.c
index 2f624fc27499..605ff191aeb7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/main.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/main.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/module.h>
 #include "../wifi.h"
 
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
index 3b11642d3f7d..1f07558debf2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
@@ -27,6 +27,7 @@
  *
  *****************************************************************************/
 
+#include <linux/export.h>
 #include "../wifi.h"
 #include "../rtl8192ce/reg.h"
 #include "../rtl8192ce/def.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
index 592a10ac5929..3b585aadabfc 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
@@ -569,7 +569,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 }
         case ERFSLEEP:{
                         if (ppsc->rfpwr_state == ERFOFF)
-                                break;
+                                return false;
                         for (queue_id = 0, i = 0;
                              queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
                                 ring = &pcipriv->dev.tx_ring[queue_id];
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index a48404cc2b96..f2aa33dc4d78 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
@@ -28,6 +28,7 @@
  *****************************************************************************/
 
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 814c05df51e8..4ed973a3aa17 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -498,7 +498,7 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
         }
         RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD, ("MAP\n"),
                       hwinfo, HWSET_MAX_SIZE);
-        eeprom_id = *((u16 *)&hwinfo[0]);
+        eeprom_id = le16_to_cpu(*((__le16 *)&hwinfo[0]));
         if (eeprom_id != RTL8190_EEPROM_ID) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          ("EEPROM ID(%#x) is invalid!!\n", eeprom_id));
@@ -516,13 +516,14 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
         pr_info("MAC address: %pM\n", rtlefuse->dev_addr);
         _rtl92cu_read_txpower_info_from_hwpg(hw,
                                            rtlefuse->autoload_failflag, hwinfo);
-        rtlefuse->eeprom_vid = *(u16 *)&hwinfo[EEPROM_VID];
-        rtlefuse->eeprom_did = *(u16 *)&hwinfo[EEPROM_DID];
+        rtlefuse->eeprom_vid = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VID]);
+        rtlefuse->eeprom_did = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_DID]);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                  (" VID = 0x%02x PID = 0x%02x\n",
                  rtlefuse->eeprom_vid, rtlefuse->eeprom_did));
         rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
-        rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];
+        rtlefuse->eeprom_version =
+                         le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VERSION]);
         rtlefuse->txpwr_fromeprom = true;
         rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index 060a06f4a885..9e0c8fcdf90f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -84,6 +84,7 @@ void rtl92c_read_chip_version(struct ieee80211_hw *hw)
                 }
         }
         rtlhal->version  = (enum version_8192c)chip_version;
+        pr_info("rtl8192cu: Chip version 0x%x\n", chip_version);
         switch (rtlhal->version) {
         case VERSION_NORMAL_TSMC_CHIP_92C_1T2R:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
index 72852900df84..e49cf2244c75 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
@@ -548,7 +548,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 break;
         case ERFSLEEP:
                 if (ppsc->rfpwr_state == ERFOFF)
-                        break;
+                        return false;
                 for (queue_id = 0, i = 0;
                      queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
                         ring = &pcipriv->dev.tx_ring[queue_id];
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index b9a158e5eb0e..94a3e1706158 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -42,6 +42,7 @@
 #include "led.h"
 #include "hw.h"
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 
 MODULE_AUTHOR("Georgia          <georgia@realtek.com>");
 MODULE_AUTHOR("Ziv Huang        <ziv_huang@realtek.com>");
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index bc33b147f44f..b3cc7b949992 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -491,7 +491,7 @@ static void _rtl_tx_desc_checksum(u8 *txdesc)
         SET_TX_DESC_TX_DESC_CHECKSUM(txdesc, 0);
         for (index = 0; index < 16; index++)
                 checksum = checksum ^ (*(ptr + index));
-        SET_TX_DESC_TX_DESC_CHECKSUM(txdesc, checksum);
+        SET_TX_DESC_TX_DESC_CHECKSUM(txdesc, cpu_to_le16(checksum));
 }
 
 void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 3ac7af1c5509..0883349e1c83 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
@@ -3374,7 +3374,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 break;
         case ERFSLEEP:
                 if (ppsc->rfpwr_state == ERFOFF)
-                        break;
+                        return false;
 
                 for (queue_id = 0, i = 0;
                      queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
index 691f80092185..149493f4c25c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index f27171af979c..f10ac1ad9087 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
@@ -602,7 +602,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                 }
         case ERFSLEEP:
                         if (ppsc->rfpwr_state == ERFOFF)
-                                break;
+                                return false;
 
                         for (queue_id = 0, i = 0;
                              queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 3ec9a0d41baf..92f49d522c56 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -30,6 +30,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/vmalloc.h>
+#include <linux/module.h>
 
 #include "../wifi.h"
 #include "../core.h"
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index b42c2e2b2055..e956fa71d040 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -28,18 +28,20 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/usb.h>
+#include <linux/export.h>
 #include "core.h"
 #include "wifi.h"
 #include "usb.h"
 #include "base.h"
 #include "ps.h"
+#include "rtl8192c/fw_common.h"
 
 #define REALTEK_USB_VENQT_READ                  0xC0
 #define REALTEK_USB_VENQT_WRITE                 0x40
 #define REALTEK_USB_VENQT_CMD_REQ               0x05
 #define REALTEK_USB_VENQT_CMD_IDX               0x00
 
-#define REALTEK_USB_VENQT_MAX_BUF_SIZE          254
+#define MAX_USBCTRL_VENDORREQ_TIMES             10
 
 static void usbctrl_async_callback(struct urb *urb)
 {
@@ -81,6 +83,7 @@ static int _usbctrl_vendorreq_async_write(struct usb_device *udev, u8 request,
         dr->wValue = cpu_to_le16(value);
         dr->wIndex = cpu_to_le16(index);
         dr->wLength = cpu_to_le16(len);
+        /* data are already in little-endian order */
         memcpy(buf, pdata, len);
         usb_fill_control_urb(urb, udev, pipe,
                              (unsigned char *)dr, buf, len,
@@ -99,16 +102,28 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request,
         unsigned int pipe;
         int status;
         u8 reqtype;
+        int vendorreq_times = 0;
+        static int count;
 
         pipe = usb_rcvctrlpipe(udev, 0); /* read_in */
         reqtype =  REALTEK_USB_VENQT_READ;
 
-        status = usb_control_msg(udev, pipe, request, reqtype, value, index,
-                                 pdata, len, 0); /* max. timeout */
+        do {
+                status = usb_control_msg(udev, pipe, request, reqtype, value,
+                                         index, pdata, len, 0); /*max. timeout*/
+                if (status < 0) {
+                        /* firmware download is checksumed, don't retry */
+                        if ((value >= FW_8192C_START_ADDRESS &&
+                            value <= FW_8192C_END_ADDRESS))
+                                break;
+                } else {
+                        break;
+                }
+        } while (++vendorreq_times < MAX_USBCTRL_VENDORREQ_TIMES);
 
-        if (status < 0)
+        if (status < 0 && count++ < 4)
                 pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n",
-                       value, status, *(u32 *)pdata);
+                       value, status, le32_to_cpu(*(u32 *)pdata));
         return status;
 }
 
@@ -128,7 +143,7 @@ static u32 _usb_read_sync(struct usb_device *udev, u32 addr, u16 len)
 
         wvalue = (u16)addr;
         _usbctrl_vendorreq_sync_read(udev, request, wvalue, index, data, len);
-        ret = *data;
+        ret = le32_to_cpu(*data);
         kfree(data);
         return ret;
 }
@@ -160,12 +175,12 @@ static void _usb_write_async(struct usb_device *udev, u32 addr, u32 val,
         u8 request;
         u16 wvalue;
         u16 index;
-        u32 data;
+        __le32 data;
 
         request = REALTEK_USB_VENQT_CMD_REQ;
         index = REALTEK_USB_VENQT_CMD_IDX; /* n/a */
         wvalue = (u16)(addr&0x0000ffff);
-        data = val;
+        data = cpu_to_le32(val);
         _usbctrl_vendorreq_async_write(udev, request, wvalue, index, &data,
                                        len);
 }
@@ -191,6 +206,30 @@ static void _usb_write32_async(struct rtl_priv *rtlpriv, u32 addr, u32 val)
         _usb_write_async(to_usb_device(dev), addr, val, 4);
 }
 
+static void _usb_writeN_sync(struct rtl_priv *rtlpriv, u32 addr, void *data,
+                             u16 len)
+{
+        struct device *dev = rtlpriv->io.dev;
+        struct usb_device *udev = to_usb_device(dev);
+        u8 request = REALTEK_USB_VENQT_CMD_REQ;
+        u8 reqtype =  REALTEK_USB_VENQT_WRITE;
+        u16 wvalue;
+        u16 index = REALTEK_USB_VENQT_CMD_IDX;
+        int pipe = usb_sndctrlpipe(udev, 0); /* write_out */
+        u8 *buffer;
+        dma_addr_t dma_addr;
+
+        wvalue = (u16)(addr&0x0000ffff);
+        buffer = usb_alloc_coherent(udev, (size_t)len, GFP_ATOMIC, &dma_addr);
+        if (!buffer)
+                return;
+        memcpy(buffer, data, len);
+        usb_control_msg(udev, pipe, request, reqtype, wvalue,
+                        index, buffer, len, 50);
+
+        usb_free_coherent(udev, (size_t)len, buffer, dma_addr);
+}
+
 static void _rtl_usb_io_handler_init(struct device *dev,
                                      struct ieee80211_hw *hw)
 {
@@ -204,6 +243,7 @@ static void _rtl_usb_io_handler_init(struct device *dev,
         rtlpriv->io.read8_sync          = _usb_read8_sync;
         rtlpriv->io.read16_sync         = _usb_read16_sync;
         rtlpriv->io.read32_sync         = _usb_read32_sync;
+        rtlpriv->io.writeN_sync         = _usb_writeN_sync;
 }
 
 static void _rtl_usb_io_handler_release(struct ieee80211_hw *hw)
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 713c7ddba8eb..085dccdbd1b6 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -63,6 +63,7 @@
 #define AC_MAX                                  4
 #define QOS_QUEUE_NUM                           4
 #define RTL_MAC80211_NUM_QUEUE                  5
+#define REALTEK_USB_VENQT_MAX_BUF_SIZE          254
 
 #define QBSS_LOAD_SIZE                          5
 #define MAX_WMMELE_LENGTH                       64
@@ -943,8 +944,10 @@ struct rtl_io {
         unsigned long pci_base_addr;    /*device I/O address */
 
         void (*write8_async) (struct rtl_priv *rtlpriv, u32 addr, u8 val);
-        void (*write16_async) (struct rtl_priv *rtlpriv, u32 addr, __le16 val);
-        void (*write32_async) (struct rtl_priv *rtlpriv, u32 addr, __le32 val);
+        void (*write16_async) (struct rtl_priv *rtlpriv, u32 addr, u16 val);
+        void (*write32_async) (struct rtl_priv *rtlpriv, u32 addr, u32 val);
+        void (*writeN_sync) (struct rtl_priv *rtlpriv, u32 addr, void *buf,
+                             u16 len);
 
         u8(*read8_sync) (struct rtl_priv *rtlpriv, u32 addr);
         u16(*read16_sync) (struct rtl_priv *rtlpriv, u32 addr);
@@ -1541,14 +1544,13 @@ struct rtl_hal_cfg {
 struct rtl_locks {
         /* mutex */
         struct mutex conf_mutex;
+        struct mutex ps_mutex;
 
         /*spin lock */
-        spinlock_t ips_lock;
         spinlock_t irq_th_lock;
         spinlock_t h2c_lock;
         spinlock_t rf_ps_lock;
         spinlock_t rf_lock;
-        spinlock_t lps_lock;
         spinlock_t waitq_lock;
 
         /*Dual mac*/
@@ -1573,7 +1575,8 @@ struct rtl_works {
         /* For SW LPS */
         struct delayed_work ps_work;
         struct delayed_work ps_rfon_wq;
-        struct tasklet_struct ips_leave_tasklet;
+
+        struct work_struct lps_leave_work;
 };
 
 struct rtl_debug {