4 files changed, 73 insertions, 280 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
index 35ff7df41a1d..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,
@@ -220,41 +234,6 @@ enum rtl_desc_qsel {
         QSLT_CMD = 0x13,
 };
 
-enum rtl_desc92c_rate {
-        DESC92C_RATE1M = 0x00,
-        DESC92C_RATE2M = 0x01,
-        DESC92C_RATE5_5M = 0x02,
-        DESC92C_RATE11M = 0x03,
-
-        DESC92C_RATE6M = 0x04,
-        DESC92C_RATE9M = 0x05,
-        DESC92C_RATE12M = 0x06,
-        DESC92C_RATE18M = 0x07,
-        DESC92C_RATE24M = 0x08,
-        DESC92C_RATE36M = 0x09,
-        DESC92C_RATE48M = 0x0a,
-        DESC92C_RATE54M = 0x0b,
-
-        DESC92C_RATEMCS0 = 0x0c,
-        DESC92C_RATEMCS1 = 0x0d,
-        DESC92C_RATEMCS2 = 0x0e,
-        DESC92C_RATEMCS3 = 0x0f,
-        DESC92C_RATEMCS4 = 0x10,
-        DESC92C_RATEMCS5 = 0x11,
-        DESC92C_RATEMCS6 = 0x12,
-        DESC92C_RATEMCS7 = 0x13,
-        DESC92C_RATEMCS8 = 0x14,
-        DESC92C_RATEMCS9 = 0x15,
-        DESC92C_RATEMCS10 = 0x16,
-        DESC92C_RATEMCS11 = 0x17,
-        DESC92C_RATEMCS12 = 0x18,
-        DESC92C_RATEMCS13 = 0x19,
-        DESC92C_RATEMCS14 = 0x1a,
-        DESC92C_RATEMCS15 = 0x1b,
-        DESC92C_RATEMCS15_SG = 0x1c,
-        DESC92C_RATEMCS32 = 0x20,
-};
-
 struct phy_sts_cck_8192s_t {
         u8 adc_pwdb_X[4];
         u8 sq_rpt;
@@ -267,108 +246,4 @@ struct h2c_cmd_8192c {
         u8 *p_cmdbuffer;
 };
 
-/* NOTE: reference to rtl8192c_rates struct */
-static inline int _rtl92c_rate_mapping(struct ieee80211_hw *hw, bool isHT,
-                                       u8 desc_rate, bool first_ampdu)
-{
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        int rate_idx = 0;
-
-        if (first_ampdu) {
-                if (false == isHT) {
-                        switch (desc_rate) {
-                        case DESC92C_RATE1M:
-                                rate_idx = 0;
-                                break;
-                        case DESC92C_RATE2M:
-                                rate_idx = 1;
-                                break;
-                        case DESC92C_RATE5_5M:
-                                rate_idx = 2;
-                                break;
-                        case DESC92C_RATE11M:
-                                rate_idx = 3;
-                                break;
-                        case DESC92C_RATE6M:
-                                rate_idx = 4;
-                                break;
-                        case DESC92C_RATE9M:
-                                rate_idx = 5;
-                                break;
-                        case DESC92C_RATE12M:
-                                rate_idx = 6;
-                                break;
-                        case DESC92C_RATE18M:
-                                rate_idx = 7;
-                                break;
-                        case DESC92C_RATE24M:
-                                rate_idx = 8;
-                                break;
-                        case DESC92C_RATE36M:
-                                rate_idx = 9;
-                                break;
-                        case DESC92C_RATE48M:
-                                rate_idx = 10;
-                                break;
-                        case DESC92C_RATE54M:
-                                rate_idx = 11;
-                                break;
-                        default:
-                                RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
-                                         ("Rate %d is not support, set to "
-                                        "1M rate.\n", desc_rate));
-                                rate_idx = 0;
-                                break;
-                        }
-                } else {
-                        rate_idx = 11;
-                }
-                return rate_idx;
-        }
-        switch (desc_rate) {
-        case DESC92C_RATE1M:
-                rate_idx = 0;
-                break;
-        case DESC92C_RATE2M:
-                rate_idx = 1;
-                break;
-        case DESC92C_RATE5_5M:
-                rate_idx = 2;
-                break;
-        case DESC92C_RATE11M:
-                rate_idx = 3;
-                break;
-        case DESC92C_RATE6M:
-                rate_idx = 4;
-                break;
-        case DESC92C_RATE9M:
-                rate_idx = 5;
-                break;
-        case DESC92C_RATE12M:
-                rate_idx = 6;
-                break;
-        case DESC92C_RATE18M:
-                rate_idx = 7;
-                break;
-        case DESC92C_RATE24M:
-                rate_idx = 8;
-                break;
-        case DESC92C_RATE36M:
-                rate_idx = 9;
-                break;
-        case DESC92C_RATE48M:
-                rate_idx = 10;
-                break;
-        case DESC92C_RATE54M:
-                rate_idx = 11;
-                break;
-        /* TODO: How to mapping MCS rate? */
-        /*  NOTE: referenc to __ieee80211_rx */
-        default:
-                rate_idx = 11;
-                break;
-        }
-        return rate_idx;
-}
-
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index 373dc78af1dc..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"
@@ -92,6 +93,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,10 +132,16 @@ 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;
         rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
+        if (!rtlpriv->psc.inactiveps)
+                pr_info("rtl8192ce: Power Save off (module option)\n");
+        if (!rtlpriv->psc.fwctrl_lps)
+                pr_info("rtl8192ce: FW Power Save off (module option)\n");
         rtlpriv->psc.reg_fwctrl_lps = 3;
         rtlpriv->psc.reg_max_lps_awakeintvl = 5;
         /* for ASPM, you can close aspm through
@@ -155,8 +164,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"));
@@ -241,6 +256,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 = {
@@ -318,21 +334,21 @@ static struct rtl_hal_cfg rtl92ce_hal_cfg = {
         .maps[RTL_IMR_ROK] = IMR_ROK,
         .maps[RTL_IBSS_INT_MASKS] = (IMR_BCNINT | IMR_TBDOK | IMR_TBDER),
 
-        .maps[RTL_RC_CCK_RATE1M] = DESC92C_RATE1M,
-        .maps[RTL_RC_CCK_RATE2M] = DESC92C_RATE2M,
-        .maps[RTL_RC_CCK_RATE5_5M] = DESC92C_RATE5_5M,
-        .maps[RTL_RC_CCK_RATE11M] = DESC92C_RATE11M,
-        .maps[RTL_RC_OFDM_RATE6M] = DESC92C_RATE6M,
-        .maps[RTL_RC_OFDM_RATE9M] = DESC92C_RATE9M,
-        .maps[RTL_RC_OFDM_RATE12M] = DESC92C_RATE12M,
-        .maps[RTL_RC_OFDM_RATE18M] = DESC92C_RATE18M,
-        .maps[RTL_RC_OFDM_RATE24M] = DESC92C_RATE24M,
-        .maps[RTL_RC_OFDM_RATE36M] = DESC92C_RATE36M,
-        .maps[RTL_RC_OFDM_RATE48M] = DESC92C_RATE48M,
-        .maps[RTL_RC_OFDM_RATE54M] = DESC92C_RATE54M,
-
-        .maps[RTL_RC_HT_RATEMCS7] = DESC92C_RATEMCS7,
-        .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15,
+        .maps[RTL_RC_CCK_RATE1M] = DESC92_RATE1M,
+        .maps[RTL_RC_CCK_RATE2M] = DESC92_RATE2M,
+        .maps[RTL_RC_CCK_RATE5_5M] = DESC92_RATE5_5M,
+        .maps[RTL_RC_CCK_RATE11M] = DESC92_RATE11M,
+        .maps[RTL_RC_OFDM_RATE6M] = DESC92_RATE6M,
+        .maps[RTL_RC_OFDM_RATE9M] = DESC92_RATE9M,
+        .maps[RTL_RC_OFDM_RATE12M] = DESC92_RATE12M,
+        .maps[RTL_RC_OFDM_RATE18M] = DESC92_RATE18M,
+        .maps[RTL_RC_OFDM_RATE24M] = DESC92_RATE24M,
+        .maps[RTL_RC_OFDM_RATE36M] = DESC92_RATE36M,
+        .maps[RTL_RC_OFDM_RATE48M] = DESC92_RATE48M,
+        .maps[RTL_RC_OFDM_RATE54M] = DESC92_RATE54M,
+
+        .maps[RTL_RC_HT_RATEMCS7] = DESC92_RATEMCS7,
+        .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,
 };
 
 DEFINE_PCI_DEVICE_TABLE(rtl92ce_pci_ids) = {
@@ -351,27 +367,35 @@ 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);
-MODULE_PARM_DESC(swenc, "using hardware crypto (default 0 [hardware])\n");
-MODULE_PARM_DESC(ips, "using no link power save (default 1 is open)\n");
-MODULE_PARM_DESC(fwlps, "using linked fw control power save "
-                 "(default 1 is open)\n");
+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/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index 230bbe900d8d..4fb5ae24dee0 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -48,104 +48,6 @@ static u8 _rtl92ce_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
         return skb->priority;
 }
 
-static int _rtl92ce_rate_mapping(bool isht, u8 desc_rate, bool first_ampdu)
-{
-        int rate_idx;
-
-        if (first_ampdu) {
-                if (false == isht) {
-                        switch (desc_rate) {
-                        case DESC92C_RATE1M:
-                                rate_idx = 0;
-                                break;
-                        case DESC92C_RATE2M:
-                                rate_idx = 1;
-                                break;
-                        case DESC92C_RATE5_5M:
-                                rate_idx = 2;
-                                break;
-                        case DESC92C_RATE11M:
-                                rate_idx = 3;
-                                break;
-                        case DESC92C_RATE6M:
-                                rate_idx = 4;
-                                break;
-                        case DESC92C_RATE9M:
-                                rate_idx = 5;
-                                break;
-                        case DESC92C_RATE12M:
-                                rate_idx = 6;
-                                break;
-                        case DESC92C_RATE18M:
-                                rate_idx = 7;
-                                break;
-                        case DESC92C_RATE24M:
-                                rate_idx = 8;
-                                break;
-                        case DESC92C_RATE36M:
-                                rate_idx = 9;
-                                break;
-                        case DESC92C_RATE48M:
-                                rate_idx = 10;
-                                break;
-                        case DESC92C_RATE54M:
-                                rate_idx = 11;
-                                break;
-                        default:
-                                rate_idx = 0;
-                                break;
-                        }
-                } else {
-                        rate_idx = 11;
-                }
-
-                return rate_idx;
-        }
-
-        switch (desc_rate) {
-        case DESC92C_RATE1M:
-                rate_idx = 0;
-                break;
-        case DESC92C_RATE2M:
-                rate_idx = 1;
-                break;
-        case DESC92C_RATE5_5M:
-                rate_idx = 2;
-                break;
-        case DESC92C_RATE11M:
-                rate_idx = 3;
-                break;
-        case DESC92C_RATE6M:
-                rate_idx = 4;
-                break;
-        case DESC92C_RATE9M:
-                rate_idx = 5;
-                break;
-        case DESC92C_RATE12M:
-                rate_idx = 6;
-                break;
-        case DESC92C_RATE18M:
-                rate_idx = 7;
-                break;
-        case DESC92C_RATE24M:
-                rate_idx = 8;
-                break;
-        case DESC92C_RATE36M:
-                rate_idx = 9;
-                break;
-        case DESC92C_RATE48M:
-                rate_idx = 10;
-                break;
-        case DESC92C_RATE54M:
-                rate_idx = 11;
-                break;
-        default:
-                rate_idx = 11;
-                break;
-        }
-        return rate_idx;
-}
-
 static u8 _rtl92c_query_rxpwrpercentage(char antpower)
 {
         if ((antpower <= -100) || (antpower >= 20))
@@ -336,8 +238,8 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
                 pstats->rxpower = rx_pwr_all;
                 pstats->recvsignalpower = rx_pwr_all;
 
-                if (pdesc->rxht && pdesc->rxmcs >= DESC92C_RATEMCS8 &&
-                    pdesc->rxmcs <= DESC92C_RATEMCS15)
+                if (pdesc->rxht && pdesc->rxmcs >= DESC92_RATEMCS8 &&
+                    pdesc->rxmcs <= DESC92_RATEMCS15)
                         max_spatial_stream = 2;
                 else
                         max_spatial_stream = 1;
@@ -670,12 +572,10 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
         if (stats->decrypted)
                 rx_status->flag |= RX_FLAG_DECRYPTED;
 
-        rx_status->rate_idx = _rtl92ce_rate_mapping((bool)
-                                                    GET_RX_DESC_RXHT(pdesc),
-                                                    (u8)
-                                                    GET_RX_DESC_RXMCS(pdesc),
-                                                    (bool)
-                                                    GET_RX_DESC_PAGGR(pdesc));
+        rx_status->rate_idx = rtlwifi_rate_mapping(hw,
+                                (bool)GET_RX_DESC_RXHT(pdesc),
+                                (u8)GET_RX_DESC_RXMCS(pdesc),
+                                (bool)GET_RX_DESC_PAGGR(pdesc));
 
         rx_status->mactime = GET_RX_DESC_TSFL(pdesc);
         if (phystatus) {
@@ -768,7 +668,7 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
                 SET_TX_DESC_RTS_BW(pdesc, 0);
                 SET_TX_DESC_RTS_SC(pdesc, tcb_desc->rts_sc);
                 SET_TX_DESC_RTS_SHORT(pdesc,
-                                      ((tcb_desc->rts_rate <= DESC92C_RATE54M) ?
+                                      ((tcb_desc->rts_rate <= DESC92_RATE54M) ?
                                        (tcb_desc->rts_use_shortpreamble ? 1 : 0)
                                        : (tcb_desc->rts_use_shortgi ? 1 : 0)));
 
@@ -886,7 +786,7 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,
         if (firstseg)
                 SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
 
-        SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE1M);
+        SET_TX_DESC_TX_RATE(pdesc, DESC92_RATE1M);
 
         SET_TX_DESC_SEQ(pdesc, 0);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
index 0f1177137501..c8977a50ca36 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
@@ -537,12 +537,6 @@ do {							\
                 memset(__pdesc, 0, _size);      \
 } while (0);
 
-#define RX_HAL_IS_CCK_RATE(_pdesc)\
-        (_pdesc->rxmcs == DESC92C_RATE1M ||             \
-         _pdesc->rxmcs == DESC92C_RATE2M ||             \
-         _pdesc->rxmcs == DESC92C_RATE5_5M ||           \
-         _pdesc->rxmcs == DESC92C_RATE11M)
-
 struct rx_fwinfo_92c {
         u8 gain_trsw[4];
         u8 pwdb_all;