mt76: mt7615: add set_coverage class support

Add the capability to configure acktimeout for mt7615 driver. Moreover
configure slottime according to the value provided by mac80211

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
index 77869e28c3c38879dbdc39351978a44152338a48..17a4055ad53f29b6d9f5007c69834ba4584609d6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
@@ -271,6 +271,7 @@ mt7615_regd_notifier(struct wiphy *wiphy,
 static void
 mt7615_init_wiphy(struct ieee80211_hw *hw)
 {
+       struct mt7615_phy *phy = mt7615_hw_phy(hw);
        struct wiphy *wiphy = hw->wiphy;
 
        hw->queues = 4;
@@ -278,6 +279,8 @@ mt7615_init_wiphy(struct ieee80211_hw *hw)
        hw->max_report_rates = 7;
        hw->max_rate_tries = 11;
 
+       phy->slottime = 9;
+
        hw->sta_data_size = sizeof(struct mt7615_sta);
        hw->vif_data_size = sizeof(struct mt7615_vif);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index b03b5c6fd57164168ed45c43dbf4f43ea5061daa..903b8395a446d49dd350d6b2f4568f7a8a015fa3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -64,6 +64,67 @@ void mt7615_mac_reset_counters(struct mt7615_dev *dev)
        mt76_set(dev, MT_WF_RMAC_MIB_AIRTIME0, MT_WF_RMAC_MIB_RXTIME_CLR);
 }
 
+void mt7615_mac_set_timing(struct mt7615_phy *phy)
+{
+       s16 coverage_class = phy->coverage_class;
+       struct mt7615_dev *dev = phy->dev;
+       bool ext_phy = phy != &dev->phy;
+       u32 val, reg_offset, reg = ext_phy ? MT_TMAC_ICR1 : MT_TMAC_ICR0;
+       u32 cck = FIELD_PREP(MT_TIMEOUT_VAL_PLCP, 231) |
+                 FIELD_PREP(MT_TIMEOUT_VAL_CCA, 48);
+       u32 ofdm = FIELD_PREP(MT_TIMEOUT_VAL_PLCP, 60) |
+                  FIELD_PREP(MT_TIMEOUT_VAL_CCA, 24);
+       int sifs, offset;
+
+       if (phy->mt76->chandef.chan->band == NL80211_BAND_5GHZ)
+               sifs = 16;
+       else
+               sifs = 10;
+
+       if (ext_phy) {
+               coverage_class = max_t(s16, dev->phy.coverage_class,
+                                      coverage_class);
+               mt76_set(dev, MT_ARB_SCR,
+                        MT_ARB_SCR_TX1_DISABLE | MT_ARB_SCR_RX1_DISABLE);
+       } else {
+               struct mt7615_phy *phy_ext = mt7615_ext_phy(dev);
+
+               if (phy_ext)
+                       coverage_class = max_t(s16, phy_ext->coverage_class,
+                                              coverage_class);
+               mt76_set(dev, MT_ARB_SCR,
+                        MT_ARB_SCR_TX0_DISABLE | MT_ARB_SCR_RX0_DISABLE);
+       }
+       udelay(1);
+
+       offset = 3 * coverage_class;
+       reg_offset = FIELD_PREP(MT_TIMEOUT_VAL_PLCP, offset) |
+                    FIELD_PREP(MT_TIMEOUT_VAL_CCA, offset);
+       mt76_wr(dev, MT_TMAC_CDTR, cck + reg_offset);
+       mt76_wr(dev, MT_TMAC_ODTR, ofdm + reg_offset);
+
+       mt76_wr(dev, reg,
+               FIELD_PREP(MT_IFS_EIFS, 360) |
+               FIELD_PREP(MT_IFS_RIFS, 2) |
+               FIELD_PREP(MT_IFS_SIFS, sifs) |
+               FIELD_PREP(MT_IFS_SLOT, phy->slottime));
+
+       if (phy->slottime < 20)
+               val = MT7615_CFEND_RATE_DEFAULT;
+       else
+               val = MT7615_CFEND_RATE_11B;
+
+       if (ext_phy) {
+               mt76_rmw_field(dev, MT_AGG_ACR1, MT_AGG_ACR_CFEND_RATE, val);
+               mt76_clear(dev, MT_ARB_SCR,
+                          MT_ARB_SCR_TX1_DISABLE | MT_ARB_SCR_RX1_DISABLE);
+       } else {
+               mt76_rmw_field(dev, MT_AGG_ACR0, MT_AGG_ACR_CFEND_RATE, val);
+               mt76_clear(dev, MT_ARB_SCR,
+                          MT_ARB_SCR_TX0_DISABLE | MT_ARB_SCR_RX0_DISABLE);
+       }
+}
+
 int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)
 {
        struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
index 6a18f7d8454e2ca5082fd094f26e7f8186fa3162..77b35accd5d2a8378d2387f9c34b1e601bf5596e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
@@ -233,6 +233,7 @@ static int mt7615_set_channel(struct mt7615_phy *phy)
                (ext_phy * MT_CHFREQ_DBDC_IDX) |
                phy->chfreq_seq);
 
+       mt7615_mac_set_timing(phy);
        ret = mt7615_dfs_init_radar_detector(phy);
        mt7615_mac_cca_stats_reset(phy);
 
@@ -409,6 +410,16 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw,
        if (changed & BSS_CHANGED_ASSOC)
                mt7615_mcu_set_bss_info(dev, vif, info->assoc);
 
+       if (changed & BSS_CHANGED_ERP_SLOT) {
+               int slottime = info->use_short_slot ? 9 : 20;
+               struct mt7615_phy *phy = mt7615_hw_phy(hw);
+
+               if (slottime != phy->slottime) {
+                       phy->slottime = slottime;
+                       mt7615_mac_set_timing(phy);
+               }
+       }
+
        if (changed & BSS_CHANGED_BEACON_ENABLED) {
                mt7615_mcu_set_bss_info(dev, vif, info->enable_beacon);
                mt7615_mcu_wtbl_bmc(dev, vif, info->enable_beacon);
@@ -616,6 +627,15 @@ mt7615_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                          IEEE80211_STA_NOTEXIST);
 }
 
+static void
+mt7615_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)
+{
+       struct mt7615_phy *phy = mt7615_hw_phy(hw);
+
+       phy->coverage_class = max_t(s16, coverage_class, 0);
+       mt7615_mac_set_timing(phy);
+}
+
 const struct ieee80211_ops mt7615_ops = {
        .tx = mt7615_tx,
        .start = mt7615_start,
@@ -640,4 +660,5 @@ const struct ieee80211_ops mt7615_ops = {
        .channel_switch_beacon = mt7615_channel_switch_beacon,
        .get_survey = mt76_get_survey,
        .get_antenna = mt76_get_antenna,
+       .set_coverage_class = mt7615_set_coverage_class,
 };

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 4fe6dc60e0cd058cbcefeaa146ddbe840167a60e..554bd04d6d81eb8be82a4750de6630ab3ae82195 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -40,6 +40,9 @@
 #define MT_CHFREQ_DBDC_IDX     BIT(6)
 #define MT_CHFREQ_SEQ          GENMASK(5, 0)
 
+#define MT7615_CFEND_RATE_DEFAULT      0x69 /* chip default (24M) */
+#define MT7615_CFEND_RATE_11B          0x03 /* 11B LP, 11M */
+
 struct mt7615_vif;
 struct mt7615_sta;
 
@@ -97,6 +100,9 @@ struct mt7615_phy {
 
        u16 chainmask;
 
+       s16 coverage_class;
+       u8 slottime;
+
        u8 chfreq_seq;
        u8 rdd_state;
        int dfs_state;
@@ -286,6 +292,7 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,
                          struct sk_buff *skb, struct mt76_wcid *wcid,
                          struct ieee80211_sta *sta, int pid,
                          struct ieee80211_key_conf *key);
+void mt7615_mac_set_timing(struct mt7615_phy *phy);
 int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb);
 void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data);
 void mt7615_mac_tx_free(struct mt7615_dev *dev, struct sk_buff *skb);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
index cece061b11083b349035bbe99f1f8068d7edf9cb..26d12164678739435367e5f4b8fc3f7bb3c4dbc9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
@@ -162,14 +162,35 @@
 #define MT_AGG_SCR                     MT_WF_AGG(0x0fc)
 #define MT_AGG_SCR_NLNAV_MID_PTEC_DIS  BIT(3)
 
+#define MT_WF_ARB_BASE                 0x20c00
+#define MT_WF_ARB(ofs)                 (MT_WF_ARB_BASE + (ofs))
+
+#define MT_ARB_SCR                     MT_WF_ARB(0x080)
+#define MT_ARB_SCR_TX0_DISABLE         BIT(8)
+#define MT_ARB_SCR_RX0_DISABLE         BIT(9)
+#define MT_ARB_SCR_TX1_DISABLE         BIT(10)
+#define MT_ARB_SCR_RX1_DISABLE         BIT(11)
+
 #define MT_WF_TMAC_BASE                        0x21000
 #define MT_WF_TMAC(ofs)                        (MT_WF_TMAC_BASE + (ofs))
 
+#define MT_TMAC_CDTR                   MT_WF_TMAC(0x090)
+#define MT_TMAC_ODTR                   MT_WF_TMAC(0x094)
+#define MT_TIMEOUT_VAL_PLCP            GENMASK(15, 0)
+#define MT_TIMEOUT_VAL_CCA             GENMASK(31, 16)
+
 #define MT_TMAC_TRCR0                  MT_WF_TMAC(0x09c)
 #define MT_TMAC_TRCR1                  MT_WF_TMAC(0x070)
 #define MT_TMAC_TRCR_CCA_SEL           GENMASK(31, 30)
 #define MT_TMAC_TRCR_SEC_CCA_SEL       GENMASK(29, 28)
 
+#define MT_TMAC_ICR0                   MT_WF_TMAC(0x0a4)
+#define MT_TMAC_ICR1                   MT_WF_TMAC(0x074)
+#define MT_IFS_EIFS                    GENMASK(8, 0)
+#define MT_IFS_RIFS                    GENMASK(14, 10)
+#define MT_IFS_SIFS                    GENMASK(22, 16)
+#define MT_IFS_SLOT                    GENMASK(30, 24)
+
 #define MT_TMAC_CTCR0                  MT_WF_TMAC(0x0f4)
 #define MT_TMAC_CTCR0_INS_DDLMT_REFTIME        GENMASK(5, 0)
 #define MT_TMAC_CTCR0_INS_DDLMT_DENSITY        GENMASK(15, 12)