You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
99 lines
3.7 KiB
99 lines
3.7 KiB
From 39d7ebf1095575793ff50489d230734b357a30b7 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= <ihuguet@redhat.com>
|
|
Date: Wed, 24 May 2023 15:00:33 +0200
|
|
Subject: [PATCH 085/142] wifi: rtw89: coex: Enable Bluetooth report when show
|
|
debug info
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/2207499
|
|
|
|
commit bc20f9235f644846520a68340ea0730d09022e0a
|
|
Author: Ching-Te Ku <ku920601@realtek.com>
|
|
Date: Sat Dec 17 22:17:41 2022 +0800
|
|
|
|
wifi: rtw89: coex: Enable Bluetooth report when show debug info
|
|
|
|
Ask WiFi firmware to send Bluetooth version report when we want to show
|
|
Bluetooth debug info. If there is no request for debug log, driver will
|
|
not enable the report. This modification can save some C2H/H2C resources.
|
|
|
|
Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
|
|
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
|
|
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
|
Link: https://lore.kernel.org/r/20221217141745.43291-4-pkshih@realtek.com
|
|
|
|
Signed-off-by: Íñigo Huguet <ihuguet@redhat.com>
|
|
---
|
|
drivers/net/wireless/realtek/rtw89/coex.c | 32 ++++++++++++++++++-------------
|
|
1 file changed, 19 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
|
|
index df3984ebba06e..b58c839e10d92 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/coex.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
|
|
@@ -5066,11 +5066,6 @@ static void _update_bt_info(struct rtw89_dev *rtwdev, u8 *buf, u32 len)
|
|
|
|
a2dp->sink = btinfo.hb3.a2dp_sink;
|
|
|
|
- if (b->profile_cnt.now || b->status.map.ble_connect)
|
|
- rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_AFH_MAP, 1);
|
|
- else
|
|
- rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_AFH_MAP, 0);
|
|
-
|
|
if (!a2dp->exist_last && a2dp->exist) {
|
|
a2dp->vendor_id = 0;
|
|
a2dp->flush_time = 0;
|
|
@@ -5080,12 +5075,6 @@ static void _update_bt_info(struct rtw89_dev *rtwdev, u8 *buf, u32 len)
|
|
RTW89_COEX_BT_DEVINFO_WORK_PERIOD);
|
|
}
|
|
|
|
- if (a2dp->exist && (a2dp->flush_time == 0 || a2dp->vendor_id == 0 ||
|
|
- a2dp->play_latency == 1))
|
|
- rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_DEVICE_INFO, 1);
|
|
- else
|
|
- rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_DEVICE_INFO, 0);
|
|
-
|
|
_run_coex(rtwdev, BTC_RSN_UPDATE_BT_INFO);
|
|
}
|
|
|
|
@@ -5218,8 +5207,7 @@ void rtw89_btc_ntfy_radio_state(struct rtw89_dev *rtwdev, enum btc_rfctrl rf_sta
|
|
|
|
if (rf_state == BTC_RFCTRL_WL_ON) {
|
|
btc->dm.cnt_dm[BTC_DCNT_BTCNT_FREEZE] = 0;
|
|
- rtw89_btc_fw_en_rpt(rtwdev,
|
|
- RPT_EN_MREG | RPT_EN_BT_VER_INFO, true);
|
|
+ rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_MREG, true);
|
|
val = BTC_WSCB_ACTIVE | BTC_WSCB_ON | BTC_WSCB_BTLOG;
|
|
_write_scbd(rtwdev, val, true);
|
|
_update_bt_scbd(rtwdev, true);
|
|
@@ -5866,6 +5854,24 @@ static void _show_bt_info(struct rtw89_dev *rtwdev, struct seq_file *m)
|
|
"[trx_req_cnt]", cx->cnt_bt[BTC_BCNT_HIPRI_RX],
|
|
cx->cnt_bt[BTC_BCNT_HIPRI_TX], cx->cnt_bt[BTC_BCNT_LOPRI_RX],
|
|
cx->cnt_bt[BTC_BCNT_LOPRI_TX], cx->cnt_bt[BTC_BCNT_POLUT]);
|
|
+
|
|
+ if (bt->enable.now && bt->ver_info.fw == 0)
|
|
+ rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_VER_INFO, true);
|
|
+ else
|
|
+ rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_VER_INFO, false);
|
|
+
|
|
+ if (bt_linfo->profile_cnt.now || bt_linfo->status.map.ble_connect)
|
|
+ rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_AFH_MAP, true);
|
|
+ else
|
|
+ rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_AFH_MAP, false);
|
|
+
|
|
+ if (bt_linfo->a2dp_desc.exist &&
|
|
+ (bt_linfo->a2dp_desc.flush_time == 0 ||
|
|
+ bt_linfo->a2dp_desc.vendor_id == 0 ||
|
|
+ bt_linfo->a2dp_desc.play_latency == 1))
|
|
+ rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_DEVICE_INFO, true);
|
|
+ else
|
|
+ rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_DEVICE_INFO, false);
|
|
}
|
|
|
|
#define CASE_BTC_RSN_STR(e) case BTC_RSN_ ## e: return #e
|
|
--
|
|
2.13.6
|
|
|