developer | 20747c1 | 2022-09-16 14:09:40 +0800 | [diff] [blame^] | 1 | From e7fac7c5c91fbabafa530abdf32cf11dd36834d7 Mon Sep 17 00:00:00 2001 |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 2 | From: Shayne Chen <shayne.chen@mediatek.com> |
| 3 | Date: Fri, 25 Feb 2022 09:36:01 +0800 |
developer | 20747c1 | 2022-09-16 14:09:40 +0800 | [diff] [blame^] | 4 | Subject: [PATCH 2/7] mt76: testmode: rework tx antenna setting |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 5 | |
| 6 | --- |
developer | 5ce5ea4 | 2022-08-31 14:12:29 +0800 | [diff] [blame] | 7 | mt7915/mcu.c | 7 +------ |
developer | 5e5d680 | 2022-09-01 10:53:06 +0800 | [diff] [blame] | 8 | mt7915/testmode.c | 13 ++++++------- |
developer | 5ce5ea4 | 2022-08-31 14:12:29 +0800 | [diff] [blame] | 9 | testmode.c | 3 +-- |
developer | 5e5d680 | 2022-09-01 10:53:06 +0800 | [diff] [blame] | 10 | 3 files changed, 8 insertions(+), 15 deletions(-) |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 11 | |
| 12 | diff --git a/mt7915/mcu.c b/mt7915/mcu.c |
developer | 20747c1 | 2022-09-16 14:09:40 +0800 | [diff] [blame^] | 13 | index 3586a8e3..d9c9805b 100644 |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 14 | --- a/mt7915/mcu.c |
| 15 | +++ b/mt7915/mcu.c |
developer | 20747c1 | 2022-09-16 14:09:40 +0800 | [diff] [blame^] | 16 | @@ -2642,14 +2642,9 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd) |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 17 | |
| 18 | #ifdef CONFIG_NL80211_TESTMODE |
| 19 | if (phy->mt76->test.tx_antenna_mask && |
| 20 | - (phy->mt76->test.state == MT76_TM_STATE_TX_FRAMES || |
| 21 | - phy->mt76->test.state == MT76_TM_STATE_RX_FRAMES || |
| 22 | - phy->mt76->test.state == MT76_TM_STATE_TX_CONT)) { |
| 23 | + mt76_testmode_enabled(phy->mt76)) { |
| 24 | req.tx_streams_num = fls(phy->mt76->test.tx_antenna_mask); |
| 25 | req.rx_streams = phy->mt76->test.tx_antenna_mask; |
| 26 | - |
| 27 | - if (phy != &dev->phy) |
| 28 | - req.rx_streams >>= dev->chainshift; |
| 29 | } |
| 30 | #endif |
| 31 | |
| 32 | diff --git a/mt7915/testmode.c b/mt7915/testmode.c |
developer | 20747c1 | 2022-09-16 14:09:40 +0800 | [diff] [blame^] | 33 | index 01866028..41b99496 100644 |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 34 | --- a/mt7915/testmode.c |
| 35 | +++ b/mt7915/testmode.c |
developer | f64861f | 2022-06-22 11:44:53 +0800 | [diff] [blame] | 36 | @@ -474,11 +474,7 @@ mt7915_tm_set_tx_frames(struct mt7915_phy *phy, bool en) |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 37 | if (td->tx_spe_idx) { |
| 38 | phy->test.spe_idx = td->tx_spe_idx; |
| 39 | } else { |
| 40 | - u8 tx_ant = td->tx_antenna_mask; |
| 41 | - |
| 42 | - if (phy != &dev->phy) |
| 43 | - tx_ant >>= dev->chainshift; |
| 44 | - phy->test.spe_idx = spe_idx_map[tx_ant]; |
| 45 | + phy->test.spe_idx = spe_idx_map[td->tx_antenna_mask]; |
| 46 | } |
| 47 | } |
| 48 | |
developer | 5e5d680 | 2022-09-01 10:53:06 +0800 | [diff] [blame] | 49 | @@ -720,8 +716,10 @@ mt7915_tm_set_params(struct mt76_phy *mphy, struct nlattr **tb, |
developer | 5ce5ea4 | 2022-08-31 14:12:29 +0800 | [diff] [blame] | 50 | { |
| 51 | struct mt76_testmode_data *td = &mphy->test; |
| 52 | struct mt7915_phy *phy = mphy->priv; |
| 53 | - u32 changed = 0; |
developer | 5e5d680 | 2022-09-01 10:53:06 +0800 | [diff] [blame] | 54 | + struct mt7915_dev *dev = phy->dev; |
developer | 5ce5ea4 | 2022-08-31 14:12:29 +0800 | [diff] [blame] | 55 | + u32 chainmask = mphy->chainmask, changed = 0; |
| 56 | int i; |
| 57 | + bool ext_phy = phy != &dev->phy; |
| 58 | |
| 59 | BUILD_BUG_ON(NUM_TM_CHANGED >= 32); |
| 60 | |
developer | 5e5d680 | 2022-09-01 10:53:06 +0800 | [diff] [blame] | 61 | @@ -729,7 +727,8 @@ mt7915_tm_set_params(struct mt76_phy *mphy, struct nlattr **tb, |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 62 | td->state == MT76_TM_STATE_OFF) |
| 63 | return 0; |
| 64 | |
| 65 | - if (td->tx_antenna_mask & ~mphy->chainmask) |
developer | 5ce5ea4 | 2022-08-31 14:12:29 +0800 | [diff] [blame] | 66 | + chainmask = ext_phy ? chainmask >> dev->chainshift : chainmask; |
| 67 | + if (td->tx_antenna_mask > chainmask) |
| 68 | return -EINVAL; |
| 69 | |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 70 | for (i = 0; i < ARRAY_SIZE(tm_change_map); i++) { |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 71 | diff --git a/testmode.c b/testmode.c |
developer | 20747c1 | 2022-09-16 14:09:40 +0800 | [diff] [blame^] | 72 | index 0accc71a..57cdfdf6 100644 |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 73 | --- a/testmode.c |
| 74 | +++ b/testmode.c |
developer | 20747c1 | 2022-09-16 14:09:40 +0800 | [diff] [blame^] | 75 | @@ -447,8 +447,7 @@ int mt76_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif, |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 76 | mt76_tm_get_u8(tb[MT76_TM_ATTR_TX_RATE_LDPC], &td->tx_rate_ldpc, 0, 1) || |
| 77 | mt76_tm_get_u8(tb[MT76_TM_ATTR_TX_RATE_STBC], &td->tx_rate_stbc, 0, 1) || |
| 78 | mt76_tm_get_u8(tb[MT76_TM_ATTR_TX_LTF], &td->tx_ltf, 0, 2) || |
| 79 | - mt76_tm_get_u8(tb[MT76_TM_ATTR_TX_ANTENNA], |
| 80 | - &td->tx_antenna_mask, 0, 0xff) || |
developer | 5ce5ea4 | 2022-08-31 14:12:29 +0800 | [diff] [blame] | 81 | + mt76_tm_get_u8(tb[MT76_TM_ATTR_TX_ANTENNA], &td->tx_antenna_mask, 1, 0xff) || |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 82 | mt76_tm_get_u8(tb[MT76_TM_ATTR_TX_SPE_IDX], &td->tx_spe_idx, 0, 27) || |
| 83 | mt76_tm_get_u8(tb[MT76_TM_ATTR_TX_DUTY_CYCLE], |
| 84 | &td->tx_duty_cycle, 0, 99) || |
| 85 | -- |
developer | 20747c1 | 2022-09-16 14:09:40 +0800 | [diff] [blame^] | 86 | 2.25.1 |
developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame] | 87 | |