mt76: testmode: add a new state for continuous tx
Subsystems (3)
Shayne Chen
reviewerPATCH 1/4 mt76: testmode: add a new state for continuous tx
Support to set a special tx state in testmode: continuous tx, which is used for sending tx without time gap.
Note that continuous tx mode doesn't send real packets, instead, it's pure phy signal, and the waveform can be observed by instrument.
--- drivers/net/wireless/mediatek/mt76/testmode.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/mediatek/mt76/testmode.h +2 -0
@@ -140,12 +140,14 @@ enum mt76_testmode_rx_attr {* @MT76_TM_STATE_IDLE: test mode enabled, but idle * @MT76_TM_STATE_TX_FRAMES: send a fixed number of test frames * @MT76_TM_STATE_RX_FRAMES: receive packets and keep statistics +* @MT76_TM_STATE_TX_CONT: waveform tx without time gap */ enum mt76_testmode_state {MT76_TM_STATE_OFF ,MT76_TM_STATE_IDLE ,MT76_TM_STATE_TX_FRAMES ,MT76_TM_STATE_RX_FRAMES , +MT76_TM_STATE_TX_CONT ,/* keep last */ NUM_MT76_TM_STATES ,
Signature · 5 lines
2.29.2 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Shayne Chen
reviewerPATCH 2/4 mt76: mt7915: rework set state part in testmode
This is a preliminary patch to simplify setting state in mt7915 testmode, for adding the new continuous tx state.
--- .../wireless/mediatek/mt76/mt7915/testmode.c | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +10 -12
@@ -395,9 +395,8 @@ mt7915_tm_reg_backup_restore(struct mt7915_phy *phy) }static void -mt7915_tm_init (struct mt7915_phy *phy) +mt7915_tm_init (struct mt7915_phy *phy,bool en) { -bool en = !(phy->mt76->test.state ==MT76_TM_STATE_OFF );struct mt7915_dev *dev = phy->dev;if (!test_bit (MT76_STATE_RUNNING , &phy->mt76->state))
@@ -502,16 +501,15 @@ mt7915_tm_set_state(struct mt76_phy *mphy, enum mt76_testmode_state state) mphy->test.state = state; -if (prev_state ==MT76_TM_STATE_TX_FRAMES ) -mt7915_tm_set_tx_frames (phy, false); -else if (state ==MT76_TM_STATE_TX_FRAMES ) -mt7915_tm_set_tx_frames (phy, true); -else if (prev_state ==MT76_TM_STATE_RX_FRAMES ) -mt7915_tm_set_rx_frames (phy, false); -else if (state ==MT76_TM_STATE_RX_FRAMES ) -mt7915_tm_set_rx_frames (phy, true); -else if (prev_state ==MT76_TM_STATE_OFF || state ==MT76_TM_STATE_OFF ) -mt7915_tm_init (phy); +if (prev_state ==MT76_TM_STATE_TX_FRAMES || + state ==MT76_TM_STATE_TX_FRAMES ) +mt7915_tm_set_tx_frames (phy, state ==MT76_TM_STATE_TX_FRAMES ); +else if (prev_state ==MT76_TM_STATE_RX_FRAMES || + state ==MT76_TM_STATE_RX_FRAMES ) +mt7915_tm_set_rx_frames (phy, state ==MT76_TM_STATE_RX_FRAMES ); +else if (prev_state ==MT76_TM_STATE_OFF || + state ==MT76_TM_STATE_OFF ) +mt7915_tm_init (phy, !(state ==MT76_TM_STATE_OFF )); if ((state == MT76_TM_STATE_IDLE && prev_state == MT76_TM_STATE_OFF) ||
Signature · 5 lines
2.29.2 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Shayne Chen
reviewerPATCH 3/4 mt76: mt7915: add support for continuous tx in testmode
In reply to Shayne ChenImplement continuous tx state for MT7915 NIC testmode.
--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 3 +- .../net/wireless/mediatek/mt76/mt7915/mcu.h | 1 + .../wireless/mediatek/mt76/mt7915/testmode.c | 160 ++++++++++++++++-- .../wireless/mediatek/mt76/mt7915/testmode.h | 40 +++++ 4 files changed, 192 insertions(+), 12 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +2 -1
@@ -3208,7 +3208,8 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)#ifdef CONFIG_NL80211_TESTMODE if (phy->mt76->test.tx_antenna_mask && (phy->mt76->test.state ==MT76_TM_STATE_TX_FRAMES || - phy->mt76->test.state ==MT76_TM_STATE_RX_FRAMES )) { + phy->mt76->test.state ==MT76_TM_STATE_RX_FRAMES || + phy->mt76->test.state ==MT76_TM_STATE_TX_CONT )) { req.tx_streams_num =fls (phy->mt76->test.tx_antenna_mask); req.rx_streams = phy->mt76->test.tx_antenna_mask;
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +1 -0
@@ -240,6 +240,7 @@ enum {enum {MCU_EXT_CMD_EFUSE_ACCESS =0x01 , +MCU_EXT_CMD_RF_TEST =0x04 ,MCU_EXT_CMD_PM_STATE_CTRL =0x07 ,MCU_EXT_CMD_CHANNEL_SWITCH =0x08 ,MCU_EXT_CMD_FW_LOG_2_HOST =0x13 ,
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +149 -11
187 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/testmode.h +40 -0
@@ -56,4 +56,44 @@ enum { TM_MAC_RX_RXV, }; +struct tm_tx_cont { +u8 control_ch; +u8 center_ch; +u8 bw; +u8 tx_ant; +__le16 rateval; +u8 band; +u8 txfd_mode; +}; + +struct mt7915_tm_rf_test { +u8 action; +u8 icap_len; +u8 _rsv[2 ]; +union { +__le32 op_mode; +__le32 freq; + +struct { +__le32 func_idx; +union { +__le32 func_data; +__le32 cal_dump; + +struct tm_tx_cont tx_cont; + +u8 _pad[80 ]; + } param; + } rf; + } op; +} __packed; + +enum { +RF_OPER_NORMAL , +RF_OPER_RF_TEST , +RF_OPER_ICAP , +RF_OPER_ICAP_OVERLAP , +RF_OPER_WIFI_SPECTRUM , +}; +#endif
Signature · 1 line
2.29.2
Felix Fietkau
maintainerRe: [PATCH 3/4] mt76: mt7915: add support for continuous tx in testmode
Quoted 16 lines · Shayne Chen
Implement continuous tx state for MT7915 NIC testmode.
Signed-off-by Shayne Chen <[email protected]>--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 3 +- .../net/wireless/mediatek/mt76/mt7915/mcu.h | 1 + .../wireless/mediatek/mt76/mt7915/testmode.c | 160 ++++++++++++++++-- .../wireless/mediatek/mt76/mt7915/testmode.h | 40 +++++ 4 files changed, 192 insertions(+), 12 deletions(-)drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +0
-0@@ -469,15 +475,144 @@ static void mt7915_tm_set_rx_frames(struct mt7915_phy *phy, bool en)
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c static void · line 481
Quoted 10 lines
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +4
-4{struct mt7915_dev *dev = phy->dev; -if (en) { -mutex_unlock (&dev->mt76.mutex); -mt7915_set_channel (phy); -mutex_lock (&dev->mt76.mutex); +if (en) +mt7915_tm_update_channel (phy); + +mt7915_tm_set_trx (phy,TM_MAC_RX_RXV , en);
This leaves dev as an unused variable. I'll fix it up locally.
- Felix
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Shayne Chen
reviewerPATCH 4/4 mt76: mt7615: mt7915: disable txpower sku when testmode enabled
In reply to Shayne ChenWhen testmode can be enabled, the start() callback would already be called, causing that txpower sku feature isn't really disabled after testmode is enabled. This patch fix the issue.
--- drivers/net/wireless/mediatek/mt76/mt7615/main.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/testmode.c | 2 ++ drivers/net/wireless/mediatek/mt76/mt7915/main.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/testmode.c | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/main.c +1 -1
@@ -321,7 +321,7 @@ int mt7615_set_channel(struct mt7615_phy *phy)mt7615_mac_set_timing (phy); ret =mt7615_dfs_init_radar_detector (phy);mt7615_mac_cca_stats_reset (phy); -mt7615_mcu_set_sku_en (phy, !mt76_testmode_enabled (phy->mt76)); +mt7615_mcu_set_sku_en (phy, true);mt7615_mac_reset_counters (dev); phy->noise =0 ;
drivers/net/wireless/mediatek/mt76/mt7615/testmode.c +2 -0
@@ -138,6 +138,8 @@ mt7615_tm_init(struct mt7615_phy *phy)if (!test_bit (MT76_STATE_RUNNING , &phy->mt76->state))return ; +mt7615_mcu_set_sku_en (phy, phy->mt76->test.state ==MT76_TM_STATE_OFF ); +mutex_unlock (&dev->mt76.mutex);mt7615_set_channel (phy); mt7615_ops.configure_filter (phy->mt76->hw,0 , &total_flags,0 );
drivers/net/wireless/mediatek/mt76/mt7915/main.c +1 -1
@@ -44,7 +44,7 @@ static int mt7915_start(struct ieee80211_hw *hw)mt7915_mac_enable_nf (dev,1 ); } -mt7915_mcu_set_sku_en (phy, !mt76_testmode_enabled (phy->mt76)); +mt7915_mcu_set_sku_en (phy, true);mt7915_mcu_set_chan_info (phy,MCU_EXT_CMD_SET_RX_PATH );set_bit (MT76_STATE_RUNNING , &phy->mt76->state);
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +2 -0
@@ -402,6 +402,8 @@ mt7915_tm_init(struct mt7915_phy *phy, bool en)if (!test_bit (MT76_STATE_RUNNING , &phy->mt76->state))return ; +mt7915_mcu_set_sku_en (phy, !en); +mt7915_tm_mode_ctrl (dev, en);mt7915_tm_reg_backup_restore (phy);mt7915_tm_set_trx (phy,TM_MAC_TXRX , !en);
Signature · 5 lines
2.29.2 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek