Update to 5.6.1

This commit is contained in:
Rin Cat
2019-09-21 05:30:30 -04:00
parent 953142179e
commit 0644d0b316
413 changed files with 179115 additions and 110562 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -20,15 +20,17 @@
#ifdef LOAD_FW_HEADER_FROM_DRIVER
#if (defined(CONFIG_AP_WOWLAN) || (DM_ODM_SUPPORT_TYPE & (ODM_AP)))
extern u8 array_mp_8822b_fw_ap[104632];
extern u8 array_mp_8822b_fw_ap[104720];
extern u32 array_length_mp_8822b_fw_ap;
#endif
#if (DM_ODM_SUPPORT_TYPE & (ODM_WIN)) || (DM_ODM_SUPPORT_TYPE & (ODM_CE))
extern u8 array_mp_8822b_fw_nic[145104];
extern u8 array_mp_8822b_fw_hybrid[173880];
extern u32 array_length_mp_8822b_fw_hybrid;
extern u8 array_mp_8822b_fw_nic[153152];
extern u32 array_length_mp_8822b_fw_nic;
#ifdef CONFIG_WOWLAN
extern u8 array_mp_8822b_fw_wowlan[84024];
extern u8 array_mp_8822b_fw_wowlan[84448];
extern u32 array_length_mp_8822b_fw_wowlan;
#endif /*CONFIG_WOWLAN*/
#endif

View File

@@ -1,6 +1,6 @@
/******************************************************************************
*
* Copyright(c) 2015 - 2017 Realtek Corporation.
* Copyright(c) 2015 - 2018 Realtek Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
@@ -38,6 +38,7 @@ struct hw_port_reg {
u8 bcn_space_shift;
u16 bcn_space_mask;
u32 ps_aid; /*reg_offset*/
u32 ta; /*reg_offset*/
};
@@ -53,6 +54,28 @@ u32 rtl8822b_deinit(PADAPTER);
void rtl8822b_init_default_value(PADAPTER);
/* rtl8822b_mac.c */
/* RXERR_RPT */
enum rx_rpt_type {
OFDM_MPDU_OK = 0, /* 0 */
OFDM_MPDU_FAIL,
OFDM_FALSE_ALARM,
CCK_MPDU_OK,
CCK_MPDU_FAIL,
CCK_FALSE_ALARM,
HT_MPDU_OK,
HT_MPDU_FAIL,
HT_PPDU,
RX_FULL_DROP, /* 10 */
FWFF_FULL_DROP,
VHT_SU_MPDU_OK = 16, /* 16 */
VHT_SU_MPDU_FAIL,
VHT_SU_PPDU,
VHT_FALSE_ALARM,
VHT_MU_MPDU_OK, /* 20 */
VHT_MU_MPDU_FAIL,
VHT_MU_PPDU /* 22 */
};
u8 rtl8822b_rcr_config(PADAPTER, u32 rcr);
u8 rtl8822b_rx_ba_ssn_appended(PADAPTER);
u8 rtl8822b_rx_fcs_append_switch(PADAPTER, u8 enable);
@@ -62,6 +85,8 @@ s32 rtl8822b_fw_dl(PADAPTER, u8 wowlan);
u8 rtl8822b_get_rx_drv_info_size(struct _ADAPTER *a);
u32 rtl8822b_get_tx_desc_size(struct _ADAPTER *a);
u32 rtl8822b_get_rx_desc_size(struct _ADAPTER *a);
u16 rtl8822b_rx_report_get(struct _ADAPTER *a, enum rx_rpt_type type);
void rtl8822b_rx_report_reset(struct _ADAPTER *a, enum rx_rpt_type type);
/* rtl8822b_ops.c */
u8 rtl8822b_read_efuse(PADAPTER);
@@ -74,6 +99,7 @@ u8 rtl8822b_gethaldefvar(PADAPTER, HAL_DEF_VARIABLE, void *pval);
void rtl8822b_set_hal_ops(PADAPTER);
/* tx */
void rtl8822b_init_xmit_priv(_adapter *adapter);
void rtl8822b_fill_txdesc_sectype(struct pkt_attrib *, u8 *ptxdesc);
void rtl8822b_fill_txdesc_vcs(PADAPTER, struct pkt_attrib *, u8 *ptxdesc);
void rtl8822b_fill_txdesc_phy(PADAPTER, struct pkt_attrib *, u8 *ptxdesc);
@@ -93,8 +119,6 @@ void rtl8822b_query_rx_desc(union recv_frame *, u8 *pdesc);
/* rtl8822b_cmd.c */
s32 rtl8822b_fillh2ccmd(PADAPTER, u8 id, u32 buf_len, u8 *pbuf);
void rtl8822b_set_FwMediaStatusRpt_cmd(PADAPTER, u8 mstatus, u8 macid);
void rtl8822b_set_FwRssiSetting_cmd(PADAPTER, u8 *param);
void rtl8822b_set_FwPwrMode_cmd(PADAPTER, u8 psmode);
#ifdef CONFIG_TDLS
@@ -104,11 +128,18 @@ void rtl8822b_set_BcnEarly_C2H_Rpt_cmd(PADAPTER padapter, u8 enable);
#endif
void rtl8822b_set_FwPwrModeInIPS_cmd(PADAPTER adapter, u8 cmd_param);
#ifdef CONFIG_WOWLAN
void rtl8822b_set_fw_pwrmode_inips_cmd_wowlan(PADAPTER padapter, u8 ps_mode);
#endif /* CONFIG_WOWLAN */
void rtl8822b_req_txrpt_cmd(PADAPTER, u8 macid);
void rtl8822b_fw_update_beacon_cmd(PADAPTER);
void rtl8822b_c2h_handler(PADAPTER, u8 *pbuf, u16 length);
void rtl8822b_c2h_handler_no_io(PADAPTER, u8 *pbuf, u16 length);
#ifdef CONFIG_LPS_PWR_TRACKING
void rtl8822b_set_fw_thermal_rpt_cmd(_adapter *adapter, u8 enable, u8 thermal_value);
void rtw_lps_pwr_tracking(_adapter *adapter, u8 thermal_value);
#endif
#ifdef CONFIG_BT_COEXIST
void rtl8822b_download_BTCoex_AP_mode_rsvd_page(PADAPTER);
#endif /* CONFIG_BT_COEXIST */

View File

@@ -76,136 +76,6 @@ exit:
return ret;
}
static void rtl8822b_set_FwRsvdPage_cmd(PADAPTER adapter, PRSVDPAGE_LOC rsvdpageloc)
{
u8 h2c[RTW_HALMAC_H2C_MAX_SIZE] = {0};
RTW_INFO(FUNC_ADPT_FMT ": ProbeRsp=%d PsPoll=%d Null=%d QoSNull=%d BTNull=%d\n",
FUNC_ADPT_ARG(adapter),
rsvdpageloc->LocProbeRsp, rsvdpageloc->LocPsPoll,
rsvdpageloc->LocNullData, rsvdpageloc->LocQosNull,
rsvdpageloc->LocBTQosNull);
RSVD_PAGE_SET_CMD_ID(h2c, CMD_ID_RSVD_PAGE);
RSVD_PAGE_SET_CLASS(h2c, CLASS_RSVD_PAGE);
RSVD_PAGE_SET_LOC_PROBE_RSP(h2c, rsvdpageloc->LocProbeRsp);
RSVD_PAGE_SET_LOC_PS_POLL(h2c, rsvdpageloc->LocPsPoll);
RSVD_PAGE_SET_LOC_NULL_DATA(h2c, rsvdpageloc->LocNullData);
RSVD_PAGE_SET_LOC_QOS_NULL(h2c, rsvdpageloc->LocQosNull);
RSVD_PAGE_SET_LOC_BT_QOS_NULL(h2c, rsvdpageloc->LocBTQosNull);
RTW_DBG_DUMP("H2C-RsvdPage Parm:", h2c, RTW_HALMAC_H2C_MAX_SIZE);
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
}
static void rtl8822b_set_FwAoacRsvdPage_cmd(PADAPTER adapter, PRSVDPAGE_LOC rsvdpageloc)
{
#ifdef CONFIG_WOWLAN
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(adapter);
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
u8 res = 0, count = 0;
u8 h2c[RTW_HALMAC_H2C_MAX_SIZE] = {0};
RTW_INFO(FUNC_ADPT_FMT ": RWC=%d ArpRsp=%d NbrAdv=%d GtkRsp=%d GtkInfo=%d ProbeReq=%d NetworkList=%d\n",
FUNC_ADPT_ARG(adapter),
rsvdpageloc->LocRemoteCtrlInfo, rsvdpageloc->LocArpRsp,
rsvdpageloc->LocNbrAdv, rsvdpageloc->LocGTKRsp,
rsvdpageloc->LocGTKInfo, rsvdpageloc->LocProbeReq,
rsvdpageloc->LocNetList);
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) {
AOAC_RSVD_PAGE_SET_CMD_ID(h2c, CMD_ID_AOAC_RSVD_PAGE);
AOAC_RSVD_PAGE_SET_CLASS(h2c, CLASS_AOAC_RSVD_PAGE);
AOAC_RSVD_PAGE_SET_LOC_REMOTE_CTRL_INFO(h2c, rsvdpageloc->LocRemoteCtrlInfo);
AOAC_RSVD_PAGE_SET_LOC_ARP_RESPONSE(h2c, rsvdpageloc->LocArpRsp);
AOAC_RSVD_PAGE_SET_LOC_GTK_RSP(h2c, rsvdpageloc->LocGTKRsp);
AOAC_RSVD_PAGE_SET_LOC_GTK_INFO(h2c, rsvdpageloc->LocGTKInfo);
#ifdef CONFIG_GTK_OL
AOAC_RSVD_PAGE_SET_LOC_GTK_EXT_MEM(h2c, rsvdpageloc->LocGTKEXTMEM);
#endif /* CONFIG_GTK_OL */
RTW_DBG_DUMP("H2C-AoacRsvdPage Parm:", h2c, RTW_HALMAC_H2C_MAX_SIZE);
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
} else {
#ifdef CONFIG_PNO_SUPPORT
if (!pwrpriv->wowlan_in_resume) {
RTW_INFO("%s: NLO_INFO=%d\n", __FUNCTION__, rsvdpageloc->LocPNOInfo);
AOAC_RSVD_PAGE3_SET_CMD_ID(h2c, CMD_ID_AOAC_RSVD_PAGE3);
AOAC_RSVD_PAGE3_SET_CLASS(h2c, CLASS_AOAC_RSVD_PAGE3);
AOAC_RSVD_PAGE3_SET_LOC_NLO_INFO(h2c, rsvdpageloc->LocPNOInfo);
RTW_DBG_DUMP("H2C-AoacRsvdPage3 Parm:", h2c, RTW_HALMAC_H2C_MAX_SIZE);
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
rtw_msleep_os(10);
}
#endif /* CONFIG_PNO_SUPPORT */
}
#endif /* CONFIG_WOWLAN */
}
void rtl8822b_set_FwMediaStatusRpt_cmd(PADAPTER adapter, u8 mstatus, u8 macid)
{
u8 h2c[RTW_HALMAC_H2C_MAX_SIZE] = {0};
u8 macid_end = 0;
RTW_INFO(FUNC_ADPT_FMT ": mstatus=%d macid=%d\n",
FUNC_ADPT_ARG(adapter), mstatus, macid);
MEDIA_STATUS_RPT_SET_CMD_ID(h2c, CMD_ID_MEDIA_STATUS_RPT);
MEDIA_STATUS_RPT_SET_CLASS(h2c, CLASS_MEDIA_STATUS_RPT);
MEDIA_STATUS_RPT_SET_OP_MODE(h2c, mstatus);
MEDIA_STATUS_RPT_SET_MACID_IN(h2c, 0);
MEDIA_STATUS_RPT_SET_MACID(h2c, macid);
MEDIA_STATUS_RPT_SET_MACID_END(h2c, macid_end);
RTW_DBG_DUMP("H2C-MediaStatusRpt Parm:", h2c, RTW_HALMAC_H2C_MAX_SIZE);
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
}
static void rtl8822b_set_FwKeepAlive_cmd(PADAPTER adapter, u8 benable, u8 pkt_type)
{
u8 h2c[RTW_HALMAC_H2C_MAX_SIZE] = {0};
u8 adopt = 1;
#ifdef CONFIG_PLATFORM_INTEL_BYT
u8 check_period = 10;
#else
u8 check_period = 5;
#endif
RTW_INFO(FUNC_ADPT_FMT ": benable=%d\n", FUNC_ADPT_ARG(adapter), benable);
KEEP_ALIVE_SET_CMD_ID(h2c, CMD_ID_KEEP_ALIVE);
KEEP_ALIVE_SET_CLASS(h2c, CLASS_KEEP_ALIVE);
KEEP_ALIVE_SET_ENABLE(h2c, benable);
KEEP_ALIVE_SET_ADOPT_USER_SETTING(h2c, adopt);
KEEP_ALIVE_SET_PKT_TYPE(h2c, pkt_type);
KEEP_ALIVE_SET_KEEP_ALIVE_CHECK_PERIOD(h2c, check_period);
RTW_DBG_DUMP("H2C-KeepAlive Parm:", h2c, RTW_HALMAC_H2C_MAX_SIZE);
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
}
static void rtl8822b_set_FwDisconDecision_cmd(PADAPTER adapter, u8 benable)
{
u8 h2c[RTW_HALMAC_H2C_MAX_SIZE] = {0};
u8 adopt = 1, check_period = 10, trypkt_num = 0;
RTW_INFO(FUNC_ADPT_FMT ": benable=%d\n",
FUNC_ADPT_ARG(adapter), benable);
DISCONNECT_DECISION_SET_CMD_ID(h2c, CMD_ID_DISCONNECT_DECISION);
DISCONNECT_DECISION_SET_CLASS(h2c, CLASS_DISCONNECT_DECISION);
DISCONNECT_DECISION_SET_ENABLE(h2c, benable);
DISCONNECT_DECISION_SET_ADOPT_USER_SETTING(h2c, adopt);
DISCONNECT_DECISION_SET_DISCON_DECISION_CHECK_PERIOD(h2c, check_period);
DISCONNECT_DECISION_SET_TRY_PKT_NUM(h2c, trypkt_num);
RTW_DBG_DUMP("H2C-DisconDecision Parm:", h2c, RTW_HALMAC_H2C_MAX_SIZE);
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
}
static u8 get_ra_vht_en(u32 wirelessMode, u32 bitmap)
{
u8 ret = 0;
@@ -221,46 +91,6 @@ static u8 get_ra_vht_en(u32 wirelessMode, u32 bitmap)
return ret;
}
void rtl8822b_set_FwRssiSetting_cmd(PADAPTER adapter, u8 *param)
{
u8 h2c[RTW_HALMAC_H2C_MAX_SIZE] = {0};
u8 mac_id = *param;
u8 rssi = *(param + 2);
u8 ra_info = 0;
RTW_INFO(FUNC_ADPT_FMT ": mac_id=%d rssi=%d param=%.2x-%.2x-%.2x\n",
FUNC_ADPT_ARG(adapter),
mac_id, rssi, *param, *(param + 1), *(param + 2));
RSSI_SETTING_SET_CMD_ID(h2c, CMD_ID_RSSI_SETTING);
RSSI_SETTING_SET_CLASS(h2c, CLASS_RSSI_SETTING);
RSSI_SETTING_SET_MAC_ID(h2c, mac_id);
RSSI_SETTING_SET_RSSI(h2c, rssi);
RSSI_SETTING_SET_RA_INFO(h2c, ra_info);
RTW_DBG_DUMP("H2C-RssiSetting Parm:", h2c, RTW_HALMAC_H2C_MAX_SIZE);
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
}
void rtl8822b_set_FwAPReqRPT_cmd(PADAPTER adapter, u32 need_ack)
{
u8 h2c[RTW_HALMAC_H2C_MAX_SIZE] = {0};
u8 macid1 = 1, macid2 = 0;
RTW_INFO(FUNC_ADPT_FMT ": need_ack = %d\n",
FUNC_ADPT_ARG(adapter), need_ack);
AP_REQ_TXRPT_SET_CMD_ID(h2c, CMD_ID_AP_REQ_TXRPT);
AP_REQ_TXRPT_SET_CLASS(h2c, CLASS_AP_REQ_TXRPT);
AP_REQ_TXRPT_SET_STA1_MACID(h2c, macid1);
AP_REQ_TXRPT_SET_STA2_MACID(h2c, macid2);
RTW_DBG_DUMP("H2C-ApReqRpt Parm:", h2c, RTW_HALMAC_H2C_MAX_SIZE);
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
}
void rtl8822b_req_txrpt_cmd(PADAPTER adapter, u8 macid)
{
u8 h2c[RTW_HALMAC_H2C_MAX_SIZE] = {0};
@@ -278,89 +108,39 @@ void rtl8822b_req_txrpt_cmd(PADAPTER adapter, u8 macid)
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
}
/*
* lps_wait_bb_rf_ready() - Wait BB/RF ready after leaving LPS
* @adapter struct _ADAPTER*
* @timeout time to wait complete, unit is millisecond
*
* This function is used to wait BB and RF ready after leaving LPS. Besdies
* checking registers, it will wait 1 ms to let everything has time to finish
* their jobs, so this function will cost more than 1ms to return. Please call
* this function carefully, or you will waste time to wait.
*
* Return 0 for BB/RF ready, otherwise NOT ready.
* The error codes are as following:
* -1 unclassified error
* -2 RF ready check timeout
* -3 BB ready check timeout
*/
static int lps_wait_bb_rf_ready(struct _ADAPTER *adapter, u32 timeout)
{
systime s_time; /* start time */
u8 ready = 0;
#define RF_READY BIT(0) /* BB ready */
#define BB_READY BIT(1) /* RF ready */
u8 awake = _FALSE;
u8 sys_func_en;
s_time = rtw_get_current_time();
do {
if (!(ready & RF_READY)) {
rtw_hal_get_hwreg(adapter, HW_VAR_FWLPS_RF_ON, &awake);
if (awake == _TRUE)
ready |= RF_READY;
}
if ((ready & RF_READY) && (!(ready & BB_READY))) {
sys_func_en = rtw_read8(adapter, REG_SYS_FUNC_EN_8822B);
if (sys_func_en & BIT_FEN_BBRSTB_8822B)
break;
}
if (rtw_is_surprise_removed(adapter))
return -1;
if (rtw_get_passing_time_ms(s_time) > timeout) {
if (!(ready & RF_READY))
return -2;
return -3;
}
rtw_usleep_os(100); /* 100us interval between each check */
} while (1);
rtw_usleep_os(1000); /* Wait 1ms */
return 0;
}
#define SET_PWR_MODE_SET_BCN_RECEIVING_TIME(h2c_pkt, value) \
SET_BITS_TO_LE_4BYTE(h2c_pkt + 0X04, 24, 5, value)
#define SET_PWR_MODE_SET_ADOPT_BCN_RECEIVING_TIME(h2c_pkt, value) \
SET_BITS_TO_LE_4BYTE(h2c_pkt + 0X04, 31, 1, value)
void rtl8822b_set_FwPwrMode_cmd(PADAPTER adapter, u8 psmode)
{
int i;
u8 smart_ps = 0, mode = 0;
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(adapter);
#ifdef CONFIG_BCN_RECV_TIME
u8 bcn_recv_time;
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
#endif
#ifdef CONFIG_WMMPS_STA
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct qos_priv *pqospriv = &pmlmepriv->qospriv;
#endif /* CONFIG_WMMPS_STA */
u8 h2c[RTW_HALMAC_H2C_MAX_SIZE] = {0};
u8 PowerState = 0, awake_intvl = 1, byte5 = 0, rlbm = 0;
u8 PowerState = 0, awake_intvl = 1, rlbm = 0;
u8 allQueueUAPSD = 0;
char *fw_psmode_str = "";
#ifdef CONFIG_P2P
struct wifidirect_info *wdinfo = &adapter->wdinfo;
#endif /* CONFIG_P2P */
u8 hw_port = rtw_hal_get_port(adapter);
if (pwrpriv->dtim > 0)
RTW_INFO(FUNC_ADPT_FMT ": dtim=%d, HW port id=%d\n", FUNC_ADPT_ARG(adapter),
pwrpriv->dtim, psmode == PS_MODE_ACTIVE ? pwrpriv->current_lps_hw_port_id:get_hw_port(adapter));
pwrpriv->dtim, psmode == PS_MODE_ACTIVE ? pwrpriv->current_lps_hw_port_id : hw_port);
else
RTW_INFO(FUNC_ADPT_FMT ": HW port id=%d\n", FUNC_ADPT_ARG(adapter),
psmode == PS_MODE_ACTIVE ? pwrpriv->current_lps_hw_port_id:get_hw_port(adapter));
psmode == PS_MODE_ACTIVE ? pwrpriv->current_lps_hw_port_id : hw_port);
if (psmode == PS_MODE_MIN || psmode == PS_MODE_MAX) {
#ifdef CONFIG_WMMPS_STA
@@ -425,28 +205,13 @@ void rtl8822b_set_FwPwrMode_cmd(PADAPTER adapter, u8 psmode)
if (psmode > 0) {
#ifdef CONFIG_BT_COEXIST
if (rtw_btcoex_IsBtControlLps(adapter) == _TRUE) {
if (rtw_btcoex_IsBtControlLps(adapter) == _TRUE)
PowerState = rtw_btcoex_RpwmVal(adapter);
byte5 = rtw_btcoex_LpsVal(adapter);
if ((rlbm == 2) && (byte5 & BIT(4))) {
/*
* Keep awake interval to 1 to prevent from
* decreasing coex performance
*/
awake_intvl = 2;
rlbm = 2;
}
} else
else
#endif /* CONFIG_BT_COEXIST */
{
PowerState = 0x00; /* AllON(0x0C), RFON(0x04), RFOFF(0x00) */
byte5 = 0x40;
}
} else {
} else
PowerState = 0x0C; /* AllON(0x0C), RFON(0x04), RFOFF(0x00) */
byte5 = 0x40;
}
if (mode == 0)
fw_psmode_str = "ACTIVE";
@@ -473,63 +238,21 @@ void rtl8822b_set_FwPwrMode_cmd(PADAPTER adapter, u8 psmode)
SET_PWR_MODE_SET_PORT_ID(h2c, pwrpriv->current_lps_hw_port_id);
} else {
/* Enter LPS, record HW port ID */
SET_PWR_MODE_SET_PORT_ID(h2c, get_hw_port(adapter));
pwrpriv->current_lps_hw_port_id = get_hw_port(adapter);
SET_PWR_MODE_SET_PORT_ID(h2c, hw_port);
pwrpriv->current_lps_hw_port_id = hw_port;
}
#ifdef CONFIG_BCN_RECV_TIME
if (pmlmeext->bcn_rx_time) {
bcn_recv_time = pmlmeext->bcn_rx_time / 128; /*unit : 128 us*/
if (pmlmeext->bcn_rx_time % 128)
bcn_recv_time += 1;
if (byte5 & BIT(0))
SET_PWR_MODE_SET_LOW_POWER_RX_BCN(h2c, 1);
if (byte5 & BIT(1))
SET_PWR_MODE_SET_ANT_AUTO_SWITCH(h2c, 1);
if (byte5 & BIT(2))
SET_PWR_MODE_SET_PS_ALLOW_BT_HIGH_PRIORITY(h2c, 1);
if (byte5 & BIT(3))
SET_PWR_MODE_SET_PROTECT_BCN(h2c, 1);
if (byte5 & BIT(4))
SET_PWR_MODE_SET_SILENCE_PERIOD(h2c, 1);
if (byte5 & BIT(5))
SET_PWR_MODE_SET_FAST_BT_CONNECT(h2c, 1);
if (byte5 & BIT(6))
SET_PWR_MODE_SET_TWO_ANTENNA_EN(h2c, 1);
#ifdef CONFIG_LPS_LCLK
if (psmode != PS_MODE_ACTIVE) {
if ((pmlmeext->adaptive_tsf_done == _FALSE)
&& (pmlmeext->bcn_cnt > 0)) {
u8 ratio_20_delay, ratio_80_delay;
/*
* byte 6 for adaptive_early_32k
* [0:3] = DrvBcnEarly (ms), [4:7] = DrvBcnTimeOut (ms)
* 20% for DrvBcnEarly, 80% for DrvBcnTimeOut
*/
ratio_20_delay = 0;
ratio_80_delay = 0;
pmlmeext->DrvBcnEarly = 0xff;
pmlmeext->DrvBcnTimeOut = 0xff;
for (i = 0; i < 9; i++) {
pmlmeext->bcn_delay_ratio[i] = (pmlmeext->bcn_delay_cnt[i] * 100) / pmlmeext->bcn_cnt;
ratio_20_delay += pmlmeext->bcn_delay_ratio[i];
ratio_80_delay += pmlmeext->bcn_delay_ratio[i];
if (ratio_20_delay > 20 && pmlmeext->DrvBcnEarly == 0xff)
pmlmeext->DrvBcnEarly = i;
if (ratio_80_delay > 80 && pmlmeext->DrvBcnTimeOut == 0xff)
pmlmeext->DrvBcnTimeOut = i;
/* reset adaptive_early_32k cnt */
pmlmeext->bcn_delay_cnt[i] = 0;
pmlmeext->bcn_delay_ratio[i] = 0;
}
pmlmeext->bcn_cnt = 0;
pmlmeext->adaptive_tsf_done = _TRUE;
}
if (bcn_recv_time > 31)
bcn_recv_time = 31;
SET_PWR_MODE_SET_ADOPT_BCN_RECEIVING_TIME(h2c, 1);
SET_PWR_MODE_SET_BCN_RECEIVING_TIME(h2c, bcn_recv_time);
}
#endif /* CONFIG_LPS_LCLK */
#endif
#ifdef CONFIG_BT_COEXIST
rtw_btcoex_RecordPwrMode(adapter, h2c + 1, RTW_HALMAC_H2C_MAX_SIZE - 1);
@@ -537,13 +260,6 @@ void rtl8822b_set_FwPwrMode_cmd(PADAPTER adapter, u8 psmode)
RTW_DBG_DUMP("H2C-PwrMode Parm:", h2c, RTW_HALMAC_H2C_MAX_SIZE);
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
if (psmode == PS_MODE_ACTIVE) {
i = lps_wait_bb_rf_ready(adapter, 1000);
if (i)
RTW_WARN("%s: BB/RF status is unknown!(%d)\n",
__FUNCTION__, i);
}
}
#ifdef CONFIG_TDLS
@@ -582,232 +298,74 @@ void rtl8822b_set_FwPwrModeInIPS_cmd(PADAPTER adapter, u8 cmd_param)
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
}
#ifdef CONFIG_WOWLAN
void rtl8822b_set_fw_pwrmode_inips_cmd_wowlan(PADAPTER padapter, u8 ps_mode)
{
struct registry_priv *registry_par = &padapter->registrypriv;
u8 param[H2C_INACTIVE_PS_LEN] = {0};
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
RTW_INFO("%s, ps_mode: %d\n", __func__, ps_mode);
if (ps_mode == PS_MODE_ACTIVE) {
SET_H2CCMD_INACTIVE_PS_EN(param, 0);
}
else {
SET_H2CCMD_INACTIVE_PS_EN(param, 1);
if(registry_par->suspend_type == FW_IPS_DISABLE_BBRF && !check_fwstate(pmlmepriv, _FW_LINKED))
SET_H2CCMD_INACTIVE_DISBBRF(param, 1);
if(registry_par->suspend_type == FW_IPS_WRC) {
SET_H2CCMD_INACTIVE_PERIOD_SCAN_EN(param, 1);
SET_H2CCMD_INACTIVE_PS_FREQ(param, 3);
SET_H2CCMD_INACTIVE_PS_DURATION(param, 1);
SET_H2CCMD_INACTIVE_PS_PERIOD_SCAN_TIME(param, 3);
}
}
rtl8822b_fillh2ccmd(padapter, H2C_INACTIVE_PS_, sizeof(param), param);
}
#endif /* CONFIG_WOWLAN */
#ifdef CONFIG_LPS_PWR_TRACKING
#define CLASS_FW_THERMAL_RPT 0x06
#define CMD_ID_FW_THERMAL_RPT 0x0B
#define SET_FW_THERMAL_RPT_SET_CMD_ID(__pH2C, __Value) SET_BITS_TO_LE_4BYTE(__pH2C + 0X00, 0, 5, __Value)
#define SET_FW_THERMAL_RPT_SET_CLASS(__pH2C, __Value) SET_BITS_TO_LE_4BYTE(__pH2C + 0X00, 5, 3, __Value)
#define SET_FW_THERMAL_RPT_SET_DETECT_EN(__pH2C, __Value) SET_BITS_TO_LE_4BYTE(__pH2C + 0X00, 8, 1, __Value)
#define SET_FW_THERMAL_RPT_SET_DETECT_VALUE(__pH2C, __Value) SET_BITS_TO_LE_4BYTE(__pH2C + 0X00, 16, 8, __Value)
#define SET_FW_THERMAL_RPT_SET_DETECT_PERIOD(__pH2C, __Value) SET_BITS_TO_LE_4BYTE(__pH2C + 0X00, 24, 8, __Value)
void rtl8822b_set_fw_thermal_rpt_cmd(_adapter *adapter, u8 enable, u8 thermal_value)
{
u8 h2c[RTW_HALMAC_H2C_MAX_SIZE] = {0};
SET_FW_THERMAL_RPT_SET_CLASS(h2c, CLASS_FW_THERMAL_RPT);
SET_FW_THERMAL_RPT_SET_CMD_ID(h2c, CMD_ID_FW_THERMAL_RPT);
if (enable) {
SET_FW_THERMAL_RPT_SET_DETECT_EN(h2c, 1);
SET_FW_THERMAL_RPT_SET_DETECT_VALUE(h2c, thermal_value);
SET_FW_THERMAL_RPT_SET_DETECT_PERIOD(h2c, 19);/*0:100ms,1:200ms, 9:1s, 19:2s*/
} else {
SET_FW_THERMAL_RPT_SET_DETECT_EN(h2c, 0);
}
rtw_halmac_send_h2c(adapter_to_dvobj(adapter), h2c);
}
#endif
static s32 rtl8822b_set_FwLowPwrLps_cmd(PADAPTER adapter, u8 enable)
{
return _FALSE;
}
#ifdef CONFIG_BT_COEXIST
static void SetFwRsvdPagePkt_BTCoex(PADAPTER adapter)
{
PHAL_DATA_TYPE hal;
struct xmit_frame *pcmdframe;
struct pkt_attrib *pattrib;
struct xmit_priv *pxmitpriv;
struct mlme_ext_priv *pmlmeext;
struct mlme_ext_info *pmlmeinfo;
u32 BeaconLength = 0;
u32 BTQosNullLength = 0;
u8 *ReservedPagePacket;
u32 page_size, desc_size;
u8 TxDescOffset;
u8 TotalPageNum = 0, CurtPktPageNum = 0, RsvdPageNum = 0;
u16 BufIndex;
u32 TotalPacketLen, MaxRsvdPageBufSize = 0;
RSVDPAGE_LOC RsvdPageLoc;
hal = GET_HAL_DATA(adapter);
pxmitpriv = &adapter->xmitpriv;
pmlmeext = &adapter->mlmeextpriv;
pmlmeinfo = &pmlmeext->mlmext_info;
rtw_hal_get_def_var(adapter, HAL_DEF_TX_PAGE_SIZE, &page_size);
desc_size = rtl8822b_get_tx_desc_size(adapter);
TxDescOffset = TXDESC_OFFSET;
RsvdPageNum = rtw_hal_get_txbuff_rsvd_page_num(adapter, _FALSE);
MaxRsvdPageBufSize = RsvdPageNum * page_size;
pcmdframe = rtw_alloc_cmdxmitframe(pxmitpriv);
if (pcmdframe == NULL) {
RTW_INFO("%s: alloc ReservedPagePacket fail!\n", __FUNCTION__);
return;
}
ReservedPagePacket = pcmdframe->buf_addr;
_rtw_memset(&RsvdPageLoc, 0, sizeof(RSVDPAGE_LOC));
/* (1) beacon */
BufIndex = TxDescOffset;
rtw_hal_construct_beacon(adapter,
&ReservedPagePacket[BufIndex], &BeaconLength);
/*
* When we count the first page size, we need to reserve description size for the RSVD
* packet, it will be filled in front of the packet in TXPKTBUF.
*/
CurtPktPageNum = (u8)PageNum(desc_size + BeaconLength, page_size);
/*
* If we don't add 1 more page, the WOWLAN function has a problem.
* Maybe it's a bug of firmware?
*/
if (CurtPktPageNum == 1)
CurtPktPageNum += 1;
TotalPageNum += CurtPktPageNum;
BufIndex += (CurtPktPageNum * page_size);
/* Jump to lastest page */
if (BufIndex < (MaxRsvdPageBufSize - page_size)) {
BufIndex = TxDescOffset + (MaxRsvdPageBufSize - page_size);
TotalPageNum = RsvdPageNum - 1;
}
/* (6) BT Qos null data */
RsvdPageLoc.LocBTQosNull = TotalPageNum;
rtw_hal_construct_NullFunctionData(
adapter,
&ReservedPagePacket[BufIndex],
&BTQosNullLength,
get_my_bssid(&pmlmeinfo->network),
_TRUE, 0, 0, _FALSE);
rtw_hal_fill_fake_txdesc(adapter, &ReservedPagePacket[BufIndex - desc_size], BTQosNullLength, _FALSE, _TRUE, _FALSE);
CurtPktPageNum = (u8)PageNum(desc_size + BTQosNullLength, page_size);
TotalPageNum += CurtPktPageNum;
TotalPacketLen = BufIndex + BTQosNullLength;
if (TotalPacketLen > MaxRsvdPageBufSize) {
RTW_INFO(FUNC_ADPT_FMT ": ERROR: The rsvd page size is not enough!!TotalPacketLen %d, MaxRsvdPageBufSize %d\n",
FUNC_ADPT_ARG(adapter), TotalPacketLen, MaxRsvdPageBufSize);
goto error;
}
/* update attribute */
pattrib = &pcmdframe->attrib;
update_mgntframe_attrib(adapter, pattrib);
pattrib->qsel = QSLT_BEACON;
pattrib->pktlen = pattrib->last_txcmdsz = TotalPacketLen - TxDescOffset;
#ifdef CONFIG_PCI_HCI
dump_mgntframe(adapter, pcmdframe);
#else /* !CONFIG_PCI_HCI */
dump_mgntframe_and_wait(adapter, pcmdframe, 100);
#endif /* !CONFIG_PCI_HCI */
rtl8822b_set_FwRsvdPage_cmd(adapter, &RsvdPageLoc);
rtl8822b_set_FwAoacRsvdPage_cmd(adapter, &RsvdPageLoc);
return;
error:
rtw_free_xmitframe(pxmitpriv, pcmdframe);
}
void rtl8822b_download_BTCoex_AP_mode_rsvd_page(PADAPTER adapter)
{
PHAL_DATA_TYPE hal;
struct mlme_ext_priv *pmlmeext;
struct mlme_ext_info *pmlmeinfo;
u8 bRecover = _FALSE;
u8 bcn_valid = _FALSE;
u8 DLBcnCount = 0;
u32 poll = 0;
u8 val8, RegFwHwTxQCtrl;
u8 restore[2];
RTW_INFO("+" FUNC_ADPT_FMT ": hw_port=%d fw_state=0x%08X\n",
FUNC_ADPT_ARG(adapter), get_hw_port(adapter), get_fwstate(&adapter->mlmepriv));
#ifdef CONFIG_RTW_DEBUG
if (check_fwstate(&adapter->mlmepriv, WIFI_AP_STATE) == _FALSE) {
RTW_INFO(FUNC_ADPT_FMT ": [WARNING] not in AP mode!!\n",
FUNC_ADPT_ARG(adapter));
}
#endif /* CONFIG_RTW_DEBUG */
hal = GET_HAL_DATA(adapter);
pmlmeext = &adapter->mlmeextpriv;
pmlmeinfo = &pmlmeext->mlmext_info;
/* We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. */
rtw_write16(adapter, REG_BCN_PSR_RPT_8822B, (0xC000 | pmlmeinfo->aid));
/* set REG_CR bit 8 */
val8 = rtw_read8(adapter, REG_CR_8822B + 1);
restore[0] = val8;
val8 |= BIT(0); /* ENSWBCN */
rtw_write8(adapter, REG_CR_8822B + 1, val8);
/*
* Disable Hw protection for a time which revserd for Hw sending beacon.
* Fix download reserved page packet fail that access collision with the protection time.
*/
val8 = rtw_read8(adapter, REG_BCN_CTRL_8822B);
restore[1] = val8;
val8 &= ~BIT_EN_BCN_FUNCTION_8822B;
val8 |= BIT_DIS_TSF_UDT_8822B;
rtw_write8(adapter, REG_BCN_CTRL_8822B, val8);
/* Set FWHW_TXQ_CTRL 0x422[6]=0 to tell Hw the packet is not a real beacon frame. */
RegFwHwTxQCtrl = rtw_read8(adapter, REG_FWHW_TXQ_CTRL_8822B + 2);
if (RegFwHwTxQCtrl & BIT(6))
bRecover = _TRUE;
/* To tell Hw the packet is not a real beacon frame. */
RegFwHwTxQCtrl &= ~BIT(6);
rtw_write8(adapter, REG_FWHW_TXQ_CTRL_8822B + 2, RegFwHwTxQCtrl);
/* Clear beacon valid check bit. */
rtw_hal_set_hwreg(adapter, HW_VAR_BCN_VALID, NULL);
rtw_hal_set_hwreg(adapter, HW_VAR_DL_BCN_SEL, NULL);
DLBcnCount = 0;
poll = 0;
do {
SetFwRsvdPagePkt_BTCoex(adapter);
DLBcnCount++;
do {
rtw_yield_os();
/* check rsvd page download OK. */
rtw_hal_get_hwreg(adapter, HW_VAR_BCN_VALID, &bcn_valid);
poll++;
} while (!bcn_valid && (poll % 10) != 0 && !RTW_CANNOT_RUN(adapter));
} while (!bcn_valid && (DLBcnCount <= 100) && !RTW_CANNOT_RUN(adapter));
if (_TRUE == bcn_valid) {
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(adapter);
pwrctl->fw_psmode_iface_id = adapter->iface_id;
RTW_INFO(ADPT_FMT": DL RSVD page success! DLBcnCount:%d, poll:%d\n",
ADPT_ARG(adapter), DLBcnCount, poll);
} else {
RTW_INFO(ADPT_FMT": DL RSVD page fail! DLBcnCount:%d, poll:%d\n",
ADPT_ARG(adapter), DLBcnCount, poll);
RTW_INFO(ADPT_FMT": DL RSVD page fail! bSurpriseRemoved=%s\n",
ADPT_ARG(adapter), rtw_is_surprise_removed(adapter) ? "True" : "False");
RTW_INFO(ADPT_FMT": DL RSVD page fail! bDriverStopped=%s\n",
ADPT_ARG(adapter), rtw_is_drv_stopped(adapter) ? "True" : "False");
}
/*
* To make sure that if there exists an adapter which would like to send beacon.
* If exists, the origianl value of 0x422[6] will be 1, we should check this to
* prevent from setting 0x422[6] to 0 after download reserved page, or it will cause
* the beacon cannot be sent by HW.
*/
if (bRecover) {
RegFwHwTxQCtrl |= BIT(6);
rtw_write8(adapter, REG_FWHW_TXQ_CTRL_8822B + 2, RegFwHwTxQCtrl);
}
rtw_write8(adapter, REG_BCN_CTRL_8822B, restore[1]);
rtw_write8(adapter, REG_CR_8822B + 1, restore[0]);
/* Clear CR[8] or beacon packet will not be send to TxBuf anymore. */
#ifndef CONFIG_PCI_HCI
val8 = rtw_read8(adapter, REG_CR_8822B + 1);
val8 &= ~BIT(0); /* ~ENSWBCN */
rtw_write8(adapter, REG_CR_8822B + 1, val8);
#endif /* !CONFIG_PCI_HCI */
hw_var_set_dl_rsvd_page(adapter, RT_MEDIA_CONNECT);
}
#endif /* CONFIG_BT_COEXIST */
void rtl8822b_fw_update_beacon_cmd(PADAPTER adapter)
{
}
/*
* Below functions are for C2H
@@ -909,6 +467,40 @@ C2HSPC_STAT_8822b(
psta->sta_stats.tx_retry_cnt = (C2H_SPECIAL_STATISTICS_GET_DATA3(CmdBuf) << 8) | C2H_SPECIAL_STATISTICS_GET_DATA2(CmdBuf);
rtw_sctx_done(&pstapriv->gotc2h);
}
#ifdef CONFIG_FW_HANDLE_TXBCN
#define C2H_SUB_CMD_ID_FW_TBTT_RPT 0X23
#define TBTT_RPT_GET_SN(c2h_pkt) LE_BITS_TO_4BYTE(c2h_pkt + 0X01, 0, 8)
#define TBTT_RPT_GET_PORT_ID(c2h_pkt) LE_BITS_TO_4BYTE(c2h_pkt + 0X04, 0, 8)
#define TBTT_ROOT 0x00
#define TBTT_VAP1 0x10
#define TBTT_VAP2 0x20
#define TBTT_VAP3 0x30
static void c2h_tbtt_rpt(PADAPTER adapter, u8 *pdata)
{
u8 ap_id, c2h_sn;
ap_id = TBTT_RPT_GET_PORT_ID(pdata);
c2h_sn = TBTT_RPT_GET_SN(pdata);
#ifdef DBG_FW_TBTT_RPT
if (ap_id == TBTT_ROOT)
RTW_INFO("== TBTT ROOT SN:%d==\n", c2h_sn);
else if (ap_id == TBTT_VAP1)
RTW_INFO("== TBTT_VAP1 SN:%d==\n", c2h_sn);
else if (ap_id == TBTT_VAP2)
RTW_INFO("== TBTT_VAP2 SN:%d==\n", c2h_sn);
else if (ap_id == TBTT_VAP3)
RTW_INFO("== TBTT_VAP3 SN:%d==\n", c2h_sn);
else
RTW_ERR("TBTT RPT INFO ERROR\n");
#endif
}
#endif
#ifdef CONFIG_LPS_PWR_TRACKING
#define C2H_PKT_DETECT_THERMAL_GET_THERMAL_VALUE(c2h_pkt) LE_BITS_TO_4BYTE(c2h_pkt + 0X04, 0, 32)
#endif
/**
* c2h = RXDESC + c2h packet
@@ -986,6 +578,23 @@ static void process_c2h_event(PADAPTER adapter, u8 *c2h, u32 size)
c2h_ccx_rpt(adapter, pc2h_data);
break;
}
#ifdef CONFIG_FW_HANDLE_TXBCN
else if (C2H_HDR_GET_C2H_SUB_CMD_ID(pc2h_data) == C2H_SUB_CMD_ID_FW_TBTT_RPT) {
c2h_tbtt_rpt(adapter, pc2h_data);
break;
}
#endif
#ifdef CONFIG_LPS_PWR_TRACKING
else if (C2H_HDR_GET_C2H_SUB_CMD_ID(pc2h_data) == C2H_SUB_CMD_ID_C2H_PKT_DETECT_THERMAL) {
u32 thermal = 0;
thermal = C2H_PKT_DETECT_THERMAL_GET_THERMAL_VALUE(pc2h_data);
if (1)
RTW_INFO("[C2H] FW Thermal report :0x%02x\n", thermal);
rtw_lps_pwr_tracking(adapter, thermal);
break;
}
#endif
/* indicate c2h pkt + rx desc to halmac */
rtw_halmac_c2h_handle(adapter_to_dvobj(adapter), c2h, size);
@@ -1054,7 +663,13 @@ void rtl8822b_c2h_handler_no_io(PADAPTER adapter, u8 *pbuf, u16 length)
case C2H_BCN_EARLY_RPT:
case C2H_EXTEND:
/* no I/O, process directly */
process_c2h_event(adapter, pbuf, length);
#ifdef CONFIG_LPS_PWR_TRACKING
if (id == C2H_EXTEND &&
C2H_HDR_GET_C2H_SUB_CMD_ID(pc2h_content) == C2H_SUB_CMD_ID_C2H_PKT_DETECT_THERMAL)
rtw_c2h_packet_wk_cmd(adapter, pbuf, length);
else
#endif
process_c2h_event(adapter, pbuf, length);
break;
default:

View File

@@ -1,6 +1,6 @@
/******************************************************************************
*
* Copyright(c) 2015 - 2017 Realtek Corporation.
* Copyright(c) 2015 - 2018 Realtek Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
@@ -34,6 +34,8 @@ void rtl8822b_init_hal_spec(PADAPTER adapter)
hal_spec->sec_cap = SEC_CAP_CHK_BMC;
hal_spec->rfpath_num_2g = 2;
hal_spec->rfpath_num_5g = 2;
hal_spec->txgi_max = 63;
hal_spec->txgi_pdbm = 2;
hal_spec->max_tx_cnt = 2;
hal_spec->tx_nss_num = 2;
hal_spec->rx_nss_num = 2;
@@ -48,7 +50,10 @@ void rtl8822b_init_hal_spec(PADAPTER adapter)
| WL_FUNC_TDLS
;
hal_spec->rx_tsf_filter = 1;
hal_spec->pg_txpwr_saddr = 0x10;
hal_spec->pg_txgi_diff_factor = 1;
hal_spec->hci_type = 0;
@@ -103,17 +108,17 @@ void rtl8822b_power_off(PADAPTER adapter)
if (bMacPwrCtrlOn == _FALSE)
goto out;
bMacPwrCtrlOn = _FALSE;
rtw_hal_set_hwreg(adapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
GET_HAL_DATA(adapter)->bFWReady = _FALSE;
err = rtw_halmac_poweroff(d);
if (err) {
RTW_ERR("%s: Power OFF Fail!!\n", __FUNCTION__);
goto out;
}
bMacPwrCtrlOn = _FALSE;
rtw_hal_set_hwreg(adapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
GET_HAL_DATA(adapter)->bFWReady = _FALSE;
out:
return;
}
@@ -192,11 +197,13 @@ void rtl8822b_init_misc(PADAPTER adapter)
PHAL_DATA_TYPE hal;
u8 v8 = 0;
u32 v32 = 0;
#ifdef RTW_AMPDU_AGG_RETRY_AND_NEW
u32 ctrl;
#endif /* RTW_AMPDU_AGG_RETRY_AND_NEW */
hal = GET_HAL_DATA(adapter);
/*
* Sync driver status and hardware setting
*/
@@ -216,8 +223,9 @@ void rtl8822b_init_misc(PADAPTER adapter)
if (iface) {
iface->registrypriv.wireless_mode = WIRELESS_MODE_5G;
iface->registrypriv.channel = 149;
#ifdef CONFIG_80211N_HT
iface->registrypriv.stbc_cap &= ~(BIT0 | BIT4);
#endif /* CONFIG_80211N_HT */
}
}
}
@@ -245,7 +253,31 @@ void rtl8822b_init_misc(PADAPTER adapter)
rtw_read32(adapter, REG_FWHW_TXQ_CTRL_8822B) | BIT_EN_QUEUE_RPT_8822B(BIT(4)));
#endif /* CONFIG_XMIT_ACK */
rtw_write8(adapter, REG_TIMER0_SRC_SEL_8822B, rtw_read8(adapter, REG_TIMER0_SRC_SEL_8822B) & ~BIT(6));
#ifdef CONFIG_TCP_CSUM_OFFLOAD_RX
rtw_hal_rcr_add(adapter, BIT_TCPOFLD_EN_8822B);
#endif /* CONFIG_TCP_CSUM_OFFLOAD_RX*/
#ifdef RTW_AMPDU_AGG_RETRY_AND_NEW
v32 = rtw_read32(adapter, REG_FWHW_TXQ_CTRL_8822B);
ctrl = v32;
/* Enable AMPDU aggregation mode with retry MPDUs and new MPDUs */
v32 &= ~BIT_EN_RTY_BK_8822B;
/* Don't agg if retry packet rate fall back */
#define BIT_EN_RTY_BK_COD_8822B (BIT(2) << 24) /* 0x423[2] */
v32 |= BIT_EN_RTY_BK_COD_8822B;
if (v32 != ctrl)
rtw_write32(adapter, REG_FWHW_TXQ_CTRL_8822B, v32);
RTW_INFO("%s: AMPDU agg retry with new/break when rate fall back: "
"%s / %s\n", __FUNCTION__,
(v32 & BIT_EN_RTY_BK_8822B) ? "false" : "true",
(v32 & BIT_EN_RTY_BK_COD_8822B) ? "true" : "false");
#endif /* RTW_AMPDU_AGG_RETRY_AND_NEW */
#ifdef CONFIG_LPS_PWR_TRACKING
rtl8822b_set_fw_thermal_rpt_cmd(adapter, _TRUE, hal->eeprom_thermal_meter + THERMAL_DIFF_TH);
#endif
}
u32 rtl8822b_init(PADAPTER adapter)
@@ -264,15 +296,21 @@ u32 rtl8822b_init(PADAPTER adapter)
rtl8822b_phy_bf_init(adapter);
#endif
#ifdef CONFIG_FW_MULTI_PORT_SUPPORT
/*HW / FW init*/
rtw_hal_set_default_port_id_cmd(adapter, 0);
#endif
#ifdef CONFIG_BT_COEXIST
/* Init BT hw config. */
if (_TRUE == hal->EEPROMBluetoothCoexist)
if (_TRUE == hal->EEPROMBluetoothCoexist) {
rtw_btcoex_HAL_Initialize(adapter, _FALSE);
else
rtw_btcoex_wifionly_hw_config(adapter);
#else /* CONFIG_BT_COEXIST */
rtw_btcoex_wifionly_hw_config(adapter);
#ifdef CONFIG_FW_MULTI_PORT_SUPPORT
rtw_hal_set_wifi_btc_port_id_cmd(adapter);
#endif
} else
#endif /* CONFIG_BT_COEXIST */
rtw_btcoex_wifionly_hw_config(adapter);
rtl8822b_init_misc(adapter);
@@ -307,9 +345,6 @@ void rtl8822b_init_default_value(PADAPTER adapter)
hal = GET_HAL_DATA(adapter);
if (adapter->registrypriv.wireless_mode == WIRELESS_MODE_MAX)
adapter->registrypriv.wireless_mode = WIRELESS_MODE_24G | WIRELESS_MODE_5G;
/* init default value */
hal->fw_ractrl = _FALSE;

View File

@@ -1,6 +1,6 @@
/******************************************************************************
*
* Copyright(c) 2015 - 2017 Realtek Corporation.
* Copyright(c) 2015 - 2018 Realtek Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
@@ -214,3 +214,63 @@ u32 rtl8822b_get_rx_desc_size(struct _ADAPTER *a)
return size;
}
/*
* _rx_report - Get/Reset RX counter report
* @a: struct _ADAPTER*
* @type: rx report type
* @reset: reset counter or not
* 0: read counter and don't reset counter
* 1: reset counter only
*
* Get/Reset RX (error) report counter from hardware.
*
* Rteurn counter when reset==0, otherwise always return 0.
*/
u16 _rx_report(struct _ADAPTER *a, enum rx_rpt_type type, u8 reset)
{
u32 sel = 0;
u16 counter = 0;
/* Rx packet counter report selection */
sel = BIT_RXERR_RPT_SEL_V1_3_0_8822B(type);
if (type & BIT(4))
sel |= BIT_RXERR_RPT_SEL_V1_4_8822B;
if (reset)
sel |= BIT_RXERR_RPT_RST_8822B;
rtw_write8(a, REG_RXERR_RPT_8822B + 3, (sel >> 24) & 0xFF);
if (!reset)
counter = rtw_read16(a, REG_RXERR_RPT_8822B);
return counter;
}
/**
* rtl8822b_rx_report_get - Get RX counter report
* @a: struct _ADAPTER*
* @type: rx report type
*
* Get RX (error) report counter from hardware.
*
* Rteurn counter for specific rx report.
*/
u16 rtl8822b_rx_report_get(struct _ADAPTER *a, enum rx_rpt_type type)
{
return _rx_report(a, type, 0);
}
/**
* rtl8822b_rx_report_reset - Reset RX counter report
* @a: struct _ADAPTER*
*
* Reset RX (error) report counter of hardware.
*/
void rtl8822b_rx_report_reset(struct _ADAPTER *a, enum rx_rpt_type type)
{
_rx_report(a, type, 1);
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
/******************************************************************************
*
* Copyright(c) 2015 - 2017 Realtek Corporation.
* Copyright(c) 2015 - 2018 Realtek Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
@@ -510,14 +510,15 @@ static void check_rxfifo_full(PADAPTER adapter)
u8 val8 = 0;
if (regsty->check_hw_status == 1) {
/* switch counter to RX fifo */
val8 = rtw_read8(adapter, REG_RXERR_RPT_8822B + 3);
rtw_write8(adapter, REG_RXERR_RPT_8822B + 3, (val8 | 0xa0));
pdbgpriv->dbg_rx_fifo_last_overflow = pdbgpriv->dbg_rx_fifo_curr_overflow;
pdbgpriv->dbg_rx_fifo_curr_overflow = rtw_read16(adapter, REG_RXERR_RPT_8822B);
pdbgpriv->dbg_rx_fifo_diff_overflow =
pdbgpriv->dbg_rx_fifo_curr_overflow - pdbgpriv->dbg_rx_fifo_last_overflow;
pdbgpriv->dbg_rx_fifo_curr_overflow = rtl8822b_rx_report_get(adapter, RX_FULL_DROP);
if (pdbgpriv->dbg_rx_fifo_curr_overflow >= pdbgpriv->dbg_rx_fifo_last_overflow)
pdbgpriv->dbg_rx_fifo_diff_overflow =
pdbgpriv->dbg_rx_fifo_curr_overflow - pdbgpriv->dbg_rx_fifo_last_overflow;
else
pdbgpriv->dbg_rx_fifo_diff_overflow =
(0xFFFF - pdbgpriv->dbg_rx_fifo_last_overflow)
+ pdbgpriv->dbg_rx_fifo_curr_overflow;
}
}
@@ -525,6 +526,9 @@ void rtl8822b_phy_haldm_watchdog(PADAPTER adapter)
{
BOOLEAN bFwCurrentInPSMode = _FALSE;
u8 bFwPSAwake = _TRUE;
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(adapter);
u8 lps_changed = _FALSE;
u8 in_lps = _FALSE;
#ifdef CONFIG_MP_INCLUDED
/* for MP power tracking */
@@ -563,7 +567,22 @@ void rtl8822b_phy_haldm_watchdog(PADAPTER adapter)
#ifdef CONFIG_DISABLE_ODM
goto skip_dm;
#endif
rtw_phydm_watchdog(adapter);
#ifdef CONFIG_LPS
if (pwrpriv->bLeisurePs && bFwCurrentInPSMode && pwrpriv->pwr_mode != PS_MODE_ACTIVE) {
lps_changed = _TRUE;
in_lps = _TRUE;
LPS_Leave(adapter, "LPS_CTRL_PHYDM");
}
#endif
rtw_phydm_watchdog(adapter, in_lps);
#ifdef CONFIG_LPS
if (lps_changed)
LPS_Enter(adapter, "LPS_CTRL_PHYDM");
#endif
#ifdef CONFIG_BEAMFORMING
#ifdef RTW_BEAMFORMING_VERSION_2
@@ -658,31 +677,46 @@ void rtl8822b_write_rf_reg(PADAPTER adapter, enum rf_path path, u32 addr, u32 ma
static void set_tx_power_level_by_path(PADAPTER adapter, u8 channel, u8 path)
{
phy_set_tx_power_index_by_rate_section(adapter, path, channel, CCK);
PHAL_DATA_TYPE hal = GET_HAL_DATA(adapter);
u8 under_survey_ch = phy_check_under_survey_ch(adapter);
u8 under_24g = (hal->current_band_type == BAND_ON_2_4G);
if (under_24g)
phy_set_tx_power_index_by_rate_section(adapter, path, channel, CCK);
phy_set_tx_power_index_by_rate_section(adapter, path, channel, OFDM);
phy_set_tx_power_index_by_rate_section(adapter, path, channel, HT_MCS0_MCS7);
phy_set_tx_power_index_by_rate_section(adapter, path, channel, HT_MCS8_MCS15);
phy_set_tx_power_index_by_rate_section(adapter, path, channel, VHT_1SSMCS0_1SSMCS9);
phy_set_tx_power_index_by_rate_section(adapter, path, channel, VHT_2SSMCS0_2SSMCS9);
if (!under_survey_ch) {
phy_set_tx_power_index_by_rate_section(adapter, path, channel, HT_MCS0_MCS7);
phy_set_tx_power_index_by_rate_section(adapter, path, channel, HT_MCS8_MCS15);
phy_set_tx_power_index_by_rate_section(adapter, path, channel, VHT_1SSMCS0_1SSMCS9);
phy_set_tx_power_index_by_rate_section(adapter, path, channel, VHT_2SSMCS0_2SSMCS9);
}
}
void rtl8822b_set_tx_power_level(PADAPTER adapter, u8 channel)
{
PHAL_DATA_TYPE hal = GET_HAL_DATA(adapter);
struct dm_struct *phydm;
#ifdef CONFIG_ANTENNA_DIVERSITY
struct phydm_fat_struct *p_dm_fat_table;
#endif
u8 path = RF_PATH_A;
hal = GET_HAL_DATA(adapter);
phydm = &hal->odmpriv;
#ifdef CONFIG_ANTENNA_DIVERSITY
p_dm_fat_table = &phydm->dm_fat_table;
if (hal->AntDivCfg) {
/* antenna diversity Enable */
path = (p_dm_fat_table->rx_idle_ant == MAIN_ANT) ? RF_PATH_A : RF_PATH_B;
set_tx_power_level_by_path(adapter, channel, path);
} else {
} else
#endif
{
/* antenna diversity disable */
for (path = RF_PATH_A; path < hal->NumTotalRFPath; ++path)
set_tx_power_level_by_path(adapter, channel, path);
@@ -729,18 +763,6 @@ void rtl8822b_set_tx_power_index(PADAPTER adapter, u32 powerindex, enum rf_path
}
}
static u8 rtl8822b_phy_get_current_tx_num(PADAPTER adapter, u8 rate)
{
u8 tx_num = 0;
if ((rate >= MGN_MCS8 && rate <= MGN_MCS15) ||
(rate >= MGN_VHT2SS_MCS0 && rate <= MGN_VHT2SS_MCS9))
tx_num = RF_2TX;
else
tx_num = RF_1TX;
return tx_num;
}
/*
* Parameters:
@@ -756,10 +778,11 @@ static u8 rtl8822b_phy_get_current_tx_num(PADAPTER adapter, u8 rate)
u8 rtl8822b_get_tx_power_index(PADAPTER adapter, enum rf_path rfpath, u8 rate, u8 bandwidth, u8 channel, struct txpwr_idx_comp *tic)
{
PHAL_DATA_TYPE hal = GET_HAL_DATA(adapter);
struct hal_spec_t *hal_spec = GET_HAL_SPEC(adapter);
s16 power_idx;
u8 base_idx = 0;
s8 by_rate_diff = 0, limit = 0, tpt_offset = 0, extra_bias = 0;
u8 ntx_idx = rtl8822b_phy_get_current_tx_num(adapter, rate);
u8 ntx_idx = phy_get_current_tx_num(adapter, rate);
u8 bIn24G = _FALSE;
base_idx = PHY_GetTxPowerIndexBase(adapter, rfpath, rate, ntx_idx, bandwidth, channel, &bIn24G);
@@ -790,8 +813,8 @@ u8 rtl8822b_get_tx_power_index(PADAPTER adapter, enum rf_path rfpath, u8 rate, u
if (power_idx < 0)
power_idx = 0;
else if (power_idx > MAX_POWER_INDEX)
power_idx = MAX_POWER_INDEX;
else if (power_idx > hal_spec->txgi_max)
power_idx = hal_spec->txgi_max;
return power_idx;
}
@@ -979,11 +1002,37 @@ void rtl8822b_switch_chnl_and_set_bw(PADAPTER adapter)
/* config channel, bw, offset setting */
#ifdef RTW_CHANNEL_SWITCH_OFFLOAD
if (hal->ch_switch_offload)
switch_chnl_and_set_bw_by_fw(adapter, switch_band);
if (hal->ch_switch_offload) {
else
#ifdef RTW_REDUCE_SCAN_SWITCH_CH_TIME
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
_adapter *iface;
struct mlme_ext_priv *mlmeext;
u8 drv_switch = _TRUE;
int i;
for (i = 0; i < dvobj->iface_nums; i++) {
iface = dvobj->padapters[i];
mlmeext = &iface->mlmeextpriv;
/* check scan state */
if (mlmeext_scan_state(mlmeext) != SCAN_DISABLE
&& mlmeext_scan_state(mlmeext) != SCAN_COMPLETE
&& mlmeext_scan_state(mlmeext) != SCAN_BACKING_OP)
drv_switch = _FALSE;
}
#else
u8 drv_switch = _FALSE;
#endif
if (drv_switch == _TRUE)
switch_chnl_and_set_bw_by_drv(adapter, switch_band);
else
switch_chnl_and_set_bw_by_fw(adapter, switch_band);
} else {
switch_chnl_and_set_bw_by_drv(adapter, switch_band);
}
#else
switch_chnl_and_set_bw_by_drv(adapter, switch_band);
#endif /* RTW_CHANNEL_SWITCH_OFFLOAD */
@@ -1553,7 +1602,7 @@ static void _config_beamformer_su(PADAPTER adapter, struct beamformer_entry *bfe
rtw_write8(adapter, REG_SND_PTCL_CTRL_8822B, 0xDB);
/* MAC address/Partial AID of Beamformer */
for (i = 0; i < 6; i++)
for (i = 0; i < ETH_ALEN; i++)
rtw_write8(adapter, addr_bfer_info+i, bfer->mac_addr[i]);
/* CSI report parameters of Beamformer */
@@ -2317,3 +2366,26 @@ void rtl8822b_phy_bf_sounding_status(PADAPTER adapter, u8 status)
}
#endif /* CONFIG_BEAMFORMING */
#ifdef CONFIG_LPS_PWR_TRACKING
void rtw_lps_pwr_tracking(_adapter *adapter, u8 thermal_value)
{
#ifdef CONFIG_LPS
u8 lps_changed;
if (adapter_to_pwrctl(adapter)->bLeisurePs &&
adapter_to_pwrctl(adapter)->bFwCurrentInPSMode &&
adapter_to_pwrctl(adapter)->pwr_mode != PS_MODE_ACTIVE)
lps_changed = _TRUE;
LPS_Leave(adapter, "LPS_CTRL_TXSS");
rtw_phydm_pwr_tracking_directly(adapter);
if (lps_changed)
LPS_Enter(adapter, "LPS_CTRL_TXSS");
#endif
thermal_value += THERMAL_DIFF_TH;
rtl8822b_set_fw_thermal_rpt_cmd(adapter, _TRUE, thermal_value);
}
#endif

View File

@@ -177,6 +177,7 @@ u8 rtl8822bu_fw_ips_deinit(_adapter *padapter)
#endif
#ifdef CONFIG_RTW_LED
static void init_hwled(PADAPTER adapter, u8 enable)
{
u8 mode = 0;
@@ -187,11 +188,18 @@ static void init_hwled(PADAPTER adapter, u8 enable)
rtw_halmac_led_cfg(adapter_to_dvobj(adapter), enable, mode);
}
#endif
static void hal_init_misc(PADAPTER adapter)
{
#ifdef CONFIG_RTW_LED
struct led_priv *ledpriv = adapter_to_led(adapter);
init_hwled(adapter, 1);
#ifdef CONFIG_RTW_SW_LED
if (ledpriv->bRegUseLed == _TRUE)
rtw_halmac_led_cfg(adapter_to_dvobj(adapter), _TRUE, 3);
#endif
#endif /* CONFIG_RTW_LED */
}
@@ -219,7 +227,13 @@ exit:
static void hal_deinit_misc(PADAPTER adapter)
{
#ifdef CONFIG_RTW_LED
struct led_priv *ledpriv = adapter_to_led(adapter);
init_hwled(adapter, 0);
#ifdef CONFIG_RTW_SW_LED
if (ledpriv->bRegUseLed == _TRUE)
rtw_halmac_led_cfg(adapter_to_dvobj(adapter), _FALSE, 3);
#endif
#endif /* CONFIG_RTW_LED */
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************
*
* Copyright(c) 2015 - 2017 Realtek Corporation.
* Copyright(c) 2015 - 2018 Realtek Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
@@ -283,11 +283,16 @@ static u8 usb_write_data_rsvd_page(void *d, u8 *pBuf, u32 size)
struct dvobj_priv *pobj = (struct dvobj_priv *)d;
PADAPTER padapter = dvobj_get_primary_adapter(pobj);
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
u8 ret;
if (pHalData->not_xmitframe_fw_dl)
return usb_write_data_not_xmitframe(d , pBuf , size, HALMAC_TXDESC_QSEL_BEACON);
ret = usb_write_data_not_xmitframe(d , pBuf , size, HALMAC_TXDESC_QSEL_BEACON);
else
return usb_write_data_rsvd_page_normal(d , pBuf , size);
ret = usb_write_data_rsvd_page_normal(d , pBuf , size);
if (ret == _TRUE)
return 1;
return 0;
}
static u8 usb_write_data_h2c(void *d, u8 *pBuf, u32 size)
@@ -295,11 +300,16 @@ static u8 usb_write_data_h2c(void *d, u8 *pBuf, u32 size)
struct dvobj_priv *pobj = (struct dvobj_priv *)d;
PADAPTER padapter = dvobj_get_primary_adapter(pobj);
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
u8 ret;
if (pHalData->not_xmitframe_fw_dl)
return usb_write_data_not_xmitframe(d , pBuf , size, HALMAC_TXDESC_QSEL_H2C_CMD);
ret = usb_write_data_not_xmitframe(d , pBuf , size, HALMAC_TXDESC_QSEL_H2C_CMD);
else
return usb_write_data_h2c_normal(d , pBuf , size);
ret = usb_write_data_h2c_normal(d , pBuf , size);
if (ret == _TRUE)
return 1;
return 0;
}
int rtl8822bu_halmac_init_adapter(PADAPTER padapter)

View File

@@ -119,8 +119,6 @@ void rtl8822bu_initswleds(PADAPTER padapter)
InitLed(padapter, &(ledpriv->SwLed0), LED_PIN_LED0);
InitLed(padapter, &(ledpriv->SwLed1), LED_PIN_LED1);
InitLed(padapter, &(ledpriv->SwLed2), LED_PIN_LED2);
rtw_halmac_led_cfg(adapter_to_dvobj(padapter), enable, mode);
}
/*
@@ -136,7 +134,5 @@ void rtl8822bu_deinitswleds(PADAPTER padapter)
DeInitLed(&(ledpriv->SwLed0));
DeInitLed(&(ledpriv->SwLed1));
DeInitLed(&(ledpriv->SwLed2));
rtw_halmac_led_cfg(adapter_to_dvobj(padapter), enable, mode);
}
#endif

View File

@@ -115,19 +115,6 @@ static u8 sethwreg(PADAPTER padapter, u8 variable, u8 *val)
}
}
break;
case HW_VAR_SET_REQ_FW_PS:
{
/*
* 1. driver write 0x8f[4]=1
* request fw ps state (only can write bit4)
*/
u8 req_fw_ps = 0;
req_fw_ps = rtw_read8(padapter, 0x8f);
req_fw_ps |= 0x10;
rtw_write8(padapter, 0x8f, req_fw_ps);
}
break;
default:
ret = rtl8822b_sethwreg(padapter, variable, val);
break;
@@ -154,10 +141,6 @@ static void gethwreg(PADAPTER padapter, u8 variable, u8 *val)
#endif /* CONFIG_LPS_LCLK */
break;
case HW_VAR_FW_PS_STATE:
/* driver read dword 0x88 to get fw ps state */
*((u16 *)val) = rtw_read16(padapter, 0x88);
break;
default:
rtl8822b_gethwreg(padapter, variable, val);
break;

View File

@@ -47,6 +47,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
sint bmcst = IS_MCAST(pattrib->ra);
u16 SWDefineContent = 0x0;
u8 DriverFixedRate = 0x0;
u8 hw_port = rtw_hal_get_port(padapter);
#ifndef CONFIG_USE_USB_BUFFER_ALLOC_TX
if (padapter->registrypriv.mp_mode == 0) {
@@ -101,16 +102,25 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
/*offset 12 */
if (!pattrib->qos_en) {
/* HW sequence, to fix to use 0 queue. todo: 4AC packets to use auto queue select */
SET_TX_DESC_EN_HWSEQ_8822B(ptxdesc, 1); /* Hw set sequence number */
SET_TX_DESC_EN_HWEXSEQ_8822B(ptxdesc, 0);
SET_TX_DESC_DISQSELSEQ_8822B(ptxdesc, 1);
SET_TX_DESC_HW_SSN_SEL_8822B(ptxdesc, 0);
SET_TX_DESC_EN_HWSEQ_8822B(ptxdesc, 1);/* Hw set sequence number */
SET_TX_DESC_HW_SSN_SEL_8822B(ptxdesc, pattrib->hw_ssn_sel);
SET_TX_DESC_EN_HWEXSEQ_8822B(ptxdesc, 0);
} else
SET_TX_DESC_SW_SEQ_8822B(ptxdesc, pattrib->seqnum);
if ((pxmitframe->frame_tag & 0x0f) == DATA_FRAMETAG) {
/* RTW_INFO("pxmitframe->frame_tag == DATA_FRAMETAG\n"); */
rtl8822b_fill_txdesc_sectype(pattrib, ptxdesc);
#ifdef CONFIG_TX_CSUM_OFFLOAD
if (pattrib->hw_csum == 1) {
int offset = 48 + pxmitframe->pkt_offset*8 + 8;
SET_TX_DESC_OFFSET_8822B(ptxdesc, offset);
SET_TX_DESC_CHK_EN_8822B(ptxdesc, 1);
SET_TX_DESC_WHEADER_LEN_8822B(ptxdesc, (pattrib->hdrlen + pattrib->iv_len)>>1);
}
#endif
/* offset 20 */
#ifdef CONFIG_USB_TX_AGGREGATION
@@ -209,8 +219,17 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
/* HW will ignore this setting if the transmission rate is legacy OFDM */
if (pmlmeinfo->preamble_mode == PREAMBLE_SHORT)
SET_TX_DESC_DATA_SHORT_8822B(ptxdesc, 1);
SET_TX_DESC_DATARATE_8822B(ptxdesc, MRateToHwRate(pmlmeext->tx_rate));
#ifdef CONFIG_IP_R_MONITOR
if((pattrib->ether_type == ETH_P_ARP) &&
(IsSupportedTxOFDM(padapter->registrypriv.wireless_mode))) {
SET_TX_DESC_DATARATE_8822B(ptxdesc, MRateToHwRate(IEEE80211_OFDM_RATE_6MB));
#ifdef DBG_IP_R_MONITOR
RTW_INFO(FUNC_ADPT_FMT ": SP Packet(0x%04X) rate=0x%x SeqNum = %d\n",
FUNC_ADPT_ARG(padapter), pattrib->ether_type, MRateToHwRate(pmlmeext->tx_rate), pattrib->seqnum);
#endif/*DBG_IP_R_MONITOR*/
} else
#endif/*CONFIG_IP_R_MONITOR*/
SET_TX_DESC_DATARATE_8822B(ptxdesc, MRateToHwRate(pmlmeext->tx_rate));
}
#ifdef CONFIG_TDLS
@@ -226,6 +245,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
#endif
} else if ((pxmitframe->frame_tag & 0x0f) == MGNT_FRAMETAG) {
/* RTW_INFO("pxmitframe->frame_tag == MGNT_FRAMETAG\n"); */
SET_TX_DESC_MBSSID_8822B(ptxdesc, pattrib->mbssid & 0xF);
SET_TX_DESC_USE_RATE_8822B(ptxdesc, 1);
DriverFixedRate = 0x01;
@@ -275,8 +295,8 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
SET_TX_DESC_SW_DEFINE_8822B(ptxdesc, SWDefineContent);
SET_TX_DESC_PORT_ID_8822B(ptxdesc, get_hw_port(padapter));
SET_TX_DESC_MULTIPLE_PORT_8822B(ptxdesc, get_hw_port(padapter));
SET_TX_DESC_PORT_ID_8822B(ptxdesc, hw_port);
SET_TX_DESC_MULTIPLE_PORT_8822B(ptxdesc, hw_port);
rtl8822b_cal_txdesc_chksum(padapter, ptxdesc);
rtl8822b_dbg_dump_tx_desc(padapter, pxmitframe->frame_tag, ptxdesc);
@@ -299,6 +319,7 @@ s32 rtl8822bu_xmit_buf_handler(PADAPTER padapter)
PHAL_DATA_TYPE phal;
struct xmit_priv *pxmitpriv;
struct xmit_buf *pxmitbuf;
struct xmit_frame *pxmitframe;
s32 ret;
@@ -332,8 +353,10 @@ s32 rtl8822bu_xmit_buf_handler(PADAPTER padapter)
if (pxmitbuf == NULL)
break;
pxmitframe = (struct xmit_frame *) pxmitbuf->priv_data;
/* only XMITBUF_DATA & XMITBUF_MGNT */
rtw_write_port_and_wait(padapter, pxmitbuf->ff_hwaddr, pxmitbuf->len, (unsigned char *)pxmitbuf, 500);
rtw_free_xmitframe(pxmitpriv, pxmitframe);
} while (1);
#ifdef CONFIG_LPS_LCLK
@@ -427,6 +450,9 @@ static s32 rtw_dump_xframe(PADAPTER padapter, struct xmit_frame *pxmitframe)
}
#ifdef CONFIG_XMIT_THREAD_MODE
if ((pattrib->qsel == QSLT_BEACON) || (pattrib->qsel == QSLT_CMD))
#endif
rtw_free_xmitframe(pxmitpriv, pxmitframe);
if (ret != _SUCCESS)
@@ -715,7 +741,7 @@ agg_end:
pxmitbuf->len = pbuf_tail;
pxmitbuf->ff_hwaddr = ff_hwaddr;
if (pxmitbuf->buf_tag == XMITBUF_CMD)
if (pfirstframe->attrib.qsel == QSLT_BEACON)
/* download rsvd page or fw */
rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8 *)pxmitbuf);
else
@@ -732,6 +758,9 @@ agg_end:
rtw_count_tx_stats(padapter, pfirstframe, pbuf_tail);
#ifdef CONFIG_XMIT_THREAD_MODE
if (pfirstframe->attrib.qsel == QSLT_BEACON)
#endif
rtw_free_xmitframe(pxmitpriv, pfirstframe);
return _TRUE;
@@ -839,7 +868,7 @@ s32 rtl8822bu_init_xmit_priv(PADAPTER padapter)
#ifdef CONFIG_TX_EARLY_MODE
pHalData->bEarlyModeEnable = padapter->registrypriv.early_mode;
#endif
rtl8822b_init_xmit_priv(padapter);
return _SUCCESS;
}