mt76: mt7915: enlarge wcid size to 544

[ Upstream commit b37d0c9735bc1976f85636e06e07f1a7547d969d ]

The mt7916 can support up to 544 wcid entries.
This is an intermediate patch to add mt7916 support.

Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
Co-developed-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 404c3d1a70d69cbe447633368c1b797883f0060f..1f6f7a44d3f007197b42f24bde81ce826907b0d9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -224,7 +224,7 @@ enum mt76_wcid_flags {
        MT_WCID_FLAG_HDR_TRANS,
 };
 
-#define MT76_N_WCIDS 288
+#define MT76_N_WCIDS 544
 
 /* stored in ieee80211_tx_info::hw_queue */
 #define MT_TX_HW_QUEUE_EXT_PHY         BIT(3)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index d054cdecd5f70421635df6a3cd9327973aae0c1f..29517ca08de0c3a64851e8fe1df0a6097af1eead 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -399,7 +399,7 @@ static void mt7915_mac_init(struct mt7915_dev *dev)
        /* enable hardware de-agg */
        mt76_set(dev, MT_MDP_DCR0, MT_MDP_DCR0_DAMSDU_EN);
 
-       for (i = 0; i < MT7915_WTBL_SIZE; i++)
+       for (i = 0; i < mt7915_wtbl_size(dev); i++)
                mt7915_mac_wtbl_update(dev, i,
                                       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
        for (i = 0; i < 2; i++)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 12567b6536072dd6561489d0eca33c125f72ee80..db267642924d0ecfd165e34601a54e227519cf07 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1598,7 +1598,7 @@ static void mt7915_mac_add_txs(struct mt7915_dev *dev, void *data)
        if (pid < MT_PACKET_ID_FIRST)
                return;
 
-       if (wcidx >= MT7915_WTBL_SIZE)
+       if (wcidx >= mt7915_wtbl_size(dev))
                return;
 
        rcu_read_lock();

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 42d887383e8d8a314fcbd723e8cfbfd464690265..12ca5456646144db415e4ab302eddbee590eb912 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -12,7 +12,8 @@
 #define MT7915_MAX_INTERFACES          19
 #define MT7915_MAX_WMM_SETS            4
 #define MT7915_WTBL_SIZE               288
-#define MT7915_WTBL_RESERVED           (MT7915_WTBL_SIZE - 1)
+#define MT7916_WTBL_SIZE               544
+#define MT7915_WTBL_RESERVED           (mt7915_wtbl_size(dev) - 1)
 #define MT7915_WTBL_STA                        (MT7915_WTBL_RESERVED - \
                                         MT7915_MAX_INTERFACES)
 
@@ -449,6 +450,11 @@ static inline bool is_mt7915(struct mt76_dev *dev)
        return mt76_chip(dev) == 0x7915;
 }
 
+static inline u16 mt7915_wtbl_size(struct mt7915_dev *dev)
+{
+       return is_mt7915(&dev->mt76) ? MT7915_WTBL_SIZE : MT7916_WTBL_SIZE;
+}
+
 void mt7915_dual_hif_set_irq_mask(struct mt7915_dev *dev, bool write_reg,
                                  u32 clear, u32 set);