developer | 281084d | 2023-06-19 12:03:50 +0800 | [diff] [blame] | 1 | From 83d30a89d61ee914b23d77256e993e9521de5cbc Mon Sep 17 00:00:00 2001 |
developer | f8871e8 | 2023-03-08 17:22:32 +0800 | [diff] [blame] | 2 | From: Shayne Chen <shayne.chen@mediatek.com> |
| 3 | Date: Wed, 15 Feb 2023 18:38:04 +0800 |
developer | 281084d | 2023-06-19 12:03:50 +0800 | [diff] [blame] | 4 | Subject: [PATCH 02/11] wifi: mt76: mt7996: move radio ctrl commands to proper |
| 5 | functions |
developer | f8871e8 | 2023-03-08 17:22:32 +0800 | [diff] [blame] | 6 | |
developer | 281084d | 2023-06-19 12:03:50 +0800 | [diff] [blame] | 7 | Move radio enable/disable commands into functions for configuring |
| 8 | per-phy radio. |
developer | f8871e8 | 2023-03-08 17:22:32 +0800 | [diff] [blame] | 9 | |
| 10 | Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> |
developer | f8871e8 | 2023-03-08 17:22:32 +0800 | [diff] [blame] | 11 | --- |
| 12 | mt7996/main.c | 11 ++++++----- |
| 13 | 1 file changed, 6 insertions(+), 5 deletions(-) |
| 14 | |
| 15 | diff --git a/mt7996/main.c b/mt7996/main.c |
developer | 281084d | 2023-06-19 12:03:50 +0800 | [diff] [blame] | 16 | index f306e9c5..e7c97d2f 100644 |
developer | f8871e8 | 2023-03-08 17:22:32 +0800 | [diff] [blame] | 17 | --- a/mt7996/main.c |
| 18 | +++ b/mt7996/main.c |
developer | ad9333b | 2023-05-22 15:16:16 +0800 | [diff] [blame] | 19 | @@ -43,6 +43,10 @@ int mt7996_run(struct ieee80211_hw *hw) |
developer | f8871e8 | 2023-03-08 17:22:32 +0800 | [diff] [blame] | 20 | if (ret) |
| 21 | goto out; |
| 22 | |
| 23 | + ret = mt7996_mcu_set_radio_en(phy, true); |
| 24 | + if (ret) |
| 25 | + goto out; |
| 26 | + |
| 27 | ret = mt7996_mcu_set_chan_info(phy, UNI_CHANNEL_RX_PATH); |
| 28 | if (ret) |
| 29 | goto out; |
developer | ad9333b | 2023-05-22 15:16:16 +0800 | [diff] [blame] | 30 | @@ -82,6 +86,8 @@ static void mt7996_stop(struct ieee80211_hw *hw) |
developer | f8871e8 | 2023-03-08 17:22:32 +0800 | [diff] [blame] | 31 | |
| 32 | mutex_lock(&dev->mt76.mutex); |
| 33 | |
| 34 | + mt7996_mcu_set_radio_en(phy, false); |
| 35 | + |
| 36 | clear_bit(MT76_STATE_RUNNING, &phy->mt76->state); |
| 37 | |
developer | d5789dc | 2023-03-27 11:22:06 +0800 | [diff] [blame] | 38 | mutex_unlock(&dev->mt76.mutex); |
developer | ad9333b | 2023-05-22 15:16:16 +0800 | [diff] [blame] | 39 | @@ -190,10 +196,6 @@ static int mt7996_add_interface(struct ieee80211_hw *hw, |
developer | f8871e8 | 2023-03-08 17:22:32 +0800 | [diff] [blame] | 40 | if (ret) |
| 41 | goto out; |
| 42 | |
| 43 | - ret = mt7996_mcu_set_radio_en(phy, true); |
| 44 | - if (ret) |
| 45 | - goto out; |
| 46 | - |
| 47 | dev->mt76.vif_mask |= BIT_ULL(mvif->mt76.idx); |
| 48 | phy->omac_mask |= BIT_ULL(mvif->mt76.omac_idx); |
| 49 | |
developer | ad9333b | 2023-05-22 15:16:16 +0800 | [diff] [blame] | 50 | @@ -253,7 +255,6 @@ static void mt7996_remove_interface(struct ieee80211_hw *hw, |
developer | f8871e8 | 2023-03-08 17:22:32 +0800 | [diff] [blame] | 51 | phy->monitor_vif = NULL; |
| 52 | |
| 53 | mt7996_mcu_add_dev_info(phy, vif, false); |
| 54 | - mt7996_mcu_set_radio_en(phy, false); |
| 55 | |
| 56 | rcu_assign_pointer(dev->mt76.wcid[idx], NULL); |
| 57 | |
| 58 | -- |
developer | ad9333b | 2023-05-22 15:16:16 +0800 | [diff] [blame] | 59 | 2.39.2 |
developer | f8871e8 | 2023-03-08 17:22:32 +0800 | [diff] [blame] | 60 | |