mt76: testmode: switch ib and wb rssi to array type for per-antenna report
Subsystems (3)
Shayne Chen
reviewerPATCH v4 1/10 mt76: testmode: switch ib and wb rssi to array type for per-antenna report
Change ib_rssi and wb_rssi into array type, since they could be reported by per-antenna.
---
v2: move Reviewed-by before s-o-b
.../net/wireless/mediatek/mt76/mt7615/mac.c | 4 ++-- .../wireless/mediatek/mt76/mt7615/mt7615.h | 4 ++-- .../wireless/mediatek/mt76/mt7615/testmode.c | 24 ++++++++++++++++--- drivers/net/wireless/mediatek/mt76/testmode.h | 4 ++-- 4 files changed, 27 insertions(+), 9 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +2 -2
@@ -215,8 +215,8 @@ static void mt7615_mac_fill_tm_rx(struct mt7615_dev *dev, __le32 *rxv) dev->test.last_rcpi[1 ] =FIELD_GET (MT_RXV4_RCPI1 , rxv4); dev->test.last_rcpi[2 ] =FIELD_GET (MT_RXV4_RCPI2 , rxv4); dev->test.last_rcpi[3 ] =FIELD_GET (MT_RXV4_RCPI3 , rxv4); - dev->test.last_ib_rssi =FIELD_GET (MT_RXV3_IB_RSSI , rxv3); - dev->test.last_wb_rssi =FIELD_GET (MT_RXV3_WB_RSSI , rxv3); + dev->test.last_ib_rssi[0 ] =FIELD_GET (MT_RXV3_IB_RSSI , rxv3); + dev->test.last_wb_rssi[0 ] =FIELD_GET (MT_RXV3_WB_RSSI , rxv3);#endif }
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +2 -2
@@ -303,8 +303,8 @@ struct mt7615_dev {s16 last_freq_offset;u8 last_rcpi[4 ]; -s8 last_ib_rssi; - s8 last_wb_rssi; +s8 last_ib_rssi[4 ]; + s8 last_wb_rssi[4]; } test;#endif
drivers/net/wireless/mediatek/mt76/mt7615/testmode.c +21 -3
@@ -335,9 +335,7 @@ mt7615_tm_dump_stats(struct mt76_dev *mdev, struct sk_buff *msg)if (!rx)return -ENOMEM ; -if (nla_put_s32 (msg,MT76_TM_RX_ATTR_FREQ_OFFSET , dev->test.last_freq_offset) || -nla_put_s32 (msg,MT76_TM_RX_ATTR_IB_RSSI , dev->test.last_ib_rssi) || -nla_put_s32 (msg,MT76_TM_RX_ATTR_WB_RSSI , dev->test.last_wb_rssi)) +if (nla_put_s32 (msg,MT76_TM_RX_ATTR_FREQ_OFFSET , dev->test.last_freq_offset))return -ENOMEM ; rssi =nla_nest_start (msg,MT76_TM_RX_ATTR_RCPI );
@@ -350,6 +348,26 @@ mt7615_tm_dump_stats(struct mt76_dev *mdev, struct sk_buff *msg)nla_nest_end (msg, rssi); + rssi =nla_nest_start (msg,MT76_TM_RX_ATTR_IB_RSSI ); +if (!rssi) +return -ENOMEM ; + +for (i =0 ; i <ARRAY_SIZE (dev->test.last_ib_rssi); i++) +if (nla_put_s8 (msg, i, dev->test.last_ib_rssi[i])) +return -ENOMEM ; + +nla_nest_end (msg, rssi); + + rssi =nla_nest_start (msg,MT76_TM_RX_ATTR_WB_RSSI ); +if (!rssi) +return -ENOMEM ; + +for (i =0 ; i <ARRAY_SIZE (dev->test.last_wb_rssi); i++) +if (nla_put_s8 (msg, i, dev->test.last_wb_rssi[i])) +return -ENOMEM ; + +nla_nest_end (msg, rssi); +nla_nest_end (msg, rx);return 0 ;
drivers/net/wireless/mediatek/mt76/testmode.h +2 -2
@@ -99,8 +99,8 @@ enum mt76_testmode_stats_attr {* * @MT76_TM_RX_ATTR_FREQ_OFFSET: frequency offset (s32) * @MT76_TM_RX_ATTR_RCPI: received channel power indicator (array, u8) -* @MT76_TM_RX_ATTR_IB_RSSI: internal inband RSSI (s8) -* @MT76_TM_RX_ATTR_WB_RSSI: internal wideband RSSI (s8) +* @MT76_TM_RX_ATTR_IB_RSSI: internal inband RSSI (array, s8) +* @MT76_TM_RX_ATTR_WB_RSSI: internal wideband RSSI (array, s8) */ enum mt76_testmode_rx_attr {MT76_TM_RX_ATTR_UNSPEC ,
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH v4 2/10 mt76: testmode: add snr attribute in rx statistics
Support to display snr value when dumping rx statistics.
---
v2: change snr attribute description to u8
drivers/net/wireless/mediatek/mt76/testmode.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/mediatek/mt76/testmode.h +2 -0
@@ -101,6 +101,7 @@ enum mt76_testmode_stats_attr {* @MT76_TM_RX_ATTR_RCPI: received channel power indicator (array, u8) * @MT76_TM_RX_ATTR_IB_RSSI: internal inband RSSI (array, s8) * @MT76_TM_RX_ATTR_WB_RSSI: internal wideband RSSI (array, s8) +* @MT76_TM_RX_ATTR_SNR: signal-to-noise ratio (u8) */ enum mt76_testmode_rx_attr {MT76_TM_RX_ATTR_UNSPEC ,
@@ -109,6 +110,7 @@ enum mt76_testmode_rx_attr {MT76_TM_RX_ATTR_RCPI ,MT76_TM_RX_ATTR_IB_RSSI ,MT76_TM_RX_ATTR_WB_RSSI , +MT76_TM_RX_ATTR_SNR ,/* keep last */ NUM_MT76_TM_RX_ATTRS,
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH v4 3/10 mt76: testmode: add tx_rate_stbc parameter
In reply to Shayne ChenAdd the parameter to control STBC function in testmode.
--- drivers/net/wireless/mediatek/mt76/mt76.h | 1 + drivers/net/wireless/mediatek/mt76/testmode.c | 6 ++++++ drivers/net/wireless/mediatek/mt76/testmode.h | 2 ++ 3 files changed, 9 insertions(+)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -527,6 +527,7 @@ struct mt76_testmode_data {u8 tx_rate_nss;u8 tx_rate_sgi;u8 tx_rate_ldpc; +u8 tx_rate_stbc;u8 tx_antenna_mask;
drivers/net/wireless/mediatek/mt76/testmode.c +6 -0
@@ -11,6 +11,7 @@ static const struct nla_policy mt76_tm_policy[NUM_MT76_TM_ATTRS] = { [MT76_TM_ATTR_TX_RATE_IDX] = { .type = NLA_U8 }, [MT76_TM_ATTR_TX_RATE_SGI] = { .type = NLA_U8 }, [MT76_TM_ATTR_TX_RATE_LDPC] = { .type = NLA_U8 }, + [MT76_TM_ATTR_TX_RATE_STBC] = { .type = NLA_U8 }, [MT76_TM_ATTR_TX_ANTENNA] = { .type = NLA_U8 }, [MT76_TM_ATTR_TX_POWER_CONTROL] = { .type = NLA_U8 }, [MT76_TM_ATTR_TX_POWER] = { .type = NLA_NESTED },
@@ -131,6 +132,9 @@ mt76_testmode_tx_init(struct mt76_dev *dev)if (td->tx_rate_ldpc) info->flags |=IEEE80211_TX_CTL_LDPC ; +if (td->tx_rate_stbc) + info->flags |=IEEE80211_TX_CTL_STBC ; +if (td->tx_rate_mode >=MT76_TM_TX_MODE_HT ) {switch (dev->phy.chandef.width) {case NL80211_CHAN_WIDTH_40 :
@@ -336,6 +340,7 @@ int mt76_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 1, hweight8(phy->antenna_mask)) ||mt76_tm_get_u8 (tb[MT76_TM_ATTR_TX_RATE_SGI ], &td->tx_rate_sgi,0 ,1 ) ||mt76_tm_get_u8 (tb[MT76_TM_ATTR_TX_RATE_LDPC ], &td->tx_rate_ldpc,0 ,1 ) || +mt76_tm_get_u8 (tb[MT76_TM_ATTR_TX_RATE_STBC ], &td->tx_rate_stbc,0 ,1 ) ||mt76_tm_get_u8 (tb[MT76_TM_ATTR_TX_ANTENNA ], &td->tx_antenna_mask,1 , phy->antenna_mask) || mt76_tm_get_u8(tb[MT76_TM_ATTR_TX_POWER_CONTROL],
@@ -472,6 +477,7 @@ int mt76_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg,nla_put_u8 (msg,MT76_TM_ATTR_TX_RATE_IDX , td->tx_rate_idx) ||nla_put_u8 (msg,MT76_TM_ATTR_TX_RATE_SGI , td->tx_rate_sgi) ||nla_put_u8 (msg,MT76_TM_ATTR_TX_RATE_LDPC , td->tx_rate_ldpc) || +nla_put_u8 (msg,MT76_TM_ATTR_TX_RATE_STBC , td->tx_rate_stbc) || (mt76_testmode_param_present (td,MT76_TM_ATTR_TX_ANTENNA ) && nla_put_u8(msg, MT76_TM_ATTR_TX_ANTENNA, td->tx_antenna_mask)) || (mt76_testmode_param_present(td, MT76_TM_ATTR_TX_POWER_CONTROL) &&
drivers/net/wireless/mediatek/mt76/testmode.h +2 -0
@@ -25,6 +25,7 @@* @MT76_TM_ATTR_TX_RATE_IDX: packet tx rate/MCS index (u8) * @MT76_TM_ATTR_TX_RATE_SGI: packet tx use short guard interval (u8) * @MT76_TM_ATTR_TX_RATE_LDPC: packet tx enable LDPC (u8) +* @MT76_TM_ATTR_TX_RATE_STBC: packet tx enable STBC (u8) * * @MT76_TM_ATTR_TX_ANTENNA: tx antenna mask (u8) * @MT76_TM_ATTR_TX_POWER_CONTROL: enable tx power control (u8)
@@ -50,6 +51,7 @@ enum mt76_testmode_attr {MT76_TM_ATTR_TX_RATE_IDX ,MT76_TM_ATTR_TX_RATE_SGI ,MT76_TM_ATTR_TX_RATE_LDPC , +MT76_TM_ATTR_TX_RATE_STBC ,MT76_TM_ATTR_TX_ANTENNA , MT76_TM_ATTR_TX_POWER_CONTROL,
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH v4 4/10 mt76: testmode: add support for LTF and GI combinations for HE mode
In reply to Shayne ChenPrepare for setting different LTF (1x, 2x, and 4x) and GI (0.8us, 1.6us, 3.2us) combinations in HE rate mode.
--- drivers/net/wireless/mediatek/mt76/mt76.h | 1 + drivers/net/wireless/mediatek/mt76/testmode.c | 6 +++++- drivers/net/wireless/mediatek/mt76/testmode.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -528,6 +528,7 @@ struct mt76_testmode_data {u8 tx_rate_sgi;u8 tx_rate_ldpc;u8 tx_rate_stbc; +u8 tx_ltf;u8 tx_antenna_mask;
drivers/net/wireless/mediatek/mt76/testmode.c +5 -1
@@ -12,6 +12,7 @@ static const struct nla_policy mt76_tm_policy[NUM_MT76_TM_ATTRS] = { [MT76_TM_ATTR_TX_RATE_SGI] = { .type = NLA_U8 }, [MT76_TM_ATTR_TX_RATE_LDPC] = { .type = NLA_U8 }, [MT76_TM_ATTR_TX_RATE_STBC] = { .type = NLA_U8 }, + [MT76_TM_ATTR_TX_LTF] = { .type = NLA_U8 }, [MT76_TM_ATTR_TX_ANTENNA] = { .type = NLA_U8 }, [MT76_TM_ATTR_TX_POWER_CONTROL] = { .type = NLA_U8 }, [MT76_TM_ATTR_TX_POWER] = { .type = NLA_NESTED },
@@ -338,9 +339,10 @@ int mt76_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 0, MT76_TM_TX_MODE_MAX) ||mt76_tm_get_u8 (tb[MT76_TM_ATTR_TX_RATE_NSS ], &td->tx_rate_nss,1 ,hweight8 (phy->antenna_mask)) || -mt76_tm_get_u8 (tb[MT76_TM_ATTR_TX_RATE_SGI ], &td->tx_rate_sgi,0 ,1 ) || +mt76_tm_get_u8 (tb[MT76_TM_ATTR_TX_RATE_SGI ], &td->tx_rate_sgi,0 ,2 ) ||mt76_tm_get_u8 (tb[MT76_TM_ATTR_TX_RATE_LDPC ], &td->tx_rate_ldpc,0 ,1 ) ||mt76_tm_get_u8 (tb[MT76_TM_ATTR_TX_RATE_STBC ], &td->tx_rate_stbc,0 ,1 ) || +mt76_tm_get_u8 (tb[MT76_TM_ATTR_TX_LTF ], &td->tx_ltf,0 ,2 ) ||mt76_tm_get_u8 (tb[MT76_TM_ATTR_TX_ANTENNA ], &td->tx_antenna_mask,1 , phy->antenna_mask) || mt76_tm_get_u8(tb[MT76_TM_ATTR_TX_POWER_CONTROL],
@@ -478,6 +480,8 @@ int mt76_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg,nla_put_u8 (msg,MT76_TM_ATTR_TX_RATE_SGI , td->tx_rate_sgi) ||nla_put_u8 (msg,MT76_TM_ATTR_TX_RATE_LDPC , td->tx_rate_ldpc) ||nla_put_u8 (msg,MT76_TM_ATTR_TX_RATE_STBC , td->tx_rate_stbc) || + (mt76_testmode_param_present (td,MT76_TM_ATTR_TX_LTF ) && +nla_put_u8 (msg,MT76_TM_ATTR_TX_LTF , td->tx_ltf)) || (mt76_testmode_param_present (td,MT76_TM_ATTR_TX_ANTENNA ) && nla_put_u8(msg, MT76_TM_ATTR_TX_ANTENNA, td->tx_antenna_mask)) || (mt76_testmode_param_present(td, MT76_TM_ATTR_TX_POWER_CONTROL) &&
drivers/net/wireless/mediatek/mt76/testmode.h +2 -0
@@ -26,6 +26,7 @@* @MT76_TM_ATTR_TX_RATE_SGI: packet tx use short guard interval (u8) * @MT76_TM_ATTR_TX_RATE_LDPC: packet tx enable LDPC (u8) * @MT76_TM_ATTR_TX_RATE_STBC: packet tx enable STBC (u8) +* @MT76_TM_ATTR_TX_LTF: packet tx LTF, set 0 to 2 for 1x, 2x, and 4x LTF (u8) * * @MT76_TM_ATTR_TX_ANTENNA: tx antenna mask (u8) * @MT76_TM_ATTR_TX_POWER_CONTROL: enable tx power control (u8)
@@ -52,6 +53,7 @@ enum mt76_testmode_attr {MT76_TM_ATTR_TX_RATE_SGI ,MT76_TM_ATTR_TX_RATE_LDPC ,MT76_TM_ATTR_TX_RATE_STBC , +MT76_TM_ATTR_TX_LTF ,MT76_TM_ATTR_TX_ANTENNA , MT76_TM_ATTR_TX_POWER_CONTROL,
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH v4 5/10 mt76: mt7915: fix tx rate related fields in tx descriptor
In reply to Shayne ChenCorrect the bitfields of tx rateval and bw in tx descriptor.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.h +4 -2
@@ -231,7 +231,7 @@ enum tx_mcu_port_q_idx {#define MT_TXD6_ANT_ID GENMASK(7, 4)#define MT_TXD6_DYN_BW BIT(3)#define MT_TXD6_FIXED_BW BIT(2) -#define MT_TXD6_BW GENMASK(2, 0) +#define MT_TXD6_BW GENMASK(1, 0)#define MT_TXD7_TXD_LEN GENMASK(31, 30)#define MT_TXD7_UDP_TCP_SUM BIT(29)
@@ -248,7 +248,9 @@ enum tx_mcu_port_q_idx {#define MT_TX_RATE_STBC BIT(13)#define MT_TX_RATE_NSS GENMASK(12, 10)#define MT_TX_RATE_MODE GENMASK(9, 6) -#define MT_TX_RATE_IDX GENMASK(5, 0) +#define MT_TX_RATE_SU_EXT_TONE BIT(5) +#define MT_TX_RATE_DCM BIT(4) +#define MT_TX_RATE_IDX GENMASK(3, 0)#define MT_TXP_MAX_BUF_NUM 6
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH v4 6/10 mt76: testmode: add support for HE rate modes
In reply to Shayne ChenExtend enum mt76_testmode_tx_mode to support various HE rate modes.
--- drivers/net/wireless/mediatek/mt76/testmode.c | 6 +++++- drivers/net/wireless/mediatek/mt76/testmode.h | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/testmode.c +5 -1
@@ -84,6 +84,10 @@ mt76_testmode_tx_init(struct mt76_dev *dev) info->flags =IEEE80211_TX_CTL_INJECTED |IEEE80211_TX_CTL_NO_ACK |IEEE80211_TX_CTL_NO_PS_BUFFER ; + +if (td->tx_rate_mode >MT76_TM_TX_MODE_VHT ) + goto out; + rate = &info->control.rates[0 ]; rate->count =1 ; rate->idx = td->tx_rate_idx;
@@ -152,7 +156,7 @@ mt76_testmode_tx_init(struct mt76_dev *dev)break ; } } - +out:skb_set_queue_mapping (skb,IEEE80211_AC_BE );return 0 ;
drivers/net/wireless/mediatek/mt76/testmode.h +8 -0
@@ -147,12 +147,20 @@ enum mt76_testmode_state {* @MT76_TM_TX_MODE_OFDM: legacy OFDM mode * @MT76_TM_TX_MODE_HT: 802.11n MCS * @MT76_TM_TX_MODE_VHT: 802.11ac MCS +* @MT76_TM_TX_MODE_HE_SU: 802.11ax single-user MIMO +* @MT76_TM_TX_MODE_HE_EXT_SU: 802.11ax extended-range SU +* @MT76_TM_TX_MODE_HE_TB: 802.11ax trigger-based +* @MT76_TM_TX_MODE_HE_MU: 802.11ax multi-user MIMO */ enum mt76_testmode_tx_mode {MT76_TM_TX_MODE_CCK ,MT76_TM_TX_MODE_OFDM ,MT76_TM_TX_MODE_HT ,MT76_TM_TX_MODE_VHT , +MT76_TM_TX_MODE_HE_SU , +MT76_TM_TX_MODE_HE_EXT_SU , +MT76_TM_TX_MODE_HE_TB , +MT76_TM_TX_MODE_HE_MU ,/* keep last */ NUM_MT76_TM_TX_MODES ,
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH v4 7/10 mt76: mt7915: implement testmode tx support
In reply to Shayne ChenSupport testmode tx for MT7915A, including tx streams and HE rate settings.
---
v3: add __packed for req struct in mt7915_tm_mode_ctrl
move the location of setting WANT_MONITOR_VIF flag
v4: fix stbc setting in tx_rate_val
fix band regs in reg_backup_restore change tx_count to 1 in TXD when doing testmode tx
.../wireless/mediatek/mt76/mt7915/Makefile | 2 + .../net/wireless/mediatek/mt76/mt7915/init.c | 8 +- .../net/wireless/mediatek/mt76/mt7915/mac.c | 129 +++++++++++++ .../net/wireless/mediatek/mt76/mt7915/main.c | 40 +++- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 31 +++ .../net/wireless/mediatek/mt76/mt7915/mcu.h | 5 + .../wireless/mediatek/mt76/mt7915/mt7915.h | 14 ++ .../net/wireless/mediatek/mt76/mt7915/regs.h | 31 +++ .../wireless/mediatek/mt76/mt7915/testmode.c | 180 ++++++++++++++++++ .../wireless/mediatek/mt76/mt7915/testmode.h | 34 ++++ 10 files changed, 465 insertions(+), 9 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/testmode.c create mode 100644 drivers/net/wireless/mediatek/mt76/mt7915/testmode.h
drivers/net/wireless/mediatek/mt76/mt7915/Makefile +2 -0
@@ -4,3 +4,5 @@ obj-$(CONFIG_MT7915E) += mt7915e.o mt7915e-y := pci.o init.o dma.o eeprom.o main.o mcu.o mac.o \ debugfs.o + +mt7915e-$(CONFIG_NL80211_TESTMODE) += testmode.o
drivers/net/wireless/mediatek/mt76/mt7915/init.c +5 -3
@@ -270,6 +270,7 @@ mt7915_init_wiphy(struct ieee80211_hw *hw)ieee80211_hw_set (hw,HAS_RATE_CONTROL );ieee80211_hw_set (hw,SUPPORTS_TX_ENCAP_OFFLOAD ); +ieee80211_hw_set (hw,WANT_MONITOR_VIF ); hw->max_tx_fragments =4 ; }
@@ -637,9 +638,6 @@ int mt7915_register_ext_phy(struct mt7915_dev *dev) mphy->hw->wiphy->perm_addr[0 ] |=2 ; mphy->hw->wiphy->perm_addr[0 ] ^=BIT (7 ); -/* The second interface does not get any packets unless it has a vif */ -ieee80211_hw_set (mphy->hw,WANT_MONITOR_VIF ); - ret =mt76_register_phy (mphy);if (ret)ieee80211_free_hw (mphy->hw);
@@ -695,6 +693,10 @@ int mt7915_register_device(struct mt7915_dev *dev)mt7915_cap_dbdc_disable (dev); dev->phy.dfs_state =-1 ; +#ifdef CONFIG_NL80211_TESTMODE + dev->mt76.test_ops = &mt7915_testmode_ops; +#endif + ret =mt76_register_device (&dev->mt76, true, mt7915_rates,ARRAY_SIZE (mt7915_rates));if (ret)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +129 -0
147 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/main.c +34 -6
@@ -44,13 +44,14 @@ static int mt7915_start(struct ieee80211_hw *hw)mt7915_mac_enable_nf (dev,1 ); } -mt7915_mcu_set_sku_en (phy, true); +mt7915_mcu_set_sku_en (phy, !mt76_testmode_enabled (&dev->mt76));mt7915_mcu_set_chan_info (phy,MCU_EXT_CMD_SET_RX_PATH );set_bit (MT76_STATE_RUNNING , &phy->mt76->state); -ieee80211_queue_delayed_work (hw, &phy->mac_work, -MT7915_WATCHDOG_TIME ); +if (!mt76_testmode_enabled (&dev->mt76)) +ieee80211_queue_delayed_work (hw, &phy->mac_work, +MT7915_WATCHDOG_TIME );if (!running)mt7915_mac_reset_counters (phy);
@@ -69,6 +70,8 @@ static void mt7915_stop(struct ieee80211_hw *hw)mutex_lock (&dev->mt76.mutex); +mt76_testmode_reset (&dev->mt76, true); +clear_bit (MT76_STATE_RUNNING , &phy->mt76->state);if (phy != &dev->phy) {
@@ -150,6 +153,12 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,mutex_lock (&dev->mt76.mutex); +mt76_testmode_reset (&dev->mt76, true); + +if (vif->type ==NL80211_IFTYPE_MONITOR && +is_zero_ether_addr (vif->addr)) + phy->monitor_vif = vif; + mvif->idx =ffs (~phy->mt76->vif_mask) -1 ;if (mvif->idx >=MT7915_MAX_INTERFACES ) { ret = -ENOSPC ;
@@ -218,6 +227,13 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,/* TODO: disable beacon for the bss */ +mutex_lock (&dev->mt76.mutex); +mt76_testmode_reset (&dev->mt76, true); +mutex_unlock (&dev->mt76.mutex); + +if (vif == phy->monitor_vif) + phy->monitor_vif =NULL ; +mt7915_mcu_add_dev_info (phy, vif, false);rcu_assign_pointer (dev->mt76.wcid[idx],NULL );
@@ -252,7 +268,7 @@ static void mt7915_init_dfs_state(struct mt7915_phy *phy) phy->dfs_state =-1 ; } -static int mt7915_set_channel (struct mt7915_phy *phy) +int mt7915_set_channel (struct mt7915_phy *phy) {struct mt7915_dev *dev = phy->dev;int ret;
@@ -281,8 +297,10 @@ out:mutex_unlock (&dev->mt76.mutex);mt76_txq_schedule_all (phy->mt76); -ieee80211_queue_delayed_work (phy->mt76->hw, &phy->mac_work, -MT7915_WATCHDOG_TIME ); + +if (!mt76_testmode_enabled (&dev->mt76)) +ieee80211_queue_delayed_work (phy->mt76->hw, &phy->mac_work, +MT7915_WATCHDOG_TIME );return ret; }
@@ -346,6 +364,13 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)int ret;if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) { +#ifdef CONFIG_NL80211_TESTMODE +if (dev->mt76.test.state !=MT76_TM_STATE_OFF ) { +mutex_lock (&dev->mt76.mutex); +mt76_testmode_reset (&dev->mt76, false); +mutex_unlock (&dev->mt76.mutex); + } +#endif ieee80211_stop_queues (hw); ret =mt7915_set_channel (phy);if (ret)
@@ -370,6 +395,7 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed) phy->rxfilter &= ~MT_WF_RFCR_DROP_OTHER_UC ;mt76_rmw_field (dev,MT_DMA_DCR0 ,MT_DMA_DCR0_RXD_G5_EN , enabled); +mt76_testmode_reset (&dev->mt76, true);mt76_wr (dev,MT_WF_RFCR (band), phy->rxfilter); }
@@ -887,6 +913,8 @@ const struct ieee80211_ops mt7915_ops = { .set_coverage_class = mt7915_set_coverage_class, .sta_statistics = mt7915_sta_statistics, .sta_set_4addr = mt7915_sta_set_4addr, + CFG80211_TESTMODE_CMD(mt76_testmode_cmd) + CFG80211_TESTMODE_DUMP(mt76_testmode_dump)#ifdef CONFIG_MAC80211_DEBUGFS .sta_add_debugfs = mt7915_sta_add_debugfs,#endif
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +31 -0
@@ -3186,6 +3186,15 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd) .channel_band = chandef->chan->band, }; +#ifdef CONFIG_NL80211_TESTMODE +if (dev->mt76.test.tx_antenna_mask && + (dev->mt76.test.state ==MT76_TM_STATE_TX_FRAMES || + dev->mt76.test.state ==MT76_TM_STATE_RX_FRAMES )) { + req.tx_streams_num =fls (dev->mt76.test.tx_antenna_mask); + req.rx_streams = dev->mt76.test.tx_antenna_mask; + } +#endif +if (dev->mt76.hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ) req.switch_reason =CH_SWITCH_SCAN_BYPASS_DPD ; else if ((chandef->chan->flags & IEEE80211_CHAN_RADAR) &&
@@ -3330,6 +3339,28 @@ int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy) sizeof(req), true); } +int mt7915_mcu_set_test_param (struct mt7915_dev *dev,u8 param,bool test_mode, +u8 en) +{ +struct { +u8 test_mode_en; +u8 param_idx; +u8 _rsv[2 ]; + +u8 enable; +u8 _rsv2[3 ]; + +u8 pad[8 ]; + } __packed req = { + .test_mode_en = test_mode, + .param_idx = param, + .enable = en, + }; + +return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_ATE_CTRL , &req, +sizeof (req), false); +} +int mt7915_mcu_set_sku_en (struct mt7915_phy *phy,bool enable) {struct mt7915_dev *dev = phy->dev;
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +5 -0
@@ -46,6 +46,10 @@ enum { MCU_EXT_EVENT_RATE_REPORT = 0x87, }; +enum { +MCU_ATE_SET_TRX =0x1 , +}; +struct mt7915_mcu_rxd {__le32 rxd[6 ];
@@ -216,6 +220,7 @@ enum {MCU_EXT_CMD_WTBL_UPDATE =0x32 ,MCU_EXT_CMD_SET_DRR_CTRL =0x36 ,MCU_EXT_CMD_SET_RDD_CTRL =0x3a , +MCU_EXT_CMD_ATE_CTRL =0x3d ,MCU_EXT_CMD_PROTECT_CTRL =0x3e ,MCU_EXT_CMD_MAC_INIT_CTRL =0x46 , MCU_EXT_CMD_RX_HDR_TRANS = 0x47,
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +14 -0
@@ -108,6 +108,8 @@ struct mt7915_phy {struct ieee80211_sband_iftype_data iftype[2 ][NUM_NL80211_IFTYPES ]; +struct ieee80211_vif *monitor_vif; +u32 rxfilter;u64 omac_mask;
@@ -158,6 +160,14 @@ struct mt7915_dev {struct idr token;bool fw_debug; + +#ifdef CONFIG_NL80211_TESTMODE +struct { +u32 *reg_backup; + +u8 spe_idx; + } test; +#endif };enum {
@@ -247,6 +257,7 @@ static inline u8 mt7915_lmac_mapping(struct mt7915_dev *dev, u8 ac)extern const struct ieee80211_ops mt7915_ops;extern struct pci_driver mt7915_pci_driver; +extern const struct mt76_testmode_ops mt7915_testmode_ops;u32 mt7915_reg_map (struct mt7915_dev *dev,u32 addr);
@@ -292,6 +303,7 @@ int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif, struct ieee80211_sta *sta);int mt7915_mcu_add_smps (struct mt7915_dev *dev,struct ieee80211_vif *vif,struct ieee80211_sta *sta); +int mt7915_set_channel (struct mt7915_phy *phy);int mt7915_mcu_set_chan_info (struct mt7915_phy *phy,int cmd);int mt7915_mcu_set_tx (struct mt7915_dev *dev,struct ieee80211_vif *vif); int mt7915_mcu_set_fixed_rate(struct mt7915_dev *dev,
@@ -300,6 +312,8 @@ int mt7915_mcu_set_eeprom(struct mt7915_dev *dev);int mt7915_mcu_get_eeprom (struct mt7915_dev *dev,u32 offset);int mt7915_mcu_set_mac (struct mt7915_dev *dev,int band,bool enable,bool hdr_trans); +int mt7915_mcu_set_test_param (struct mt7915_dev *dev,u8 param,bool test_mode, +u8 en);int mt7915_mcu_set_scs (struct mt7915_dev *dev,u8 band,bool enable);int mt7915_mcu_set_ser (struct mt7915_dev *dev,u8 action,u8 set,u8 band);int mt7915_mcu_set_rts_thresh (struct mt7915_phy *phy,u32 val);
drivers/net/wireless/mediatek/mt76/mt7915/regs.h +31 -0
@@ -51,6 +51,9 @@#define MT_WF_TMAC_BASE (_band) ((_band) ? 0xa1000 : 0x21000)#define MT_WF_TMAC (_band, ofs) (MT_WF_TMAC_BASE(_band) + (ofs)) +#define MT_TMAC_TCR0 (_band) MT_WF_TMAC(_band, 0) +#define MT_TMAC_TCR0_TBTT_STOP_CTRL BIT(25) +#define MT_TMAC_CDTR (_band) MT_WF_TMAC(_band, 0x090)#define MT_TMAC_ODTR (_band) MT_WF_TMAC(_band, 0x094)#define MT_TIMEOUT_VAL_PLCP GENMASK(15, 0)
@@ -72,6 +75,9 @@#define MT_TMAC_FP0R18 (_band) MT_WF_TMAC(_band, 0x270)#define MT_TMAC_FP_MASK GENMASK(7, 0) +#define MT_TMAC_TRCR0 (_band) MT_WF_TMAC(_band, 0x09c) +#define MT_TMAC_TFCR0 (_band) MT_WF_TMAC(_band, 0x1e0) +/* DMA Band 0 */ #define MT_WF_DMA_BASE 0x21e00#define MT_WF_DMA (ofs) (MT_WF_DMA_BASE + (ofs))
@@ -171,10 +177,33 @@#define MT_WF_AGG_BASE (_band) ((_band) ? 0xa0800 : 0x20800)#define MT_WF_AGG (_band, ofs) (MT_WF_AGG_BASE(_band) + (ofs)) +#define MT_AGG_AWSCR0 (_band, _n) MT_WF_AGG(_band, 0x05c + (_n) * 4) +#define MT_AGG_PCR0 (_band, _n) MT_WF_AGG(_band, 0x06c + (_n) * 4) +#define MT_AGG_PCR0_MM_PROT BIT(0) +#define MT_AGG_PCR0_GF_PROT BIT(1) +#define MT_AGG_PCR0_BW20_PROT BIT(2) +#define MT_AGG_PCR0_BW40_PROT BIT(4) +#define MT_AGG_PCR0_BW80_PROT BIT(6) +#define MT_AGG_PCR0_ERP_PROT GENMASK(12, 8) +#define MT_AGG_PCR0_VHT_PROT BIT(13) +#define MT_AGG_PCR0_PTA_WIN_DIS BIT(15) + +#define MT_AGG_PCR1_RTS0_NUM_THRES GENMASK(31, 23) +#define MT_AGG_PCR1_RTS0_LEN_THRES GENMASK(19, 0) +#define MT_AGG_ACR0 (_band) MT_WF_AGG(_band, 0x084)#define MT_AGG_ACR_CFEND_RATE GENMASK(13, 0)#define MT_AGG_ACR_BAR_RATE GENMASK(29, 16) +#define MT_AGG_MRCR (_band) MT_WF_AGG(_band, 0x098) +#define MT_AGG_MRCR_BAR_CNT_LIMIT GENMASK(15, 12) +#define MT_AGG_MRCR_LAST_RTS_CTS_RN BIT(6) +#define MT_AGG_MRCR_RTS_FAIL_LIMIT GENMASK(11, 7) +#define MT_AGG_MRCR_TXCMD_RTS_FAIL_LIMIT GENMASK(28, 24) + +#define MT_AGG_ATCR1 (_band) MT_WF_AGG(_band, 0x0f0) +#define MT_AGG_ATCR3 (_band) MT_WF_AGG(_band, 0x0f4) +/* ARB: band 0(0x20c00), band 1(0xa0c00) */ #define MT_WF_ARB_BASE (_band) ((_band) ? 0xa0c00 : 0x20c00)#define MT_WF_ARB (_band, ofs) (MT_WF_ARB_BASE(_band) + (ofs))
@@ -183,6 +212,8 @@#define MT_ARB_SCR_TX_DISABLE BIT(8)#define MT_ARB_SCR_RX_DISABLE BIT(9) +#define MT_ARB_DRNGR0 (_band, _n) MT_WF_ARB(_band, 0x194 + (_n) * 4) +/* RMAC: band 0(0x21400), band 1(0xa1400) */ #define MT_WF_RMAC_BASE (_band) ((_band) ? 0xa1400 : 0x21400)#define MT_WF_RMAC (_band, ofs) (MT_WF_RMAC_BASE(_band) + (ofs))
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c new file +180 -0
180 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/testmode.h new file +34 -0
@@ -0,0 +1,34 @@ +// SPDX-License-Identifier: ISC +/* Copyright (C) 2020 MediaTek Inc. */ + +#ifndef __MT7915_TESTMODE_H +#define __MT7915_TESTMODE_H + +struct mt7915_tm_trx { +u8 type; +u8 enable; +u8 band; +u8 rsv; +}; + +struct mt7915_tm_cmd { +u8 testmode_en; +u8 param_idx; +u8 _rsv[2 ]; +union { +__le32 data; +struct mt7915_tm_trx trx; +u8 test[72 ]; + } param; +} __packed; + +enum { +TM_MAC_TX =1 , +TM_MAC_RX , +TM_MAC_TXRX , +TM_MAC_TXRX_RXV , +TM_MAC_RXV , +TM_MAC_RX_RXV , +}; + +#endif
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH v4 8/10 mt76: mt7915: implement testmode rx support
In reply to Shayne ChenSupport testmode rx and display rx statistic by parsing RXV packet type, which is currently only enabled in testmode.
---
v2: change last_snr to u8
v3: use nla_put_u8 for MT76_TM_RX_ATTR_SNR
change snr variable type to u8 in mt7915_mac_fill_rx_vector
v4: directly set rx filter to reg for testmode rx, and restore it
when leaving testmode
.../net/wireless/mediatek/mt76/mt7915/dma.c | 3 + .../net/wireless/mediatek/mt76/mt7915/mac.c | 38 +++++++++ .../net/wireless/mediatek/mt76/mt7915/mac.h | 5 ++ .../wireless/mediatek/mt76/mt7915/mt7915.h | 7 ++ .../wireless/mediatek/mt76/mt7915/testmode.c | 77 +++++++++++++++++++ 5 files changed, 130 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/dma.c +3 -0
@@ -61,6 +61,9 @@ void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,case PKT_TYPE_RX_EVENT :mt7915_mcu_rx_event (dev, skb);break ; +case PKT_TYPE_TXRXV : +mt7915_mac_fill_rx_vector (dev, skb); +break ;case PKT_TYPE_NORMAL :if (!mt7915_mac_fill_rx (dev, skb)) {mt76_rx (&dev->mt76, q, skb);
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +38 -0
@@ -562,6 +562,44 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)return 0 ; } +void mt7915_mac_fill_rx_vector (struct mt7915_dev *dev,struct sk_buff *skb) +{ +#ifdef CONFIG_NL80211_TESTMODE +__le32 *rxd = (__le32 *)skb->data; +__le32 *rxv = rxd +4 ; +u32 rcpi, ib_rssi, wb_rssi, v20, v21; +s32 foe; +u8 snr; +int i; + + rcpi =le32_to_cpu (rxv[6 ]); + ib_rssi =le32_to_cpu (rxv[7 ]); + wb_rssi =le32_to_cpu (rxv[8 ]) >>5 ; + +for (i =0 ; i <4 ; i++, rcpi >>=8 , ib_rssi >>=8 , wb_rssi >>=9 ) { +if (i ==3 ) + wb_rssi =le32_to_cpu (rxv[9 ]); + + dev->test.last_rcpi[i] = rcpi &0xff ; + dev->test.last_ib_rssi[i] = ib_rssi &0xff ; + dev->test.last_wb_rssi[i] = wb_rssi &0xff ; + } + + v20 =le32_to_cpu (rxv[20 ]); + v21 =le32_to_cpu (rxv[21 ]); + + foe =FIELD_GET (MT_CRXV_FOE_LO , v20) | + (FIELD_GET (MT_CRXV_FOE_HI , v21) <<MT_CRXV_FOE_SHIFT ); + + snr =FIELD_GET (MT_CRXV_SNR , v20) -16 ; + + dev->test.last_freq_offset = foe; + dev->test.last_snr = snr; + +dev_kfree_skb (skb); +#endif +} +static u16 mt7915_mac_tx_rate_val (struct mt76_phy *mphy,u8 mode,u8 rate_idx,u8 nss,u8 stbc,u8 *bw)
drivers/net/wireless/mediatek/mt76/mt7915/mac.h +5 -0
@@ -128,6 +128,11 @@ enum rx_pkt_type {#define MT_CRXV_HE_BEAM_CHNG BIT(13)#define MT_CRXV_HE_DOPPLER BIT(16) +#define MT_CRXV_SNR GENMASK(18, 13) +#define MT_CRXV_FOE_LO GENMASK(31, 19) +#define MT_CRXV_FOE_HI GENMASK(6, 0) +#define MT_CRXV_FOE_SHIFT 13 +enum tx_header_format {MT_HDR_FORMAT_802_3 ,MT_HDR_FORMAT_CMD ,
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +7 -0
@@ -165,6 +165,12 @@ struct mt7915_dev {struct {u32 *reg_backup; +s32 last_freq_offset; +u8 last_rcpi[4 ]; +s8 last_ib_rssi[4 ]; +s8 last_wb_rssi[4 ]; +u8 last_snr; +u8 spe_idx; } test;#endif
@@ -436,6 +442,7 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi, struct ieee80211_key_conf *key, bool beacon);void mt7915_mac_set_timing (struct mt7915_phy *phy);int mt7915_mac_fill_rx (struct mt7915_dev *dev,struct sk_buff *skb); +void mt7915_mac_fill_rx_vector (struct mt7915_dev *dev,struct sk_buff *skb);void mt7915_mac_tx_free (struct mt7915_dev *dev,struct sk_buff *skb);int mt7915_mac_sta_add (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta);
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +77 -0
107 lines not on this page · raw message
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH v4 9/10 mt76: mt7915: add support to set txpower in testmode
In reply to Shayne ChenSupport tx_power setting in testmode. Note that the tx power value of antenna 1-3 equal to antenna 0.
--- .../wireless/mediatek/mt76/mt7915/testmode.c | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +100 -0
@@ -6,6 +6,17 @@#include "mcu.h" #include "testmode.h" +enum { +TM_CHANGED_TXPOWER , + +/* must be last */ +NUM_TM_CHANGED +}; + +static const u8 tm_change_map[] = { + [TM_CHANGED_TXPOWER ] =MT76_TM_ATTR_TX_POWER , +}; +struct reg_band {u32 band[2 ]; };
@@ -35,6 +46,42 @@ static const struct reg_band reg_backup_list[] = { REG_BAND(WF_RFCR1), }; +static int +mt7915_tm_set_tx_power (struct mt7915_phy *phy) +{ +struct mt7915_dev *dev = phy->dev; +struct mt76_phy *mphy = phy->mt76; +struct cfg80211_chan_def *chandef = &mphy->chandef; +int freq = chandef->center_freq1; +int ret; +struct { +u8 format_id; +u8 dbdc_idx; +s8 tx_power; +u8 ant_idx;/* Only 0 is valid */ +u8 center_chan; +u8 rsv[3 ]; + } __packed req = { + .format_id =0xf , + .dbdc_idx = phy != &dev->phy, + .center_chan =ieee80211_frequency_to_channel (freq), + }; +u8 *tx_power =NULL ; + +if (dev->mt76.test.state !=MT76_TM_STATE_OFF ) + tx_power = dev->mt76.test.tx_power; + +/* Tx power of the other antennas are the same as antenna 0 */ +if (tx_power && tx_power[0 ]) + req.tx_power = tx_power[0 ]; + + ret =mt76_mcu_send_msg (&dev->mt76, +MCU_EXT_CMD_TX_POWER_FEATURE_CTRL , + &req,sizeof (req), false); + +return ret; +} +static int mt7915_tm_mode_ctrl (struct mt7915_dev *dev,bool enable) {
@@ -176,6 +223,13 @@ mt7915_tm_set_rx_frames(struct mt7915_dev *dev, bool en)mt7915_tm_set_trx (dev, &dev->phy,TM_MAC_RX_RXV , en); } +static void +mt7915_tm_update_params (struct mt7915_dev *dev,u32 changed) +{ +if (changed &BIT (TM_CHANGED_TXPOWER )) +mt7915_tm_set_tx_power (&dev->phy); +} +static int mt7915_tm_set_state (struct mt76_dev *mdev,enum mt76_testmode_state state) {
@@ -196,6 +250,51 @@ mt7915_tm_set_state(struct mt76_dev *mdev, enum mt76_testmode_state state)else if (prev_state ==MT76_TM_STATE_OFF || state ==MT76_TM_STATE_OFF )mt7915_tm_init (dev); +if ((state ==MT76_TM_STATE_IDLE && + prev_state ==MT76_TM_STATE_OFF ) || + (state ==MT76_TM_STATE_OFF && + prev_state ==MT76_TM_STATE_IDLE )) { +u32 changed =0 ; +int i; + +for (i =0 ; i <ARRAY_SIZE (tm_change_map); i++) { +u16 cur = tm_change_map[i]; + +if (td->param_set[cur /32 ] &BIT (cur %32 )) + changed |=BIT (i); + } + +mt7915_tm_update_params (dev, changed); + } + +return 0 ; +} + +static int +mt7915_tm_set_params (struct mt76_dev *mdev,struct nlattr **tb, +enum mt76_testmode_state new_state) +{ + struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76); +struct mt76_testmode_data *td = &dev->mt76.test; +u32 changed =0 ; +int i; + +BUILD_BUG_ON (NUM_TM_CHANGED >=32 ); + +if (new_state ==MT76_TM_STATE_OFF || + td->state ==MT76_TM_STATE_OFF ) +return 0 ; + +if (td->tx_antenna_mask & ~dev->phy.chainmask) +return -EINVAL ; + +for (i =0 ; i <ARRAY_SIZE (tm_change_map); i++) { +if (tb[tm_change_map[i]]) + changed |=BIT (i); + } + +mt7915_tm_update_params (dev, changed); +return 0 ; }
@@ -253,5 +352,6 @@ mt7915_tm_dump_stats(struct mt76_dev *mdev, struct sk_buff *msg)const struct mt76_testmode_ops mt7915_testmode_ops = { .set_state = mt7915_tm_set_state, + .set_params = mt7915_tm_set_params, .dump_stats = mt7915_tm_dump_stats, };
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH v4 10/10 mt76: mt7915: add support to set tx frequency offset in testmode
In reply to Shayne ChenSupport to set tx frequency offset in testmode, which is usally used in the pre-calibration stage.
--- .../net/wireless/mediatek/mt76/mt7915/mcu.h | 1 + .../wireless/mediatek/mt76/mt7915/testmode.c | 20 +++++++++++++++++++ .../wireless/mediatek/mt76/mt7915/testmode.h | 6 ++++++ 3 files changed, 27 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +1 -0
@@ -48,6 +48,7 @@ enum {enum {MCU_ATE_SET_TRX =0x1 , +MCU_ATE_SET_FREQ_OFFSET =0xa , };struct mt7915_mcu_rxd {
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +20 -0
@@ -8,6 +8,7 @@enum {TM_CHANGED_TXPOWER , +TM_CHANGED_FREQ_OFFSET ,/* must be last */ NUM_TM_CHANGED
@@ -15,6 +16,7 @@ enum {static const u8 tm_change_map[] = { [TM_CHANGED_TXPOWER ] =MT76_TM_ATTR_TX_POWER , + [TM_CHANGED_FREQ_OFFSET ] =MT76_TM_ATTR_FREQ_OFFSET , };struct reg_band {
@@ -82,6 +84,19 @@ mt7915_tm_set_tx_power(struct mt7915_phy *phy)return ret; } +static int +mt7915_tm_set_freq_offset (struct mt7915_dev *dev,bool en,u32 val) +{ +struct mt7915_tm_cmd req = { + .testmode_en = en, + .param_idx =MCU_ATE_SET_FREQ_OFFSET , + .param.freq.freq_offset =cpu_to_le32 (val), + }; + +return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_ATE_CTRL , &req, +sizeof (req), false); +} +static int mt7915_tm_mode_ctrl (struct mt7915_dev *dev,bool enable) {
@@ -226,6 +241,11 @@ mt7915_tm_set_rx_frames(struct mt7915_dev *dev, bool en)static void mt7915_tm_update_params (struct mt7915_dev *dev,u32 changed) { +struct mt76_testmode_data *td = &dev->mt76.test; +bool en = dev->mt76.test.state !=MT76_TM_STATE_OFF ; + +if (changed &BIT (TM_CHANGED_FREQ_OFFSET )) +mt7915_tm_set_freq_offset (dev, en, en ? td->freq_offset :0 );if (changed &BIT (TM_CHANGED_TXPOWER ))mt7915_tm_set_tx_power (&dev->phy); }
drivers/net/wireless/mediatek/mt76/mt7915/testmode.h +6 -0
@@ -11,6 +11,11 @@ struct mt7915_tm_trx {u8 rsv; }; +struct mt7915_tm_freq_offset { +u8 band; +__le32 freq_offset; +}; +struct mt7915_tm_cmd {u8 testmode_en;u8 param_idx;
@@ -18,6 +23,7 @@ struct mt7915_tm_cmd {union {__le32 data;struct mt7915_tm_trx trx; +struct mt7915_tm_freq_offset freq;u8 test[72 ]; } param; } __packed;
Signature · 1 line
2.17.1