wifi: rtw89: send OFDM rate only in P2P mode

Check IEEE80211_TX_CTL_NO_CCK_RATE flag to avoid sending frames with
CCK rates in 2GHz band.

In TX flow, add IEEE80211_TX_CTL_NO_CCK_RATE flag to check and get its
lowest rate without CCK rates if the TX type is mgmt frames or data frames.
Besides, the decision of phy rate and retry rate in P2P mode are also
be handled.

In P2P GO mode, it should send beacon of no CCK rates in its frame rate.
Therefore, We add a condition to decide which rate is added to beacon
content.

Moreover, we avoid setting a mask of rates to be used for rate control
selection before and after connection in P2P mode.

Signed-off-by: Dian-Syuan Yang <dian_syuan0116@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/20220922010435.12167-3-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 79d3182fce5a323cbfaf1dbf1bfd4e6c03451fe9..ee8cb7ab7e82795849d2c9734619c329ffad686a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -496,8 +496,14 @@ static u16 rtw89_core_get_mgmt_rate(struct rtw89_dev *rtwdev,
        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
        struct ieee80211_vif *vif = tx_info->control.vif;
        const struct rtw89_chan *chan = rtw89_chan_get(rtwdev, RTW89_SUB_ENTITY_0);
-       u16 lowest_rate = chan->band_type == RTW89_BAND_2G ?
-                         RTW89_HW_RATE_CCK1 : RTW89_HW_RATE_OFDM6;
+       u16 lowest_rate;
+
+       if (tx_info->flags & IEEE80211_TX_CTL_NO_CCK_RATE || vif->p2p)
+               lowest_rate = RTW89_HW_RATE_OFDM6;
+       else if (chan->band_type == RTW89_BAND_2G)
+               lowest_rate = RTW89_HW_RATE_CCK1;
+       else
+               lowest_rate = RTW89_HW_RATE_OFDM6;
 
        if (!vif || !vif->bss_conf.basic_rates || !tx_req->sta)
                return lowest_rate;
@@ -708,7 +714,9 @@ rtw89_core_tx_update_data_info(struct rtw89_dev *rtwdev,
        if (IEEE80211_SKB_CB(skb)->control.hw_key)
                rtw89_core_tx_update_sec_key(rtwdev, tx_req);
 
-       if (rate_pattern->enable)
+       if (vif->p2p)
+               desc_info->data_retry_lowest_rate = RTW89_HW_RATE_OFDM6;
+       else if (rate_pattern->enable)
                desc_info->data_retry_lowest_rate = rate_pattern->rate;
        else if (chan->band_type == RTW89_BAND_2G)
                desc_info->data_retry_lowest_rate = RTW89_HW_RATE_CCK1;

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 5e65f2c410bfd792a4b010815b2f14104f2dcc34..e4b12cdeb2de6b2e3963c7a84c29e090b3c73042 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -1061,12 +1061,20 @@ int rtw89_fw_h2c_assoc_cmac_tbl(struct rtw89_dev *rtwdev,
        struct sk_buff *skb;
        u8 pads[RTW89_PPE_BW_NUM];
        u8 mac_id = rtwsta ? rtwsta->mac_id : rtwvif->mac_id;
+       u16 lowest_rate;
        int ret;
 
        memset(pads, 0, sizeof(pads));
        if (sta)
                __get_sta_he_pkt_padding(rtwdev, sta, pads);
 
+       if (vif->p2p)
+               lowest_rate = RTW89_HW_RATE_OFDM6;
+       else if (chan->band_type == RTW89_BAND_2G)
+               lowest_rate = RTW89_HW_RATE_CCK1;
+       else
+               lowest_rate = RTW89_HW_RATE_OFDM6;
+
        skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, H2C_CMC_TBL_LEN);
        if (!skb) {
                rtw89_err(rtwdev, "failed to alloc skb for fw dl\n");
@@ -1077,10 +1085,7 @@ int rtw89_fw_h2c_assoc_cmac_tbl(struct rtw89_dev *rtwdev,
        SET_CTRL_INFO_OPERATION(skb->data, 1);
        SET_CMC_TBL_DISRTSFB(skb->data, 1);
        SET_CMC_TBL_DISDATAFB(skb->data, 1);
-       if (chan->band_type == RTW89_BAND_2G)
-               SET_CMC_TBL_RTS_RTY_LOWEST_RATE(skb->data, RTW89_HW_RATE_CCK1);
-       else
-               SET_CMC_TBL_RTS_RTY_LOWEST_RATE(skb->data, RTW89_HW_RATE_OFDM6);
+       SET_CMC_TBL_RTS_RTY_LOWEST_RATE(skb->data, lowest_rate);
        SET_CMC_TBL_RTS_TXCNT_LMT_SEL(skb->data, 0);
        SET_CMC_TBL_DATA_TXCNT_LMT_SEL(skb->data, 0);
        if (vif->type == NL80211_IFTYPE_STATION)
@@ -1214,8 +1219,16 @@ int rtw89_fw_h2c_update_beacon(struct rtw89_dev *rtwdev,
        struct sk_buff *skb_beacon;
        u16 tim_offset;
        int bcn_total_len;
+       u16 beacon_rate;
        int ret;
 
+       if (vif->p2p)
+               beacon_rate = RTW89_HW_RATE_OFDM6;
+       else if (chan->band_type == RTW89_BAND_2G)
+               beacon_rate = RTW89_HW_RATE_CCK1;
+       else
+               beacon_rate = RTW89_HW_RATE_OFDM6;
+
        skb_beacon = ieee80211_beacon_get_tim(rtwdev->hw, vif, &tim_offset,
                                              NULL, 0);
        if (!skb_beacon) {
@@ -1239,8 +1252,7 @@ int rtw89_fw_h2c_update_beacon(struct rtw89_dev *rtwdev,
        SET_BCN_UPD_MACID(skb->data, rtwvif->mac_id);
        SET_BCN_UPD_SSN_SEL(skb->data, RTW89_MGMT_HW_SSN_SEL);
        SET_BCN_UPD_SSN_MODE(skb->data, RTW89_MGMT_HW_SEQ_MODE);
-       SET_BCN_UPD_RATE(skb->data, chan->band_type == RTW89_BAND_2G ?
-                                   RTW89_HW_RATE_CCK1 : RTW89_HW_RATE_OFDM6);
+       SET_BCN_UPD_RATE(skb->data, beacon_rate);
 
        skb_put_data(skb, skb_beacon->data, skb_beacon->len);
        dev_kfree_skb_any(skb_beacon);

diff --git a/drivers/net/wireless/realtek/rtw89/mac80211.c b/drivers/net/wireless/realtek/rtw89/mac80211.c
index f9cd98d496157a435b1e7b31ac07cf7b41f74358..70f555887c6eace70c8fd2de3ac2d0a96ff22dcf 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw89/mac80211.c
@@ -677,7 +677,7 @@ static void rtw89_ra_mask_info_update_iter(void *data, struct ieee80211_sta *sta
        struct rtw89_sta *rtwsta = (struct rtw89_sta *)sta->drv_priv;
        struct ieee80211_vif *vif = rtwvif_to_vif(rtwsta->rtwvif);
 
-       if (vif != br_data->vif)
+       if (vif != br_data->vif || vif->p2p)
                return;
 
        rtwsta->use_cfg_mask = true;

diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
index be2c3715bbf420259a562959abf7b7a45676fea9..6a6bdc652e09e5a037ca0264e89fc3e471b13f3c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.c
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
@@ -235,6 +235,7 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev,
        struct rtw89_phy_rate_pattern *rate_pattern = &rtwvif->rate_pattern;
        struct rtw89_ra_info *ra = &rtwsta->ra;
        const struct rtw89_chan *chan = rtw89_chan_get(rtwdev, RTW89_SUB_ENTITY_0);
+       struct ieee80211_vif *vif = rtwvif_to_vif(rtwsta->rtwvif);
        const u64 *high_rate_masks = rtw89_ra_mask_ht_rates;
        u8 rssi = ewma_rssi_read(&rtwsta->avg_rssi);
        u64 ra_mask = 0;
@@ -292,10 +293,10 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev,
        switch (chan->band_type) {
        case RTW89_BAND_2G:
                ra_mask |= sta->deflink.supp_rates[NL80211_BAND_2GHZ];
-               if (sta->deflink.supp_rates[NL80211_BAND_2GHZ] <= 0xf)
+               if (sta->deflink.supp_rates[NL80211_BAND_2GHZ] & 0xf)
                        mode |= RTW89_RA_MODE_CCK;
-               else
-                       mode |= RTW89_RA_MODE_CCK | RTW89_RA_MODE_OFDM;
+               if (sta->deflink.supp_rates[NL80211_BAND_2GHZ] & 0xff0)
+                       mode |= RTW89_RA_MODE_OFDM;
                break;
        case RTW89_BAND_5G:
                ra_mask |= (u64)sta->deflink.supp_rates[NL80211_BAND_5GHZ] << 4;
@@ -358,7 +359,7 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev,
            IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_16_QAM)
                ra->dcm_cap = 1;
 
-       if (rate_pattern->enable) {
+       if (rate_pattern->enable && !vif->p2p) {
                ra_mask = rtw89_phy_ra_mask_cfg(rtwdev, rtwsta);
                ra_mask &= rate_pattern->ra_mask;
                mode = rate_pattern->ra_mode;