rtlwifi: 8192de: Fix used uninitialized variables in power tracking
[email protected]
maintainercover rtlwifi: 8192de: Fix used uninitialized variables in power tracking
From: Ping-Ke Shih <[email protected]>
This issue is found by Coverity and repoerted by Colin Ian King. An array ofdm_index[3] is never initialized.
In order to fix this issue, I refactor the code to be more readable, and then I investigate the variable ofdm_index[] should be initialized as the index corresponding to thermal value programmed in efuse.
The cckswing table in the last patch is used to adjust TX power. When I check this function, the table is in little-endian order, but compare with register value in cpu order. Then, fix it as well.
Ping-Ke Shih (4):
rtlwifi: 8192de: Reduce indentation and fix coding style
rtlwifi: 8192de: make tables to be 'static const'
rtlwifi: 8192de: Fix used uninitialized variables in power tracking
rtlwifi: 8192de: use le32 to access cckswing tables
.../wireless/realtek/rtlwifi/rtl8192de/dm.c | 695 +++++++++--------- 1 file changed, 330 insertions(+), 365 deletions(-)
Signature · 1 line
2.21.0
[email protected]
maintainerPATCH 1/4 rtlwifi: 8192de: Reduce indentation and fix coding style
From: Ping-Ke Shih <[email protected]>
This commit doesn't change logic at all. Since indentation is lower, the wrapped statements can be put in single line that will become more readable.
--- .../wireless/realtek/rtlwifi/rtl8192de/dm.c | 640 +++++++++--------- 1 file changed, 303 insertions(+), 337 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c +303 -337
@@ -837,365 +837,331 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter( rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter);rtl92d_phy_ap_calibrate (hw, (thermalvalue - rtlefuse->eeprom_thermalmeter)); + +if (!thermalvalue) + goto exit; +if (is2t) rf =2 ;else rf =1 ; -if (thermalvalue) { - ele_d =rtl_get_bbreg (hw,ROFDM0_XATXIQIMBALANCE , + + 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; + +RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , +"Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index=0x%x\n" , +ROFDM0_XATXIQIMBALANCE , + ele_d, ofdm_index_old[0 ]); +break ; + } + } +if (is2t) { + ele_d =rtl_get_bbreg (hw,ROFDM0_XBTXIQIMBALANCE ,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; - -RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index=0x%x\n" , -ROFDM0_XATXIQIMBALANCE , - ele_d, ofdm_index_old[0 ]); +if (ele_d == + (ofdmswing_table[i] &MASKOFDM_D )) { + ofdm_index_old[1 ] = (u8 )i; +RT_TRACE (rtlpriv,COMP_POWER_TRACKING , +DBG_LOUD , +"Initial pathB ele_d reg 0x%x = 0x%lx, ofdm_index = 0x%x\n" , +ROFDM0_XBTXIQIMBALANCE , ele_d, + ofdm_index_old[1 ]);break ; } } -if (is2t) { - ele_d =rtl_get_bbreg (hw,ROFDM0_XBTXIQIMBALANCE , -MASKDWORD ) &MASKOFDM_D ; -for (i =0 ; i <OFDM_TABLE_SIZE_92D ; i++) { -if (ele_d == - (ofdmswing_table[i] &MASKOFDM_D )) { - ofdm_index_old[1 ] = (u8 ) i; -RT_TRACE (rtlpriv,COMP_POWER_TRACKING , -DBG_LOUD , -"Initial pathB ele_d reg 0x%x = 0x%lx, ofdm_index = 0x%x\n" , -ROFDM0_XBTXIQIMBALANCE , ele_d, - ofdm_index_old[1 ]); -break ; - } - } - } -if (rtlhal->current_bandtype ==BAND_ON_2_4G ) { -rtl92d_bandtype_2_4G (hw, &temp_cck, &cck_index_old); - }else { - temp_cck =0x090e1317 ; - cck_index_old =12 ; - } + } +if (rtlhal->current_bandtype ==BAND_ON_2_4G ) { +rtl92d_bandtype_2_4G (hw, &temp_cck, &cck_index_old); + }else { + temp_cck =0x090e1317 ; + 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; -for (i =0 ; i < rf; i++) - rtlpriv->dm.ofdm_index[i] = ofdm_index_old[i]; - rtlpriv->dm.cck_index = cck_index_old; +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; +for (i =0 ; i < rf; i++) + rtlpriv->dm.ofdm_index[i] = ofdm_index_old[i]; + rtlpriv->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; +RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , +"reload ofdm index for band switch\n" ); + } + 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]; + thermalvalue_avg_count++; } -if (rtlhal->reloadtxpowerindex) { + } +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); + 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); + }else { + delta = (thermalvalue > rtlefuse->eeprom_thermalmeter) ? + (thermalvalue - rtlefuse->eeprom_thermalmeter) : + (rtlefuse->eeprom_thermalmeter - thermalvalue); + } + 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); +RT_TRACE (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); +if (delta_lck > rtlefuse->delta_lck && rtlefuse->delta_lck !=0 ) { + rtlpriv->dm.thermalvalue_lck = thermalvalue; +rtl92d_phy_lc_calibrate (hw); + } + +if (delta ==0 || !rtlpriv->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); +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) {for (i =0 ; i < rf; i++) - rtlpriv->dm.ofdm_index[i] = ofdm_index_old[i]; - rtlpriv->dm.cck_index = cck_index_old; -RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"reload ofdm index for band switch\n" ); - } - 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]; - 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); - 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); + ofdm_index[i] -= delta; + cck_index -= delta; }else { - delta = (thermalvalue > rtlefuse->eeprom_thermalmeter) ? - (thermalvalue - rtlefuse->eeprom_thermalmeter) : - (rtlefuse->eeprom_thermalmeter - thermalvalue); +for (i =0 ; i < rf; i++) + ofdm_index[i] += index; + cck_index += index; } - 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); + }else if (rtlhal->current_bandtype ==BAND_ON_5G ) { +rtl92d_bandtype_5G (rtlhal, ofdm_index, + &internal_pa, thermalvalue, + delta, rf, rtlefuse, rtlpriv, + rtlphy, index_mapping, + index_mapping_internal_pa); + } +if (is2t) { +RT_TRACE (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); + }else {RT_TRACE (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); -if ((delta_lck > rtlefuse->delta_lck) && - (rtlefuse->delta_lck !=0 )) { - rtlpriv->dm.thermalvalue_lck = thermalvalue; -rtl92d_phy_lc_calibrate (hw); +"temp OFDM_A_index=0x%x,cck_index = 0x%x\n" , + rtlpriv->dm.ofdm_index[0 ], + rtlpriv->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 ; +else if (ofdm_index[i] < ofdm_min_index) + 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 (internal_pa || + rtlhal->current_bandtype ==BAND_ON_2_4G ) { +if (ofdm_index[i] < ofdm_min_index_internal_pa) + ofdm_index[i] = ofdm_min_index_internal_pa; + }else if (cck_index <0 ) { + cck_index =0 ; } -if (delta >0 && rtlpriv->dm.txpower_track_control) { - rtlpriv->dm.done_txpower = true; - delta = (thermalvalue > rtlefuse->eeprom_thermalmeter) ? - (thermalvalue - rtlefuse->eeprom_thermalmeter) : - (rtlefuse->eeprom_thermalmeter - thermalvalue); -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) { -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, - rtlphy, index_mapping, - index_mapping_internal_pa); - } -if (is2t) { -RT_TRACE (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); - }else { -RT_TRACE (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); - } -for (i =0 ; i < rf; i++) { -if (ofdm_index[i] >OFDM_TABLE_SIZE_92D -1 ) - ofdm_index[i] =OFDM_TABLE_SIZE_92D -1 ; -else if (ofdm_index[i] < ofdm_min_index) - 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 (internal_pa || - rtlhal->current_bandtype == -BAND_ON_2_4G ) { -if (ofdm_index[i] < - ofdm_min_index_internal_pa) - ofdm_index[i] = - ofdm_min_index_internal_pa; - }else if (cck_index <0 ) { - cck_index =0 ; - } - } -if (is2t) { -RT_TRACE (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); - }else { -RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"new OFDM_A_index=0x%x,cck_index = 0x%x\n" , - ofdm_index[0 ], cck_index); - } - ele_d = (ofdmswing_table[(u8 ) 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 ; - 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 ) &0x000003FF ; - -/* wirte new elements A, C, D to regC80 and -* regC94, element B is always 0 */ - value32 = (ele_d <<22 ) | ((ele_c &0x3F ) << -16 ) | ele_a; -rtl_set_bbreg (hw,ROFDM0_XATXIQIMBALANCE , -MASKDWORD , value32); - - value32 = (ele_c &0x000003C0 ) >>6 ; -rtl_set_bbreg (hw,ROFDM0_XCTXAFE ,MASKH4BITS , - value32); - - value32 = ((val_x * ele_d) >>7 ) &0x01 ; -rtl_set_bbreg (hw,ROFDM0_ECCATHRESHOLD ,BIT (24 ), - value32); + } +if (is2t) { +RT_TRACE (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); + }else { +RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , +"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 ; + 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 ) &0x000003FF ; + +/* write new elements A, C, D to regC80 and +* regC94, element B is always 0 +*/ + value32 = (ele_d <<22 ) | ((ele_c &0x3F ) <<16 ) | ele_a; +rtl_set_bbreg (hw,ROFDM0_XATXIQIMBALANCE , +MASKDWORD , value32); + + value32 = (ele_c &0x000003C0 ) >>6 ; +rtl_set_bbreg (hw,ROFDM0_XCTXAFE ,MASKH4BITS , + value32); + + value32 = ((val_x * ele_d) >>7 ) &0x01 ; +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 ); - } + }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 ); + } -RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"TxPwrTracking for interface %d path A: X = 0x%lx, Y = 0x%lx ele_A = 0x%lx ele_C = 0x%lx ele_D = 0x%lx 0xe94 = 0x%lx 0xe9c = 0x%lx\n" , - rtlhal->interfaceindex, - 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 - [(u8 )cck_index][0 ]); -rtl_write_byte (rtlpriv,0xa23 , - cckswing_table_ch1ch13 - [(u8 )cck_index][1 ]); -rtl_write_byte (rtlpriv,0xa24 , - cckswing_table_ch1ch13 - [(u8 )cck_index][2 ]); -rtl_write_byte (rtlpriv,0xa25 , - cckswing_table_ch1ch13 - [(u8 )cck_index][3 ]); -rtl_write_byte (rtlpriv,0xa26 , - cckswing_table_ch1ch13 - [(u8 )cck_index][4 ]); -rtl_write_byte (rtlpriv,0xa27 , - cckswing_table_ch1ch13 - [(u8 )cck_index][5 ]); -rtl_write_byte (rtlpriv,0xa28 , - cckswing_table_ch1ch13 - [(u8 )cck_index][6 ]); -rtl_write_byte (rtlpriv,0xa29 , - cckswing_table_ch1ch13 - [(u8 )cck_index][7 ]); - }else { -rtl_write_byte (rtlpriv,0xa22 , - cckswing_table_ch14 - [(u8 )cck_index][0 ]); -rtl_write_byte (rtlpriv,0xa23 , - cckswing_table_ch14 - [(u8 )cck_index][1 ]); -rtl_write_byte (rtlpriv,0xa24 , - cckswing_table_ch14 - [(u8 )cck_index][2 ]); -rtl_write_byte (rtlpriv,0xa25 , - cckswing_table_ch14 - [(u8 )cck_index][3 ]); -rtl_write_byte (rtlpriv,0xa26 , - cckswing_table_ch14 - [(u8 )cck_index][4 ]); -rtl_write_byte (rtlpriv,0xa27 , - cckswing_table_ch14 - [(u8 )cck_index][5 ]); -rtl_write_byte (rtlpriv,0xa28 , - cckswing_table_ch14 - [(u8 )cck_index][6 ]); -rtl_write_byte (rtlpriv,0xa29 , - cckswing_table_ch14 - [(u8 )cck_index][7 ]); - } - } -if (is2t) { - ele_d = (ofdmswing_table[(u8 ) 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 , -MASKDWORD , value32); - value32 = (ele_c &0x000003C0 ) >>6 ; -rtl_set_bbreg (hw,ROFDM0_XDTXAFE , -MASKH4BITS , value32); - value32 = ((val_x * ele_d) >>7 ) &0x01 ; -rtl_set_bbreg (hw,ROFDM0_ECCATHRESHOLD , -BIT (28 ), value32); - }else { -rtl_set_bbreg (hw, -ROFDM0_XBTXIQIMBALANCE , -MASKDWORD , - ofdmswing_table - [(u8 ) ofdm_index[1 ]]); -rtl_set_bbreg (hw,ROFDM0_XDTXAFE , -MASKH4BITS ,0x00 ); -rtl_set_bbreg (hw,ROFDM0_ECCATHRESHOLD , -BIT (28 ),0x00 ); - } -RT_TRACE (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); - } -RT_TRACE (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 )); - } -if ((delta_iqk > rtlefuse->delta_iqk) && - (rtlefuse->delta_iqk !=0 )) { -rtl92d_phy_reset_iqk_result (hw); - rtlpriv->dm.thermalvalue_iqk = thermalvalue; -rtl92d_phy_iq_calibrate (hw); +RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , +"TxPwrTracking for interface %d path A: X = 0x%lx, Y = 0x%lx ele_A = 0x%lx ele_C = 0x%lx ele_D = 0x%lx 0xe94 = 0x%lx 0xe9c = 0x%lx\n" , + rtlhal->interfaceindex, + 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 ]); } -if (delta_rxgain >0 && rtlhal->current_bandtype ==BAND_ON_5G - && thermalvalue <= rtlefuse->eeprom_thermalmeter) { - rtlpriv->dm.thermalvalue_rxgain = thermalvalue; -rtl92d_dm_rxgain_tracking_thermalmeter (hw); + } +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 , +MASKDWORD , value32); + value32 = (ele_c &0x000003C0 ) >>6 ; +rtl_set_bbreg (hw,ROFDM0_XDTXAFE , +MASKH4BITS , value32); + value32 = ((val_x * ele_d) >>7 ) &0x01 ; +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 ); } -if (rtlpriv->dm.txpower_track_control) - rtlpriv->dm.thermalvalue = thermalvalue; +RT_TRACE (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); + } +RT_TRACE (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 )); + +check_delta: +if (delta_iqk > rtlefuse->delta_iqk && rtlefuse->delta_iqk !=0 ) { +rtl92d_phy_reset_iqk_result (hw); + rtlpriv->dm.thermalvalue_iqk = thermalvalue; +rtl92d_phy_iq_calibrate (hw); } +if (delta_rxgain >0 && rtlhal->current_bandtype ==BAND_ON_5G && + thermalvalue <= rtlefuse->eeprom_thermalmeter) { + rtlpriv->dm.thermalvalue_rxgain = thermalvalue; +rtl92d_dm_rxgain_tracking_thermalmeter (hw); + } +if (rtlpriv->dm.txpower_track_control) + rtlpriv->dm.thermalvalue = thermalvalue; +exit:RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD ,"<===\n" ); }
Signature · 1 line
2.21.0
Re: [PATCH 1/4] rtlwifi: 8192de: Reduce indentation and fix coding style
Quoted 7 lines · <[email protected]> wrote:
From: Ping-Ke Shih <[email protected]>
This commit doesn't change logic at all. Since indentation is lower, the wrapped statements can be put in single line that will become more readable.
Signed-off-by Ping-Ke Shih <[email protected]>
4 patches applied to wireless-drivers-next.git, thanks.
3bde4ed3da38 rtlwifi: 8192de: Reduce indentation and fix coding style 8a7db8b66b40 rtlwifi: 8192de: make tables to be 'static const' 0e7d38132bf8 rtlwifi: 8192de: Fix used uninitialized variables in power tracking 80429a86e3d9 rtlwifi: 8192de: use le32 to access cckswing tables
Signature · 3 lines
https://patchwork.kernel.org/patch/10938337/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
[email protected]
maintainerPATCH 2/4 rtlwifi: 8192de: make tables to be 'static const'
In reply to [email protected]From: Ping-Ke Shih <[email protected]>
This can reduce code size 264 bytes, and make code more readable.
text data bss dec hex filename
Before: 13586 0 16 13602 3522 rtl8192de/dm.o After: 13322 0 16 13338 341a rtl8192de/dm.o
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c +4 -4
@@ -718,8 +718,8 @@ static void rtl92d_bandtype_5G(struct rtl_hal *rtlhal, u8 *ofdm_index, bool *internal_pa, u8 thermalvalue, u8 delta, u8 rf, struct rtl_efuse *rtlefuse, struct rtl_priv *rtlpriv, struct rtl_phy *rtlphy, - u8 index_mapping[5][INDEX_MAPPING_NUM], - u8 index_mapping_pa[8][INDEX_MAPPING_NUM]) + const u8 index_mapping[5][INDEX_MAPPING_NUM], + const u8 index_mapping_pa[8][INDEX_MAPPING_NUM]) { int i;u8 index;
@@ -797,7 +797,7 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(u8 ofdm_min_index =6 , ofdm_min_index_internal_pa =3 , rf;u8 indexforchannel =rtl92d_get_rightchnlplace_for_iqk (rtlphy->current_channel); -u8 index_mapping[5 ][INDEX_MAPPING_NUM ] = { +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 },/* 5G, path A/MAC 0, increase power */
@@ -809,7 +809,7 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(/* 2.4G, for decreas power */ {0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9, 10, 10}, }; -u8 index_mapping_internal_pa[8 ][INDEX_MAPPING_NUM ] = { +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 }, /* 5G, path A/MAC 0, ch36-64, increase power */
Signature · 1 line
2.21.0
[email protected]
maintainerPATCH 3/4 rtlwifi: 8192de: Fix used uninitialized variables in power tracking
In reply to [email protected]From: Ping-Ke Shih <[email protected]>
ofdm_index_old[] is the index of ofdmswing_table[], and used to indicate initial value of ROFDM0_X{A,B}TXIQIMBALANCE in rtl8192de_phy_reg_2tarray[] table, and the initial value is corresponding to calibration thermal value written in efuse, namely rtlefuse->eeprom_thermalmeter. Then, local variable ofdm_index_old[] save to rtlpriv->dm.ofdm_index[] for operational use.
If thermal value (temperature) is increasing, output TX power is lower. So, we calculate the delta between current and calibration thermal value, then add power to yield expected and the same output TX power.
Thus, ofdm_index[] should be initialized as rtlpriv->dm.ofdm_index[], and shift to proper index depends on delta of thermal value. Then, new power value ofdmswing_table[ofdm_index[]] is written to register.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c +9 -2
@@ -787,9 +787,9 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(bool internal_pa = false;long ele_a =0 , ele_d, temp_cck, val_x, value32;long val_y, ele_c =0 ; -u8 ofdm_index[3 ]; +u8 ofdm_index[2 ];s8 cck_index =0 ; -u8 ofdm_index_old[3 ] = {0 ,0 ,0 }; +u8 ofdm_index_old[2 ] = {0 ,0 };s8 cck_index_old =0 ;u8 index;int i;
@@ -846,6 +846,9 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(else rf =1 ; +if (rtlpriv->dm.thermalvalue && !rtlhal->reloadtxpowerindex) + goto old_index_done; + 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 )) {
@@ -897,6 +900,10 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(RT_TRACE (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]; + rtlpriv->dm.thermalvalue_avg [rtlpriv->dm.thermalvalue_avg_index] = thermalvalue; rtlpriv->dm.thermalvalue_avg_index++;
Signature · 1 line
2.21.0
[email protected]
maintainerPATCH 4/4 rtlwifi: 8192de: use le32 to access cckswing tables
In reply to [email protected]From: Ping-Ke Shih <[email protected]>
The cckswing tables cckswing_table_ch1ch13 and cckswing_table_ch14 are u8 array in little-endian order. To compare four u8 value with register u32 value, cast the value to cpu order.
--- .../wireless/realtek/rtlwifi/rtl8192de/dm.c | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c +14 -22
@@ -680,6 +680,7 @@ static void rtl92d_bandtype_2_4G(struct ieee80211_hw *hw, long *temp_cckg,int i;unsigned long flag =0 ;long temp_cck; +const u8 *cckswing;/* Query CCK default setting From 0xa24 */ rtl92d_acquire_cckandrw_pagea_ctl (hw, &flag);
@@ -687,28 +688,19 @@ static void rtl92d_bandtype_2_4G(struct ieee80211_hw *hw, long *temp_cckg, MASKDWORD) & MASKCCK;rtl92d_release_cckandrw_pagea_ctl (hw, &flag);for (i =0 ; i <CCK_TABLE_LENGTH ; i++) { -if (rtlpriv->dm.cck_inch14) { -if (!memcmp ((void *)&temp_cck, - (void *)&cckswing_table_ch14[i][2 ],4 )) { - *cck_index_old = (u8 ) i; -RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"Initial reg0x%x = 0x%lx, cck_index=0x%x, ch 14 %d\n" , -RCCK0_TXFILTER2 , temp_cck, - *cck_index_old, - rtlpriv->dm.cck_inch14); -break ; - } - }else { -if (!memcmp ((void *) &temp_cck, - &cckswing_table_ch1ch13[i][2 ],4 )) { - *cck_index_old = (u8 ) i; -RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , -"Initial reg0x%x = 0x%lx, cck_index = 0x%x, ch14 %d\n" , -RCCK0_TXFILTER2 , temp_cck, - *cck_index_old, - rtlpriv->dm.cck_inch14); -break ; - } +if (rtlpriv->dm.cck_inch14) + cckswing = &cckswing_table_ch14[i][2 ]; +else + cckswing = &cckswing_table_ch1ch13[i][2 ]; + +if (temp_cck ==le32_to_cpu (*((__le32 *)cckswing))) { + *cck_index_old = (u8 )i; +RT_TRACE (rtlpriv,COMP_POWER_TRACKING ,DBG_LOUD , +"Initial reg0x%x = 0x%lx, cck_index = 0x%x, ch14 %d\n" , +RCCK0_TXFILTER2 , temp_cck, + *cck_index_old, + rtlpriv->dm.cck_inch14); +break ; } } *temp_cckg = temp_cck;
Signature · 1 line
2.21.0