4 files changed, 36 insertions, 70 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 468bf73cc883..68b5c7e92cfb 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -394,7 +394,7 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
                         if (rtlefuse->eeprom_did == 0x8176) {
                                 if ((rtlefuse->eeprom_svid == 0x103C &&
                                      rtlefuse->eeprom_smid == 0x1629))
-                                        rtlhal->oem_id = RT_CID_819x_HP;
+                                        rtlhal->oem_id = RT_CID_819X_HP;
                                 else
                                         rtlhal->oem_id = RT_CID_DEFAULT;
                         } else {
@@ -405,7 +405,7 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
                         rtlhal->oem_id = RT_CID_TOSHIBA;
                         break;
                 case EEPROM_CID_QMI:
-                        rtlhal->oem_id = RT_CID_819x_QMI;
+                        rtlhal->oem_id = RT_CID_819X_QMI;
                         break;
                 case EEPROM_CID_WHQL:
                 default:
@@ -423,14 +423,14 @@ static void _rtl92cu_hal_customized_behavior(struct ieee80211_hw *hw)
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
         switch (rtlhal->oem_id) {
-        case RT_CID_819x_HP:
+        case RT_CID_819X_HP:
                 usb_priv->ledctl.led_opendrain = true;
                 break;
-        case RT_CID_819x_Lenovo:
+        case RT_CID_819X_LENOVO:
         case RT_CID_DEFAULT:
         case RT_CID_TOSHIBA:
         case RT_CID_CCX:
-        case RT_CID_819x_Acer:
+        case RT_CID_819X_ACER:
         case RT_CID_WHQL:
         default:
                 break;
@@ -985,6 +985,17 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         int err = 0;
         static bool iqk_initialized;
+        unsigned long flags;
+
+        /* As this function can take a very long time (up to 350 ms)
+         * and can be called with irqs disabled, reenable the irqs
+         * to let the other devices continue being serviced.
+         *
+         * It is safe doing so since our own interrupts will only be enabled
+         * in a subsequent step.
+         */
+        local_save_flags(flags);
+        local_irq_enable();
 
         rtlhal->hw_type = HARDWARE_TYPE_RTL8192CU;
         err = _rtl92cu_init_mac(hw);
@@ -997,7 +1008,7 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "Failed to download FW. Init HW without FW now..\n");
                 err = 1;
-                return err;
+                goto exit;
         }
         rtlhal->last_hmeboxnum = 0; /* h2c */
         _rtl92cu_phy_param_tab_init(hw);
@@ -1034,6 +1045,8 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
         _InitPABias(hw);
         _update_mac_setting(hw);
         rtl92c_dm_init(hw);
+exit:
+        local_irq_restore(flags);
         return err;
 }
 
@@ -1379,11 +1392,13 @@ void rtl92cu_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
-        u32 reg_rcr = rtl_read_dword(rtlpriv, REG_RCR);
+        u32 reg_rcr;
 
         if (rtlpriv->psc.rfpwr_state != ERFON)
                 return;
 
+        rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
+
         if (check_bssid) {
                 u8 tmp;
                 if (IS_NORMAL_CHIP(rtlhal->version)) {
@@ -1795,7 +1810,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                           e_aci);
                                 break;
                         }
-                        if (rtlusb->acm_method != eAcmWay2_SW)
+                        if (rtlusb->acm_method != EACMWAY2_SW)
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                          HW_VAR_ACM_CTRL, &e_aci);
                         break;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
index 0c09240eadcc..9831ff1128ca 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
@@ -30,6 +30,7 @@
 #include "../wifi.h"
 #include "../pci.h"
 #include "../ps.h"
+#include "../core.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
@@ -188,18 +189,7 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
         }
         if (configtype == BASEBAND_CONFIG_PHY_REG) {
                 for (i = 0; i < phy_reg_arraylen; i = i + 2) {
-                        if (phy_regarray_table[i] == 0xfe)
-                                mdelay(50);
-                        else if (phy_regarray_table[i] == 0xfd)
-                                mdelay(5);
-                        else if (phy_regarray_table[i] == 0xfc)
-                                mdelay(1);
-                        else if (phy_regarray_table[i] == 0xfb)
-                                udelay(50);
-                        else if (phy_regarray_table[i] == 0xfa)
-                                udelay(5);
-                        else if (phy_regarray_table[i] == 0xf9)
-                                udelay(1);
+                        rtl_addr_delay(phy_regarray_table[i]);
                         rtl_set_bbreg(hw, phy_regarray_table[i], MASKDWORD,
                                       phy_regarray_table[i + 1]);
                         udelay(1);
@@ -236,18 +226,7 @@ bool _rtl92cu_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
         phy_regarray_table_pg = rtlphy->hwparam_tables[PHY_REG_PG].pdata;
         if (configtype == BASEBAND_CONFIG_PHY_REG) {
                 for (i = 0; i < phy_regarray_pg_len; i = i + 3) {
-                        if (phy_regarray_table_pg[i] == 0xfe)
-                                mdelay(50);
-                        else if (phy_regarray_table_pg[i] == 0xfd)
-                                mdelay(5);
-                        else if (phy_regarray_table_pg[i] == 0xfc)
-                                mdelay(1);
-                        else if (phy_regarray_table_pg[i] == 0xfb)
-                                udelay(50);
-                        else if (phy_regarray_table_pg[i] == 0xfa)
-                                udelay(5);
-                        else if (phy_regarray_table_pg[i] == 0xf9)
-                                udelay(1);
+                        rtl_addr_delay(phy_regarray_table_pg[i]);
                         _rtl92c_store_pwrIndex_diffrate_offset(hw,
                                                   phy_regarray_table_pg[i],
                                                   phy_regarray_table_pg[i + 1],
@@ -294,46 +273,16 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
         switch (rfpath) {
         case RF90_PATH_A:
                 for (i = 0; i < radioa_arraylen; i = i + 2) {
-                        if (radioa_array_table[i] == 0xfe)
-                                mdelay(50);
-                        else if (radioa_array_table[i] == 0xfd)
-                                mdelay(5);
-                        else if (radioa_array_table[i] == 0xfc)
-                                mdelay(1);
-                        else if (radioa_array_table[i] == 0xfb)
-                                udelay(50);
-                        else if (radioa_array_table[i] == 0xfa)
-                                udelay(5);
-                        else if (radioa_array_table[i] == 0xf9)
-                                udelay(1);
-                        else {
-                                rtl_set_rfreg(hw, rfpath, radioa_array_table[i],
-                                              RFREG_OFFSET_MASK,
-                                              radioa_array_table[i + 1]);
-                                udelay(1);
-                        }
+                        rtl_rfreg_delay(hw, rfpath, radioa_array_table[i],
+                                        RFREG_OFFSET_MASK,
+                                        radioa_array_table[i + 1]);
                 }
                 break;
         case RF90_PATH_B:
                 for (i = 0; i < radiob_arraylen; i = i + 2) {
-                        if (radiob_array_table[i] == 0xfe) {
-                                mdelay(50);
-                        } else if (radiob_array_table[i] == 0xfd)
-                                mdelay(5);
-                        else if (radiob_array_table[i] == 0xfc)
-                                mdelay(1);
-                        else if (radiob_array_table[i] == 0xfb)
-                                udelay(50);
-                        else if (radiob_array_table[i] == 0xfa)
-                                udelay(5);
-                        else if (radiob_array_table[i] == 0xf9)
-                                udelay(1);
-                        else {
-                                rtl_set_rfreg(hw, rfpath, radiob_array_table[i],
-                                              RFREG_OFFSET_MASK,
-                                              radiob_array_table[i + 1]);
-                                udelay(1);
-                        }
+                        rtl_rfreg_delay(hw, rfpath, radiob_array_table[i],
+                                        RFREG_OFFSET_MASK,
+                                        radiob_array_table[i + 1]);
                 }
                 break;
         case RF90_PATH_C:
@@ -344,6 +293,8 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "switch case not processed\n");
                 break;
+        default:
+                break;
         }
         return true;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index 1bc21ccfa71b..035e0dc3922c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -495,7 +495,7 @@ static void _rtl_tx_desc_checksum(u8 *txdesc)
 
 void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
                           struct ieee80211_hdr *hdr, u8 *pdesc_tx,
-                          struct ieee80211_tx_info *info,
+                          u8 *pbd_desc_tx, struct ieee80211_tx_info *info,
                           struct ieee80211_sta *sta,
                           struct sk_buff *skb,
                           u8 queue_index,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
index 725c53accc58..fd8051dcd98a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
@@ -420,7 +420,7 @@ struct sk_buff *rtl8192c_tx_aggregate_hdl(struct ieee80211_hw *,
                                            struct sk_buff_head *);
 void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
                           struct ieee80211_hdr *hdr, u8 *pdesc_tx,
-                          struct ieee80211_tx_info *info,
+                          u8 *pbd_desc_tx, struct ieee80211_tx_info *info,
                           struct ieee80211_sta *sta,
                           struct sk_buff *skb,
                           u8 queue_index,