wifi: rtlwifi: Clean up rtl8192d-common a bit
authorBitterblue Smith <rtl8821cerfe2@gmail.com>
Thu, 25 Apr 2024 18:14:35 +0000 (21:14 +0300)
committerPing-Ke Shih <pkshih@realtek.com>
Thu, 2 May 2024 02:44:27 +0000 (10:44 +0800)
Improve readability:
 * add empty lines
 * use abs_diff in rtl92d_dm_txpower_tracking_callback_thermalmeter
 * roll up repeated statements into a for loop in
   rtl92d_dm_txpower_tracking_callback_thermalmeter
 * shorten lines by replacing many instances of "rtlpriv->dm" with "dm"
   pointer in rtl92d_dm_txpower_tracking_callback_thermalmeter
 * sort some declarations by length
 * refactor _rtl92d_get_txpower_writeval_by_regulatory a little
 * refactor _rtl92de_readpowervalue_fromprom a little

Delete unused structs tag_dynamic_init_gain_operation_type_definition
and swat.

Simplify rtl92d_fill_h2c_cmd a little and delete a pointless wrapper
function.

Tested with a single MAC single PHY USB dongle from Aliexpress labelled
"CC&C WL-6210-V3".

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://msgid.link/f6acfa78-2f4e-47f1-95d4-65aa77510113@gmail.com
drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.c
drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.h
drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.c
drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c
drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.c
drivers/net/wireless/realtek/rtlwifi/rtl8192d/reg.h
drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.c
drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.c

index d376e458445493cee74b50effe72444360a657e7..20373ce998bffea6bfd929771d9f8dcfa0cd7bd9 100644 (file)
@@ -9,8 +9,6 @@
 #include "phy_common.h"
 #include "dm_common.h"
 
-#define UNDEC_SM_PWDB  entry_min_undec_sm_pwdb
-
 static const u32 ofdmswing_table[OFDM_TABLE_SIZE_92D] = {
        0x7f8001fe,             /* 0, +6.0dB */
        0x788001e2,             /* 1, +5.5dB */
@@ -137,16 +135,18 @@ static void rtl92d_dm_rxgain_tracking_thermalmeter(struct ieee80211_hw *hw)
                0x05, 0x04, 0x04, 0x03, 0x02
        };
        struct rtl_priv *rtlpriv = rtl_priv(hw);
+       int i, idx;
        u32 u4tmp;
-       int i;
 
-       u4tmp = (index_mapping[(rtlpriv->efuse.eeprom_thermalmeter -
-                               rtlpriv->dm.thermalvalue_rxgain)]) << 12;
+       idx = rtlpriv->efuse.eeprom_thermalmeter - rtlpriv->dm.thermalvalue_rxgain;
+       u4tmp = index_mapping[idx] << 12;
+
        rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                "===> Rx Gain %x\n", u4tmp);
+
        for (i = RF90_PATH_A; i < rtlpriv->phy.num_total_rfpath; i++)
                rtl_set_rfreg(hw, i, 0x3C, RFREG_OFFSET_MASK,
-                             (rtlpriv->phy.reg_rf3c[i] & (~(0xF000))) | u4tmp);
+                             (rtlpriv->phy.reg_rf3c[i] & ~0xF000) | u4tmp);
 }
 
 static void rtl92d_bandtype_2_4G(struct ieee80211_hw *hw, long *temp_cckg,
@@ -163,6 +163,7 @@ static void rtl92d_bandtype_2_4G(struct ieee80211_hw *hw, long *temp_cckg,
        temp_cck = rtl_get_bbreg(hw, RCCK0_TXFILTER2,
                                 MASKDWORD) & MASKCCK;
        rtl92d_release_cckandrw_pagea_ctl(hw, &flag);
+
        for (i = 0; i < CCK_TABLE_LENGTH; i++) {
                if (rtlpriv->dm.cck_inch14)
                        cckswing = &cckswing_table_ch14[i][2];
@@ -199,6 +200,7 @@ static void rtl92d_bandtype_5G(struct rtl_hal *rtlhal, u8 *ofdm_index,
                        *internal_pa = rtlefuse->internal_pa_5g[1];
                else
                        *internal_pa = rtlefuse->internal_pa_5g[i];
+
                if (*internal_pa) {
                        if (rtlhal->interfaceindex == 1 || i == rf)
                                offset = 4;
@@ -213,8 +215,10 @@ static void rtl92d_bandtype_5G(struct rtl_hal *rtlhal, u8 *ofdm_index,
                        else
                                offset = 0;
                }
+
                if (thermalvalue > rtlefuse->eeprom_thermalmeter)
                        offset++;
+
                if (*internal_pa) {
                        if (delta > INDEX_MAPPING_NUM - 1)
                                index = index_mapping_pa[offset]
@@ -229,6 +233,7 @@ static void rtl92d_bandtype_5G(struct rtl_hal *rtlhal, u8 *ofdm_index,
                        else
                                index = index_mapping[offset][delta];
                }
+
                if (thermalvalue > rtlefuse->eeprom_thermalmeter) {
                        if (*internal_pa && thermalvalue > 0x12) {
                                ofdm_index[i] = rtlpriv->dm.ofdm_index[i] -
@@ -247,62 +252,67 @@ rtl92d_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw *hw)
 {
        static const u8 index_mapping[5][INDEX_MAPPING_NUM] = {
                /* 5G, path A/MAC 0, decrease power  */
-               {0, 1, 3, 6, 8, 9,      11, 13, 14, 16, 17, 18, 18},
+               {0, 1, 3, 6, 8, 9, 11, 13, 14, 16, 17, 18, 18},
                /* 5G, path A/MAC 0, increase power  */
-               {0, 2, 4, 5, 7, 10,     12, 14, 16, 18, 18, 18, 18},
+               {0, 2, 4, 5, 7, 10, 12, 14, 16, 18, 18, 18, 18},
                /* 5G, path B/MAC 1, decrease power */
-               {0, 2, 3, 6, 8, 9,      11, 13, 14, 16, 17, 18, 18},
+               {0, 2, 3, 6, 8, 9, 11, 13, 14, 16, 17, 18, 18},
                /* 5G, path B/MAC 1, increase power */
-               {0, 2, 4, 5, 7, 10,     13, 16, 16, 18, 18, 18, 18},
+               {0, 2, 4, 5, 7, 10, 13, 16, 16, 18, 18, 18, 18},
                /* 2.4G, for decreas power */
-               {0, 1, 2, 3, 4, 5,      6, 7, 7, 8, 9, 10, 10},
+               {0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9, 10, 10},
        };
        static const u8 index_mapping_internal_pa[8][INDEX_MAPPING_NUM] = {
                /* 5G, path A/MAC 0, ch36-64, decrease power  */
-               {0, 1, 2, 4, 6, 7,      9, 11, 12, 14, 15, 16, 16},
+               {0, 1, 2, 4, 6, 7, 9, 11, 12, 14, 15, 16, 16},
                /* 5G, path A/MAC 0, ch36-64, increase power  */
-               {0, 2, 4, 5, 7, 10,     12, 14, 16, 18, 18, 18, 18},
+               {0, 2, 4, 5, 7, 10, 12, 14, 16, 18, 18, 18, 18},
                /* 5G, path A/MAC 0, ch100-165, decrease power  */
-               {0, 1, 2, 3, 5, 6,      8, 10, 11, 13, 14, 15, 15},
+               {0, 1, 2, 3, 5, 6, 8, 10, 11, 13, 14, 15, 15},
                /* 5G, path A/MAC 0, ch100-165, increase power  */
-               {0, 2, 4, 5, 7, 10,     12, 14, 16, 18, 18, 18, 18},
+               {0, 2, 4, 5, 7, 10, 12, 14, 16, 18, 18, 18, 18},
                /* 5G, path B/MAC 1, ch36-64, decrease power */
-               {0, 1, 2, 4, 6, 7,      9, 11, 12, 14, 15, 16, 16},
+               {0, 1, 2, 4, 6, 7, 9, 11, 12, 14, 15, 16, 16},
                /* 5G, path B/MAC 1, ch36-64, increase power */
-               {0, 2, 4, 5, 7, 10,     13, 16, 16, 18, 18, 18, 18},
+               {0, 2, 4, 5, 7, 10, 13, 16, 16, 18, 18, 18, 18},
                /* 5G, path B/MAC 1, ch100-165, decrease power */
-               {0, 1, 2, 3, 5, 6,      8, 9, 10, 12, 13, 14, 14},
+               {0, 1, 2, 3, 5, 6, 8, 9, 10, 12, 13, 14, 14},
                /* 5G, path B/MAC 1, ch100-165, increase power */
-               {0, 2, 4, 5, 7, 10,     13, 16, 16, 18, 18, 18, 18},
+               {0, 2, 4, 5, 7, 10, 13, 16, 16, 18, 18, 18, 18},
        };
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_efuse *rtlefuse = rtl_efuse(rtlpriv);
        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
        struct rtl_phy *rtlphy = &rtlpriv->phy;
+       struct rtl_dm *dm = &rtlpriv->dm;
        u8 thermalvalue, delta, delta_lck, delta_iqk, delta_rxgain;
+       u8 ofdm_min_index = 6, ofdm_min_index_internal_pa = 3, rf;
+       long ele_a = 0, ele_d, temp_cck, val_x, value32;
+       bool is2t = IS_92D_SINGLEPHY(rtlhal->version);
        u8 offset, thermalvalue_avg_count = 0;
+       u8 ofdm_index_old[2] = {0, 0};
        u32 thermalvalue_avg = 0;
        bool internal_pa = false;
-       long ele_a = 0, ele_d, temp_cck, val_x, value32;
        long val_y, ele_c = 0;
+       s8 cck_index_old = 0;
+       u8 indexforchannel;
        u8 ofdm_index[2];
        s8 cck_index = 0;
-       u8 ofdm_index_old[2] = {0, 0};
-       s8 cck_index_old = 0;
-       u8 index;
+       u8 index, swing;
        int i;
-       bool is2t = IS_92D_SINGLEPHY(rtlhal->version);
-       u8 ofdm_min_index = 6, ofdm_min_index_internal_pa = 3, rf;
-       u8 indexforchannel =
-           rtl92d_get_rightchnlplace_for_iqk(rtlphy->current_channel);
 
-       rtlpriv->dm.txpower_trackinginit = true;
+       indexforchannel = rtl92d_get_rightchnlplace_for_iqk(rtlphy->current_channel);
+
+       dm->txpower_trackinginit = true;
+
        rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "\n");
+
        thermalvalue = (u8)rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0xf800);
+
        rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x\n",
                thermalvalue,
-               rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter);
+               dm->thermalvalue, rtlefuse->eeprom_thermalmeter);
 
        if (!thermalvalue)
                goto exit;
@@ -312,10 +322,11 @@ rtl92d_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw *hw)
        else
                rf = 1;
 
-       if (rtlpriv->dm.thermalvalue && !rtlhal->reloadtxpowerindex)
+       if (dm->thermalvalue && !rtlhal->reloadtxpowerindex)
                goto old_index_done;
 
-       ele_d = rtl_get_bbreg(hw, ROFDM0_XATXIQIMBALANCE,  MASKDWORD) & MASKOFDM_D;
+       ele_d = rtl_get_bbreg(hw, ROFDM0_XATXIQIMBALANCE, MASKDWORD) & MASKOFDM_D;
+
        for (i = 0; i < OFDM_TABLE_SIZE_92D; i++) {
                if (ele_d == (ofdmswing_table[i] & MASKOFDM_D)) {
                        ofdm_index_old[0] = (u8)i;
@@ -327,13 +338,15 @@ rtl92d_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw *hw)
                        break;
                }
        }
+
        if (is2t) {
-               ele_d = rtl_get_bbreg(hw, ROFDM0_XBTXIQIMBALANCE,
-                                     MASKDWORD) & MASKOFDM_D;
+               ele_d = rtl_get_bbreg(hw, ROFDM0_XBTXIQIMBALANCE, MASKDWORD);
+               ele_d &= MASKOFDM_D;
+
                for (i = 0; i < OFDM_TABLE_SIZE_92D; i++) {
-                       if (ele_d ==
-                           (ofdmswing_table[i] & MASKOFDM_D)) {
+                       if (ele_d == (ofdmswing_table[i] & MASKOFDM_D)) {
                                ofdm_index_old[1] = (u8)i;
+
                                rtl_dbg(rtlpriv, COMP_POWER_TRACKING,
                                        DBG_LOUD,
                                        "Initial pathB ele_d reg 0x%x = 0x%lx, ofdm_index = 0x%x\n",
@@ -343,6 +356,7 @@ rtl92d_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw *hw)
                        }
                }
        }
+
        if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                rtl92d_bandtype_2_4G(hw, &temp_cck, &cck_index_old);
        } else {
@@ -350,115 +364,113 @@ rtl92d_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw *hw)
                cck_index_old = 12;
        }
 
-       if (!rtlpriv->dm.thermalvalue) {
-               rtlpriv->dm.thermalvalue = rtlefuse->eeprom_thermalmeter;
-               rtlpriv->dm.thermalvalue_lck = thermalvalue;
-               rtlpriv->dm.thermalvalue_iqk = thermalvalue;
-               rtlpriv->dm.thermalvalue_rxgain = rtlefuse->eeprom_thermalmeter;
+       if (!dm->thermalvalue) {
+               dm->thermalvalue = rtlefuse->eeprom_thermalmeter;
+               dm->thermalvalue_lck = thermalvalue;
+               dm->thermalvalue_iqk = thermalvalue;
+               dm->thermalvalue_rxgain = rtlefuse->eeprom_thermalmeter;
+
                for (i = 0; i < rf; i++)
-                       rtlpriv->dm.ofdm_index[i] = ofdm_index_old[i];
-               rtlpriv->dm.cck_index = cck_index_old;
+                       dm->ofdm_index[i] = ofdm_index_old[i];
+
+               dm->cck_index = cck_index_old;
        }
+
        if (rtlhal->reloadtxpowerindex) {
                for (i = 0; i < rf; i++)
-                       rtlpriv->dm.ofdm_index[i] = ofdm_index_old[i];
-               rtlpriv->dm.cck_index = cck_index_old;
+                       dm->ofdm_index[i] = ofdm_index_old[i];
+
+               dm->cck_index = cck_index_old;
+
                rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                        "reload ofdm index for band switch\n");
        }
+
 old_index_done:
        for (i = 0; i < rf; i++)
-               ofdm_index[i] = rtlpriv->dm.ofdm_index[i];
+               ofdm_index[i] = dm->ofdm_index[i];
+
+       dm->thermalvalue_avg[dm->thermalvalue_avg_index] = thermalvalue;
+       dm->thermalvalue_avg_index++;
+
+       if (dm->thermalvalue_avg_index == AVG_THERMAL_NUM)
+               dm->thermalvalue_avg_index = 0;
 
-       rtlpriv->dm.thermalvalue_avg
-                   [rtlpriv->dm.thermalvalue_avg_index] = thermalvalue;
-       rtlpriv->dm.thermalvalue_avg_index++;
-       if (rtlpriv->dm.thermalvalue_avg_index == AVG_THERMAL_NUM)
-               rtlpriv->dm.thermalvalue_avg_index = 0;
        for (i = 0; i < AVG_THERMAL_NUM; i++) {
-               if (rtlpriv->dm.thermalvalue_avg[i]) {
-                       thermalvalue_avg += rtlpriv->dm.thermalvalue_avg[i];
+               if (dm->thermalvalue_avg[i]) {
+                       thermalvalue_avg += dm->thermalvalue_avg[i];
                        thermalvalue_avg_count++;
                }
        }
+
        if (thermalvalue_avg_count)
                thermalvalue = (u8)(thermalvalue_avg / thermalvalue_avg_count);
+
        if (rtlhal->reloadtxpowerindex) {
-               delta = (thermalvalue > rtlefuse->eeprom_thermalmeter) ?
-                   (thermalvalue - rtlefuse->eeprom_thermalmeter) :
-                   (rtlefuse->eeprom_thermalmeter - thermalvalue);
+               delta = abs_diff(thermalvalue, rtlefuse->eeprom_thermalmeter);
                rtlhal->reloadtxpowerindex = false;
-               rtlpriv->dm.done_txpower = false;
-       } else if (rtlpriv->dm.done_txpower) {
-               delta = (thermalvalue > rtlpriv->dm.thermalvalue) ?
-                   (thermalvalue - rtlpriv->dm.thermalvalue) :
-                   (rtlpriv->dm.thermalvalue - thermalvalue);
+               dm->done_txpower = false;
+       } else if (dm->done_txpower) {
+               delta = abs_diff(thermalvalue, dm->thermalvalue);
        } else {
-               delta = (thermalvalue > rtlefuse->eeprom_thermalmeter) ?
-                   (thermalvalue - rtlefuse->eeprom_thermalmeter) :
-                   (rtlefuse->eeprom_thermalmeter - thermalvalue);
+               delta = abs_diff(thermalvalue, rtlefuse->eeprom_thermalmeter);
        }
-       delta_lck = (thermalvalue > rtlpriv->dm.thermalvalue_lck) ?
-           (thermalvalue - rtlpriv->dm.thermalvalue_lck) :
-           (rtlpriv->dm.thermalvalue_lck - thermalvalue);
-       delta_iqk = (thermalvalue > rtlpriv->dm.thermalvalue_iqk) ?
-           (thermalvalue - rtlpriv->dm.thermalvalue_iqk) :
-           (rtlpriv->dm.thermalvalue_iqk - thermalvalue);
-       delta_rxgain =
-               (thermalvalue > rtlpriv->dm.thermalvalue_rxgain) ?
-               (thermalvalue - rtlpriv->dm.thermalvalue_rxgain) :
-               (rtlpriv->dm.thermalvalue_rxgain - thermalvalue);
+
+       delta_lck = abs_diff(thermalvalue, dm->thermalvalue_lck);
+       delta_iqk = abs_diff(thermalvalue, dm->thermalvalue_iqk);
+       delta_rxgain = abs_diff(thermalvalue, dm->thermalvalue_rxgain);
+
        rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x delta 0x%x delta_lck 0x%x delta_iqk 0x%x\n",
-               thermalvalue, rtlpriv->dm.thermalvalue,
-               rtlefuse->eeprom_thermalmeter, delta, delta_lck,
-               delta_iqk);
+               thermalvalue, dm->thermalvalue, rtlefuse->eeprom_thermalmeter,
+               delta, delta_lck, delta_iqk);
+
        if (delta_lck > rtlefuse->delta_lck && rtlefuse->delta_lck != 0) {
-               rtlpriv->dm.thermalvalue_lck = thermalvalue;
+               dm->thermalvalue_lck = thermalvalue;
                rtlpriv->cfg->ops->phy_lc_calibrate(hw, is2t);
        }
 
-       if (delta == 0 || !rtlpriv->dm.txpower_track_control)
+       if (delta == 0 || !dm->txpower_track_control)
                goto check_delta;
 
-       rtlpriv->dm.done_txpower = true;
-       delta = (thermalvalue > rtlefuse->eeprom_thermalmeter) ?
-           (thermalvalue - rtlefuse->eeprom_thermalmeter) :
-           (rtlefuse->eeprom_thermalmeter - thermalvalue);
+       dm->done_txpower = true;
+       delta = abs_diff(thermalvalue, rtlefuse->eeprom_thermalmeter);
+
        if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                offset = 4;
                if (delta > INDEX_MAPPING_NUM - 1)
                        index = index_mapping[offset][INDEX_MAPPING_NUM - 1];
                else
                        index = index_mapping[offset][delta];
-               if (thermalvalue > rtlpriv->dm.thermalvalue) {
+
+               if (thermalvalue > dm->thermalvalue) {
                        for (i = 0; i < rf; i++)
                                ofdm_index[i] -= delta;
+
                        cck_index -= delta;
                } else {
                        for (i = 0; i < rf; i++)
                                ofdm_index[i] += index;
+
                        cck_index += index;
                }
        } else if (rtlhal->current_bandtype == BAND_ON_5G) {
-               rtl92d_bandtype_5G(rtlhal, ofdm_index,
-                                  &internal_pa, thermalvalue,
-                                  delta, rf, rtlefuse, rtlpriv,
+               rtl92d_bandtype_5G(rtlhal, ofdm_index, &internal_pa,
+                                  thermalvalue, delta, rf, rtlefuse, rtlpriv,
                                   rtlphy, index_mapping,
                                   index_mapping_internal_pa);
        }
+
        if (is2t) {
                rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                       "temp OFDM_A_index=0x%x, OFDM_B_index = 0x%x,cck_index=0x%x\n",
-                       rtlpriv->dm.ofdm_index[0],
-                       rtlpriv->dm.ofdm_index[1],
-                       rtlpriv->dm.cck_index);
+                       "temp OFDM_A_index=0x%x, OFDM_B_index = 0x%x, cck_index=0x%x\n",
+                       dm->ofdm_index[0], dm->ofdm_index[1], dm->cck_index);
        } else {
                rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                       "temp OFDM_A_index=0x%x,cck_index = 0x%x\n",
-                       rtlpriv->dm.ofdm_index[0],
-                       rtlpriv->dm.cck_index);
+                       "temp OFDM_A_index=0x%x, cck_index = 0x%x\n",
+                       dm->ofdm_index[0], dm->cck_index);
        }
+
        for (i = 0; i < rf; i++) {
                if (ofdm_index[i] > OFDM_TABLE_SIZE_92D - 1) {
                        ofdm_index[i] = OFDM_TABLE_SIZE_92D - 1;
@@ -470,25 +482,28 @@ old_index_done:
                        ofdm_index[i] = ofdm_min_index;
                }
        }
+
        if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                if (cck_index > CCK_TABLE_SIZE - 1)
                        cck_index = CCK_TABLE_SIZE - 1;
                else if (cck_index < 0)
                        cck_index = 0;
        }
+
        if (is2t) {
                rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                        "new OFDM_A_index=0x%x, OFDM_B_index = 0x%x, cck_index=0x%x\n",
-                       ofdm_index[0], ofdm_index[1],
-                       cck_index);
+                       ofdm_index[0], ofdm_index[1], cck_index);
        } else {
                rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                       "new OFDM_A_index=0x%x,cck_index = 0x%x\n",
+                       "new OFDM_A_index=0x%x, cck_index = 0x%x\n",
                        ofdm_index[0], cck_index);
        }
+
        ele_d = (ofdmswing_table[ofdm_index[0]] & 0xFFC00000) >> 22;
        val_x = rtlphy->iqk_matrix[indexforchannel].value[0][0];
        val_y = rtlphy->iqk_matrix[indexforchannel].value[0][1];
+
        if (val_x != 0) {
                if ((val_x & 0x00000200) != 0)
                        val_x = val_x | 0xFFFFFC00;
@@ -507,21 +522,16 @@ old_index_done:
                              MASKDWORD, value32);
 
                value32 = (ele_c & 0x000003C0) >> 6;
-               rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS,
-                             value32);
+               rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS, value32);
 
                value32 = ((val_x * ele_d) >> 7) & 0x01;
-               rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(24),
-                             value32);
+               rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(24), value32);
 
        } else {
-               rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE,
-                             MASKDWORD,
-                             ofdmswing_table[(u8)ofdm_index[0]]);
-               rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS,
-                             0x00);
-               rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD,
-                             BIT(24), 0x00);
+               rtl_set_bbreg(hw, ROFDM0_XATXIQIMBALANCE, MASKDWORD,
+                             ofdmswing_table[ofdm_index[0]]);
+               rtl_set_bbreg(hw, ROFDM0_XCTXAFE, MASKH4BITS, 0x00);
+               rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(24), 0x00);
        }
 
        rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
@@ -530,109 +540,79 @@ old_index_done:
                val_x, val_y, ele_a, ele_c, ele_d,
                val_x, val_y);
 
-       if (cck_index >= CCK_TABLE_SIZE)
-               cck_index = CCK_TABLE_SIZE - 1;
-       if (cck_index < 0)
-               cck_index = 0;
        if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                /* Adjust CCK according to IQK result */
-               if (!rtlpriv->dm.cck_inch14) {
-                       rtl_write_byte(rtlpriv, 0xa22,
-                                      cckswing_table_ch1ch13[cck_index][0]);
-                       rtl_write_byte(rtlpriv, 0xa23,
-                                      cckswing_table_ch1ch13[cck_index][1]);
-                       rtl_write_byte(rtlpriv, 0xa24,
-                                      cckswing_table_ch1ch13[cck_index][2]);
-                       rtl_write_byte(rtlpriv, 0xa25,
-                                      cckswing_table_ch1ch13[cck_index][3]);
-                       rtl_write_byte(rtlpriv, 0xa26,
-                                      cckswing_table_ch1ch13[cck_index][4]);
-                       rtl_write_byte(rtlpriv, 0xa27,
-                                      cckswing_table_ch1ch13[cck_index][5]);
-                       rtl_write_byte(rtlpriv, 0xa28,
-                                      cckswing_table_ch1ch13[cck_index][6]);
-                       rtl_write_byte(rtlpriv, 0xa29,
-                                      cckswing_table_ch1ch13[cck_index][7]);
-               } else {
-                       rtl_write_byte(rtlpriv, 0xa22,
-                                      cckswing_table_ch14[cck_index][0]);
-                       rtl_write_byte(rtlpriv, 0xa23,
-                                      cckswing_table_ch14[cck_index][1]);
-                       rtl_write_byte(rtlpriv, 0xa24,
-                                      cckswing_table_ch14[cck_index][2]);
-                       rtl_write_byte(rtlpriv, 0xa25,
-                                      cckswing_table_ch14[cck_index][3]);
-                       rtl_write_byte(rtlpriv, 0xa26,
-                                      cckswing_table_ch14[cck_index][4]);
-                       rtl_write_byte(rtlpriv, 0xa27,
-                                      cckswing_table_ch14[cck_index][5]);
-                       rtl_write_byte(rtlpriv, 0xa28,
-                                      cckswing_table_ch14[cck_index][6]);
-                       rtl_write_byte(rtlpriv, 0xa29,
-                                      cckswing_table_ch14[cck_index][7]);
+               for (i = 0; i < 8; i++) {
+                       if (dm->cck_inch14)
+                               swing = cckswing_table_ch14[cck_index][i];
+                       else
+                               swing = cckswing_table_ch1ch13[cck_index][i];
+
+                       rtl_write_byte(rtlpriv, 0xa22 + i, swing);
                }
        }
+
        if (is2t) {
                ele_d = (ofdmswing_table[ofdm_index[1]] & 0xFFC00000) >> 22;
                val_x = rtlphy->iqk_matrix[indexforchannel].value[0][4];
                val_y = rtlphy->iqk_matrix[indexforchannel].value[0][5];
+
                if (val_x != 0) {
                        if ((val_x & 0x00000200) != 0)
                                /* consider minus */
                                val_x = val_x | 0xFFFFFC00;
                        ele_a = ((val_x * ele_d) >> 8) & 0x000003FF;
+
                        /* new element C = element D x Y */
                        if ((val_y & 0x00000200) != 0)
                                val_y = val_y | 0xFFFFFC00;
                        ele_c = ((val_y * ele_d) >> 8) & 0x00003FF;
+
                        /* write new elements A, C, D to regC88
                         * and regC9C, element B is always 0
                         */
                        value32 = (ele_d << 22) | ((ele_c & 0x3F) << 16) | ele_a;
-                       rtl_set_bbreg(hw,
-                                     ROFDM0_XBTXIQIMBALANCE,
+                       rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE,
                                      MASKDWORD, value32);
+
                        value32 = (ele_c & 0x000003C0) >> 6;
-                       rtl_set_bbreg(hw, ROFDM0_XDTXAFE,
-                                     MASKH4BITS, value32);
+                       rtl_set_bbreg(hw, ROFDM0_XDTXAFE, MASKH4BITS, value32);
+
                        value32 = ((val_x * ele_d) >> 7) & 0x01;
-                       rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD,
-                                     BIT(28), value32);
+                       rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(28), value32);
                } else {
-                       rtl_set_bbreg(hw,
-                                     ROFDM0_XBTXIQIMBALANCE,
-                                     MASKDWORD,
-                                     ofdmswing_table[ofdm_index[1]]);
-                       rtl_set_bbreg(hw, ROFDM0_XDTXAFE,
-                                     MASKH4BITS, 0x00);
-                       rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD,
-                                     BIT(28), 0x00);
+                       rtl_set_bbreg(hw, ROFDM0_XBTXIQIMBALANCE,
+                                     MASKDWORD, ofdmswing_table[ofdm_index[1]]);
+                       rtl_set_bbreg(hw, ROFDM0_XDTXAFE, MASKH4BITS, 0x00);
+                       rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(28), 0x00);
                }
+
                rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                        "TxPwrTracking path B: X = 0x%lx, Y = 0x%lx ele_A = 0x%lx ele_C = 0x%lx ele_D = 0x%lx 0xeb4 = 0x%lx 0xebc = 0x%lx\n",
-                       val_x, val_y, ele_a, ele_c,
-                       ele_d, val_x, val_y);
+                       val_x, val_y, ele_a, ele_c, ele_d, val_x, val_y);
        }
+
        rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                "TxPwrTracking 0xc80 = 0x%x, 0xc94 = 0x%x RF 0x24 = 0x%x\n",
                rtl_get_bbreg(hw, 0xc80, MASKDWORD),
                rtl_get_bbreg(hw, 0xc94, MASKDWORD),
-               rtl_get_rfreg(hw, RF90_PATH_A, 0x24,
-                             RFREG_OFFSET_MASK));
+               rtl_get_rfreg(hw, RF90_PATH_A, 0x24, RFREG_OFFSET_MASK));
 
 check_delta:
        if (delta_iqk > rtlefuse->delta_iqk && rtlefuse->delta_iqk != 0) {
                rtl92d_phy_reset_iqk_result(hw);
-               rtlpriv->dm.thermalvalue_iqk = thermalvalue;
+               dm->thermalvalue_iqk = thermalvalue;
                rtlpriv->cfg->ops->phy_iq_calibrate(hw);
        }
+
        if (delta_rxgain > 0 && rtlhal->current_bandtype == BAND_ON_5G &&
            thermalvalue <= rtlefuse->eeprom_thermalmeter) {
-               rtlpriv->dm.thermalvalue_rxgain = thermalvalue;
+               dm->thermalvalue_rxgain = thermalvalue;
                rtl92d_dm_rxgain_tracking_thermalmeter(hw);
        }
-       if (rtlpriv->dm.txpower_track_control)
-               rtlpriv->dm.thermalvalue = thermalvalue;
+
+       if (dm->txpower_track_control)
+               dm->thermalvalue = thermalvalue;
 
 exit:
        rtl_dbg(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "<===\n");
@@ -675,25 +655,29 @@ EXPORT_SYMBOL_GPL(rtl92d_dm_check_txpower_tracking_thermal_meter);
 
 void rtl92d_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
 {
-       u32 ret_value;
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct false_alarm_statistics *falsealm_cnt = &rtlpriv->falsealm_cnt;
        unsigned long flag = 0;
+       u32 ret_value;
 
        /* hold ofdm counter */
        rtl_set_bbreg(hw, ROFDM0_LSTF, BIT(31), 1); /* hold page C counter */
-       rtl_set_bbreg(hw, ROFDM1_LSTF, BIT(31), 1); /*hold page D counter */
+       rtl_set_bbreg(hw, ROFDM1_LSTF, BIT(31), 1); /* hold page D counter */
 
        ret_value = rtl_get_bbreg(hw, ROFDM0_FRAMESYNC, MASKDWORD);
-       falsealm_cnt->cnt_fast_fsync_fail = (ret_value & 0xffff);
-       falsealm_cnt->cnt_sb_search_fail = ((ret_value & 0xffff0000) >> 16);
+       falsealm_cnt->cnt_fast_fsync_fail = ret_value & 0xffff;
+       falsealm_cnt->cnt_sb_search_fail = (ret_value & 0xffff0000) >> 16;
+
        ret_value = rtl_get_bbreg(hw, ROFDM_PHYCOUNTER1, MASKDWORD);
-       falsealm_cnt->cnt_parity_fail = ((ret_value & 0xffff0000) >> 16);
+       falsealm_cnt->cnt_parity_fail = (ret_value & 0xffff0000) >> 16;
+
        ret_value = rtl_get_bbreg(hw, ROFDM_PHYCOUNTER2, MASKDWORD);
-       falsealm_cnt->cnt_rate_illegal = (ret_value & 0xffff);
-       falsealm_cnt->cnt_crc8_fail = ((ret_value & 0xffff0000) >> 16);
+       falsealm_cnt->cnt_rate_illegal = ret_value & 0xffff;
+       falsealm_cnt->cnt_crc8_fail = (ret_value & 0xffff0000) >> 16;
+
        ret_value = rtl_get_bbreg(hw, ROFDM_PHYCOUNTER3, MASKDWORD);
-       falsealm_cnt->cnt_mcs_fail = (ret_value & 0xffff);
+       falsealm_cnt->cnt_mcs_fail = ret_value & 0xffff;
+
        falsealm_cnt->cnt_ofdm_fail = falsealm_cnt->cnt_parity_fail +
                                      falsealm_cnt->cnt_rate_illegal +
                                      falsealm_cnt->cnt_crc8_fail +
@@ -702,7 +686,6 @@ void rtl92d_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
                                      falsealm_cnt->cnt_sb_search_fail;
 
        if (rtlpriv->rtlhal.current_bandtype != BAND_ON_5G) {
-               /* hold cck counter */
                rtl92d_acquire_cckandrw_pagea_ctl(hw, &flag);
                ret_value = rtl_get_bbreg(hw, RCCK0_FACOUNTERLOWER, MASKBYTE0);
                falsealm_cnt->cnt_cck_fail = ret_value;
@@ -713,22 +696,17 @@ void rtl92d_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
                falsealm_cnt->cnt_cck_fail = 0;
        }
 
-       /* reset false alarm counter registers */
-       falsealm_cnt->cnt_all = falsealm_cnt->cnt_fast_fsync_fail +
-                               falsealm_cnt->cnt_sb_search_fail +
-                               falsealm_cnt->cnt_parity_fail +
-                               falsealm_cnt->cnt_rate_illegal +
-                               falsealm_cnt->cnt_crc8_fail +
-                               falsealm_cnt->cnt_mcs_fail +
+       falsealm_cnt->cnt_all = falsealm_cnt->cnt_ofdm_fail +
                                falsealm_cnt->cnt_cck_fail;
 
+       /* reset false alarm counter registers */
        rtl_set_bbreg(hw, ROFDM1_LSTF, 0x08000000, 1);
-       /* update ofdm counter */
        rtl_set_bbreg(hw, ROFDM1_LSTF, 0x08000000, 0);
-       /* update page C counter */
-       rtl_set_bbreg(hw, ROFDM0_LSTF, BIT(31), 0);
-       /* update page D counter */
-       rtl_set_bbreg(hw, ROFDM1_LSTF, BIT(31), 0);
+
+       /* update ofdm counter */
+       rtl_set_bbreg(hw, ROFDM0_LSTF, BIT(31), 0); /* update page C counter */
+       rtl_set_bbreg(hw, ROFDM1_LSTF, BIT(31), 0); /* update page D counter */
+
        if (rtlpriv->rtlhal.current_bandtype != BAND_ON_5G) {
                /* reset cck counter */
                rtl92d_acquire_cckandrw_pagea_ctl(hw, &flag);
@@ -737,16 +715,19 @@ void rtl92d_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
                rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, 0x0000c000, 2);
                rtl92d_release_cckandrw_pagea_ctl(hw, &flag);
        }
+
        rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
                "Cnt_Fast_Fsync_fail = %x, Cnt_SB_Search_fail = %x\n",
                falsealm_cnt->cnt_fast_fsync_fail,
                falsealm_cnt->cnt_sb_search_fail);
+
        rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
                "Cnt_Parity_Fail = %x, Cnt_Rate_Illegal = %x, Cnt_Crc8_fail = %x, Cnt_Mcs_fail = %x\n",
                falsealm_cnt->cnt_parity_fail,
                falsealm_cnt->cnt_rate_illegal,
                falsealm_cnt->cnt_crc8_fail,
                falsealm_cnt->cnt_mcs_fail);
+
        rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD,
                "Cnt_Ofdm_fail = %x, Cnt_Cck_fail = %x, Cnt_all = %x\n",
                falsealm_cnt->cnt_ofdm_fail,
@@ -763,7 +744,7 @@ void rtl92d_dm_find_minimum_rssi(struct ieee80211_hw *hw)
 
        /* Determine the minimum RSSI  */
        if (mac->link_state < MAC80211_LINKED &&
-           rtlpriv->dm.UNDEC_SM_PWDB == 0) {
+           rtlpriv->dm.entry_min_undec_sm_pwdb == 0) {
                de_digtable->min_undec_pwdb_for_dm = 0;
                rtl_dbg(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
                        "Not connected to any\n");
@@ -772,19 +753,20 @@ void rtl92d_dm_find_minimum_rssi(struct ieee80211_hw *hw)
                if (mac->opmode == NL80211_IFTYPE_AP ||
                    mac->opmode == NL80211_IFTYPE_ADHOC) {
                        de_digtable->min_undec_pwdb_for_dm =
-                           rtlpriv->dm.UNDEC_SM_PWDB;
+                               rtlpriv->dm.entry_min_undec_sm_pwdb;
                        rtl_dbg(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
                                "AP Client PWDB = 0x%lx\n",
-                                rtlpriv->dm.UNDEC_SM_PWDB);
+                                rtlpriv->dm.entry_min_undec_sm_pwdb);
                } else {
                        de_digtable->min_undec_pwdb_for_dm =
-                           rtlpriv->dm.undec_sm_pwdb;
+                               rtlpriv->dm.undec_sm_pwdb;
                        rtl_dbg(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
                                "STA Default Port PWDB = 0x%x\n",
                                de_digtable->min_undec_pwdb_for_dm);
                }
        } else {
-               de_digtable->min_undec_pwdb_for_dm = rtlpriv->dm.UNDEC_SM_PWDB;
+               de_digtable->min_undec_pwdb_for_dm =
+                       rtlpriv->dm.entry_min_undec_sm_pwdb;
                rtl_dbg(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
                        "AP Ext Port or disconnect PWDB = 0x%x\n",
                        de_digtable->min_undec_pwdb_for_dm);
index 9dc0df5bb068c465aa73a21b61c31a1903b99c25..a146fc9754214b839ab9296ff15cd2a7486d772b 100644 (file)
 #define TX_POWER_NEAR_FIELD_THRESH_LVL1                67
 #define INDEX_MAPPING_NUM                      13
 
-struct swat {
-       u8 failure_cnt;
-       u8 try_flag;
-       u8 stop_trying;
-       long pre_rssi;
-       long trying_threshold;
-       u8 cur_antenna;
-       u8 pre_antenna;
-};
-
-enum tag_dynamic_init_gain_operation_type_definition {
-       DIG_TYPE_THRESH_HIGH = 0,
-       DIG_TYPE_THRESH_LOW = 1,
-       DIG_TYPE_BACKOFF = 2,
-       DIG_TYPE_RX_GAIN_MIN = 3,
-       DIG_TYPE_RX_GAIN_MAX = 4,
-       DIG_TYPE_ENABLE = 5,
-       DIG_TYPE_DISABLE = 6,
-       DIG_OP_TYPE_MAX
-};
-
 enum dm_1r_cca {
        CCA_1R = 0,
        CCA_2R = 1,
index 73cfa9ad78ae9e419d3783a5baa3415267437186..ecdbe3cd5161d0ecf6aabc321afd0ec13c72f2c2 100644 (file)
@@ -11,8 +11,7 @@
 
 bool rtl92d_is_fw_downloaded(struct rtl_priv *rtlpriv)
 {
-       return (rtl_read_dword(rtlpriv, REG_MCUFWDL) & MCUFWDL_RDY) ?
-               true : false;
+       return !!(rtl_read_dword(rtlpriv, REG_MCUFWDL) & MCUFWDL_RDY);
 }
 EXPORT_SYMBOL_GPL(rtl92d_is_fw_downloaded);
 
@@ -50,17 +49,22 @@ void rtl92d_write_fw(struct ieee80211_hw *hw,
        u32 page, offset;
 
        rtl_dbg(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes,\n", size);
+
        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192DE)
                rtl_fill_dummy(bufferptr, &size);
+
        pagenums = size / FW_8192D_PAGE_SIZE;
        remainsize = size % FW_8192D_PAGE_SIZE;
+
        if (pagenums > 8)
                pr_err("Page numbers should not greater then 8\n");
+
        for (page = 0; page < pagenums; page++) {
                offset = page * FW_8192D_PAGE_SIZE;
                rtl_fw_page_write(hw, page, (bufferptr + offset),
                                  FW_8192D_PAGE_SIZE);
        }
+
        if (remainsize) {
                offset = pagenums * FW_8192D_PAGE_SIZE;
                page = pagenums;
@@ -79,14 +83,17 @@ int rtl92d_fw_free_to_go(struct ieee80211_hw *hw)
                value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
        } while ((counter++ < FW_8192D_POLLING_TIMEOUT_COUNT) &&
                 (!(value32 & FWDL_CHKSUM_RPT)));
+
        if (counter >= FW_8192D_POLLING_TIMEOUT_COUNT) {
                pr_err("chksum report fail! REG_MCUFWDL:0x%08x\n",
                       value32);
                return -EIO;
        }
+
        value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
        value32 |= MCUFWDL_RDY;
        rtl_write_dword(rtlpriv, REG_MCUFWDL, value32);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(rtl92d_fw_free_to_go);
@@ -99,7 +106,9 @@ void rtl92d_firmware_selfreset(struct ieee80211_hw *hw)
 
        /* Set (REG_HMETFR + 3) to  0x20 is reset 8051 */
        rtl_write_byte(rtlpriv, REG_HMETFR + 3, 0x20);
+
        u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
+
        while (u1b_tmp & BIT(2)) {
                delay--;
                if (delay == 0)
@@ -174,23 +183,22 @@ static bool _rtl92d_check_fw_read_last_h2c(struct ieee80211_hw *hw, u8 boxnum)
        return result;
 }
 
-static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
-                                    u8 element_id, u32 cmd_len, u8 *cmdbuffer)
+void rtl92d_fill_h2c_cmd(struct ieee80211_hw *hw,
+                        u8 element_id, u32 cmd_len, u8 *cmdbuffer)
 {
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
-       struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-       u8 boxnum;
+       struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+       struct rtl_priv *rtlpriv = rtl_priv(hw);
+       u8 boxcontent[4], boxextcontent[2];
        u16 box_reg = 0, box_extreg = 0;
-       u8 u1b_tmp;
-       bool isfw_read = false;
-       u8 buf_index = 0;
+       u8 wait_writeh2c_limmit = 100;
        bool bwrite_success = false;
        u8 wait_h2c_limmit = 100;
-       u8 wait_writeh2c_limmit = 100;
-       u8 boxcontent[4], boxextcontent[2];
        u32 h2c_waitcounter = 0;
+       bool isfw_read = false;
        unsigned long flag;
+       u8 u1b_tmp;
+       u8 boxnum;
        u8 idx;
 
        if (ppsc->rfpwr_state == ERFOFF || ppsc->inactive_pwrstate == ERFOFF) {
@@ -198,7 +206,9 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                        "Return as RF is off!!!\n");
                return;
        }
+
        rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD, "come in\n");
+
        while (true) {
                spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
                if (rtlhal->h2c_setinprogress) {
@@ -228,35 +238,23 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                        break;
                }
        }
+
        while (!bwrite_success) {
                wait_writeh2c_limmit--;
                if (wait_writeh2c_limmit == 0) {
                        pr_err("Write H2C fail because no trigger for FW INT!\n");
                        break;
                }
+
                boxnum = rtlhal->last_hmeboxnum;
-               switch (boxnum) {
-               case 0:
-                       box_reg = REG_HMEBOX_0;
-                       box_extreg = REG_HMEBOX_EXT_0;
-                       break;
-               case 1:
-                       box_reg = REG_HMEBOX_1;
-                       box_extreg = REG_HMEBOX_EXT_1;
-                       break;
-               case 2:
-                       box_reg = REG_HMEBOX_2;
-                       box_extreg = REG_HMEBOX_EXT_2;
-                       break;
-               case 3:
-                       box_reg = REG_HMEBOX_3;
-                       box_extreg = REG_HMEBOX_EXT_3;
-                       break;
-               default:
-                       pr_err("switch case %#x not processed\n",
-                              boxnum);
+               if (boxnum > 3) {
+                       pr_err("boxnum %#x too big\n", boxnum);
                        break;
                }
+
+               box_reg = REG_HMEBOX_0 + boxnum * SIZE_OF_REG_HMEBOX;
+               box_extreg = REG_HMEBOX_EXT_0 + boxnum * SIZE_OF_REG_HMEBOX_EXT;
+
                isfw_read = _rtl92d_check_fw_read_last_h2c(hw, boxnum);
                while (!isfw_read) {
                        wait_h2c_limmit--;
@@ -266,78 +264,70 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                                        boxnum);
                                break;
                        }
+
                        udelay(10);
+
                        isfw_read = _rtl92d_check_fw_read_last_h2c(hw, boxnum);
                        u1b_tmp = rtl_read_byte(rtlpriv, 0x1BF);
                        rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
                                "Waiting for FW read clear HMEBox(%d)!!! 0x1BF = %2x\n",
                                boxnum, u1b_tmp);
                }
+
                if (!isfw_read) {
                        rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
                                "Write H2C register BOX[%d] fail!!!!! Fw do not read.\n",
                                boxnum);
                        break;
                }
+
                memset(boxcontent, 0, sizeof(boxcontent));
                memset(boxextcontent, 0, sizeof(boxextcontent));
                boxcontent[0] = element_id;
+
                rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
                        "Write element_id box_reg(%4x) = %2x\n",
                        box_reg, element_id);
+
                switch (cmd_len) {
-               case 1:
-                       boxcontent[0] &= ~(BIT(7));
-                       memcpy(boxcontent + 1, cmdbuffer + buf_index, 1);
-                       for (idx = 0; idx < 4; idx++)
-                               rtl_write_byte(rtlpriv, box_reg + idx,
-                                              boxcontent[idx]);
-                       break;
-               case 2:
-                       boxcontent[0] &= ~(BIT(7));
-                       memcpy(boxcontent + 1, cmdbuffer + buf_index, 2);
-                       for (idx = 0; idx < 4; idx++)
-                               rtl_write_byte(rtlpriv, box_reg + idx,
-                                              boxcontent[idx]);
-                       break;
-               case 3:
-                       boxcontent[0] &= ~(BIT(7));
-                       memcpy(boxcontent + 1, cmdbuffer + buf_index, 3);
-                       for (idx = 0; idx < 4; idx++)
-                               rtl_write_byte(rtlpriv, box_reg + idx,
-                                              boxcontent[idx]);
-                       break;
-               case 4:
-                       boxcontent[0] |= (BIT(7));
-                       memcpy(boxextcontent, cmdbuffer + buf_index, 2);
-                       memcpy(boxcontent + 1, cmdbuffer + buf_index + 2, 2);
-                       for (idx = 0; idx < 2; idx++)
-                               rtl_write_byte(rtlpriv, box_extreg + idx,
-                                              boxextcontent[idx]);
+               case 1 ... 3:
+                       /* BOX:      | ID | A0 | A1 | A2 |
+                        * BOX_EXT:  --- N/A ------
+                        */
+                       boxcontent[0] &= ~BIT(7);
+                       memcpy(boxcontent + 1, cmdbuffer, cmd_len);
+
                        for (idx = 0; idx < 4; idx++)
                                rtl_write_byte(rtlpriv, box_reg + idx,
                                               boxcontent[idx]);
                        break;
-               case 5:
-                       boxcontent[0] |= (BIT(7));
-                       memcpy(boxextcontent, cmdbuffer + buf_index, 2);
-                       memcpy(boxcontent + 1, cmdbuffer + buf_index + 2, 3);
+               case 4 ... 5:
+                       /* * ID ext = ID | BIT(7)
+                        * BOX:      | ID ext | A2 | A3 | A4 |
+                        * BOX_EXT:  | A0     | A1 |
+                        */
+                       boxcontent[0] |= BIT(7);
+                       memcpy(boxextcontent, cmdbuffer, 2);
+                       memcpy(boxcontent + 1, cmdbuffer + 2, cmd_len - 2);
+
                        for (idx = 0; idx < 2; idx++)
                                rtl_write_byte(rtlpriv, box_extreg + idx,
                                               boxextcontent[idx]);
+
                        for (idx = 0; idx < 4; idx++)
                                rtl_write_byte(rtlpriv, box_reg + idx,
                                               boxcontent[idx]);
                        break;
                default:
-                       pr_err("switch case %#x not processed\n",
-                              cmd_len);
+                       pr_err("switch case %#x not processed\n", cmd_len);
                        break;
                }
+
                bwrite_success = true;
                rtlhal->last_hmeboxnum = boxnum + 1;
                if (rtlhal->last_hmeboxnum == 4)
                        rtlhal->last_hmeboxnum = 0;
+
                rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD,
                        "pHalData->last_hmeboxnum  = %d\n",
                        rtlhal->last_hmeboxnum);
@@ -347,16 +337,6 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
        spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
        rtl_dbg(rtlpriv, COMP_CMD, DBG_LOUD, "go out\n");
 }
-
-void rtl92d_fill_h2c_cmd(struct ieee80211_hw *hw,
-                        u8 element_id, u32 cmd_len, u8 *cmdbuffer)
-{
-       u32 tmp_cmdbuf[2];
-
-       memset(tmp_cmdbuf, 0, 8);
-       memcpy(tmp_cmdbuf, cmdbuffer, cmd_len);
-       _rtl92d_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
-}
 EXPORT_SYMBOL_GPL(rtl92d_fill_h2c_cmd);
 
 void rtl92d_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus)
index e70e83252e1689e333c900c9bb57eb9864aae723..40aadb9c46098f9471c06587a455195739b080ae 100644 (file)
@@ -363,10 +363,10 @@ static enum version_8192d _rtl92d_read_chip_version(struct ieee80211_hw *hw)
 }
 
 static void _rtl92de_readpowervalue_fromprom(struct txpower_info *pwrinfo,
-                                            u8 *rom_content, bool autoloadfail)
+                                            u8 *efuse, bool autoloadfail)
 {
-       u32 rfpath, eeaddr, group, offset1, offset2;
-       u8 i;
+       u32 rfpath, eeaddr, group, offset, offset1, offset2;
+       u8 i, val8;
 
        memset(pwrinfo, 0, sizeof(struct txpower_info));
        if (autoloadfail) {
@@ -405,98 +405,93 @@ static void _rtl92de_readpowervalue_fromprom(struct txpower_info *pwrinfo,
         */
        for (rfpath = 0; rfpath < RF6052_MAX_PATH; rfpath++) {
                for (group = 0; group < CHANNEL_GROUP_MAX_2G; group++) {
-                       eeaddr = EEPROM_CCK_TX_PWR_INX_2G + (rfpath * 3)
-                                + group;
+                       eeaddr = EEPROM_CCK_TX_PWR_INX_2G + (rfpath * 3) + group;
+
                        pwrinfo->cck_index[rfpath][group] =
-                                       (rom_content[eeaddr] == 0xFF) ?
-                                            (eeaddr > 0x7B ?
-                                            EEPROM_DEFAULT_TXPOWERLEVEL_5G :
-                                            EEPROM_DEFAULT_TXPOWERLEVEL_2G) :
-                                            rom_content[eeaddr];
+                               efuse[eeaddr] == 0xFF ?
+                               (eeaddr > 0x7B ?
+                                EEPROM_DEFAULT_TXPOWERLEVEL_5G :
+                                EEPROM_DEFAULT_TXPOWERLEVEL_2G) :
+                               efuse[eeaddr];
                }
        }
        for (rfpath = 0; rfpath < RF6052_MAX_PATH; rfpath++) {
                for (group = 0; group < CHANNEL_GROUP_MAX; group++) {
                        offset1 = group / 3;
                        offset2 = group % 3;
-                       eeaddr = EEPROM_HT40_1S_TX_PWR_INX_2G + (rfpath * 3) +
-                           offset2 + offset1 * 21;
+                       eeaddr = EEPROM_HT40_1S_TX_PWR_INX_2G + (rfpath * 3);
+                       eeaddr += offset2 + offset1 * 21;
+
                        pwrinfo->ht40_1sindex[rfpath][group] =
-                           (rom_content[eeaddr] == 0xFF) ? (eeaddr > 0x7B ?
-                                            EEPROM_DEFAULT_TXPOWERLEVEL_5G :
-                                            EEPROM_DEFAULT_TXPOWERLEVEL_2G) :
-                                                rom_content[eeaddr];
+                               efuse[eeaddr] == 0xFF ?
+                               (eeaddr > 0x7B ?
+                                EEPROM_DEFAULT_TXPOWERLEVEL_5G :
+                                EEPROM_DEFAULT_TXPOWERLEVEL_2G) :
+                               efuse[eeaddr];
                }
        }
+
        /* These just for 92D efuse offset. */
        for (group = 0; group < CHANNEL_GROUP_MAX; group++) {
                for (rfpath = 0; rfpath < RF6052_MAX_PATH; rfpath++) {
-                       int base1 = EEPROM_HT40_2S_TX_PWR_INX_DIFF_2G;
-
                        offset1 = group / 3;
                        offset2 = group % 3;
+                       offset = offset2 + offset1 * 21;
 
-                       if (rom_content[base1 + offset2 + offset1 * 21] != 0xFF)
+                       val8 = efuse[EEPROM_HT40_2S_TX_PWR_INX_DIFF_2G + offset];
+                       if (val8 != 0xFF)
                                pwrinfo->ht40_2sindexdiff[rfpath][group] =
-                                   (rom_content[base1 +
-                                    offset2 + offset1 * 21] >> (rfpath * 4))
-                                    & 0xF;
+                                   (val8 >> (rfpath * 4)) & 0xF;
                        else
                                pwrinfo->ht40_2sindexdiff[rfpath][group] =
                                    EEPROM_DEFAULT_HT40_2SDIFF;
-                       if (rom_content[EEPROM_HT20_TX_PWR_INX_DIFF_2G + offset2
-                           + offset1 * 21] != 0xFF)
+
+                       val8 = efuse[EEPROM_HT20_TX_PWR_INX_DIFF_2G + offset];
+                       if (val8 != 0xFF)
                                pwrinfo->ht20indexdiff[rfpath][group] =
-                                   (rom_content[EEPROM_HT20_TX_PWR_INX_DIFF_2G
-                                   + offset2 + offset1 * 21] >> (rfpath * 4))
-                                   & 0xF;
+                                   (val8 >> (rfpath * 4)) & 0xF;
                        else
                                pwrinfo->ht20indexdiff[rfpath][group] =
                                    EEPROM_DEFAULT_HT20_DIFF;
-                       if (rom_content[EEPROM_OFDM_TX_PWR_INX_DIFF_2G + offset2
-                           + offset1 * 21] != 0xFF)
+
+                       val8 = efuse[EEPROM_OFDM_TX_PWR_INX_DIFF_2G + offset];
+                       if (val8 != 0xFF)
                                pwrinfo->ofdmindexdiff[rfpath][group] =
-                                   (rom_content[EEPROM_OFDM_TX_PWR_INX_DIFF_2G
-                                    + offset2 + offset1 * 21] >> (rfpath * 4))
-                                    & 0xF;
+                                   (val8 >> (rfpath * 4)) & 0xF;
                        else
                                pwrinfo->ofdmindexdiff[rfpath][group] =
                                    EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF;
-                       if (rom_content[EEPROM_HT40_MAX_PWR_OFFSET_2G + offset2
-                           + offset1 * 21] != 0xFF)
+
+                       val8 = efuse[EEPROM_HT40_MAX_PWR_OFFSET_2G + offset];
+                       if (val8 != 0xFF)
                                pwrinfo->ht40maxoffset[rfpath][group] =
-                                   (rom_content[EEPROM_HT40_MAX_PWR_OFFSET_2G
-                                   + offset2 + offset1 * 21] >> (rfpath * 4))
-                                   & 0xF;
+                                   (val8 >> (rfpath * 4)) & 0xF;
                        else
                                pwrinfo->ht40maxoffset[rfpath][group] =
                                    EEPROM_DEFAULT_HT40_PWRMAXOFFSET;
-                       if (rom_content[EEPROM_HT20_MAX_PWR_OFFSET_2G + offset2
-                           + offset1 * 21] != 0xFF)
+
+                       val8 = efuse[EEPROM_HT20_MAX_PWR_OFFSET_2G + offset];
+                       if (val8 != 0xFF)
                                pwrinfo->ht20maxoffset[rfpath][group] =
-                                   (rom_content[EEPROM_HT20_MAX_PWR_OFFSET_2G +
-                                    offset2 + offset1 * 21] >> (rfpath * 4)) &
-                                    0xF;
+                                   (val8 >> (rfpath * 4)) & 0xF;
                        else
                                pwrinfo->ht20maxoffset[rfpath][group] =
                                    EEPROM_DEFAULT_HT20_PWRMAXOFFSET;
                }
        }
-       if (rom_content[EEPROM_TSSI_A_5G] != 0xFF) {
+
+       if (efuse[EEPROM_TSSI_A_5G] != 0xFF) {
                /* 5GL */
-               pwrinfo->tssi_a[0] = rom_content[EEPROM_TSSI_A_5G] & 0x3F;
-               pwrinfo->tssi_b[0] = rom_content[EEPROM_TSSI_B_5G] & 0x3F;
+               pwrinfo->tssi_a[0] = efuse[EEPROM_TSSI_A_5G] & 0x3F;
+               pwrinfo->tssi_b[0] = efuse[EEPROM_TSSI_B_5G] & 0x3F;
                /* 5GM */
-               pwrinfo->tssi_a[1] = rom_content[EEPROM_TSSI_AB_5G] & 0x3F;
-               pwrinfo->tssi_b[1] =
-                   (rom_content[EEPROM_TSSI_AB_5G] & 0xC0) >> 6 |
-                   (rom_content[EEPROM_TSSI_AB_5G + 1] & 0x0F) << 2;
+               pwrinfo->tssi_a[1] = efuse[EEPROM_TSSI_AB_5G] & 0x3F;
+               pwrinfo->tssi_b[1] = (efuse[EEPROM_TSSI_AB_5G] & 0xC0) >> 6 |
+                                    (efuse[EEPROM_TSSI_AB_5G + 1] & 0x0F) << 2;
                /* 5GH */
-               pwrinfo->tssi_a[2] = (rom_content[EEPROM_TSSI_AB_5G + 1] &
-                                     0xF0) >> 4 |
-                   (rom_content[EEPROM_TSSI_AB_5G + 2] & 0x03) << 4;
-               pwrinfo->tssi_b[2] = (rom_content[EEPROM_TSSI_AB_5G + 2] &
-                                     0xFC) >> 2;
+               pwrinfo->tssi_a[2] = (efuse[EEPROM_TSSI_AB_5G + 1] & 0xF0) >> 4 |
+                                    (efuse[EEPROM_TSSI_AB_5G + 2] & 0x03) << 4;
+               pwrinfo->tssi_b[2] = (efuse[EEPROM_TSSI_AB_5G + 2] & 0xFC) >> 2;
        } else {
                for (i = 0; i < 3; i++) {
                        pwrinfo->tssi_a[i] = EEPROM_DEFAULT_TSSI;
@@ -684,8 +679,6 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
                        EEPROM_SVID, EEPROM_SMID, EEPROM_MAC_ADDR_MAC0_92D,
                        EEPROM_CHANNEL_PLAN, EEPROM_VERSION, EEPROM_CUSTOMER_ID,
                        COUNTRY_CODE_WORLD_WIDE_13};
-       int i;
-       u16 usvalue;
        u8 *hwinfo;
 
        hwinfo = kzalloc(HWSET_MAX_SIZE, GFP_KERNEL);
@@ -699,12 +692,10 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
        _rtl92de_read_macphymode_and_bandtype(hw, hwinfo);
 
        /* Read Permanent MAC address for 2nd interface */
-       if (rtlhal->interfaceindex != 0) {
-               for (i = 0; i < 6; i += 2) {
-                       usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR_MAC1_92D + i];
-                       *((u16 *)(&rtlefuse->dev_addr[i])) = usvalue;
-               }
-       }
+       if (rtlhal->interfaceindex != 0)
+               ether_addr_copy(rtlefuse->dev_addr,
+                               &hwinfo[EEPROM_MAC_ADDR_MAC1_92D]);
+
        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ETHER_ADDR,
                                      rtlefuse->dev_addr);
        rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);
@@ -761,22 +752,24 @@ EXPORT_SYMBOL_GPL(rtl92de_read_eeprom_info);
 static void rtl92de_update_hal_rate_table(struct ieee80211_hw *hw,
                                          struct ieee80211_sta *sta)
 {
+       struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+       struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_phy *rtlphy = &rtlpriv->phy;
-       struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-       struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-       u32 ratr_value;
-       u8 ratr_index = 0;
-       u8 nmode = mac->ht_enable;
+       enum wireless_mode wirelessmode;
        u8 mimo_ps = IEEE80211_SMPS_OFF;
-       u16 shortgi_rate;
-       u32 tmp_ratr_value;
        u8 curtxbw_40mhz = mac->bw_40;
-       u8 curshortgi_40mhz = (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
-                                                       1 : 0;
-       u8 curshortgi_20mhz = (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
-                                                       1 : 0;
-       enum wireless_mode wirelessmode = mac->mode;
+       u8 nmode = mac->ht_enable;
+       u8 curshortgi_40mhz;
+       u8 curshortgi_20mhz;
+       u32 tmp_ratr_value;
+       u8 ratr_index = 0;
+       u16 shortgi_rate;
+       u32 ratr_value;
+
+       curshortgi_40mhz = !!(sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_40);
+       curshortgi_20mhz = !!(sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_20);
+       wirelessmode = mac->mode;
 
        if (rtlhal->current_bandtype == BAND_ON_5G)
                ratr_value = sta->deflink.supp_rates[1] << 4;
@@ -844,27 +837,30 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw,
                                         struct ieee80211_sta *sta,
                                         u8 rssi_level, bool update_bw)
 {
+       struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
+       struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_phy *rtlphy = &rtlpriv->phy;
-       struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-       struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
        struct rtl_sta_info *sta_entry = NULL;
+       enum wireless_mode wirelessmode;
+       bool shortgi = false;
+       u8 curshortgi_40mhz;
+       u8 curshortgi_20mhz;
+       u8 curtxbw_40mhz;
        u32 ratr_bitmap;
        u8 ratr_index;
-       u8 curtxbw_40mhz = (sta->deflink.bandwidth >= IEEE80211_STA_RX_BW_40) ? 1 : 0;
-       u8 curshortgi_40mhz = (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_40) ?
-                                                       1 : 0;
-       u8 curshortgi_20mhz = (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ?
-                                                       1 : 0;
-       enum wireless_mode wirelessmode = 0;
-       bool shortgi = false;
        u32 value[2];
        u8 macid = 0;
-       u8 mimo_ps = IEEE80211_SMPS_OFF;
+       u8 mimo_ps;
+
+       curtxbw_40mhz = sta->deflink.bandwidth >= IEEE80211_STA_RX_BW_40;
+       curshortgi_40mhz = !!(sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_40);
+       curshortgi_20mhz = !!(sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_20);
 
        sta_entry = (struct rtl_sta_info *)sta->drv_priv;
        mimo_ps = sta_entry->mimo_ps;
        wirelessmode = sta_entry->wireless_mode;
+
        if (mac->opmode == NL80211_IFTYPE_STATION)
                curtxbw_40mhz = mac->bw_40;
        else if (mac->opmode == NL80211_IFTYPE_AP ||
@@ -877,6 +873,7 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw,
                ratr_bitmap = sta->deflink.supp_rates[0];
        ratr_bitmap |= (sta->deflink.ht_cap.mcs.rx_mask[1] << 20 |
                        sta->deflink.ht_cap.mcs.rx_mask[0] << 12);
+
        switch (wirelessmode) {
        case WIRELESS_MODE_B:
                ratr_index = RATR_INX_WIRELESS_B;
@@ -905,6 +902,7 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw,
                        ratr_index = RATR_INX_WIRELESS_NGB;
                else
                        ratr_index = RATR_INX_WIRELESS_NG;
+
                if (mimo_ps == IEEE80211_SMPS_STATIC) {
                        if (rssi_level == 1)
                                ratr_bitmap &= 0x00070000;
@@ -948,6 +946,7 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw,
                                }
                        }
                }
+
                if ((curtxbw_40mhz && curshortgi_40mhz) ||
                    (!curtxbw_40mhz && curshortgi_20mhz)) {
                        if (macid == 0)
@@ -1065,12 +1064,6 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
                     u8 *p_macaddr, bool is_group, u8 enc_algo,
                     bool is_wepkey, bool clear_all)
 {
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
-       struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-       struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
-       const u8 *macaddr = p_macaddr;
-       u32 entry_id;
-       bool is_pairwise = false;
        static const u8 cam_const_addr[4][6] = {
                {0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
                {0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
@@ -1080,6 +1073,12 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
        static const u8 cam_const_broad[] = {
                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
        };
+       struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+       struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
+       struct rtl_priv *rtlpriv = rtl_priv(hw);
+       const u8 *macaddr = p_macaddr;
+       bool is_pairwise = false;
+       u32 entry_id;
 
        if (clear_all) {
                u8 idx;
index 87c458b27f4fea45e43183378a7a7755e4b1c8c5..dbc8ea39d6fc5b5c04495eed84bd1fc4e900635a 100644 (file)
@@ -41,8 +41,7 @@ static u32 _rtl92d_phy_rf_serial_read(struct ieee80211_hw *hw,
                      tmplong & (~BLSSIREADEDGE));
        udelay(10);
        rtl_set_bbreg(hw, pphyreg->rfhssi_para2, MASKDWORD, tmplong2);
-       udelay(50);
-       udelay(50);
+       udelay(100);
        rtl_set_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD,
                      tmplong | BLSSIREADEDGE);
        udelay(10);
@@ -319,23 +318,21 @@ void rtl92d_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
        struct rtl_phy *rtlphy = &rtlpriv->phy;
 
        rtlphy->default_initialgain[0] =
-           (u8)rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0);
+           rtl_get_bbreg(hw, ROFDM0_XAAGCCORE1, MASKBYTE0);
        rtlphy->default_initialgain[1] =
-           (u8)rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1, MASKBYTE0);
+           rtl_get_bbreg(hw, ROFDM0_XBAGCCORE1, MASKBYTE0);
        rtlphy->default_initialgain[2] =
-           (u8)rtl_get_bbreg(hw, ROFDM0_XCAGCCORE1, MASKBYTE0);
+           rtl_get_bbreg(hw, ROFDM0_XCAGCCORE1, MASKBYTE0);
        rtlphy->default_initialgain[3] =
-           (u8)rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
+           rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
        rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
                "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
                rtlphy->default_initialgain[0],
                rtlphy->default_initialgain[1],
                rtlphy->default_initialgain[2],
                rtlphy->default_initialgain[3]);
-       rtlphy->framesync = (u8)rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3,
-                                             MASKBYTE0);
-       rtlphy->framesync_c34 = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR2,
-                                             MASKDWORD);
+       rtlphy->framesync = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3, MASKBYTE0);
+       rtlphy->framesync_c34 = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR2, MASKDWORD);
        rtl_dbg(rtlpriv, COMP_INIT, DBG_TRACE,
                "Default framesync (0x%x) = 0x%x\n",
                ROFDM0_RXDETECTOR3, rtlphy->framesync);
@@ -349,7 +346,7 @@ static void _rtl92d_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
        struct rtl_phy *rtlphy = &rtlpriv->phy;
        struct rtl_hal *rtlhal = &rtlpriv->rtlhal;
        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
-       u8 index = (channel - 1);
+       u8 index = channel - 1;
 
        /* 1. CCK */
        if (rtlhal->current_bandtype == BAND_ON_2_4G) {
@@ -643,6 +640,7 @@ static void rtl92d_phy_set_io(struct ieee80211_hw *hw)
        rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
                "--->Cmd(%#x), set_io_inprogress(%d)\n",
                rtlphy->current_io_type, rtlphy->set_io_inprogress);
+
        switch (rtlphy->current_io_type) {
        case IO_CMD_RESUME_DM_BY_SCAN:
                de_digtable->cur_igvalue = rtlphy->initgain_backup.xaagccore1;
@@ -659,6 +657,7 @@ static void rtl92d_phy_set_io(struct ieee80211_hw *hw)
                       rtlphy->current_io_type);
                break;
        }
+
        rtlphy->set_io_inprogress = false;
        rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE, "<---(%#x)\n",
                rtlphy->current_io_type);
@@ -673,6 +672,7 @@ bool rtl92d_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
        rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE,
                "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
                 iotype, rtlphy->set_io_inprogress);
+
        do {
                switch (iotype) {
                case IO_CMD_RESUME_DM_BY_SCAN:
@@ -691,12 +691,14 @@ bool rtl92d_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
                        break;
                }
        } while (false);
+
        if (postprocessing && !rtlphy->set_io_inprogress) {
                rtlphy->set_io_inprogress = true;
                rtlphy->current_io_type = iotype;
        } else {
                return false;
        }
+
        rtl92d_phy_set_io(hw);
        rtl_dbg(rtlpriv, COMP_CMD, DBG_TRACE, "<--IO Type(%#x)\n", iotype);
        return true;
index 2783d7e7b2278e7659e4ef00b597a49ab438f41b..1dc52abe3d0dfa3fda3a18eefc5e5c5588a453ff 100644 (file)
@@ -50,6 +50,7 @@
 #define REG_HMEBOX_EXT_1               0x008A
 #define REG_HMEBOX_EXT_2               0x008C
 #define REG_HMEBOX_EXT_3               0x008E
+#define SIZE_OF_REG_HMEBOX_EXT         2
 
 #define REG_BIST_SCAN                  0x00D0
 #define REG_BIST_RPT                   0x00D4
 #define REG_HMEBOX_1                   0x01D4
 #define REG_HMEBOX_2                   0x01D8
 #define REG_HMEBOX_3                   0x01DC
+#define SIZE_OF_REG_HMEBOX             4
 
 #define REG_LLT_INIT                   0x01E0
 #define REG_BB_ACCEESS_CTRL            0x01E8
index 8af1661836888032cf4b09bc6e5212ed1d58eb13..427d1877f43144bf1a62f829a62108da6fe03dbc 100644 (file)
@@ -16,10 +16,11 @@ void rtl92d_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
        switch (bandwidth) {
        case HT_CHANNEL_WIDTH_20:
                for (rfpath = 0; rfpath < rtlphy->num_total_rfpath; rfpath++) {
-                       rtlphy->rfreg_chnlval[rfpath] = ((rtlphy->rfreg_chnlval
-                                       [rfpath] & 0xfffff3ff) | 0x0400);
-                       rtl_set_rfreg(hw, rfpath, RF_CHNLBW, BIT(10) |
-                                     BIT(11), 0x01);
+                       rtlphy->rfreg_chnlval[rfpath] &= 0xfffff3ff;
+                       rtlphy->rfreg_chnlval[rfpath] |= 0x0400;
+
+                       rtl_set_rfreg(hw, rfpath, RF_CHNLBW,
+                                     BIT(10) | BIT(11), 0x01);
 
                        rtl_dbg(rtlpriv, COMP_RF, DBG_LOUD,
                                "20M RF 0x18 = 0x%x\n",
@@ -29,10 +30,11 @@ void rtl92d_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                break;
        case HT_CHANNEL_WIDTH_20_40:
                for (rfpath = 0; rfpath < rtlphy->num_total_rfpath; rfpath++) {
-                       rtlphy->rfreg_chnlval[rfpath] =
-                           ((rtlphy->rfreg_chnlval[rfpath] & 0xfffff3ff));
-                       rtl_set_rfreg(hw, rfpath, RF_CHNLBW, BIT(10) | BIT(11),
-                                     0x00);
+                       rtlphy->rfreg_chnlval[rfpath] &= 0xfffff3ff;
+
+                       rtl_set_rfreg(hw, rfpath, RF_CHNLBW,
+                                     BIT(10) | BIT(11), 0x00);
+
                        rtl_dbg(rtlpriv, COMP_RF, DBG_LOUD,
                                "40M RF 0x18 = 0x%x\n",
                                rtlphy->rfreg_chnlval[rfpath]);
@@ -135,7 +137,7 @@ static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw,
                legacy_pwrdiff = rtlefuse->txpwr_legacyhtdiff[i][channel - 1];
                powerbase0 = powerlevel[i] + legacy_pwrdiff;
                powerbase0 = (powerbase0 << 24) | (powerbase0 << 16) |
-                   (powerbase0 << 8) | powerbase0;
+                            (powerbase0 << 8) | powerbase0;
                *(ofdmbase + i) = powerbase0;
                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                        " [OFDM power base index rf(%c) = 0x%x]\n",
@@ -157,6 +159,31 @@ static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw,
        }
 }
 
+static void _rtl92d_get_pwr_diff_limit(struct ieee80211_hw *hw, u8 channel,
+                                      u8 index, u8 rf, u8 pwr_diff_limit[4])
+{
+       struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+       struct rtl_priv *rtlpriv = rtl_priv(hw);
+       struct rtl_phy *rtlphy = &rtlpriv->phy;
+       u32 mcs_offset;
+       u8 limit;
+       int i;
+
+       mcs_offset = rtlphy->mcs_offset[0][index + (rf ? 8 : 0)];
+
+       for (i = 0; i < 4; i++) {
+               pwr_diff_limit[i] = (mcs_offset >> (i * 8)) & 0x7f;
+
+               if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40)
+                       limit = rtlefuse->pwrgroup_ht40[rf][channel - 1];
+               else
+                       limit = rtlefuse->pwrgroup_ht20[rf][channel - 1];
+
+               if (pwr_diff_limit[i] > limit)
+                       pwr_diff_limit[i] = limit;
+       }
+}
+
 static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                                       u8 channel, u8 index,
                                                       u32 *powerbase0,
@@ -166,107 +193,86 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_phy *rtlphy = &rtlpriv->phy;
-       u8 i, chnlgroup = 0, pwr_diff_limit[4];
        u32 writeval = 0, customer_limit, rf;
+       u8 chnlgroup = 0, pwr_diff_limit[4];
 
        for (rf = 0; rf < 2; rf++) {
                switch (rtlefuse->eeprom_regulatory) {
                case 0:
-                       chnlgroup = 0;
-                       writeval = rtlphy->mcs_offset
-                                       [chnlgroup][index +
-                                       (rf ? 8 : 0)] + ((index < 2) ?
-                                       powerbase0[rf] :
-                                       powerbase1[rf]);
+                       writeval = rtlphy->mcs_offset[0][index + (rf ? 8 : 0)];
+
                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                               "RTK better performance, writeval(%c) = 0x%x\n",
-                               rf == 0 ? 'A' : 'B', writeval);
+                               "RTK better performance\n");
                        break;
                case 1:
                        if (rtlphy->pwrgroup_cnt == 1)
                                chnlgroup = 0;
-                       if (rtlphy->pwrgroup_cnt >= MAX_PG_GROUP) {
-                               chnlgroup = rtl92d_phy_get_chnlgroup_bypg(channel - 1);
-                               if (rtlphy->current_chan_bw ==
-                                   HT_CHANNEL_WIDTH_20)
-                                       chnlgroup++;
-                               else
-                                       chnlgroup += 4;
-                               writeval = rtlphy->mcs_offset
-                                               [chnlgroup][index +
-                                               (rf ? 8 : 0)] + ((index < 2) ?
-                                               powerbase0[rf] :
-                                               powerbase1[rf]);
-                               RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                       "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
-                                       rf == 0 ? 'A' : 'B', writeval);
-                       }
+
+                       if (rtlphy->pwrgroup_cnt < MAX_PG_GROUP)
+                               break;
+
+                       chnlgroup = rtl92d_phy_get_chnlgroup_bypg(channel - 1);
+                       if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20)
+                               chnlgroup++;
+                       else
+                               chnlgroup += 4;
+
+                       writeval = rtlphy->mcs_offset
+                                       [chnlgroup][index + (rf ? 8 : 0)];
+
+                       RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                               "Realtek regulatory, 20MHz\n");
                        break;
                case 2:
-                       writeval = ((index < 2) ? powerbase0[rf] :
-                                  powerbase1[rf]);
-                       RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                               "Better regulatory, writeval(%c) = 0x%x\n",
-                               rf == 0 ? 'A' : 'B', writeval);
+                       writeval = 0;
+
+                       RTPRINT(rtlpriv, FPHY, PHY_TXPWR, "Better regulatory\n");
                        break;
                case 3:
-                       chnlgroup = 0;
                        if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                        "customer's limit, 40MHz rf(%c) = 0x%x\n",
                                        rf == 0 ? 'A' : 'B',
-                                       rtlefuse->pwrgroup_ht40[rf]
-                                       [channel - 1]);
+                                       rtlefuse->pwrgroup_ht40[rf][channel - 1]);
                        } else {
                                RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                        "customer's limit, 20MHz rf(%c) = 0x%x\n",
                                        rf == 0 ? 'A' : 'B',
-                                       rtlefuse->pwrgroup_ht20[rf]
-                                       [channel - 1]);
-                       }
-                       for (i = 0; i < 4; i++) {
-                               pwr_diff_limit[i] = (u8)((rtlphy->mcs_offset
-                                       [chnlgroup][index + (rf ? 8 : 0)] &
-                                       (0x7f << (i * 8))) >> (i * 8));
-                               if (rtlphy->current_chan_bw ==
-                                   HT_CHANNEL_WIDTH_20_40) {
-                                       if (pwr_diff_limit[i] >
-                                           rtlefuse->pwrgroup_ht40[rf]
-                                          [channel - 1])
-                                               pwr_diff_limit[i] =
-                                                       rtlefuse->pwrgroup_ht40
-                                                       [rf][channel - 1];
-                               } else {
-                                       if (pwr_diff_limit[i] >
-                                           rtlefuse->pwrgroup_ht20[rf][channel - 1])
-                                               pwr_diff_limit[i] =
-                                                  rtlefuse->pwrgroup_ht20[rf]
-                                                  [channel - 1];
-                               }
+                                       rtlefuse->pwrgroup_ht20[rf][channel - 1]);
                        }
+
+                       _rtl92d_get_pwr_diff_limit(hw, channel, index, rf,
+                                                  pwr_diff_limit);
+
                        customer_limit = (pwr_diff_limit[3] << 24) |
                                         (pwr_diff_limit[2] << 16) |
                                         (pwr_diff_limit[1] << 8) |
                                         (pwr_diff_limit[0]);
+
                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
                                "Customer's limit rf(%c) = 0x%x\n",
                                rf == 0 ? 'A' : 'B', customer_limit);
-                       writeval = customer_limit + ((index < 2) ?
-                                  powerbase0[rf] : powerbase1[rf]);
-                       RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                               "Customer, writeval rf(%c)= 0x%x\n",
-                               rf == 0 ? 'A' : 'B', writeval);
+
+                       writeval = customer_limit;
+
+                       RTPRINT(rtlpriv, FPHY, PHY_TXPWR, "Customer\n");
                        break;
                default:
-                       chnlgroup = 0;
-                       writeval = rtlphy->mcs_offset[chnlgroup][index +
-                                  (rf ? 8 : 0)] + ((index < 2) ?
-                                  powerbase0[rf] : powerbase1[rf]);
+                       writeval = rtlphy->mcs_offset[0][index + (rf ? 8 : 0)];
+
                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                               "RTK better performance, writeval rf(%c) = 0x%x\n",
-                               rf == 0 ? 'A' : 'B', writeval);
+                               "RTK better performance\n");
                        break;
                }
+
+               if (index < 2)
+                       writeval += powerbase0[rf];
+               else
+                       writeval += powerbase1[rf];
+
+               RTPRINT(rtlpriv, FPHY, PHY_TXPWR, "writeval rf(%c)= 0x%x\n",
+                       rf == 0 ? 'A' : 'B', writeval);
+
                *(p_outwriteval + rf) = writeval;
        }
 }
index 5b8f404373ea2fa5ca25f8f392793cc9f7af71ee..72d2b7426d82fd75172cd1d7e29cace2b48d376d 100644 (file)
@@ -349,14 +349,16 @@ static void _rtl92de_translate_rx_signal_stuff(struct ieee80211_hw *hw,
                                               __le32 *pdesc,
                                               struct rx_fwinfo_92d *p_drvinfo)
 {
-       struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
+       struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        struct ieee80211_hdr *hdr;
+       bool packet_matchbssid;
+       bool packet_beacon;
+       bool packet_toself;
+       u16 type, cfc;
        u8 *tmp_buf;
        u8 *praddr;
-       u16 type, cfc;
        __le16 fc;
-       bool packet_matchbssid, packet_toself, packet_beacon = false;
 
        tmp_buf = skb->data + pstats->rx_drvinfo_size + pstats->rx_bufshift;
        hdr = (struct ieee80211_hdr *)tmp_buf;
@@ -372,8 +374,7 @@ static void _rtl92de_translate_rx_signal_stuff(struct ieee80211_hw *hw,
             (!pstats->hwerror) && (!pstats->crc) && (!pstats->icv));
        packet_toself = packet_matchbssid &&
                        ether_addr_equal(praddr, rtlefuse->dev_addr);
-       if (ieee80211_is_beacon(fc))
-               packet_beacon = true;
+       packet_beacon = ieee80211_is_beacon(fc);
        _rtl92de_query_rxphystatus(hw, pstats, pdesc, p_drvinfo,
                                   packet_matchbssid, packet_toself,
                                   packet_beacon);