Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtlwifi: Use 6 bits as sequence number of TX report

Browse Source 
In new design, SW_DEFINE[1:0] of tx desc are used by firmware, and the TX
report only contains SW_DEFINE[7:0]. To satisfy with all cases, driver uses
SW_DEFINE[7:2] as sequence number.
Besides, the format of tx report have been changed, so a new flag
RTL_SPEC_EXT_C2H is used to access report.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Ping-Ke Shih 2018-01-29 11:26:34 +08:00 committed by Kalle Valo
parent 1ca72c3047
commit 5f380ceff5
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/wireless/realtek/rtlwifi/base.c
View File

@ -1597,7 +1597,11 @@ static u16 rtl_get_tx_report_sn(struct ieee80211_hw *hw)
struct rtl_tx_report *tx_report = &rtlpriv->tx_report;
u16 sn;
sn = atomic_inc_return(&tx_report->sn) & 0x0FFF;
/* SW_DEFINE[11:8] are reserved (driver fills zeros)
* SW_DEFINE[7:2] are used by driver
* SW_DEFINE[1:0] are reserved for firmware (driver fills zeros)
*/
sn = (atomic_inc_return(&tx_report->sn) & 0x003F) << 2;
tx_report->last_sent_sn = sn;
tx_report->last_sent_time = jiffies;
@ -1625,14 +1629,23 @@ void rtl_tx_report_handler(struct ieee80211_hw *hw, u8 *tmp_buf, u8 c2h_cmd_len)
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_tx_report *tx_report = &rtlpriv->tx_report;
u16 sn;
u8 st, retry;
sn = ((tmp_buf[7] & 0x0F) << 8) | tmp_buf[6];
if (rtlpriv->cfg->spec_ver & RTL_SPEC_EXT_C2H) {
sn = GET_TX_REPORT_SN_V2(tmp_buf);
st = GET_TX_REPORT_ST_V2(tmp_buf);
retry = GET_TX_REPORT_RETRY_V2(tmp_buf);
} else {
sn = GET_TX_REPORT_SN_V1(tmp_buf);
st = GET_TX_REPORT_ST_V1(tmp_buf);
retry = GET_TX_REPORT_RETRY_V1(tmp_buf);
}
tx_report->last_recv_sn = sn;
RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_DMESG,
"Recv TX-Report st=0x%02X sn=0x%X retry=0x%X\n",
tmp_buf[0], sn, tmp_buf[2]);
st, sn, retry);
}
EXPORT_SYMBOL_GPL(rtl_tx_report_handler);
@ -1646,7 +1659,8 @@ bool rtl_check_tx_report_acked(struct ieee80211_hw *hw)
if (time_before(tx_report->last_sent_time + 3 * HZ, jiffies)) {
RT_TRACE(rtlpriv, COMP_TX_REPORT, DBG_WARNING,
"Check TX-Report timeout!!\n");
"Check TX-Report timeout!! s_sn=0x%X r_sn=0x%X\n",
tx_report->last_sent_sn, tx_report->last_recv_sn);
return true; /* 3 sec. (timeout) seen as acked */
}

8
drivers/net/wireless/realtek/rtlwifi/wifi.h
View File

@ -154,6 +154,13 @@ enum rtl8192c_h2c_cmd {
MAX_H2CCMD
};
#define GET_TX_REPORT_SN_V1(c2h) (c2h[6])
#define GET_TX_REPORT_ST_V1(c2h) (c2h[0] & 0xC0)
#define GET_TX_REPORT_RETRY_V1(c2h) (c2h[2] & 0x3F)
#define GET_TX_REPORT_SN_V2(c2h) (c2h[6])
#define GET_TX_REPORT_ST_V2(c2h) (c2h[7] & 0xC0)
#define GET_TX_REPORT_RETRY_V2(c2h) (c2h[8] & 0x3F)
#define MAX_TX_COUNT 4
#define MAX_REGULATION_NUM 4
#define MAX_RF_PATH_NUM 4
@ -953,6 +960,7 @@ enum package_type {
enum rtl_spec_ver {
RTL_SPEC_NEW_RATEID = BIT(0), /* use ratr_table_mode_new */
RTL_SPEC_SUPPORT_VHT = BIT(1), /* support VHT */
RTL_SPEC_EXT_C2H = BIT(2), /* extend FW C2H (e.g. TX REPORT) */
};
struct octet_string {