16 files changed, 233 insertions, 138 deletions

diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index 098fc557a88d..d4fdd2a5a739 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -311,6 +311,8 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
             IEEE80211_HW_RX_INCLUDES_FCS |
             IEEE80211_HW_BEACON_FILTER |
             IEEE80211_HW_AMPDU_AGGREGATION |
+            IEEE80211_HW_CONNECTION_MONITOR |
+            /* IEEE80211_HW_SUPPORTS_CQM_RSSI | */
             IEEE80211_HW_REPORTS_TX_ACK_STATUS | 0;
 
         /* swlps or hwlps has been set in diff chip in init_sw_vars */
@@ -850,7 +852,7 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
                  *So tcb_desc->hw_rate is just used for
                  *special data and mgt frames
                  */
-                if (info->control.rates[0].idx == 0 &&
+                if (info->control.rates[0].idx == 0 ||
                                 ieee80211_is_nullfunc(fc)) {
                         tcb_desc->use_driver_rate = true;
                         tcb_desc->ratr_index = RATR_INX_WIRELESS_MC;
@@ -1138,7 +1140,7 @@ void rtl_watchdog_wq_callback(void *data)
         }
 
         /*
-         *<3> to check if traffic busy, if
+         *<2> to check if traffic busy, if
          * busytraffic we don't change channel
          */
         if (mac->link_state >= MAC80211_LINKED) {
diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c
index b2f897acb238..1b5cb7153a52 100644
--- a/drivers/net/wireless/rtlwifi/debug.c
+++ b/drivers/net/wireless/rtlwifi/debug.c
@@ -28,17 +28,11 @@
 
 #include "wifi.h"
 
-static unsigned int debug = DBG_EMERG;
-module_param(debug, uint, 0);
-MODULE_PARM_DESC(debug, "Set global debug level for rtlwifi (0,2-5)");
-
 void rtl_dbgp_flag_init(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 i;
 
-        rtlpriv->dbg.global_debuglevel = debug;
-
         rtlpriv->dbg.global_debugcomponents =
             COMP_ERR | COMP_FW | COMP_INIT | COMP_RECV | COMP_SEND |
             COMP_MLME | COMP_SCAN | COMP_INTR | COMP_LED | COMP_SEC |
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 9983fa18065a..5380f3b040ac 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1993,36 +1993,25 @@ call rtl_mac_stop() from the mac80211
 suspend function first, So there is
 no need to call hw_disable here.
 ****************************************/
-int rtl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+int rtl_pci_suspend(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         rtlpriv->cfg->ops->hw_suspend(hw);
         rtl_deinit_rfkill(hw);
 
-        pci_save_state(pdev);
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, PCI_D3hot);
         return 0;
 }
 EXPORT_SYMBOL(rtl_pci_suspend);
 
-int rtl_pci_resume(struct pci_dev *pdev)
+int rtl_pci_resume(struct device *dev)
 {
-        int ret;
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        pci_set_power_state(pdev, PCI_D0);
-        ret = pci_enable_device(pdev);
-        if (ret) {
-                RT_ASSERT(false, ("ERR: <======\n"));
-                return ret;
-        }
-
-        pci_restore_state(pdev);
-
         rtlpriv->cfg->ops->hw_resume(hw);
         rtl_init_rfkill(hw);
         return 0;
diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h
index a24e505b202b..ebe0b42c0518 100644
--- a/drivers/net/wireless/rtlwifi/pci.h
+++ b/drivers/net/wireless/rtlwifi/pci.h
@@ -237,8 +237,8 @@ extern struct rtl_intf_ops rtl_pci_ops;
 int __devinit rtl_pci_probe(struct pci_dev *pdev,
                             const struct pci_device_id *id);
 void rtl_pci_disconnect(struct pci_dev *pdev);
-int rtl_pci_suspend(struct pci_dev *pdev, pm_message_t state);
-int rtl_pci_resume(struct pci_dev *pdev);
+int rtl_pci_suspend(struct device *dev);
+int rtl_pci_resume(struct device *dev);
 
 static inline u8 pci_read8_sync(struct rtl_priv *rtlpriv, u32 addr)
 {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
index 11f43196e61d..9fc804d89d65 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
@@ -142,8 +142,22 @@ enum version_8192c {
         VERSION_UNKNOWN = 0x88,
 };
 
+#define CUT_VERSION_MASK                (BIT(6)|BIT(7))
+#define CHIP_VENDOR_UMC                 BIT(5)
+#define CHIP_VENDOR_UMC_B_CUT           BIT(6) /* Chip version for ECO */
+#define IS_VENDOR_UMC_A_CUT(version)    ((IS_CHIP_VENDOR_UMC(version)) ? \
+        ((GET_CVID_CUT_VERSION(version)) ? false : true) : false)
 #define IS_CHIP_VER_B(version)  ((version & CHIP_VER_B) ? true : false)
+#define IS_VENDOR_UMC_A_CUT(version)    ((IS_CHIP_VENDOR_UMC(version)) ? \
+        ((GET_CVID_CUT_VERSION(version)) ? false : true) : false)
 #define IS_92C_SERIAL(version)  ((version & CHIP_92C_BITMASK) ? true : false)
+#define IS_CHIP_VENDOR_UMC(version)             \
+        ((version & CHIP_VENDOR_UMC) ? true : false)
+#define GET_CVID_CUT_VERSION(version)   ((version) & CUT_VERSION_MASK)
+#define IS_81xxC_VENDOR_UMC_B_CUT(version)              \
+        ((IS_CHIP_VENDOR_UMC(version)) ? \
+        ((GET_CVID_CUT_VERSION(version) == CHIP_VENDOR_UMC_B_CUT) ?     \
+        true : false) : false)
 
 enum rtl819x_loopback_e {
         RTL819X_NO_LOOPBACK = 0,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index b7ecb9e44aa9..a48404cc2b96 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
@@ -92,6 +92,8 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         const struct firmware *firmware;
+        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+        char *fw_name = NULL;
 
         rtl8192ce_bt_reg_init(hw);
 
@@ -129,6 +131,8 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
 
         rtlpci->irq_mask[1] = (u32) (IMR_CPWM | IMR_C2HCMD | 0);
 
+        /* for debug level */
+        rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
         /* for LPS & IPS */
         rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps;
         rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
@@ -159,8 +163,14 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
         }
 
         /* request fw */
-        err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
-                        rtlpriv->io.dev);
+        if (IS_VENDOR_UMC_A_CUT(rtlhal->version) &&
+            !IS_92C_SERIAL(rtlhal->version))
+                fw_name = "rtlwifi/rtl8192cfwU.bin";
+        else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))
+                fw_name = "rtlwifi/rtl8192cfwU_B.bin";
+        else
+                fw_name = rtlpriv->cfg->fw_name;
+        err = request_firmware(&firmware, fw_name, rtlpriv->io.dev);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          ("Failed to request firmware!\n"));
@@ -245,6 +255,7 @@ static struct rtl_mod_params rtl92ce_mod_params = {
         .inactiveps = true,
         .swctrl_lps = false,
         .fwctrl_lps = true,
+        .debug = DBG_EMERG,
 };
 
 static struct rtl_hal_cfg rtl92ce_hal_cfg = {
@@ -355,8 +366,11 @@ MODULE_AUTHOR("Larry Finger	<Larry.Finger@lwfinger.net>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Realtek 8192C/8188C 802.11n PCI wireless");
 MODULE_FIRMWARE("rtlwifi/rtl8192cfw.bin");
+MODULE_FIRMWARE("rtlwifi/rtl8192cfwU.bin");
+MODULE_FIRMWARE("rtlwifi/rtl8192cfwU_B.bin");
 
 module_param_named(swenc, rtl92ce_mod_params.sw_crypto, bool, 0444);
+module_param_named(debug, rtl92ce_mod_params.debug, int, 0444);
 module_param_named(ips, rtl92ce_mod_params.inactiveps, bool, 0444);
 module_param_named(swlps, rtl92ce_mod_params.swctrl_lps, bool, 0444);
 module_param_named(fwlps, rtl92ce_mod_params.fwctrl_lps, bool, 0444);
@@ -364,18 +378,23 @@ MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
 MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");
 MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n");
 MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
+MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+
+static const struct dev_pm_ops rtlwifi_pm_ops = {
+        .suspend = rtl_pci_suspend,
+        .resume = rtl_pci_resume,
+        .freeze = rtl_pci_suspend,
+        .thaw = rtl_pci_resume,
+        .poweroff = rtl_pci_suspend,
+        .restore = rtl_pci_resume,
+};
 
 static struct pci_driver rtl92ce_driver = {
         .name = KBUILD_MODNAME,
         .id_table = rtl92ce_pci_ids,
         .probe = rtl_pci_probe,
         .remove = rtl_pci_disconnect,
-
-#ifdef CONFIG_PM
-        .suspend = rtl_pci_suspend,
-        .resume = rtl_pci_resume,
-#endif
-
+        .driver.pm = &rtlwifi_pm_ops,
 };
 
 static int __init rtl92ce_module_init(void)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/def.h b/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
index c54940ea72fe..d097efb1e717 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
@@ -50,10 +50,6 @@
 #define IS_VENDOR_UMC(version)          \
         (((version) & CHIP_VENDOR_UMC) ? true : false)
 
-#define IS_VENDOR_UMC_A_CUT(version)    \
-        (((version) & CHIP_VENDOR_UMC) ? (((version) & (BIT(6) | BIT(7))) ? \
-        false : true) : false)
-
 #define IS_VENDOR_8723_A_CUT(version)   \
         (((version) & CHIP_VENDOR_UMC) ? (((version) & (BIT(6))) ? \
         false : true) : false)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index 424b8a0323e2..feed1ed8d9b6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -60,6 +60,7 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->dm.dm_flag = 0;
         rtlpriv->dm.disable_framebursting = 0;
         rtlpriv->dm.thermalvalue = 0;
+        rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
         rtlpriv->rtlhal.pfirmware = vmalloc(0x4000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -149,8 +150,14 @@ static struct rtl_hal_ops rtl8192cu_hal_ops = {
 
 static struct rtl_mod_params rtl92cu_mod_params = {
         .sw_crypto = 0,
+        .debug = DBG_EMERG,
 };
 
+module_param_named(swenc, rtl92cu_mod_params.sw_crypto, bool, 0444);
+module_param_named(debug, rtl92cu_mod_params.debug, int, 0444);
+MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
+MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+
 static struct rtl_hal_usbint_cfg rtl92cu_interface_cfg = {
         /* rx */
         .in_ep_num = RTL92C_USB_BULK_IN_NUM,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/def.h b/drivers/net/wireless/rtlwifi/rtl8192de/def.h
index aff7e19714ff..946304771748 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/def.h
@@ -122,59 +122,98 @@
 #define GET_C2H_CMD_FEEDBACK_CCX_SEQ(__pcmdfbhdr)       \
         LE_BITS_TO_4BYTE(((__pcmdfbhdr) + 4), 20, 12)
 
-/*
- * 92D chip ver:
- * BIT8: IS 92D
- * BIT9: single phy
- * BIT10: C-cut
- * BIT11: D-cut
- */
-
-/* Chip specific */
-#define CHIP_92C                        BIT(0)
-#define CHIP_92C_1T2R                   BIT(1)
-#define CHIP_8723                       BIT(2) /* RTL8723 With BT feature */
-#define CHIP_8723_DRV_REV               BIT(3) /* RTL8723 Driver Revised */
-#define NORMAL_CHIP                     BIT(4)
-#define CHIP_VENDOR_UMC                 BIT(5)
-#define CHIP_VENDOR_UMC_B_CUT           BIT(6) /* Chip version for ECO */
+enum version_8192d {
+        VERSION_TEST_CHIP_88C = 0x0000,
+        VERSION_TEST_CHIP_92C = 0x0020,
+        VERSION_TEST_UMC_CHIP_8723 = 0x0081,
+        VERSION_NORMAL_TSMC_CHIP_88C = 0x0008,
+        VERSION_NORMAL_TSMC_CHIP_92C = 0x0028,
+        VERSION_NORMAL_TSMC_CHIP_92C_1T2R = 0x0018,
+        VERSION_NORMAL_UMC_CHIP_88C_A_CUT = 0x0088,
+        VERSION_NORMAL_UMC_CHIP_92C_A_CUT = 0x00a8,
+        VERSION_NORMAL_UMC_CHIP_92C_1T2R_A_CUT = 0x0098,
+        VERSION_NORMAL_UMC_CHIP_8723_1T1R_A_CUT = 0x0089,
+        VERSION_NORMAL_UMC_CHIP_8723_1T1R_B_CUT = 0x1089,
+        VERSION_NORMAL_UMC_CHIP_88C_B_CUT = 0x1088,
+        VERSION_NORMAL_UMC_CHIP_92C_B_CUT = 0x10a8,
+        VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT = 0x1090,
+        VERSION_TEST_CHIP_92D_SINGLEPHY = 0x0022,
+        VERSION_TEST_CHIP_92D_DUALPHY = 0x0002,
+        VERSION_NORMAL_CHIP_92D_SINGLEPHY = 0x002a,
+        VERSION_NORMAL_CHIP_92D_DUALPHY = 0x000a,
+        VERSION_NORMAL_CHIP_92D_C_CUT_SINGLEPHY = 0x202a,
+        VERSION_NORMAL_CHIP_92D_C_CUT_DUALPHY = 0x200a,
+        VERSION_NORMAL_CHIP_92D_D_CUT_SINGLEPHY = 0x302a,
+        VERSION_NORMAL_CHIP_92D_D_CUT_DUALPHY = 0x300a,
+        VERSION_NORMAL_CHIP_92D_E_CUT_SINGLEPHY = 0x402a,
+        VERSION_NORMAL_CHIP_92D_E_CUT_DUALPHY = 0x400a,
+};
 
 /* for 92D */
-#define CHIP_92D                        BIT(8)
 #define CHIP_92D_SINGLEPHY              BIT(9)
-#define CHIP_92D_C_CUT                  BIT(10)
-#define CHIP_92D_D_CUT                  BIT(11)
+#define C_CUT_VERSION                   BIT(13)
+#define D_CUT_VERSION                   ((BIT(12)|BIT(13)))
+#define E_CUT_VERSION                   BIT(14)
+
+/* Chip specific */
+#define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3)
+#define CHIP_BONDING_92C_1T2R                   0x1
+#define CHIP_BONDING_88C_USB_MCARD              0x2
+#define CHIP_BONDING_88C_USB_HP                 0x1
+
+/* [15:12] IC version(CUT): A-cut=0, B-cut=1, C-cut=2, D-cut=3 */
+/* [7] Manufacturer: TSMC=0, UMC=1 */
+/* [6:4] RF type: 1T1R=0, 1T2R=1, 2T2R=2 */
+/* [3] Chip type: TEST=0, NORMAL=1 */
+/* [2:0] IC type: 81xxC=0, 8723=1, 92D=2 */
+#define CHIP_8723                       BIT(0)
+#define CHIP_92D                        BIT(1)
+#define NORMAL_CHIP                     BIT(3)
+#define RF_TYPE_1T1R                    (~(BIT(4)|BIT(5)|BIT(6)))
+#define RF_TYPE_1T2R                    BIT(4)
+#define RF_TYPE_2T2R                    BIT(5)
+#define CHIP_VENDOR_UMC                 BIT(7)
+#define B_CUT_VERSION                   BIT(12)
+
+/* MASK */
+#define IC_TYPE_MASK                    (BIT(0)|BIT(1)|BIT(2))
+#define CHIP_TYPE_MASK                  BIT(3)
+#define RF_TYPE_MASK                    (BIT(4)|BIT(5)|BIT(6))
+#define MANUFACTUER_MASK                BIT(7)
+#define ROM_VERSION_MASK                (BIT(11)|BIT(10)|BIT(9)|BIT(8))
+#define CUT_VERSION_MASK                (BIT(15)|BIT(14)|BIT(13)|BIT(12))
 
-enum version_8192d {
-        VERSION_TEST_CHIP_88C = 0x00,
-        VERSION_TEST_CHIP_92C = 0x01,
-        VERSION_NORMAL_TSMC_CHIP_88C = 0x10,
-        VERSION_NORMAL_TSMC_CHIP_92C = 0x11,
-        VERSION_NORMAL_TSMC_CHIP_92C_1T2R = 0x13,
-        VERSION_NORMAL_UMC_CHIP_88C_A_CUT = 0x30,
-        VERSION_NORMAL_UMC_CHIP_92C_A_CUT = 0x31,
-        VERSION_NORMAL_UMC_CHIP_92C_1T2R_A_CUT = 0x33,
-        VERSION_NORMA_UMC_CHIP_8723_1T1R_A_CUT = 0x34,
-        VERSION_NORMA_UMC_CHIP_8723_1T1R_B_CUT = 0x3c,
-        VERSION_NORMAL_UMC_CHIP_88C_B_CUT = 0x70,
-        VERSION_NORMAL_UMC_CHIP_92C_B_CUT = 0x71,
-        VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT = 0x73,
-        VERSION_TEST_CHIP_92D_SINGLEPHY = 0x300,
-        VERSION_TEST_CHIP_92D_DUALPHY = 0x100,
-        VERSION_NORMAL_CHIP_92D_SINGLEPHY = 0x310,
-        VERSION_NORMAL_CHIP_92D_DUALPHY = 0x110,
-        VERSION_NORMAL_CHIP_92D_C_CUT_SINGLEPHY = 0x710,
-        VERSION_NORMAL_CHIP_92D_C_CUT_DUALPHY = 0x510,
-        VERSION_NORMAL_CHIP_92D_D_CUT_SINGLEPHY = 0xB10,
-        VERSION_NORMAL_CHIP_92D_D_CUT_DUALPHY = 0x910,
-};
 
-#define IS_92D_SINGLEPHY(version)               \
-        ((version & CHIP_92D_SINGLEPHY) ? true : false)
-#define IS_92D_C_CUT(version)                   \
-        ((version & CHIP_92D_C_CUT) ? true : false)
-#define IS_92D_D_CUT(version)                   \
-        ((version & CHIP_92D_D_CUT) ? true : false)
+/* Get element */
+#define GET_CVID_IC_TYPE(version)       ((version) & IC_TYPE_MASK)
+#define GET_CVID_CHIP_TYPE(version)     ((version) & CHIP_TYPE_MASK)
+#define GET_CVID_RF_TYPE(version)       ((version) & RF_TYPE_MASK)
+#define GET_CVID_MANUFACTUER(version)   ((version) & MANUFACTUER_MASK)
+#define GET_CVID_ROM_VERSION(version)   ((version) & ROM_VERSION_MASK)
+#define GET_CVID_CUT_VERSION(version)   ((version) & CUT_VERSION_MASK)
+
+#define IS_1T1R(version)                ((GET_CVID_RF_TYPE(version)) ?  \
+                                         false : true)
+#define IS_1T2R(version)                ((GET_CVID_RF_TYPE(version) ==  \
+                                         RF_TYPE_1T2R) ? true : false)
+#define IS_2T2R(version)                ((GET_CVID_RF_TYPE(version) ==  \
+                                         RF_TYPE_2T2R) ? true : false)
+
+#define IS_92D_SINGLEPHY(version)       ((IS_92D(version)) ?            \
+                                 (IS_2T2R(version) ? true : false) : false)
+#define IS_92D(version)                 ((GET_CVID_IC_TYPE(version) ==  \
+                                         CHIP_92D) ? true : false)
+#define IS_92D_C_CUT(version)           ((IS_92D(version)) ?            \
+                                 ((GET_CVID_CUT_VERSION(version) ==     \
+                                 0x2000) ? true : false) : false)
+#define IS_92D_D_CUT(version)                   ((IS_92D(version)) ?    \
+                                 ((GET_CVID_CUT_VERSION(version) ==     \
+                                 0x3000) ? true : false) : false)
+#define IS_92D_E_CUT(version)           ((IS_92D(version)) ?            \
+                                 ((GET_CVID_CUT_VERSION(version) ==     \
+                                 0x4000) ? true : false) : false)
+#define CHIP_92D_C_CUT                  BIT(10)
+#define CHIP_92D_D_CUT                  BIT(11)
 
 enum rf_optype {
         RF_OP_BY_SW_3WIRE = 0,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index 0073cf106af2..f5bd3a3cd34a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
@@ -1608,17 +1608,16 @@ static void _rtl92de_read_txpower_info(struct ieee80211_hw *hw,
                 tempval[0] = hwinfo[EEPROM_IQK_DELTA] & 0x03;
                 tempval[1] = (hwinfo[EEPROM_LCK_DELTA] & 0x0C) >> 2;
                 rtlefuse->txpwr_fromeprom = true;
-                if (IS_92D_D_CUT(rtlpriv->rtlhal.version)) {
+                if (IS_92D_D_CUT(rtlpriv->rtlhal.version) ||
+                    IS_92D_E_CUT(rtlpriv->rtlhal.version)) {
                         rtlefuse->internal_pa_5g[0] =
-                                 !((hwinfo[EEPROM_TSSI_A_5G] &
-                                 BIT(6)) >> 6);
+                                !((hwinfo[EEPROM_TSSI_A_5G] & BIT(6)) >> 6);
                         rtlefuse->internal_pa_5g[1] =
-                                 !((hwinfo[EEPROM_TSSI_B_5G] &
-                                 BIT(6)) >> 6);
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                !((hwinfo[EEPROM_TSSI_B_5G] & BIT(6)) >> 6);
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                                  ("Is D cut,Internal PA0 %d Internal PA1 %d\n",
-                                  rtlefuse->internal_pa_5g[0],
-                                  rtlefuse->internal_pa_5g[1]))
+                                 rtlefuse->internal_pa_5g[0],
+                                 rtlefuse->internal_pa_5g[1]))
                 }
                 rtlefuse->eeprom_c9 = hwinfo[EEPROM_RF_OPT6];
                 rtlefuse->eeprom_cc = hwinfo[EEPROM_RF_OPT7];
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
index c681597c7f20..691f80092185 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
@@ -146,6 +146,8 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
 
         rtlpci->irq_mask[1] = (u32) (IMR_CPWM | IMR_C2HCMD);
 
+        /* for debug level */
+        rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
         /* for LPS & IPS */
         rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps;
         rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
@@ -267,6 +269,7 @@ static struct rtl_mod_params rtl92de_mod_params = {
         .inactiveps = true,
         .swctrl_lps = true,
         .fwctrl_lps = false,
+        .debug = DBG_EMERG,
 };
 
 static struct rtl_hal_cfg rtl92de_hal_cfg = {
@@ -377,6 +380,7 @@ MODULE_DESCRIPTION("Realtek 8192DE 802.11n Dual Mac PCI wireless");
 MODULE_FIRMWARE("rtlwifi/rtl8192defw.bin");
 
 module_param_named(swenc, rtl92de_mod_params.sw_crypto, bool, 0444);
+module_param_named(debug, rtl92de_mod_params.debug, int, 0444);
 module_param_named(ips, rtl92de_mod_params.inactiveps, bool, 0444);
 module_param_named(swlps, rtl92de_mod_params.swctrl_lps, bool, 0444);
 module_param_named(fwlps, rtl92de_mod_params.fwctrl_lps, bool, 0444);
@@ -384,18 +388,23 @@ MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
 MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");
 MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n");
 MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
+MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+
+static const struct dev_pm_ops rtlwifi_pm_ops = {
+        .suspend = rtl_pci_suspend,
+        .resume = rtl_pci_resume,
+        .freeze = rtl_pci_suspend,
+        .thaw = rtl_pci_resume,
+        .poweroff = rtl_pci_suspend,
+        .restore = rtl_pci_resume,
+};
 
 static struct pci_driver rtl92de_driver = {
         .name = KBUILD_MODNAME,
         .id_table = rtl92de_pci_ids,
         .probe = rtl_pci_probe,
         .remove = rtl_pci_disconnect,
-
-#ifdef CONFIG_PM
-        .suspend = rtl_pci_suspend,
-        .resume = rtl_pci_resume,
-#endif
-
+        .driver.pm = &rtlwifi_pm_ops,
 };
 
 /* add global spin lock to solve the problem that
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index d59f66cb7768..c474486e3911 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -1382,7 +1382,7 @@ static void _rtl92se_power_domain_init(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, LDOA15_CTRL, 0x34);
 
         /* Reset MAC-IO and CPU and Core Digital BIT10/11/15 */
-        tmpu1b = rtl_read_byte(rtlpriv, SYS_FUNC_EN + 1);
+        tmpu1b = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
 
         /* If IPS we need to turn LED on. So we not
          * not disable BIT 3/7 of reg3. */
@@ -1391,7 +1391,7 @@ static void _rtl92se_power_domain_init(struct ieee80211_hw *hw)
         else
                 tmpu1b &= 0x73;
 
-        rtl_write_byte(rtlpriv, SYS_FUNC_EN + 1, tmpu1b);
+        rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, tmpu1b);
         /* wait for BIT 10/11/15 to pull high automatically!! */
         mdelay(1);
 
@@ -1428,15 +1428,15 @@ static void _rtl92se_power_domain_init(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, LDOA15_CTRL, (tmpu1b | BIT(0)));
 
         /* Set Digital Vdd to Retention isolation Path. */
-        tmpu2b = rtl_read_word(rtlpriv, SYS_ISO_CTRL);
-        rtl_write_word(rtlpriv, SYS_ISO_CTRL, (tmpu2b | BIT(11)));
+        tmpu2b = rtl_read_word(rtlpriv, REG_SYS_ISO_CTRL);
+        rtl_write_word(rtlpriv, REG_SYS_ISO_CTRL, (tmpu2b | BIT(11)));
 
 
         /* For warm reboot NIC disappera bug. */
-        tmpu2b = rtl_read_word(rtlpriv, SYS_FUNC_EN);
-        rtl_write_word(rtlpriv, SYS_FUNC_EN, (tmpu2b | BIT(13)));
+        tmpu2b = rtl_read_word(rtlpriv, REG_SYS_FUNC_EN);
+        rtl_write_word(rtlpriv, REG_SYS_FUNC_EN, (tmpu2b | BIT(13)));
 
-        rtl_write_byte(rtlpriv, SYS_ISO_CTRL + 1, 0x68);
+        rtl_write_byte(rtlpriv, REG_SYS_ISO_CTRL + 1, 0x68);
 
         /* Enable AFE PLL Macro Block */
         tmpu1b = rtl_read_byte(rtlpriv, AFE_PLL_CTRL);
@@ -1447,17 +1447,17 @@ static void _rtl92se_power_domain_init(struct ieee80211_hw *hw)
         mdelay(1);
 
         /* Release isolation AFE PLL & MD */
-        rtl_write_byte(rtlpriv, SYS_ISO_CTRL, 0xA6);
+        rtl_write_byte(rtlpriv, REG_SYS_ISO_CTRL, 0xA6);
 
         /* Enable MAC clock */
         tmpu2b = rtl_read_word(rtlpriv, SYS_CLKR);
         rtl_write_word(rtlpriv, SYS_CLKR, (tmpu2b | BIT(12) | BIT(11)));
 
         /* Enable Core digital and enable IOREG R/W */
-        tmpu2b = rtl_read_word(rtlpriv, SYS_FUNC_EN);
-        rtl_write_word(rtlpriv, SYS_FUNC_EN, (tmpu2b | BIT(11)));
+        tmpu2b = rtl_read_word(rtlpriv, REG_SYS_FUNC_EN);
+        rtl_write_word(rtlpriv, REG_SYS_FUNC_EN, (tmpu2b | BIT(11)));
         /* enable REG_EN */
-        rtl_write_word(rtlpriv, SYS_FUNC_EN, (tmpu2b | BIT(11) | BIT(15)));
+        rtl_write_word(rtlpriv, REG_SYS_FUNC_EN, (tmpu2b | BIT(11) | BIT(15)));
 
         /* Switch the control path. */
         tmpu2b = rtl_read_word(rtlpriv, SYS_CLKR);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
index ea32ef2d4098..11f125c030ce 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
@@ -735,6 +735,7 @@
 #define HWSET_MAX_SIZE_92S                      128
 #define EFUSE_MAX_SECTION                       16
 #define EFUSE_REAL_CONTENT_LEN                  512
+#define EFUSE_OOB_PROTECT_BYTES                 15
 
 #define RTL8190_EEPROM_ID                       0x8129
 #define EEPROM_HPON                             0x02
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 24bd331a5484..3ec9a0d41baf 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -160,6 +160,8 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
 
         rtlpci->first_init = true;
 
+        /* for debug level */
+        rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
         /* for LPS & IPS */
         rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps;
         rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
@@ -272,6 +274,7 @@ static struct rtl_mod_params rtl92se_mod_params = {
         .inactiveps = true,
         .swctrl_lps = true,
         .fwctrl_lps = false,
+        .debug = DBG_EMERG,
 };
 
 /* Because memory R/W bursting will cause system hang/crash
@@ -304,6 +307,7 @@ static struct rtl_hal_cfg rtl92se_hal_cfg = {
         .maps[EFUSE_HWSET_MAX_SIZE] = HWSET_MAX_SIZE_92S,
         .maps[EFUSE_MAX_SECTION_MAP] = EFUSE_MAX_SECTION,
         .maps[EFUSE_REAL_CONTENT_SIZE] = EFUSE_REAL_CONTENT_LEN,
+        .maps[EFUSE_OOB_PROTECT_BYTES_LEN] = EFUSE_OOB_PROTECT_BYTES,
 
         .maps[RWCAM] = REG_RWCAM,
         .maps[WCAMI] = REG_WCAMI,
@@ -388,6 +392,7 @@ MODULE_DESCRIPTION("Realtek 8192S/8191S 802.11n PCI wireless");
 MODULE_FIRMWARE("rtlwifi/rtl8192sefw.bin");
 
 module_param_named(swenc, rtl92se_mod_params.sw_crypto, bool, 0444);
+module_param_named(debug, rtl92se_mod_params.debug, int, 0444);
 module_param_named(ips, rtl92se_mod_params.inactiveps, bool, 0444);
 module_param_named(swlps, rtl92se_mod_params.swctrl_lps, bool, 0444);
 module_param_named(fwlps, rtl92se_mod_params.fwctrl_lps, bool, 0444);
@@ -395,18 +400,23 @@ MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
 MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n");
 MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n");
 MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
+MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+
+static const struct dev_pm_ops rtlwifi_pm_ops = {
+        .suspend = rtl_pci_suspend,
+        .resume = rtl_pci_resume,
+        .freeze = rtl_pci_suspend,
+        .thaw = rtl_pci_resume,
+        .poweroff = rtl_pci_suspend,
+        .restore = rtl_pci_resume,
+};
 
 static struct pci_driver rtl92se_driver = {
         .name = KBUILD_MODNAME,
         .id_table = rtl92se_pci_ids,
         .probe = rtl_pci_probe,
         .remove = rtl_pci_disconnect,
-
-#ifdef CONFIG_PM
-        .suspend = rtl_pci_suspend,
-        .resume = rtl_pci_resume,
-#endif
-
+        .driver.pm = &rtlwifi_pm_ops,
 };
 
 static int __init rtl92se_module_init(void)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index ba137da082b5..fbebe3ea0a22 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -124,18 +124,15 @@ static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
         u8 i, max_spatial_stream;
         u32 rssi, total_rssi = 0;
         bool in_powersavemode = false;
-        bool is_cck_rate;
+        bool is_cck = pstats->is_cck;
 
-        is_cck_rate = SE_RX_HAL_IS_CCK_RATE(pdesc);
         pstats->packet_matchbssid = packet_match_bssid;
         pstats->packet_toself = packet_toself;
-        pstats->is_cck = is_cck_rate;
         pstats->packet_beacon = packet_beacon;
-        pstats->is_cck = is_cck_rate;
         pstats->rx_mimo_signalquality[0] = -1;
         pstats->rx_mimo_signalquality[1] = -1;
 
-        if (is_cck_rate) {
+        if (is_cck) {
                 u8 report, cck_highpwr;
                 cck_buf = (struct phy_sts_cck_8192s_t *)p_drvinfo;
 
@@ -246,9 +243,8 @@ static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
                 pstats->rxpower = rx_pwr_all;
                 pstats->recvsignalpower = rx_pwr_all;
 
-                if (GET_RX_STATUS_DESC_RX_HT(pdesc) &&
-                        GET_RX_STATUS_DESC_RX_MCS(pdesc) >= DESC92_RATEMCS8 &&
-                    GET_RX_STATUS_DESC_RX_MCS(pdesc) <= DESC92_RATEMCS15)
+                if (pstats->is_ht && pstats->rate >= DESC92_RATEMCS8 &&
+                    pstats->rate <= DESC92_RATEMCS15)
                         max_spatial_stream = 2;
                 else
                         max_spatial_stream = 1;
@@ -266,7 +262,7 @@ static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw,
                 }
         }
 
-        if (is_cck_rate)
+        if (is_cck)
                 pstats->signalstrength = (u8)(_rtl92se_signal_scale_mapping(hw,
                                          pwdb_all));
         else if (rf_rx_num != 0)
@@ -518,6 +514,8 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
 {
         struct rx_fwinfo *p_drvinfo;
         u32 phystatus = (u32)GET_RX_STATUS_DESC_PHY_STATUS(pdesc);
+        struct ieee80211_hdr *hdr;
+        bool first_ampdu = false;
 
         stats->length = (u16)GET_RX_STATUS_DESC_PKT_LEN(pdesc);
         stats->rx_drvinfo_size = (u8)GET_RX_STATUS_DESC_DRVINFO_SIZE(pdesc) * 8;
@@ -530,8 +528,12 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
         stats->rate = (u8)GET_RX_STATUS_DESC_RX_MCS(pdesc);
         stats->shortpreamble = (u16)GET_RX_STATUS_DESC_SPLCP(pdesc);
         stats->isampdu = (bool)(GET_RX_STATUS_DESC_PAGGR(pdesc) == 1);
+        stats->isfirst_ampdu = (bool) ((GET_RX_STATUS_DESC_PAGGR(pdesc) == 1)
+                               && (GET_RX_STATUS_DESC_FAGGR(pdesc) == 1));
         stats->timestamp_low = GET_RX_STATUS_DESC_TSFL(pdesc);
         stats->rx_is40Mhzpacket = (bool)GET_RX_STATUS_DESC_BW(pdesc);
+        stats->is_ht = (bool)GET_RX_STATUS_DESC_RX_HT(pdesc);
+        stats->is_cck = SE_RX_HAL_IS_CCK_RATE(pdesc);
 
         if (stats->hwerror)
                 return false;
@@ -539,30 +541,39 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
         rx_status->freq = hw->conf.channel->center_freq;
         rx_status->band = hw->conf.channel->band;
 
-        if (GET_RX_STATUS_DESC_CRC32(pdesc))
-                rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
+        hdr = (struct ieee80211_hdr *)(skb->data + stats->rx_drvinfo_size
+              + stats->rx_bufshift);
 
-        if (!GET_RX_STATUS_DESC_SWDEC(pdesc))
-                rx_status->flag |= RX_FLAG_DECRYPTED;
+        if (stats->crc)
+                rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
 
-        if (GET_RX_STATUS_DESC_BW(pdesc))
+        if (stats->rx_is40Mhzpacket)
                 rx_status->flag |= RX_FLAG_40MHZ;
 
-        if (GET_RX_STATUS_DESC_RX_HT(pdesc))
+        if (stats->is_ht)
                 rx_status->flag |= RX_FLAG_HT;
 
         rx_status->flag |= RX_FLAG_MACTIME_MPDU;
 
-        if (stats->decrypted)
-                rx_status->flag |= RX_FLAG_DECRYPTED;
+        /* hw will set stats->decrypted true, if it finds the
+         * frame is open data frame or mgmt frame,
+         * hw will not decrypt robust managment frame
+         * for IEEE80211w but still set stats->decrypted
+         * true, so here we should set it back to undecrypted
+         * for IEEE80211w frame, and mac80211 sw will help
+         * to decrypt it */
+        if (stats->decrypted) {
+                if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
+                        (ieee80211_has_protected(hdr->frame_control)))
+                        rx_status->flag &= ~RX_FLAG_DECRYPTED;
+                else
+                        rx_status->flag |= RX_FLAG_DECRYPTED;
+        }
 
         rx_status->rate_idx = rtlwifi_rate_mapping(hw,
-                                (bool)GET_RX_STATUS_DESC_RX_HT(pdesc),
-                                (u8)GET_RX_STATUS_DESC_RX_MCS(pdesc),
-                                (bool)GET_RX_STATUS_DESC_PAGGR(pdesc));
-
+                              stats->is_ht, stats->rate, first_ampdu);
 
-        rx_status->mactime = GET_RX_STATUS_DESC_TSFL(pdesc);
+        rx_status->mactime = stats->timestamp_low;
         if (phystatus) {
                 p_drvinfo = (struct rx_fwinfo *)(skb->data +
                                                  stats->rx_bufshift);
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 3126485393d9..713c7ddba8eb 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -450,6 +450,7 @@ enum rtl_var_map {
         EFUSE_HWSET_MAX_SIZE,
         EFUSE_MAX_SECTION_MAP,
         EFUSE_REAL_CONTENT_SIZE,
+        EFUSE_OOB_PROTECT_BYTES_LEN,
 
         /*CAM map */
         RWCAM,
@@ -1324,6 +1325,7 @@ struct rtl_stats {
         s8 rx_mimo_signalquality[2];
         bool packet_matchbssid;
         bool is_cck;
+        bool is_ht;
         bool packet_toself;
         bool packet_beacon;     /*for rssi */
         char cck_adc_pwdb[4];   /*for rx path selection */
@@ -1485,6 +1487,9 @@ struct rtl_mod_params {
         /* default: 0 = using hardware encryption */
         int sw_crypto;
 
+        /* default: 0 = DBG_EMERG (0)*/
+        int debug;
+
         /* default: 1 = using no linked power save */
         bool inactiveps;