mt76x02: set protection according to ht operation element

Configure protection based on information that are provided to
us either by remote AP or by hostapd via HT operation IE.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index d3f1d57..ddc1c31 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -731,6 +731,89 @@ void mt76x02_mac_set_rts_thresh(struct mt76x02_dev *dev, u32 val)
                 MT_PROT_CFG_CTRL | MT_PROT_CFG_RTS_THRESH, data);
 }
 
+void mt76x02_mac_set_tx_protection(struct mt76x02_dev *dev, bool legacy_prot,
+                                  int ht_mode)
+{
+       int mode = ht_mode & IEEE80211_HT_OP_MODE_PROTECTION;
+       bool non_gf = !!(ht_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
+       u32 prot[6];
+       u32 vht_prot[3];
+       int i;
+       u16 rts_thr;
+
+       for (i = 0; i < ARRAY_SIZE(prot); i++) {
+               prot[i] = mt76_rr(dev, MT_CCK_PROT_CFG + i * 4);
+               prot[i] &= ~MT_PROT_CFG_CTRL;
+               if (i >= 2)
+                       prot[i] &= ~MT_PROT_CFG_RATE;
+       }
+
+       for (i = 0; i < ARRAY_SIZE(vht_prot); i++) {
+               vht_prot[i] = mt76_rr(dev, MT_TX_PROT_CFG6 + i * 4);
+               vht_prot[i] &= ~(MT_PROT_CFG_CTRL | MT_PROT_CFG_RATE);
+       }
+
+       rts_thr = mt76_get_field(dev, MT_TX_RTS_CFG, MT_TX_RTS_CFG_THRESH);
+
+       if (rts_thr != 0xffff)
+               prot[0] |= MT_PROT_CTRL_RTS_CTS;
+
+       if (legacy_prot) {
+               prot[1] |= MT_PROT_CTRL_CTS2SELF;
+
+               prot[2] |= MT_PROT_RATE_CCK_11;
+               prot[3] |= MT_PROT_RATE_CCK_11;
+               prot[4] |= MT_PROT_RATE_CCK_11;
+               prot[5] |= MT_PROT_RATE_CCK_11;
+
+               vht_prot[0] |= MT_PROT_RATE_CCK_11;
+               vht_prot[1] |= MT_PROT_RATE_CCK_11;
+               vht_prot[2] |= MT_PROT_RATE_CCK_11;
+       } else {
+               if (rts_thr != 0xffff)
+                       prot[1] |= MT_PROT_CTRL_RTS_CTS;
+
+               prot[2] |= MT_PROT_RATE_OFDM_24;
+               prot[3] |= MT_PROT_RATE_DUP_OFDM_24;
+               prot[4] |= MT_PROT_RATE_OFDM_24;
+               prot[5] |= MT_PROT_RATE_DUP_OFDM_24;
+
+               vht_prot[0] |= MT_PROT_RATE_OFDM_24;
+               vht_prot[1] |= MT_PROT_RATE_DUP_OFDM_24;
+               vht_prot[2] |= MT_PROT_RATE_SGI_OFDM_24;
+       }
+
+       switch (mode) {
+       case IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER:
+       case IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED:
+               prot[2] |= MT_PROT_CTRL_RTS_CTS;
+               prot[3] |= MT_PROT_CTRL_RTS_CTS;
+               prot[4] |= MT_PROT_CTRL_RTS_CTS;
+               prot[5] |= MT_PROT_CTRL_RTS_CTS;
+               vht_prot[0] |= MT_PROT_CTRL_RTS_CTS;
+               vht_prot[1] |= MT_PROT_CTRL_RTS_CTS;
+               vht_prot[2] |= MT_PROT_CTRL_RTS_CTS;
+               break;
+       case IEEE80211_HT_OP_MODE_PROTECTION_20MHZ:
+               prot[3] |= MT_PROT_CTRL_RTS_CTS;
+               prot[5] |= MT_PROT_CTRL_RTS_CTS;
+               vht_prot[1] |= MT_PROT_CTRL_RTS_CTS;
+               vht_prot[2] |= MT_PROT_CTRL_RTS_CTS;
+               break;
+       }
+
+       if (non_gf) {
+               prot[4] |= MT_PROT_CTRL_RTS_CTS;
+               prot[5] |= MT_PROT_CTRL_RTS_CTS;
+       }
+
+       for (i = 0; i < ARRAY_SIZE(prot); i++)
+               mt76_wr(dev, MT_CCK_PROT_CFG + i * 4, prot[i]);
+
+       for (i = 0; i < ARRAY_SIZE(vht_prot); i++)
+               mt76_wr(dev, MT_TX_PROT_CFG6 + i * 4, vht_prot[i]);
+}
+
 void mt76x02_update_channel(struct mt76_dev *mdev)
 {
        struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
index d1a8ed1..91c76a0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
@@ -194,6 +194,8 @@ void mt76x02_send_tx_status(struct mt76x02_dev *dev,
                            struct mt76x02_tx_status *stat, u8 *update);
 int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,
                           void *rxi);
+void mt76x02_mac_set_tx_protection(struct mt76x02_dev *dev, bool legacy_prot,
+                                  int ht_mode);
 void mt76x02_mac_set_rts_thresh(struct mt76x02_dev *dev, u32 val);
 void mt76x02_mac_setaddr(struct mt76x02_dev *dev, u8 *addr);
 void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h b/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
index d1ac847..20ad076 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
@@ -443,6 +443,7 @@
 #define MT_PROT_RATE_OFDM_6            0x2000
 #define MT_PROT_RATE_OFDM_24           0x2004
 #define MT_PROT_RATE_DUP_OFDM_24       0x2084
+#define MT_PROT_RATE_SGI_OFDM_24       0x2104
 #define MT_PROT_TXOP_ALLOW_ALL         GENMASK(25, 20)
 #define MT_PROT_TXOP_ALLOW_BW20                (MT_PROT_TXOP_ALLOW_ALL &       \
                                         ~MT_PROT_TXOP_ALLOW_MM40 &     \

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index 364e7b2..aac64d0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -661,6 +661,10 @@ void mt76x02_bss_info_changed(struct ieee80211_hw *hw,
                tasklet_enable(&dev->pre_tbtt_tasklet);
        }
 
+       if (changed & BSS_CHANGED_HT || changed & BSS_CHANGED_ERP_CTS_PROT)
+               mt76x02_mac_set_tx_protection(dev, info->use_cts_prot,
+                                             info->ht_operation_mode);
+
        if (changed & BSS_CHANGED_BEACON_INT) {
                mt76_rmw_field(dev, MT_BEACON_TIME_CFG,
                               MT_BEACON_TIME_CFG_INTVAL,