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.
115 lines
4.1 KiB
115 lines
4.1 KiB
From 58dc54df808f49ac70bef3116e4785d5b4b85d5b 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:38 +0200
|
|
Subject: [PATCH 128/142] wifi: rtw89: refine MCC C2H debug logs
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/2207499
|
|
|
|
commit 214a98b151b14d3dbfa60136abcf99df5d347a80
|
|
Author: Zong-Zhe Yang <kevin_yang@realtek.com>
|
|
Date: Thu Jan 19 14:43:42 2023 +0800
|
|
|
|
wifi: rtw89: refine MCC C2H debug logs
|
|
|
|
To debug channel concurrency more centrally, we add a new debug flag,
|
|
RTW89_DBG_CHAN, for channel related things, especially channel concurrency.
|
|
Then, we change MCC (multi-channel concurrency) C2H (chip to host packets)
|
|
debug flag to it.
|
|
|
|
Besides, refine debug logs to show TSF in u64 directly.
|
|
|
|
Signed-off-by: Zong-Zhe Yang <kevin_yang@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/20230119064342.65391-2-pkshih@realtek.com
|
|
|
|
Signed-off-by: Íñigo Huguet <ihuguet@redhat.com>
|
|
---
|
|
drivers/net/wireless/realtek/rtw89/debug.h | 1 +
|
|
drivers/net/wireless/realtek/rtw89/mac.c | 21 +++++++++++++--------
|
|
2 files changed, 14 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/debug.h b/drivers/net/wireless/realtek/rtw89/debug.h
|
|
index d1de5e600836c..079269bb5251c 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/debug.h
|
|
+++ b/drivers/net/wireless/realtek/rtw89/debug.h
|
|
@@ -28,6 +28,7 @@ enum rtw89_debug_mask {
|
|
RTW89_DBG_STATE = BIT(17),
|
|
RTW89_DBG_WOW = BIT(18),
|
|
RTW89_DBG_UL_TB = BIT(19),
|
|
+ RTW89_DBG_CHAN = BIT(20),
|
|
|
|
RTW89_DBG_UNEXP = BIT(31),
|
|
};
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
|
|
index 05a5ad7c2439d..8c622111e832e 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/mac.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
|
|
@@ -4295,12 +4295,12 @@ rtw89_mac_c2h_mcc_rcv_ack(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len
|
|
case H2C_FUNC_MCC_SET_DURATION:
|
|
break;
|
|
default:
|
|
- rtw89_debug(rtwdev, RTW89_DBG_FW,
|
|
+ rtw89_debug(rtwdev, RTW89_DBG_CHAN,
|
|
"invalid MCC C2H RCV ACK: func %d\n", func);
|
|
return;
|
|
}
|
|
|
|
- rtw89_debug(rtwdev, RTW89_DBG_FW,
|
|
+ rtw89_debug(rtwdev, RTW89_DBG_CHAN,
|
|
"MCC C2H RCV ACK: group %d, func %d\n", group, func);
|
|
}
|
|
|
|
@@ -4328,12 +4328,12 @@ rtw89_mac_c2h_mcc_req_ack(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len
|
|
case H2C_FUNC_DEL_MCC_GROUP:
|
|
case H2C_FUNC_RESET_MCC_GROUP:
|
|
default:
|
|
- rtw89_debug(rtwdev, RTW89_DBG_FW,
|
|
+ rtw89_debug(rtwdev, RTW89_DBG_CHAN,
|
|
"invalid MCC C2H REQ ACK: func %d\n", func);
|
|
return;
|
|
}
|
|
|
|
- rtw89_debug(rtwdev, RTW89_DBG_FW,
|
|
+ rtw89_debug(rtwdev, RTW89_DBG_CHAN,
|
|
"MCC C2H REQ ACK: group %d, func %d, return code %d\n",
|
|
group, func, retcode);
|
|
|
|
@@ -4361,6 +4361,11 @@ rtw89_mac_c2h_mcc_tsf_rpt(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len
|
|
rpt->tsf_y_low = RTW89_GET_MAC_C2H_MCC_TSF_RPT_TSF_LOW_Y(c2h->data);
|
|
rpt->tsf_y_high = RTW89_GET_MAC_C2H_MCC_TSF_RPT_TSF_HIGH_Y(c2h->data);
|
|
|
|
+ rtw89_debug(rtwdev, RTW89_DBG_CHAN,
|
|
+ "MCC C2H TSF RPT: macid %d> %llu, macid %d> %llu\n",
|
|
+ rpt->macid_x, (u64)rpt->tsf_x_high << 32 | rpt->tsf_x_low,
|
|
+ rpt->macid_y, (u64)rpt->tsf_y_high << 32 | rpt->tsf_y_low);
|
|
+
|
|
cond = RTW89_MCC_WAIT_COND(group, H2C_FUNC_MCC_REQ_TSF);
|
|
rtw89_complete_cond(&rtwdev->mcc.wait, cond, &data);
|
|
}
|
|
@@ -4418,14 +4423,14 @@ rtw89_mac_c2h_mcc_status_rpt(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32
|
|
rsp = false;
|
|
break;
|
|
default:
|
|
- rtw89_debug(rtwdev, RTW89_DBG_FW,
|
|
+ rtw89_debug(rtwdev, RTW89_DBG_CHAN,
|
|
"invalid MCC C2H STS RPT: status %d\n", status);
|
|
return;
|
|
}
|
|
|
|
- rtw89_debug(rtwdev, RTW89_DBG_FW,
|
|
- "MCC C2H STS RPT: group %d, macid %d, status %d, tsf {%d, %d}\n",
|
|
- group, macid, status, tsf_low, tsf_high);
|
|
+ rtw89_debug(rtwdev, RTW89_DBG_CHAN,
|
|
+ "MCC C2H STS RPT: group %d, macid %d, status %d, tsf %llu\n",
|
|
+ group, macid, status, (u64)tsf_high << 32 | tsf_low);
|
|
|
|
if (!rsp)
|
|
return;
|
|
--
|
|
2.13.6
|
|
|