Commit 8468446a authored by Ching-Te Ku's avatar Ching-Te Ku Committed by Kalle Valo

wifi: rtw89: coex: Move coexistence firmware buffer size parameter to chip info

Because RTL8852A/RTL8852C use different firmware buffer size to
send C2H packet, it's necessary to use different size to parse C2H report.
Signed-off-by: default avatarChing-Te Ku <ku920601@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220913092546.43722-4-pkshih@realtek.com
parent 1bb2d4f1
...@@ -650,8 +650,6 @@ static void _reset_btc_var(struct rtw89_dev *rtwdev, u8 type) ...@@ -650,8 +650,6 @@ static void _reset_btc_var(struct rtw89_dev *rtwdev, u8 type)
memset(&btc->mdinfo, 0, sizeof(btc->mdinfo)); memset(&btc->mdinfo, 0, sizeof(btc->mdinfo));
} }
#define BTC_FWINFO_BUF 1024
#define BTC_RPT_HDR_SIZE 3 #define BTC_RPT_HDR_SIZE 3
#define BTC_CHK_WLSLOT_DRIFT_MAX 15 #define BTC_CHK_WLSLOT_DRIFT_MAX 15
#define BTC_CHK_HANG_MAX 3 #define BTC_CHK_HANG_MAX 3
...@@ -1315,6 +1313,7 @@ static void _parse_btc_report(struct rtw89_dev *rtwdev, ...@@ -1315,6 +1313,7 @@ static void _parse_btc_report(struct rtw89_dev *rtwdev,
struct rtw89_btc_btf_fwinfo *pfwinfo, struct rtw89_btc_btf_fwinfo *pfwinfo,
u8 *pbuf, u32 buf_len) u8 *pbuf, u32 buf_len)
{ {
const struct rtw89_chip_info *chip = rtwdev->chip;
struct rtw89_btc_prpt *btc_prpt = NULL; struct rtw89_btc_prpt *btc_prpt = NULL;
u32 index = 0, rpt_len = 0; u32 index = 0, rpt_len = 0;
...@@ -1324,7 +1323,7 @@ static void _parse_btc_report(struct rtw89_dev *rtwdev, ...@@ -1324,7 +1323,7 @@ static void _parse_btc_report(struct rtw89_dev *rtwdev,
while (pbuf) { while (pbuf) {
btc_prpt = (struct rtw89_btc_prpt *)&pbuf[index]; btc_prpt = (struct rtw89_btc_prpt *)&pbuf[index];
if (index + 2 >= BTC_FWINFO_BUF) if (index + 2 >= chip->btc_fwinfo_buf)
break; break;
/* At least 3 bytes: type(1) & len(2) */ /* At least 3 bytes: type(1) & len(2) */
rpt_len = le16_to_cpu(btc_prpt->len); rpt_len = le16_to_cpu(btc_prpt->len);
......
...@@ -2654,6 +2654,7 @@ struct rtw89_chip_info { ...@@ -2654,6 +2654,7 @@ struct rtw89_chip_info {
u8 btcx_desired; u8 btcx_desired;
u8 scbd; u8 scbd;
u8 mailbox; u8 mailbox;
u16 btc_fwinfo_buf;
u8 fcxbtcrpt_ver; u8 fcxbtcrpt_ver;
u8 fcxtdma_ver; u8 fcxtdma_ver;
......
...@@ -2190,6 +2190,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { ...@@ -2190,6 +2190,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
.btcx_desired = 0x5, .btcx_desired = 0x5,
.scbd = 0x1, .scbd = 0x1,
.mailbox = 0x1, .mailbox = 0x1,
.btc_fwinfo_buf = 1024,
.fcxbtcrpt_ver = 1, .fcxbtcrpt_ver = 1,
.fcxtdma_ver = 1, .fcxtdma_ver = 1,
......
...@@ -3035,6 +3035,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { ...@@ -3035,6 +3035,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
.btcx_desired = 0x5, .btcx_desired = 0x5,
.scbd = 0x1, .scbd = 0x1,
.mailbox = 0x1, .mailbox = 0x1,
.btc_fwinfo_buf = 1280,
.fcxbtcrpt_ver = 4, .fcxbtcrpt_ver = 4,
.fcxtdma_ver = 3, .fcxtdma_ver = 3,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment