wifi: mt76: mt7996: adjust interface num and wtbl size for mt7992

MT7992 chipsets support up to 32 interfaces (with maximum 19 per-band)
and 512 station entries.
This is a preliminary patch for mt7992 chipsets support.

Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c
index f876bb1f3ba44284317b3d800630f97040b593b1..4a8237118287354f535e04cc633486bf1f06f5ef 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c
@@ -111,7 +111,8 @@ static int mt7996_eeprom_parse_efuse_hw_cap(struct mt7996_dev *dev)
                dev->wtbl_size_group = u32_get_bits(cap, WTBL_SIZE_GROUP);
        }
 
-       if (dev->wtbl_size_group < 2 || dev->wtbl_size_group > 4)
+       if (dev->wtbl_size_group < 2 || dev->wtbl_size_group > 4 ||
+           is_mt7992(&dev->mt76))
                dev->wtbl_size_group = 2; /* set default */
 
        return 0;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index 5cdde28ce83fe17cbb620e55932b27226e0ff6bc..bc73bcb47bf02c86ce6e3e98320fb6491e7f1cc8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -13,6 +13,7 @@
 
 #define MT7996_MAX_INTERFACES          19      /* per-band */
 #define MT7996_MAX_WMM_SETS            4
+#define MT7996_WTBL_BMC_SIZE           (is_mt7992(&dev->mt76) ? 32 : 64)
 #define MT7996_WTBL_RESERVED           (mt7996_wtbl_size(dev) - 1)
 #define MT7996_WTBL_STA                        (MT7996_WTBL_RESERVED - \
                                         mt7996_max_interface_num(dev))
@@ -512,13 +513,14 @@ int mt7996_mcu_wed_rro_reset_sessions(struct mt7996_dev *dev, u16 id);
 
 static inline u8 mt7996_max_interface_num(struct mt7996_dev *dev)
 {
-       return MT7996_MAX_INTERFACES * (1 + mt7996_band_valid(dev, MT_BAND1) +
-                                       mt7996_band_valid(dev, MT_BAND2));
+       return min(MT7996_MAX_INTERFACES * (1 + mt7996_band_valid(dev, MT_BAND1) +
+                                           mt7996_band_valid(dev, MT_BAND2)),
+                  MT7996_WTBL_BMC_SIZE);
 }
 
 static inline u16 mt7996_wtbl_size(struct mt7996_dev *dev)
 {
-       return (dev->wtbl_size_group << 8) + 64;
+       return (dev->wtbl_size_group << 8) + MT7996_WTBL_BMC_SIZE;
 }
 
 void mt7996_dual_hif_set_irq_mask(struct mt7996_dev *dev, bool write_reg,