developer | c2cfe0f | 2023-09-22 04:11:09 +0800 | [diff] [blame] | 1 | From 8fecc721eb37961a4eb2238be62d83d70a368c59 Mon Sep 17 00:00:00 2001 |
developer | 483388c | 2023-03-08 13:52:15 +0800 | [diff] [blame] | 2 | From: Shayne Chen <shayne.chen@mediatek.com> |
| 3 | Date: Thu, 16 Feb 2023 13:53:14 +0800 |
developer | c2cfe0f | 2023-09-22 04:11:09 +0800 | [diff] [blame] | 4 | Subject: [PATCH 14/22] wifi: mt76: connac: set correct muar_idx for connac3 |
developer | 483388c | 2023-03-08 13:52:15 +0800 | [diff] [blame] | 5 | chipset |
| 6 | |
| 7 | Set the muar_idx to 0xe for the hw bcast/mcast station entry of connac3 |
| 8 | chipset. |
| 9 | |
| 10 | Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> |
| 11 | Change-Id: I7054c3b3c64ec447cc280ea810f4958afdfa9e02 |
| 12 | --- |
| 13 | mt76_connac.h | 5 +++++ |
| 14 | mt76_connac_mcu.c | 3 +++ |
| 15 | 2 files changed, 8 insertions(+) |
| 16 | |
| 17 | diff --git a/mt76_connac.h b/mt76_connac.h |
developer | c2cfe0f | 2023-09-22 04:11:09 +0800 | [diff] [blame] | 18 | index 1f29d8cd9..fa742b9ae 100644 |
developer | 483388c | 2023-03-08 13:52:15 +0800 | [diff] [blame] | 19 | --- a/mt76_connac.h |
| 20 | +++ b/mt76_connac.h |
developer | c2cfe0f | 2023-09-22 04:11:09 +0800 | [diff] [blame] | 21 | @@ -245,6 +245,11 @@ static inline bool is_connac_v1(struct mt76_dev *dev) |
developer | 483388c | 2023-03-08 13:52:15 +0800 | [diff] [blame] | 22 | return is_mt7615(dev) || is_mt7663(dev) || is_mt7622(dev); |
| 23 | } |
| 24 | |
| 25 | +static inline bool is_connac_v3(struct mt76_dev *dev) |
| 26 | +{ |
| 27 | + return is_mt7996(dev); |
| 28 | +} |
| 29 | + |
| 30 | static inline bool is_mt76_fw_txp(struct mt76_dev *dev) |
| 31 | { |
| 32 | switch (mt76_chip(dev)) { |
| 33 | diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c |
developer | c2cfe0f | 2023-09-22 04:11:09 +0800 | [diff] [blame] | 34 | index bcd6c20f3..68de52535 100644 |
developer | 483388c | 2023-03-08 13:52:15 +0800 | [diff] [blame] | 35 | --- a/mt76_connac_mcu.c |
| 36 | +++ b/mt76_connac_mcu.c |
developer | c2cfe0f | 2023-09-22 04:11:09 +0800 | [diff] [blame] | 37 | @@ -282,6 +282,9 @@ __mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif, |
developer | 483388c | 2023-03-08 13:52:15 +0800 | [diff] [blame] | 38 | }; |
| 39 | struct sk_buff *skb; |
| 40 | |
| 41 | + if (is_connac_v3(dev) && !wcid->sta) |
| 42 | + hdr.muar_idx = 0xe; |
| 43 | + |
| 44 | mt76_connac_mcu_get_wlan_idx(dev, wcid, &hdr.wlan_idx_lo, |
| 45 | &hdr.wlan_idx_hi); |
| 46 | skb = mt76_mcu_msg_alloc(dev, NULL, len); |
| 47 | -- |
developer | c2cfe0f | 2023-09-22 04:11:09 +0800 | [diff] [blame] | 48 | 2.39.2 |
developer | 483388c | 2023-03-08 13:52:15 +0800 | [diff] [blame] | 49 | |