mirrors/8821cu-20210916
1
0
Fork 0
mirror of https://github.com/morrownr/8821cu-20210916.git synced 2024-11-18 19:44:48 +00:00
Code Releases Activity

cleanup logging

Browse Source
This commit is contained in:
morrownr 2022-12-29 16:14:24 -06:00
parent 0476bb22ac
commit 1b04b9c821
5 changed files with 65 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
8821cu.conf
View File

@ -9,7 +9,7 @@
blacklist rtw88_8821cu
#
# Edit the following line to change, add or delete options:
options 8821cu rtw_drv_log_level=0 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_power_mgnt=1
options 8821cu rtw_drv_log_level=1 rtw_led_ctrl=1 rtw_vht_enable=1 rtw_power_mgnt=1
#
# After editing is complete, save this file (if using nano: Ctrl + x, y, Enter)
# and reboot to activate the changes.

2
Makefile
View File

@ -77,7 +77,7 @@ CONFIG_USB_AUTOSUSPEND = n
CONFIG_HW_PWRP_DETECTION = n
CONFIG_BT_COEXIST = y
CONFIG_WAPI_SUPPORT = n
CONFIG_EFUSE_CONFIG_FILE = y
CONFIG_EFUSE_CONFIG_FILE = n
CONFIG_EXT_CLK = n
CONFIG_TRAFFIC_PROTECT = n
CONFIG_LOAD_PHY_PARA_FROM_FILE = y

58
core/rtw_pwrctrl.c
View File

@ -89,12 +89,13 @@ void _ips_enter(_adapter *padapter)
if (rf_off == pwrpriv->change_rfpwrstate) {
pwrpriv->bpower_saving = _TRUE;
RTW_PRINT("nolinked power save enter\n");
/* nrm */
// RTW_PRINT("nolinked power save enter\n");
if (pwrpriv->ips_mode == IPS_LEVEL_2)
pwrpriv->bkeepfwalive = _TRUE;
#ifdef CONFIG_RTW_CFGVENDOR_LLSTATS
#ifdef CONFIG_RTW_CFGVENDOR_LLSTATS
pwrpriv->pwr_saving_start_time = rtw_get_current_time();
#endif /* CONFIG_RTW_CFGVENDOR_LLSTATS */
@ -137,12 +138,13 @@ int _ips_leave(_adapter *padapter)
result = rtw_ips_pwr_up(padapter);
if (result == _SUCCESS)
pwrpriv->rf_pwrstate = rf_on;
#ifdef CONFIG_RTW_CFGVENDOR_LLSTATS
#ifdef CONFIG_RTW_CFGVENDOR_LLSTATS
pwrpriv->pwr_saving_time += rtw_get_passing_time_ms(pwrpriv->pwr_saving_start_time);
#endif /* CONFIG_RTW_CFGVENDOR_LLSTATS */
RTW_PRINT("nolinked power save leave\n");
/* nrm */
// RTW_PRINT("nolinked power save leave\n");
RTW_INFO("==> ips_leave.....LED(0x%08x)...\n", rtw_read32(padapter, 0x4c));
pwrpriv->bips_processing = _FALSE;
@ -310,7 +312,7 @@ void rtw_ps_processor(_adapter *padapter)
/* RTW_INFO("==> fw report state(0x%x)\n",rtw_read8(padapter,0x1ca)); */
if (pwrpriv->bHWPwrPindetect) {
rfpwrstate = RfOnOffDetect(padapter);
RTW_INFO("@@@@- #2 %s==> rfstate:%s\n", __FUNCTION__, (rfpwrstate == rf_on) ? "rf_on" : "rf_off");
@ -325,7 +327,7 @@ void rtw_ps_processor(_adapter *padapter)
}
RTW_INFO("current rf_pwrstate(%s)\n", (pwrpriv->rf_pwrstate == rf_off) ? "rf_off" : "rf_on");
}
pwrpriv->pwr_state_check_cnts++;
}
#endif /* SUPPORT_HW_RFOFF_DETECTED */
@ -338,7 +340,7 @@ void rtw_ps_processor(_adapter *padapter)
if ((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts % 4) == 0)) {
RTW_INFO("==>%s .fw_state(%x)\n", __FUNCTION__, get_fwstate(pmlmepriv));
pwrpriv->change_rfpwrstate = rf_off;
pwrpriv->change_rfpwrstate = rf_off;
#ifdef CONFIG_IPS
ips_enter(padapter);
@ -874,7 +876,7 @@ void rtw_lps_rfon_ctrl(_adapter *padapter, u8 rfon_ctrl)
} while (1);
if (ready == _FAIL)
RTW_INFO(FUNC_ADPT_FMT": It is not ready to leave 32K !!!\n",
RTW_INFO(FUNC_ADPT_FMT": It is not ready to leave 32K !!!\n",
FUNC_ADPT_ARG(padapter));
}
#endif /* CONFIG_LPS_LCLK */
@ -895,7 +897,7 @@ void rtw_lps_rfon_ctrl(_adapter *padapter, u8 rfon_ctrl)
#ifdef CONFIG_LPS_PG
if (pwrpriv->lps_level == LPS_PG) {
if (rtw_hal_set_lps_pg_info_cmd(padapter) == _FAIL)
RTW_INFO(FUNC_ADPT_FMT": Send PG H2C command Fail! \n",
RTW_INFO(FUNC_ADPT_FMT": Send PG H2C command Fail! \n",
FUNC_ADPT_ARG(padapter));
}
#endif /* CONFIG_LPS_PG */
@ -925,14 +927,14 @@ void rtw_lps_rfon_ctrl(_adapter *padapter, u8 rfon_ctrl)
} while (polling_cnt < 100);
if (result == _FAIL )
RTW_INFO(FUNC_ADPT_FMT": It is not finished to enter 32K !!!\n",
RTW_INFO(FUNC_ADPT_FMT": It is not finished to enter 32K !!!\n",
FUNC_ADPT_ARG(padapter));
}
}
#endif /* CONFIG_LPS_LCLK */
}
} else {
RTW_INFO(FUNC_ADPT_FMT": RFON can't work due to ps state is not in LPS !\n",
RTW_INFO(FUNC_ADPT_FMT": RFON can't work due to ps state is not in LPS !\n",
FUNC_ADPT_ARG(padapter));
}
}
@ -945,7 +947,7 @@ void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode
struct dvobj_priv *psdpriv = padapter->dvobj;
struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
#endif
#ifdef CONFIG_WMMPS_STA
#ifdef CONFIG_WMMPS_STA
struct registry_priv *pregistrypriv = &padapter->registrypriv;
#endif
#ifdef CONFIG_P2P
@ -973,7 +975,7 @@ void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode
return;
#ifndef CONFIG_BT_COEXIST
#ifdef CONFIG_WMMPS_STA
#ifdef CONFIG_WMMPS_STA
if (!rtw_is_wmmps_mode(padapter))
#endif /* CONFIG_WMMPS_STA */
if ((pwrpriv->smart_ps == smart_ps) &&
@ -1159,12 +1161,12 @@ void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode
}
#endif
#ifdef CONFIG_WMMPS_STA
#ifdef CONFIG_WMMPS_STA
pwrpriv->wmm_smart_ps = pregistrypriv->wmm_smart_ps;
#endif /* CONFIG_WMMPS_STA */
rtw_exec_lps(padapter, ps_mode);
#ifdef CONFIG_WOWLAN
if (pwrpriv->wowlan_mode == _TRUE)
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_INACTIVE_IPS, (u8 *)(&ps_mode));
@ -1273,10 +1275,10 @@ void LPS_Enter(PADAPTER padapter, const char *msg)
if (rtw_is_wmmps_mode(padapter))
msg = "WMMPS_IDLE";
#endif /* CONFIG_WMMPS_STA */
sprintf(buf, "WIFI-%s", msg);
pwrpriv->bpower_saving = _TRUE;
#ifdef CONFIG_RTW_CFGVENDOR_LLSTATS
pwrpriv->pwr_saving_start_time = rtw_get_current_time();
#endif /* CONFIG_RTW_CFGVENDOR_LLSTATS */
@ -1329,11 +1331,11 @@ void LPS_Leave(PADAPTER padapter, const char *msg)
if (rtw_is_wmmps_mode(padapter))
msg = "WMMPS_BUSY";
#endif /* CONFIG_WMMPS_STA */
sprintf(buf, "WIFI-%s", msg);
rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0, buf);
#ifdef CONFIG_RTW_CFGVENDOR_LLSTATS
#ifdef CONFIG_RTW_CFGVENDOR_LLSTATS
pwrpriv->pwr_saving_time += rtw_get_passing_time_ms(pwrpriv->pwr_saving_start_time);
#endif /* CONFIG_RTW_CFGVENDOR_LLSTATS */
}
@ -1495,14 +1497,14 @@ void LeaveAllPowerSaveMode(PADAPTER Adapter)
#endif
} else {
if (adapter_to_pwrctl(Adapter)->rf_pwrstate == rf_off) {
#if defined(CONFIG_FWLPS_IN_IPS) || defined(CONFIG_SWLPS_IN_IPS) || (defined(CONFIG_PLATFORM_SPRD) && defined(CONFIG_RTL8188E))
#ifdef CONFIG_IPS
if (_FALSE == ips_leave(Adapter))
RTW_INFO("======> ips_leave fail.............\n");
#endif
#endif /* CONFIG_SWLPS_IN_IPS || (CONFIG_PLATFORM_SPRD && CONFIG_RTL8188E) */
}
}
@ -2257,7 +2259,7 @@ void rtw_init_pwrctrl_priv(PADAPTER padapter)
pwrctrlpriv->tog = 0x80;
pwrctrlpriv->rpwm_retry = 0;
RTW_INFO("%s: IPS_mode=%d, LPS_mode=%d, LPS_level=%d"LPS_1T1R_FMT"\n",
RTW_INFO("%s: IPS_mode=%d, LPS_mode=%d, LPS_level=%d"LPS_1T1R_FMT"\n",
__func__, pwrctrlpriv->ips_mode, pwrctrlpriv->power_mgnt, pwrctrlpriv->lps_level
LPS_1T1R_ARG
);
@ -2332,7 +2334,7 @@ void rtw_init_pwrctrl_priv(PADAPTER padapter)
, pwrctrlpriv->wowlan_gpio_output_state);
rtw_hal_switch_gpio_wl_ctrl(padapter, pwrctrlpriv->wowlan_gpio_index, _TRUE);
RTW_INFO("%s: set GPIO_%d to OUTPUT %s state in initial and %s_ACTIVE.\n",
__func__, pwrctrlpriv->wowlan_gpio_index,
__func__, pwrctrlpriv->wowlan_gpio_index,
pwrctrlpriv->wowlan_gpio_output_state ? "HIGH" : "LOW",
pwrctrlpriv->is_high_active ? "HIGI" : "LOW");
#endif /*CONFIG_WAKEUP_GPIO_INPUT_MODE*/
@ -2707,7 +2709,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
}
if (rf_off == pwrpriv->rf_pwrstate) {
#ifdef CONFIG_IPS
RTW_INFO("%s call ips_leave....\n", __FUNCTION__);
if (_FAIL == ips_leave(padapter)) {
@ -2716,7 +2718,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
goto exit;
}
#endif
}
/* TODO: the following checking need to be merged... */
@ -2808,7 +2810,7 @@ int rtw_pm_set_wow_lps(_adapter *padapter, u8 mode)
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
if (mode < PS_MODE_NUM) {
if (pwrctrlpriv->wowlan_power_mgmt != mode)
if (pwrctrlpriv->wowlan_power_mgmt != mode)
pwrctrlpriv->wowlan_power_mgmt = mode;
} else
ret = -EINVAL;

61
hal/hal_dm.c
View File

@ -435,7 +435,7 @@ void Init_ODM_ComInfo(_adapter *adapter)
odm_cmn_info_init(pDM_Odm, ODM_CMNINFO_EFUSE0X3D8, pHalData->efuse0x3d8);
/* waiting for PhyDMV034 support*/
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_MANUAL_SUPPORTABILITY, &(adapter->registrypriv.phydm_ability));
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_MANUAL_SUPPORTABILITY, &(adapter->registrypriv.phydm_ability));
/*Add by YuChen for adaptivity init*/
odm_cmn_info_hook(pDM_Odm, ODM_CMNINFO_ADAPTIVITY, &(adapter->registrypriv.adaptivity_en));
phydm_adaptivity_info_init(pDM_Odm, PHYDM_ADAPINFO_CARRIER_SENSE_ENABLE, (adapter->registrypriv.adaptivity_mode != 0) ? TRUE : FALSE);
@ -553,20 +553,20 @@ struct turbo_edca_setting{
static struct turbo_edca_setting rtw_turbo_edca[TURBO_EDCA_MODE_NUM] = {
TURBO_EDCA_ENT(0xa42b, 0xa42b), /* mode 0 */
TURBO_EDCA_ENT(0x431c, 0x431c), /* mode 1 */
TURBO_EDCA_ENT(0x4319, 0x4319), /* mode 2 */
TURBO_EDCA_ENT(0x4319, 0x4319), /* mode 2 */
TURBO_EDCA_ENT(0x5ea42b, 0x5ea42b), /* mode 3 */
TURBO_EDCA_ENT(0x5e431c, 0x5e431c), /* mode 4 */
TURBO_EDCA_ENT(0x5e4319, 0x5e4319), /* mode 5 */
TURBO_EDCA_ENT(0x5e4319, 0x5e4319), /* mode 5 */
TURBO_EDCA_ENT(0x6ea42b, 0x6ea42b), /* mode 6 */
TURBO_EDCA_ENT(0x6e431c, 0x6e431c), /* mode 7 */
TURBO_EDCA_ENT(0x6e4319, 0x6e4319), /* mode 8 */
TURBO_EDCA_ENT(0x5ea42b, 0xa42b), /* mode 9 */
TURBO_EDCA_ENT(0x5e431c, 0x431c), /* mode 10 */
TURBO_EDCA_ENT(0x5e4319, 0x4319), /* mode 11 */
TURBO_EDCA_ENT(0x6ea42b, 0xa42b), /* mode 12 */
TURBO_EDCA_ENT(0x6e431c, 0x431c), /* mode 13 */
TURBO_EDCA_ENT(0x6e4319, 0x4319), /* mode 14 */
@ -583,18 +583,18 @@ static struct turbo_edca_setting rtw_turbo_edca[TURBO_EDCA_MODE_NUM] = {
/* { UL, DL } */
TURBO_EDCA_ENT(0x5e431c, 0x431c), /* mode 0 */
TURBO_EDCA_ENT(0x431c, 0x431c), /* mode 1 */
TURBO_EDCA_ENT(0x431c, 0x431c), /* mode 1 */
TURBO_EDCA_ENT(0x5e431c, 0x5e431c), /* mode 2 */
TURBO_EDCA_ENT(0x5ea42b, 0x5ea42b), /* mode 3 */
TURBO_EDCA_ENT(0x5ea42b, 0x431c), /* mode 4 */
TURBO_EDCA_ENT(0x6ea42b, 0x6ea42b), /* mode 5 */
TURBO_EDCA_ENT(0xa42b, 0xa42b), /* mode 6 */
TURBO_EDCA_ENT(0x5e431c, 0xa42b), /* mode 7 */
};
#endif
@ -731,15 +731,15 @@ void rtw_hal_turbo_edca(_adapter *adapter)
EDCA_BE_DL = 0x00431c;
#ifdef CONFIG_RTW_TPT_MODE
if ( dvobj->tpt_mode > 0 ) {
if ( dvobj->tpt_mode > 0 ) {
EDCA_BE_UL = dvobj->edca_be_ul;
EDCA_BE_DL = dvobj->edca_be_dl;
}
#endif /* CONFIG_RTW_TPT_MODE */
/* keep this condition at last check */
if (hal_data->dis_turboedca == 2) {
if (hal_data->dis_turboedca == 2) {
if (hal_data->edca_param_mode < TURBO_EDCA_MODE_NUM) {
struct turbo_edca_setting param;
@ -748,12 +748,12 @@ void rtw_hal_turbo_edca(_adapter *adapter)
EDCA_BE_UL = param.edca_ul;
EDCA_BE_DL = param.edca_dl;
} else {
EDCA_BE_UL = hal_data->edca_param_mode;
EDCA_BE_DL = hal_data->edca_param_mode;
}
}
}
if (traffic_index == DOWN_LINK)
@ -771,7 +771,7 @@ void rtw_hal_turbo_edca(_adapter *adapter)
struct sta_info *psta;
struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj);
u8 mac_id, role, current_rate_id;
/* search all used & connect2AP macid */
for (mac_id = 0; mac_id < macid_ctl->num; mac_id++) {
if (rtw_macid_is_used(macid_ctl, mac_id)) {
@ -816,7 +816,7 @@ void rtw_hal_turbo_edca(_adapter *adapter)
#endif
if ( edca_param != hal_data->ac_param_be) {
rtw_hal_set_hwreg(adapter, HW_VAR_AC_PARAM_BE, (u8 *)(&edca_param));
RTW_INFO("Turbo EDCA =0x%x\n", edca_param);
@ -1237,7 +1237,7 @@ void rtw_phydm_wd_lps_lclk_hdl(_adapter *adapter)
#ifdef CONFIG_LPS_PG
if (pwrpriv->lps_level == LPS_PG) {
if (rtw_hal_set_lps_pg_info_cmd(adapter) == _FAIL)
RTW_INFO(FUNC_ADPT_FMT": Send PG H2C command Fail! \n",
RTW_INFO(FUNC_ADPT_FMT": Send PG H2C command Fail! \n",
FUNC_ADPT_ARG(adapter));
}
#endif /* CONFIG_LPS_PG */
@ -1321,7 +1321,7 @@ void dump_sta_traffic(void *sel, _adapter *adapter, struct sta_info *psta)
else
_RTW_PRINT_SEL(sel, "Tx : %d(Kbps) ", psta->sta_stats.tx_tp_kbits);
if (rx_tp_mbips)
if (rx_tp_mbips)
_RTW_PRINT_SEL(sel, "Rx : %d(Mbps) ", rx_tp_mbips);
else
_RTW_PRINT_SEL(sel, "Rx : %d(Kbps) ", psta->sta_stats.rx_tp_kbits);
@ -1341,7 +1341,7 @@ void dump_sta_traffic(void *sel, _adapter *adapter, struct sta_info *psta)
else
_RTW_PRINT_SEL(sel, "Tx : %d(Kbps) ", psta->sta_stats.smooth_tx_tp_kbits);
if (rx_tp_mbips)
if (rx_tp_mbips)
_RTW_PRINT_SEL(sel, "Rx : %d(Mbps) ", rx_tp_mbips);
else
_RTW_PRINT_SEL(sel, "Rx : %d(Kbps) ", psta->sta_stats.smooth_rx_tp_kbits);
@ -1392,7 +1392,8 @@ void dump_sta_info(void *sel, struct sta_info *psta)
HDATA_RATE(curr_tx_rate), (curr_tx_sgi) ? "S" : "L");
RTW_PRINT_SEL(sel, "curr_tx_bw : %s\n", ch_width_str(ra_info->curr_tx_bw));
RTW_PRINT_SEL(sel, "curr_retry_ratio : %d\n", ra_info->curr_retry_ratio);
RTW_PRINT_SEL(sel, "ra_mask : 0x%016llx\n\n", ra_info->ramask);
/* nrm */
RTW_PRINT_SEL(sel, "ra_mask : 0x%016llx\n", ra_info->ramask);
}
void rtw_phydm_ra_registed(_adapter *adapter, struct sta_info *psta)
@ -1496,7 +1497,7 @@ u8 rtw_hal_runtime_trx_path_decision(_adapter *adapter)
rtw_warn_on(1);
goto exit;
}
} else
} else
txpath_1ss = txpath;
if (hal_data->txpath_nss[0] != txpath_1ss) {
@ -1672,7 +1673,7 @@ static u8 _rtw_phydm_rfk_condition_check(_adapter *adapter, u8 is_scaning, u8 if
#ifdef CONFIG_MCC_MODE
/*not in MCC State*/
if (MCC_EN(adapter) &&
if (MCC_EN(adapter) &&
rtw_hal_check_mcc_status(adapter, MCC_STATUS_DOING_MCC)) {
rfk_allowed = _FALSE;
if (0)
@ -1788,15 +1789,15 @@ void rtw_dyn_soml_config(_adapter *adapter)
RTW_INFO("dyn_soml_en = 1\n");
} else {
if (adapter->registrypriv.dyn_soml_en == 2) {
rtw_dyn_soml_para_set(adapter,
adapter->registrypriv.dyn_soml_train_num,
adapter->registrypriv.dyn_soml_interval,
rtw_dyn_soml_para_set(adapter,
adapter->registrypriv.dyn_soml_train_num,
adapter->registrypriv.dyn_soml_interval,
adapter->registrypriv.dyn_soml_period,
adapter->registrypriv.dyn_soml_delay);
RTW_INFO("dyn_soml_en = 2\n");
RTW_INFO("dyn_soml_en, param = %d, %d, %d, %d\n",
adapter->registrypriv.dyn_soml_train_num,
adapter->registrypriv.dyn_soml_interval,
adapter->registrypriv.dyn_soml_interval,
adapter->registrypriv.dyn_soml_period,
adapter->registrypriv.dyn_soml_delay);
} else if (adapter->registrypriv.dyn_soml_en == 0) {

3
hal/halmac/halmac_88xx/halmac_8821c/halmac_usb_8821c.c
View File

@ -87,7 +87,8 @@ mac_pwr_switch_usb_8821c(struct halmac_adapter *adapter,
HALMAC_REG_W8_CLR(REG_SYS_STATUS1 + 1, BIT(0));
if ((HALMAC_REG_R8(REG_SW_MDIO + 3) & BIT(0)) == BIT(0))
PLTFM_MSG_ALWAYS("[ALWAYS]shall R reg twice!!\n");
/* nrm */
// PLTFM_MSG_ALWAYS("[ALWAYS]shall R reg twice!!\n");
adapter->halmac_state.mac_pwr = HALMAC_MAC_POWER_ON;
}