mt76: mt7615: fix max wtbl size for 7663

Current mt7663 offload firmware can support up to 32 wtbl entries

Fixes: f40ac0f3d3c0 ("mt76: mt7615: introduce mt7663e support")
Co-developed-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
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/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index c953328..ffb1468 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -12,8 +12,9 @@
 
 #define MT7615_MAX_INTERFACES          4
 #define MT7615_MAX_WMM_SETS            4
+#define MT7663_WTBL_SIZE               32
 #define MT7615_WTBL_SIZE               128
-#define MT7615_WTBL_RESERVED           (MT7615_WTBL_SIZE - 1)
+#define MT7615_WTBL_RESERVED           (mt7615_wtbl_size(dev) - 1)
 #define MT7615_WTBL_STA                        (MT7615_WTBL_RESERVED - \
                                         MT7615_MAX_INTERFACES)
 
@@ -424,6 +425,14 @@ static inline bool mt7615_firmware_offload(struct mt7615_dev *dev)
        return dev->fw_ver > MT7615_FIRMWARE_V2;
 }
 
+static inline u16 mt7615_wtbl_size(struct mt7615_dev *dev)
+{
+       if (is_mt7663(&dev->mt76) && mt7615_firmware_offload(dev))
+               return MT7663_WTBL_SIZE;
+       else
+               return MT7615_WTBL_SIZE;
+}
+
 void mt7615_scan_work(struct work_struct *work);
 void mt7615_ps_work(struct work_struct *work);
 void mt7615_init_txpower(struct mt7615_dev *dev,

diff --git a/drivers/net/wireless/mediatek/mt76/util.c b/drivers/net/wireless/mediatek/mt76/util.c
index 8c60c45..07cf712 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/util.c
+++ b/drivers/net/wireless/mediatek/mt76/util.c
@@ -46,7 +46,7 @@ int mt76_wcid_alloc(unsigned long *mask, int size)
 {
        int i, idx = 0, cur;
 
-       for (i = 0; i < size / BITS_PER_LONG; i++) {
+       for (i = 0; i < DIV_ROUND_UP(size, BITS_PER_LONG); i++) {
                idx = ffs(~mask[i]);
                if (!idx)
                        continue;