6 files changed, 49 insertions, 115 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index 4f461786a7eb..9098558d916d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -251,7 +251,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 e_aci = *val;
                         rtl92s_dm_init_edca_turbo(hw);
 
-                        if (rtlpci->acm_method != eAcmWay2_SW)
+                        if (rtlpci->acm_method != EACMWAY2_SW)
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                  HW_VAR_ACM_CTRL,
                                                  &e_aci);
@@ -413,20 +413,18 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         (u8 *)(&fw_current_inps));
                         rtlpriv->cfg->ops->set_hw_reg(hw,
                                         HW_VAR_H2C_FW_PWRMODE,
-                                        (u8 *)(&ppsc->fwctrl_psmode));
+                                        &ppsc->fwctrl_psmode);
 
-                        rtlpriv->cfg->ops->set_hw_reg(hw,
-                                        HW_VAR_SET_RPWM,
-                                        (u8 *)(&rpwm_val));
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
+                                                      &rpwm_val);
                 } else {
                         rpwm_val = 0x0C;        /* RF on */
                         fw_pwrmode = FW_PS_ACTIVE_MODE;
                         fw_current_inps = false;
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
-                                        (u8 *)(&rpwm_val));
-                        rtlpriv->cfg->ops->set_hw_reg(hw,
-                                        HW_VAR_H2C_FW_PWRMODE,
-                                        (u8 *)(&fw_pwrmode));
+                                                      &rpwm_val);
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_H2C_FW_PWRMODE,
+                                                      &fw_pwrmode);
 
                         rtlpriv->cfg->ops->set_hw_reg(hw,
                                         HW_VAR_FW_PSMODE_STATUS,
@@ -955,7 +953,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 tmp_byte = 0;
-
+        unsigned long flags;
         bool rtstatus = true;
         u8 tmp_u1b;
         int err = false;
@@ -967,6 +965,16 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
 
         rtlpci->being_init_adapter = true;
 
+        /* 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();
+
         rtlpriv->intf_ops->disable_aspm(hw);
 
         /* 1. MAC Initialize */
@@ -984,7 +992,8 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
                          "Failed to download FW. Init HW without FW now... "
                          "Please copy FW into /lib/firmware/rtlwifi\n");
-                return 1;
+                err = 1;
+                goto exit;
         }
 
         /* After FW download, we have to reset MAC register */
@@ -997,7 +1006,8 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
         /* 3. Initialize MAC/PHY Config by MACPHY_reg.txt */
         if (!rtl92s_phy_mac_config(hw)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "MAC Config failed\n");
-                return rtstatus;
+                err = rtstatus;
+                goto exit;
         }
 
         /* because last function modify RCR, so we update
@@ -1016,7 +1026,8 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
         /* 4. Initialize BB After MAC Config PHY_reg.txt, AGC_Tab.txt */
         if (!rtl92s_phy_bb_config(hw)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "BB Config failed\n");
-                return rtstatus;
+                err = rtstatus;
+                goto exit;
         }
 
         /* 5. Initiailze RF RAIO_A.txt RF RAIO_B.txt */
@@ -1033,7 +1044,8 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
 
         if (!rtl92s_phy_rf_config(hw)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n");
-                return rtstatus;
+                err = rtstatus;
+                goto exit;
         }
 
         /* After read predefined TXT, we must set BB/MAC/RF
@@ -1122,8 +1134,9 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
 
         rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_ON);
         rtl92s_dm_init(hw);
+exit:
+        local_irq_restore(flags);
         rtlpci->being_init_adapter = false;
-
         return err;
 }
 
@@ -1135,12 +1148,13 @@ void rtl92se_set_mac_addr(struct rtl_io *io, const u8 *addr)
 void rtl92se_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        u32 reg_rcr = rtlpci->receive_config;
+        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) {
                 reg_rcr |= (RCR_CBSSID);
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR, (u8 *)(&reg_rcr));
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index 9c092e6eb3fe..77c5b5f35244 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/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"
@@ -833,18 +834,7 @@ static bool _rtl92s_phy_config_bb(struct ieee80211_hw *hw, u8 configtype)
 
         if (configtype == BASEBAND_CONFIG_PHY_REG) {
                 for (i = 0; i < phy_reg_len; i = i + 2) {
-                        if (phy_reg_table[i] == 0xfe)
-                                mdelay(50);
-                        else if (phy_reg_table[i] == 0xfd)
-                                mdelay(5);
-                        else if (phy_reg_table[i] == 0xfc)
-                                mdelay(1);
-                        else if (phy_reg_table[i] == 0xfb)
-                                udelay(50);
-                        else if (phy_reg_table[i] == 0xfa)
-                                udelay(5);
-                        else if (phy_reg_table[i] == 0xf9)
-                                udelay(1);
+                        rtl_addr_delay(phy_reg_table[i]);
 
                         /* Add delay for ECS T20 & LG malow platform, */
                         udelay(1);
@@ -886,18 +876,7 @@ static bool _rtl92s_phy_set_bb_to_diff_rf(struct ieee80211_hw *hw,
 
         if (configtype == BASEBAND_CONFIG_PHY_REG) {
                 for (i = 0; i < phy_regarray2xtxr_len; i = i + 3) {
-                        if (phy_regarray2xtxr_table[i] == 0xfe)
-                                mdelay(50);
-                        else if (phy_regarray2xtxr_table[i] == 0xfd)
-                                mdelay(5);
-                        else if (phy_regarray2xtxr_table[i] == 0xfc)
-                                mdelay(1);
-                        else if (phy_regarray2xtxr_table[i] == 0xfb)
-                                udelay(50);
-                        else if (phy_regarray2xtxr_table[i] == 0xfa)
-                                udelay(5);
-                        else if (phy_regarray2xtxr_table[i] == 0xf9)
-                                udelay(1);
+                        rtl_addr_delay(phy_regarray2xtxr_table[i]);
 
                         rtl92s_phy_set_bb_reg(hw, phy_regarray2xtxr_table[i],
                                 phy_regarray2xtxr_table[i + 1],
@@ -920,18 +899,7 @@ static bool _rtl92s_phy_config_bb_with_pg(struct ieee80211_hw *hw,
 
         if (configtype == BASEBAND_CONFIG_PHY_REG) {
                 for (i = 0; i < phy_pg_len; i = i + 3) {
-                        if (phy_table_pg[i] == 0xfe)
-                                mdelay(50);
-                        else if (phy_table_pg[i] == 0xfd)
-                                mdelay(5);
-                        else if (phy_table_pg[i] == 0xfc)
-                                mdelay(1);
-                        else if (phy_table_pg[i] == 0xfb)
-                                udelay(50);
-                        else if (phy_table_pg[i] == 0xfa)
-                                udelay(5);
-                        else if (phy_table_pg[i] == 0xf9)
-                                udelay(1);
+                        rtl_addr_delay(phy_table_pg[i]);
 
                         _rtl92s_store_pwrindex_diffrate_offset(hw,
                                         phy_table_pg[i],
@@ -1034,28 +1002,9 @@ u8 rtl92s_phy_config_rf(struct ieee80211_hw *hw, enum radio_path rfpath)
         switch (rfpath) {
         case RF90_PATH_A:
                 for (i = 0; i < radio_a_tblen; i = i + 2) {
-                        if (radio_a_table[i] == 0xfe)
-                                /* Delay specific ms. Only RF configuration
-                                 * requires delay. */
-                                mdelay(50);
-                        else if (radio_a_table[i] == 0xfd)
-                                mdelay(5);
-                        else if (radio_a_table[i] == 0xfc)
-                                mdelay(1);
-                        else if (radio_a_table[i] == 0xfb)
-                                udelay(50);
-                        else if (radio_a_table[i] == 0xfa)
-                                udelay(5);
-                        else if (radio_a_table[i] == 0xf9)
-                                udelay(1);
-                        else
-                                rtl92s_phy_set_rf_reg(hw, rfpath,
-                                                      radio_a_table[i],
-                                                      MASK20BITS,
-                                                      radio_a_table[i + 1]);
+                        rtl_rfreg_delay(hw, rfpath, radio_a_table[i],
+                                        MASK20BITS, radio_a_table[i + 1]);
 
-                        /* Add delay for ECS T20 & LG malow platform */
-                        udelay(1);
                 }
 
                 /* PA Bias current for inferiority IC */
@@ -1063,28 +1012,8 @@ u8 rtl92s_phy_config_rf(struct ieee80211_hw *hw, enum radio_path rfpath)
                 break;
         case RF90_PATH_B:
                 for (i = 0; i < radio_b_tblen; i = i + 2) {
-                        if (radio_b_table[i] == 0xfe)
-                                /* Delay specific ms. Only RF configuration
-                                 * requires delay.*/
-                                mdelay(50);
-                        else if (radio_b_table[i] == 0xfd)
-                                mdelay(5);
-                        else if (radio_b_table[i] == 0xfc)
-                                mdelay(1);
-                        else if (radio_b_table[i] == 0xfb)
-                                udelay(50);
-                        else if (radio_b_table[i] == 0xfa)
-                                udelay(5);
-                        else if (radio_b_table[i] == 0xf9)
-                                udelay(1);
-                        else
-                                rtl92s_phy_set_rf_reg(hw, rfpath,
-                                                      radio_b_table[i],
-                                                      MASK20BITS,
-                                                      radio_b_table[i + 1]);
-
-                        /* Add delay for ECS T20 & LG malow platform */
-                        udelay(1);
+                        rtl_rfreg_delay(hw, rfpath, radio_b_table[i],
+                                        MASK20BITS, radio_b_table[i + 1]);
                 }
                 break;
         case RF90_PATH_C:
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
index c81c83591940..e13043479b71 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
@@ -1165,16 +1165,4 @@
 
 #define BTX_AGCRATECCK                          0x7f00
 
-#define MASKBYTE0                               0xff
-#define MASKBYTE1                               0xff00
-#define MASKBYTE2                               0xff0000
-#define MASKBYTE3                               0xff000000
-#define MASKHWORD                               0xffff0000
-#define MASKLWORD                               0x0000ffff
-#define MASKDWORD                               0xffffffff
-
-#define MAKS12BITS                              0xfffff
-#define MASK20BITS                              0xfffff
-#define RFREG_OFFSET_MASK                       0xfffff
-
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
index 92d38ab3c60e..78a81c1e390b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
@@ -52,7 +52,7 @@ static void _rtl92s_get_powerbase(struct ieee80211_hw *hw, u8 *p_pwrlevel,
         /* We only care about the path A for legacy. */
         if (rtlefuse->eeprom_version < 2) {
                 pwrbase0 = pwrlevel[0] + (rtlefuse->legacy_httxpowerdiff & 0xf);
-        } else if (rtlefuse->eeprom_version >= 2) {
+        } else {
                 legacy_pwrdiff = rtlefuse->txpwr_legacyhtdiff
                                                 [RF90_PATH_A][chnl - 1];
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index 27efbcdac6a9..36b48be8329c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -310,7 +310,7 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
                         /* during testing, hdr was NULL here */
                         return false;
                 }
-                if ((ieee80211_is_robust_mgmt_frame(hdr)) &&
+                if ((_ieee80211_is_robust_mgmt_frame(hdr)) &&
                         (ieee80211_has_protected(hdr->frame_control)))
                         rx_status->flag &= ~RX_FLAG_DECRYPTED;
                 else
@@ -336,7 +336,7 @@ bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
 
 void rtl92se_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 hw_queue, struct rtl_tcb_desc *ptcb_desc)
@@ -573,7 +573,8 @@ void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
         }
 }
 
-void rtl92se_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
+void rtl92se_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
+                      u8 desc_name, u8 *val)
 {
         if (istx) {
                 switch (desc_name) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.h b/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
index 64dd66f287c1..5a13f17e3b41 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
@@ -29,8 +29,9 @@
 #ifndef __REALTEK_PCI92SE_TRX_H__
 #define __REALTEK_PCI92SE_TRX_H__
 
-void rtl92se_tx_fill_desc(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
-                          u8 *pdesc, struct ieee80211_tx_info *info,
+void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,
+                          struct ieee80211_hdr *hdr, u8 *pdesc,
+                          u8 *pbd_desc_tx, struct ieee80211_tx_info *info,
                           struct ieee80211_sta *sta,
                           struct sk_buff *skb, u8 hw_queue,
                           struct rtl_tcb_desc *ptcb_desc);
@@ -39,7 +40,8 @@ void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, bool firstseg,
 bool rtl92se_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
                            struct ieee80211_rx_status *rx_status, u8 *pdesc,
                            struct sk_buff *skb);
-void rtl92se_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val);
+void rtl92se_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,
+                      u8 desc_name, u8 *val);
 u32 rtl92se_get_desc(u8 *pdesc, bool istx, u8 desc_name);
 void rtl92se_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);