developer | 7e2761e | 2023-10-12 08:11:13 +0800 | [diff] [blame] | 1 | From 12f123f46ccce46990ce98d05a3a9db3b20b5459 Mon Sep 17 00:00:00 2001 |
| 2 | From: StanleyYP Wang <StanleyYP.Wang@mediatek.com> |
| 3 | Date: Wed, 14 Jun 2023 17:47:11 +0800 |
| 4 | Subject: [PATCH 25/98] wifi: mt76: mt7996: add kite wtbl size support |
| 5 | |
| 6 | Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com> |
| 7 | --- |
| 8 | mt7996/eeprom.c | 3 ++- |
| 9 | mt7996/mt7996.h | 6 ++++-- |
| 10 | 2 files changed, 6 insertions(+), 3 deletions(-) |
| 11 | |
| 12 | diff --git a/mt7996/eeprom.c b/mt7996/eeprom.c |
| 13 | index 9db7e53..ca0e9d0 100644 |
| 14 | --- a/mt7996/eeprom.c |
| 15 | +++ b/mt7996/eeprom.c |
| 16 | @@ -103,7 +103,8 @@ static int mt7996_eeprom_parse_efuse_hw_cap(struct mt7996_dev *dev) |
| 17 | dev->wtbl_size_group = u32_get_bits(cap, WTBL_SIZE_GROUP); |
| 18 | } |
| 19 | |
| 20 | - if (dev->wtbl_size_group < 2 || dev->wtbl_size_group > 4) |
| 21 | + if (dev->wtbl_size_group < 2 || dev->wtbl_size_group > 4 || |
| 22 | + is_mt7992(&dev->mt76)) |
| 23 | dev->wtbl_size_group = 2; /* set default */ |
| 24 | |
| 25 | return 0; |
| 26 | diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h |
| 27 | index f268773..6a31819 100644 |
| 28 | --- a/mt7996/mt7996.h |
| 29 | +++ b/mt7996/mt7996.h |
| 30 | @@ -13,6 +13,7 @@ |
| 31 | |
| 32 | #define MT7996_MAX_INTERFACES 19 /* per-band */ |
| 33 | #define MT7996_MAX_WMM_SETS 4 |
| 34 | +#define MT7996_WTBL_EXTEND_SIZE (is_mt7992(&dev->mt76) ? 32 : 64) |
| 35 | #define MT7996_WTBL_RESERVED (mt7996_wtbl_size(dev) - 1) |
| 36 | #define MT7996_WTBL_STA (MT7996_WTBL_RESERVED - \ |
| 37 | mt7996_max_interface_num(dev)) |
| 38 | @@ -497,12 +498,13 @@ int mt7996_mcu_get_all_sta_info(struct mt7996_phy *phy, u16 tag); |
| 39 | |
| 40 | static inline u8 mt7996_max_interface_num(struct mt7996_dev *dev) |
| 41 | { |
| 42 | - return MT7996_MAX_INTERFACES * (1 + dev->dbdc_support + dev->tbtc_support); |
| 43 | + return min(MT7996_MAX_INTERFACES * (1 + dev->dbdc_support + dev->tbtc_support), |
| 44 | + MT7996_WTBL_EXTEND_SIZE); |
| 45 | } |
| 46 | |
| 47 | static inline u16 mt7996_wtbl_size(struct mt7996_dev *dev) |
| 48 | { |
| 49 | - return (dev->wtbl_size_group << 8) + 64; |
| 50 | + return (dev->wtbl_size_group << 8) + MT7996_WTBL_EXTEND_SIZE; |
| 51 | } |
| 52 | |
| 53 | void mt7996_dual_hif_set_irq_mask(struct mt7996_dev *dev, bool write_reg, |
| 54 | -- |
| 55 | 2.18.0 |
| 56 | |