wifi: rtl8xxxu: Fix the channel width reporting
PATCH 1/2 wifi: rtl8xxxu: Fix the channel width reporting
The gen 2 chips RTL8192EU and RTL8188FU periodically send the driver reports about the TX rate, and the driver passes these reports to sta_statistics. The reports from RTL8192EU may or may not include the channel width. The reports from RTL8188FU do not include it.
Only access the c2h->ra_report.bw field if the report (skb) is big enough.
The other problem fixed here is that the code was actually never changing the channel width initially reported by rtl8xxxu_bss_info_changed because the value of RATE_INFO_BW_20 is 0.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +7 -3
@@ -5569,7 +5569,6 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work) rarpt->txrate.flags =0 ; rate = c2h->ra_report.rate; sgi = c2h->ra_report.sgi; - bw = c2h->ra_report.bw;if (rate <DESC_RATE_MCS0 ) { rarpt->txrate.legacy =
@@ -5586,8 +5585,13 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work)RATE_INFO_FLAGS_SHORT_GI ; } -if (bw ==RATE_INFO_BW_20 ) - rarpt->txrate.bw |=RATE_INFO_BW_20 ; +if (skb->len >=2 +7 ) { +if (c2h->ra_report.bw ==RTL8XXXU_CHANNEL_WIDTH_40 ) + bw =RATE_INFO_BW_40 ; +else + bw =RATE_INFO_BW_20 ; + rarpt->txrate.bw = bw; + } } bit_rate =cfg80211_calculate_bitrate (&rarpt->txrate); rarpt->bit_rate = bit_rate;
Signature · 1 line
2.38.0
PATCH 2/2 wifi: rtl8xxxu: Introduce rtl8xxxu_update_ra_report
The ra_report struct is used for reporting the TX rate via sta_statistics. The code which fills it out is duplicated in two places, and the RTL8188EU will need it in a third place. Move this code into a new function rtl8xxxu_update_ra_report.
---
This patch should be applied after my other patch:
"[PATCH v2] wifi: rtl8xxxu: Fix use after rcu_read_unlock in rtl8xxxu_bss_info_changed"
--- .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 105 ++++++++---------- 1 file changed, 45 insertions(+), 60 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +45 -60
@@ -4598,6 +4598,32 @@ static void rtl8xxxu_set_aifs(struct rtl8xxxu_priv *priv, u8 slot_time) } } +static void rtl8xxxu_update_ra_report (struct rtl8xxxu_ra_report *rarpt, +u8 rate,u8 sgi,u8 bw) +{ +u8 mcs, nss; + + rarpt->txrate.flags =0 ; + +if (rate <DESC_RATE_MCS0 ) { + rarpt->txrate.legacy = rtl8xxxu_legacy_ratetable[rate].bitrate; + }else { +rtl8xxxu_desc_to_mcsrate (rate, &mcs, &nss); + rarpt->txrate.flags |=RATE_INFO_FLAGS_MCS ; + + rarpt->txrate.mcs = mcs; + rarpt->txrate.nss = nss; + +if (sgi) + rarpt->txrate.flags |=RATE_INFO_FLAGS_SHORT_GI ; + + rarpt->txrate.bw = bw; + } + + rarpt->bit_rate =cfg80211_calculate_bitrate (&rarpt->txrate); + rarpt->desc_rate = rate; +} +static void rtl8xxxu_bss_info_changed (struct ieee80211_hw *hw,struct ieee80211_vif *vif,struct ieee80211_bss_conf *bss_conf,u64 changed)
@@ -4620,9 +4646,7 @@ rtl8xxxu_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,u32 ramask;int sgi =0 ;u8 highest_rate; -u8 mcs =0 , nss =0 ; -u32 bit_rate; - +u8 bw;rcu_read_lock (); sta =ieee80211_find_sta (vif, bss_conf->bssid);
@@ -4647,37 +4671,19 @@ rtl8xxxu_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, sgi =1 ; highest_rate =fls (ramask) -1 ; -if (highest_rate <DESC_RATE_MCS0 ) { - rarpt->txrate.legacy = - rtl8xxxu_legacy_ratetable[highest_rate].bitrate; - }else { -rtl8xxxu_desc_to_mcsrate (highest_rate, - &mcs, &nss); - rarpt->txrate.flags |=RATE_INFO_FLAGS_MCS ; - - rarpt->txrate.mcs = mcs; - rarpt->txrate.nss = nss; - -if (sgi) { - rarpt->txrate.flags |= -RATE_INFO_FLAGS_SHORT_GI ; - } - -if (rtl8xxxu_ht40_2g && - (sta->deflink.ht_cap.cap &IEEE80211_HT_CAP_SUP_WIDTH_20_40 )) - rarpt->txrate.bw =RATE_INFO_BW_40 ; -else - rarpt->txrate.bw =RATE_INFO_BW_20 ; - } +if (rtl8xxxu_ht40_2g && + (sta->deflink.ht_cap.cap &IEEE80211_HT_CAP_SUP_WIDTH_20_40 )) + bw =RATE_INFO_BW_40 ; +else + bw =RATE_INFO_BW_20 ;rcu_read_unlock (); - bit_rate =cfg80211_calculate_bitrate (&rarpt->txrate); - rarpt->bit_rate = bit_rate; - rarpt->desc_rate = highest_rate; + +rtl8xxxu_update_ra_report (rarpt, highest_rate, sgi, bw); priv->vif = vif; priv->rssi_level =RTL8XXXU_RATR_STA_INIT ; - priv->fops->update_rate_mask (priv, ramask,0 , sgi, rarpt->txrate.bw ==RATE_INFO_BW_40 ); + priv->fops->update_rate_mask (priv, ramask,0 , sgi, bw ==RATE_INFO_BW_40 );rtl8xxxu_write8 (priv,REG_BCN_MAX_ERR ,0xff );
@@ -5538,9 +5544,7 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work)u8 bt_info =0 ;struct rtl8xxxu_btcoex *btcoex;struct rtl8xxxu_ra_report *rarpt; -u8 rate, sgi, bw; -u32 bit_rate; -u8 mcs =0 , nss =0 ; +u8 bw; priv = container_of(work, struct rtl8xxxu_priv, c2hcmd_work); btcoex = &priv->bt_coex;
@@ -5566,36 +5570,17 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work)rtl8723bu_handle_bt_info (priv);break ;case C2H_8723B_RA_REPORT : - rarpt->txrate.flags =0 ; - rate = c2h->ra_report.rate; - sgi = c2h->ra_report.sgi; - -if (rate <DESC_RATE_MCS0 ) { - rarpt->txrate.legacy = - rtl8xxxu_legacy_ratetable[rate].bitrate; - }else { -rtl8xxxu_desc_to_mcsrate (rate, &mcs, &nss); - rarpt->txrate.flags |=RATE_INFO_FLAGS_MCS ; + bw = rarpt->txrate.bw; - rarpt->txrate.mcs = mcs; - rarpt->txrate.nss = nss; - -if (sgi) { - rarpt->txrate.flags |= -RATE_INFO_FLAGS_SHORT_GI ; - } - -if (skb->len >=2 +7 ) { -if (c2h->ra_report.bw ==RTL8XXXU_CHANNEL_WIDTH_40 ) - bw =RATE_INFO_BW_40 ; -else - bw =RATE_INFO_BW_20 ; - rarpt->txrate.bw = bw; - } +if (skb->len >=2 +7 ) { +if (c2h->ra_report.bw ==RTL8XXXU_CHANNEL_WIDTH_40 ) + bw =RATE_INFO_BW_40 ; +else + bw =RATE_INFO_BW_20 ; } - bit_rate =cfg80211_calculate_bitrate (&rarpt->txrate); - rarpt->bit_rate = bit_rate; - rarpt->desc_rate = rate; + +rtl8xxxu_update_ra_report (rarpt, c2h->ra_report.rate, + c2h->ra_report.sgi, bw);break ;default :break ;
Signature · 1 line
2.38.0
RE: [PATCH 2/2] wifi: rtl8xxxu: Introduce rtl8xxxu_update_ra_report
Quoted 29 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Thursday, November 24, 2022 5:34 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>; Ping-Ke Shih <[email protected]>
Subject: [PATCH 2/2] wifi: rtl8xxxu: Introducertl8xxxu_update_ra_reportThe
ra_reportstruct is used for reporting the TX rate viasta_statistics. The code which fills it out is duplicated in two places, and the RTL8188EU will need it in a third place. Move this code into a new functionrtl8xxxu_update_ra_report.Signed-off-by Bitterblue Smith <[email protected]>---
This patch should be applied after my other patch:
"[PATCH v2] wifi: rtl8xxxu: Fix use afterrcu_read_unlockinrtl8xxxu_bss_info_changed"--- .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 105 ++++++++---------- 1 file changed, 45 insertions(+), 60 deletions(-)drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +0
-0@@ -4598,6 +4598,32 @@ static void rtl8xxxu_set_aifs(struct rtl8xxxu_priv *priv, u8 slot_time) }
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_set_aifs(struct rtl8xxxu_priv *priv, u8 slot_time) · line 4608
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +8
-0} +static void rtl8xxxu_update_ra_report (struct rtl8xxxu_ra_report *rarpt, +u8 rate,u8 sgi,u8 bw) +{ +u8 mcs, nss; + + rarpt->txrate.flags =0 ; + +if (rate <DESC_RATE_MCS0 ) {
I think 'if (rate <= DESC_RATE_54M)' would be more reasonable, because rtl8xxxu_legacy_ratetable[] are list of legacy rates.
[...]
Ping-Ke
Re: [PATCH 2/2] wifi: rtl8xxxu: Introduce rtl8xxxu_update_ra_report
Quoted 31 lines · Ping-Ke Shih
Quoted 31 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Thursday, November 24, 2022 5:34 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>; Ping-Ke Shih <[email protected]>
Subject: [PATCH 2/2] wifi: rtl8xxxu: Introducertl8xxxu_update_ra_reportThe
ra_reportstruct is used for reporting the TX rate viasta_statistics. The code which fills it out is duplicated in two places, and the RTL8188EU will need it in a third place. Move this code into a new functionrtl8xxxu_update_ra_report.Signed-off-by Bitterblue Smith <[email protected]>---
This patch should be applied after my other patch:
"[PATCH v2] wifi: rtl8xxxu: Fix use afterrcu_read_unlockinrtl8xxxu_bss_info_changed"--- .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 105 ++++++++---------- 1 file changed, 45 insertions(+), 60 deletions(-)drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +0
-0@@ -4598,6 +4598,32 @@ static void rtl8xxxu_set_aifs(struct rtl8xxxu_priv *priv, u8 slot_time) } }
Quoted 12 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_set_aifs(struct rtl8xxxu_priv *priv, u8 slot_time) · line 4608
Quoted 8 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +8
-0+static void rtl8xxxu_update_ra_report (struct rtl8xxxu_ra_report *rarpt, +u8 rate,u8 sgi,u8 bw) +{ +u8 mcs, nss; + + rarpt->txrate.flags =0 ; + +if (rate <DESC_RATE_MCS0 ) {I think 'if (rate <=
DESC_RATE_54M)' would be more reasonable, because rtl8xxxu_legacy_ratetable[] are list of legacy rates.
Okay.
Quoted 41 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Thursday, November 24, 2022 5:31 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>; Ping-Ke Shih <[email protected]>
Subject: [PATCH 1/2] wifi: rtl8xxxu: Fix the channel width reportingThe gen 2 chips RTL8192EU and RTL8188FU periodically send the driver reports about the TX rate, and the driver passes these reports to
sta_statistics. The reports from RTL8192EU may or may not include the channel width. The reports from RTL8188FU do not include it.Only access the
c2h->ra_report.bwfield if the report (skb) is big enough.The other problem fixed here is that the code was actually never changing the channel width initially reported by
rtl8xxxu_bss_info_changedbecause the value ofRATE_INFO_BW_20is 0.Fixes 0985d3a410ac ("rtl8xxxu: Feed current txrate information for mac80211")Signed-off-by Bitterblue Smith <[email protected]>--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +0
-1@@ -5569,7 +5569,6 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work) rarpt->txrate.flags =0 ; rate = c2h->ra_report.rate; sgi = c2h->ra_report.sgi; - bw = c2h->ra_report.bw;if (rate <DESC_RATE_MCS0 ) { rarpt->txrate.legacy =
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_c2hcmd_callback(struct work_struct *work) · line 5588
Quoted 6 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1
-2@@ -5586,8 +5585,13 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work)RATE_INFO_FLAGS_SHORT_GI ; } -if (bw ==RATE_INFO_BW_20 ) - rarpt->txrate.bw |=RATE_INFO_BW_20 ; +if (skb->len >=2 +7 ) {
I think 2 is header length of C2H, and 7 is sizeof(c2h->ra_report), so we can have:
#define RTL8XXXU_C2H_HDR_LEN 2
Then, replace this statement with
if (skb->len >= RTL8XXXU_C2H_HDR_LEN + sizeof(c2h->ra_report))
By the way, I found 'struct rtl8723bu_c2h' miss '__packed'.
--
Ping-Ke
Quoted 35 lines
-----Original Message-----
From: Ping-Ke Shih <[email protected]>
Sent: Friday, November 25, 2022 4:05 PM
To: Bitterblue Smith <[email protected]>; [email protected]
Cc: Jes Sorensen <[email protected]>
Subject: RE: [PATCH 1/2] wifi: rtl8xxxu: Fix the channel width reportingQuoted 25 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Thursday, November 24, 2022 5:31 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>; Ping-Ke Shih <[email protected]>
Subject: [PATCH 1/2] wifi: rtl8xxxu: Fix the channel width reportingThe gen 2 chips RTL8192EU and RTL8188FU periodically send the driver reports about the TX rate, and the driver passes these reports to
sta_statistics. The reports from RTL8192EU may or may not include the channel width. The reports from RTL8188FU do not include it.Only access the
c2h->ra_report.bwfield if the report (skb) is big enough.The other problem fixed here is that the code was actually never changing the channel width initially reported by
rtl8xxxu_bss_info_changedbecause the value ofRATE_INFO_BW_20is 0.Fixes 0985d3a410ac ("rtl8xxxu: Feed current txrate information for mac80211")Signed-off-by Bitterblue Smith <[email protected]>--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
Quoted 9 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_c2hcmd_callback(struct work_struct *work) · line 5571
Quoted 9 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +0
-0@@ -5569,7 +5569,6 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work) rarpt->txrate.flags =0 ; rate = c2h->ra_report.rate; sgi = c2h->ra_report.sgi;
Additional one question about small size of report (skb). Is it possible you can't access .sgi and .rate too?
Quoted 27 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_c2hcmd_callback(struct work_struct *work) · line 5588
Quoted 11 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1
-3- bw = c2h->ra_report.bw;if (rate <DESC_RATE_MCS0 ) { rarpt->txrate.legacy =@@ -5586,8 +5585,13 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work)RATE_INFO_FLAGS_SHORT_GI ; } -if (bw ==RATE_INFO_BW_20 ) - rarpt->txrate.bw |=RATE_INFO_BW_20 ; +if (skb->len >=2 +7 ) {I think 2 is header length of C2H, and 7 is
sizeof(c2h->ra_report), so we can have:
#defineRTL8XXXU_C2H_HDR_LEN2Then, replace this statement with
if (
skb->len>=RTL8XXXU_C2H_HDR_LEN+sizeof(c2h->ra_report))By the way, I found 'struct
rtl8723bu_c2h' miss '__packed'.--
Ping-Ke------Please consider the environment before printing this e-mail.
Quoted 35 lines · Ping-Ke Shih
Quoted 35 lines
-----Original Message-----
From: Ping-Ke Shih <[email protected]>
Sent: Friday, November 25, 2022 4:05 PM
To: Bitterblue Smith <[email protected]>; [email protected]
Cc: Jes Sorensen <[email protected]>
Subject: RE: [PATCH 1/2] wifi: rtl8xxxu: Fix the channel width reportingQuoted 25 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Thursday, November 24, 2022 5:31 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>; Ping-Ke Shih <[email protected]>
Subject: [PATCH 1/2] wifi: rtl8xxxu: Fix the channel width reportingThe gen 2 chips RTL8192EU and RTL8188FU periodically send the driver reports about the TX rate, and the driver passes these reports to
sta_statistics. The reports from RTL8192EU may or may not include the channel width. The reports from RTL8188FU do not include it.Only access the
c2h->ra_report.bwfield if the report (skb) is big enough.The other problem fixed here is that the code was actually never changing the channel width initially reported by
rtl8xxxu_bss_info_changedbecause the value ofRATE_INFO_BW_20is 0.Fixes 0985d3a410ac ("rtl8xxxu: Feed current txrate information for mac80211")Signed-off-by Bitterblue Smith <[email protected]>--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
Quoted 13 lines
Quoted 9 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_c2hcmd_callback(struct work_struct *work) · line 5571
Quoted 9 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +0
-0@@ -5569,7 +5569,6 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work) rarpt->txrate.flags =0 ; rate = c2h->ra_report.rate; sgi = c2h->ra_report.sgi;Additional one question about small size of report (skb). Is it possible you can't access .sgi and .rate too?
I don't think so, because they are in the first byte of the payload. The payload would have to be 0 bytes long, which is not very useful. Also, the RTL8192EU and RTL8188FU drivers access the first byte unconditionally.
Quoted 16 lines
Quoted 16 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_c2hcmd_callback(struct work_struct *work) · line 5588
Quoted 11 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1
-3- bw = c2h->ra_report.bw;if (rate <DESC_RATE_MCS0 ) { rarpt->txrate.legacy =@@ -5586,8 +5585,13 @@ static void rtl8xxxu_c2hcmd_callback(struct work_struct *work)RATE_INFO_FLAGS_SHORT_GI ; } -if (bw ==RATE_INFO_BW_20 ) - rarpt->txrate.bw |=RATE_INFO_BW_20 ; +if (skb->len >=2 +7 ) {I think 2 is header length of C2H, and 7 is
sizeof(c2h->ra_report), so we can have:
#defineRTL8XXXU_C2H_HDR_LEN2
Quoted 3 lines
Quoted 3 lines
Then, replace this statement with
if (
skb->len>=RTL8XXXU_C2H_HDR_LEN+sizeof(c2h->ra_report))
That sounds good.
Quoted 3 lines
Quoted 3 lines
By the way, I found 'struct
rtl8723bu_c2h' miss '__packed'.
I will add it.
Quoted 5 lines
Quoted 5 lines
--
Ping-Ke------Please consider the environment before printing this e-mail.