On 9/18/22 08:40, Bitterblue Smith wrote:
> The module parameter ht40_2g was supposed to enable 40 MHz operation,
> but it didn't.
>
> Tell the firmware about the channel width when updating the rate mask.
> This makes it work with my gen 2 chip RTL8188FU.
>
> I'm not sure if anything needs to be done for the gen 1 chips, if 40
> MHz channel width already works or not. They update the rate mask with
> a different structure which doesn't have a field for the channel width.
>
> Also set the channel width correctly for sta_statistics.
>
> Fixes: f653e69009c6 ("rtl8xxxu: Implement basic 8723b specific update_rate_mask() function")
> Fixes: bd917b3d28c9 ("rtl8xxxu: fill up txrate info for gen1 chips")
> Signed-off-by: Bitterblue Smith <rtl8821cerfe2@xxxxxxxxx>
Acked-by: Jes Sorensen <jes@xxxxxxxxxxxxxxxxxx>
> .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 6 +++---
> .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 21 +++++++++++++------
> 2 files changed, 18 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
> index 501900c07fac..9950a2ee00aa 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
> @@ -1477,7 +1477,7 @@ struct rtl8xxxu_fileops {
> void (*set_tx_power) (struct rtl8xxxu_priv *priv, int channel,
> bool ht40);
> void (*update_rate_mask) (struct rtl8xxxu_priv *priv,
> - u32 ramask, u8 rateid, int sgi);
> + u32 ramask, u8 rateid, int sgi, int txbw_40mhz);
> void (*report_connect) (struct rtl8xxxu_priv *priv,
> u8 macid, bool connect);
> void (*fill_txdesc) (struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
> @@ -1565,9 +1565,9 @@ void rtl8xxxu_gen2_config_channel(struct ieee80211_hw *hw);
> void rtl8xxxu_gen1_usb_quirks(struct rtl8xxxu_priv *priv);
> void rtl8xxxu_gen2_usb_quirks(struct rtl8xxxu_priv *priv);
> void rtl8xxxu_update_rate_mask(struct rtl8xxxu_priv *priv,
> - u32 ramask, u8 rateid, int sgi);
> + u32 ramask, u8 rateid, int sgi, int txbw_40mhz);
> void rtl8xxxu_gen2_update_rate_mask(struct rtl8xxxu_priv *priv,
> - u32 ramask, u8 rateid, int sgi);
> + u32 ramask, u8 rateid, int sgi, int txbw_40mhz);
> void rtl8xxxu_gen1_report_connect(struct rtl8xxxu_priv *priv,
> u8 macid, bool connect);
> void rtl8xxxu_gen2_report_connect(struct rtl8xxxu_priv *priv,
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> index 7978d5dcc826..7724ee8033a8 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> @@ -4407,7 +4407,7 @@ static void rtl8xxxu_sw_scan_complete(struct ieee80211_hw *hw,
> }
>
> void rtl8xxxu_update_rate_mask(struct rtl8xxxu_priv *priv,
> - u32 ramask, u8 rateid, int sgi)
> + u32 ramask, u8 rateid, int sgi, int txbw_40mhz)
> {
> struct h2c_cmd h2c;
>
> @@ -4427,10 +4427,15 @@ void rtl8xxxu_update_rate_mask(struct rtl8xxxu_priv *priv,
> }
>
> void rtl8xxxu_gen2_update_rate_mask(struct rtl8xxxu_priv *priv,
> - u32 ramask, u8 rateid, int sgi)
> + u32 ramask, u8 rateid, int sgi, int txbw_40mhz)
> {
> struct h2c_cmd h2c;
> - u8 bw = RTL8XXXU_CHANNEL_WIDTH_20;
> + u8 bw;
> +
> + if (txbw_40mhz)
> + bw = RTL8XXXU_CHANNEL_WIDTH_40;
> + else
> + bw = RTL8XXXU_CHANNEL_WIDTH_20;
>
> memset(&h2c, 0, sizeof(struct h2c_cmd));
>
> @@ -4717,7 +4722,11 @@ rtl8xxxu_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> RATE_INFO_FLAGS_SHORT_GI;
> }
>
> - rarpt->txrate.bw |= RATE_INFO_BW_20;
> + 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;
> }
> bit_rate = cfg80211_calculate_bitrate(&rarpt->txrate);
> rarpt->bit_rate = bit_rate;
> @@ -4726,7 +4735,7 @@ rtl8xxxu_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> priv->vif = vif;
> priv->rssi_level = RTL8XXXU_RATR_STA_INIT;
>
> - priv->fops->update_rate_mask(priv, ramask, 0, sgi);
> + priv->fops->update_rate_mask(priv, ramask, 0, sgi, rarpt->txrate.bw == RATE_INFO_BW_40);
>
> rtl8xxxu_write8(priv, REG_BCN_MAX_ERR, 0xff);
>
> @@ -6440,7 +6449,7 @@ static void rtl8xxxu_refresh_rate_mask(struct rtl8xxxu_priv *priv,
> }
>
> priv->rssi_level = rssi_level;
> - priv->fops->update_rate_mask(priv, rate_bitmap, ratr_idx, sgi);
> + priv->fops->update_rate_mask(priv, rate_bitmap, ratr_idx, sgi, txbw_40mhz);
> }
> }
>
