| Message ID | 20231218061341.51255-2-pkshih@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | acc55d7dd4de525ac07e43e90ea3cc630677ec8a |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: rtw89: coex: improve BT-coexistence performance for 8852B and 8851B | expand |
Ping-Ke Shih <pkshih@realtek.com> wrote: > From: Ching-Te Ku <ku920601@realtek.com> > > The Wi-Fi firmware 29.29.X should use version 2 role info format. FDDT > mechanism version 5 use the same cell members to judge traffic situation, > don't need to add another new format. > > Signed-off-by: Ching-Te Ku <ku920601@realtek.com> > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> 11 patches applied to wireless-next.git, thanks. acc55d7dd4de wifi: rtw89: coex: Fix wrong Wi-Fi role info and FDDT parameter members e9ff8a96e3aa wifi: rtw89: coex: Record down Wi-Fi initial mode information 21aa791b4367 wifi: rtw89: coex: Add Pre-AGC control to enhance Wi-Fi RX performance 07912ecb3eb2 wifi: rtw89: coex: Update BTG control related logic 3ac4b57ca12d wifi: rtw89: coex: Still show hardware grant signal info even Wi-Fi is PS 94fb737042c1 wifi: rtw89: coex: Update coexistence policy for Wi-Fi LPS 0c1829dc7a5d wifi: rtw89: coex: Set Bluetooth scan low-priority when Wi-Fi link/scan 221a72f73888 wifi: rtw89: coex: Add Bluetooth RSSI level information 6e5cf39f3107 wifi: rtw89: coex: Update RF parameter control setting logic c744f523cecb wifi: rtw89: coex: Translate antenna configuration from ID to string 28a197af3fcb wifi: rtw89: coex: To improve Wi-Fi performance while BT is idle
diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c index 9c0db35d3e13..1ff04ff79cd1 100644 --- a/drivers/net/wireless/realtek/rtw89/coex.c +++ b/drivers/net/wireless/realtek/rtw89/coex.c @@ -131,7 +131,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5, .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 2, .fcxgpiodbg = 1, .fcxbtver = 1, .fcxbtscan = 2, .fcxbtafh = 2, .fcxbtdevinfo = 1, - .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, + .fwlrole = 2, .frptmap = 3, .fcxctrl = 1, .info_buf = 1800, .max_role_num = 6, }, {RTL8852C, RTW89_FW_VER_CODE(0, 27, 57, 0), @@ -159,7 +159,7 @@ static const struct rtw89_btc_ver rtw89_btc_ver_defs[] = { .fcxbtcrpt = 105, .fcxtdma = 3, .fcxslots = 1, .fcxcysta = 5, .fcxstep = 3, .fcxnullsta = 2, .fcxmreg = 2, .fcxgpiodbg = 1, .fcxbtver = 1, .fcxbtscan = 2, .fcxbtafh = 2, .fcxbtdevinfo = 1, - .fwlrole = 1, .frptmap = 3, .fcxctrl = 1, + .fwlrole = 2, .frptmap = 3, .fcxctrl = 1, .info_buf = 1800, .max_role_num = 6, }, {RTL8852B, RTW89_FW_VER_CODE(0, 29, 14, 0), diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h index 21421980fd06..6e050c0845a6 100644 --- a/drivers/net/wireless/realtek/rtw89/core.h +++ b/drivers/net/wireless/realtek/rtw89/core.h @@ -2307,12 +2307,6 @@ struct rtw89_btc_fbtc_fddt_cell_status { u8 state_phase; /* [0:3] train state, [4:7] train phase */ } __packed; -struct rtw89_btc_fbtc_fddt_cell_status_v5 { - s8 wl_tx_pwr; - s8 bt_tx_pwr; - s8 bt_rx_gain; -} __packed; - struct rtw89_btc_fbtc_cysta_v3 { /* statistics for cycles */ u8 fver; u8 rsvd; @@ -2376,9 +2370,9 @@ struct rtw89_btc_fbtc_cysta_v5 { /* statistics for cycles */ struct rtw89_btc_fbtc_cycle_a2dp_empty_info a2dp_ept; struct rtw89_btc_fbtc_a2dp_trx_stat_v4 a2dp_trx[BTC_CYCLE_SLOT_MAX]; struct rtw89_btc_fbtc_cycle_fddt_info_v5 fddt_trx[BTC_CYCLE_SLOT_MAX]; - struct rtw89_btc_fbtc_fddt_cell_status_v5 fddt_cells[FDD_TRAIN_WL_DIRECTION] - [FDD_TRAIN_WL_RSSI_LEVEL] - [FDD_TRAIN_BT_RSSI_LEVEL]; + struct rtw89_btc_fbtc_fddt_cell_status fddt_cells[FDD_TRAIN_WL_DIRECTION] + [FDD_TRAIN_WL_RSSI_LEVEL] + [FDD_TRAIN_BT_RSSI_LEVEL]; __le32 except_map; } __packed;