mt76: mt7915: add partial add_bss_info command on testmode init
Subsystems (3)
Shayne Chen
reviewerPATCH 1/5 mt76: mt7915: add partial add_bss_info command on testmode init
This is a preliminary patch for DBDC and ipg config support in testmode.
The wmm_idx of band1 should be configured by this command to make band1 Tx work normally. Also, for setting ipg, FW needs a non-empty bss_info structure to do edca parameters update.
--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 20 ++++++++++++++----- .../wireless/mediatek/mt76/mt7915/testmode.c | 2 ++ 2 files changed, 17 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +15 -5
@@ -674,6 +674,7 @@ mt7915_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,switch (vif->type) {case NL80211_IFTYPE_MESH_POINT :case NL80211_IFTYPE_AP : +case NL80211_IFTYPE_MONITOR :break ;case NL80211_IFTYPE_STATION :/* TODO: enable BSS_INFO_UAPSD & BSS_INFO_PM */
@@ -702,16 +703,21 @@ mt7915_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, } bss = (struct bss_info_basic *)tlv; -memcpy (bss->bssid, vif->bss_conf.bssid,ETH_ALEN ); - bss->bcn_interval =cpu_to_le16 (vif->bss_conf.beacon_int); bss->network_type =cpu_to_le32 (type); - bss->dtim_period = vif->bss_conf.dtim_period; bss->bmc_wcid_lo =to_wcid_lo (wlan_idx); bss->bmc_wcid_hi =to_wcid_hi (wlan_idx); - bss->phy_mode =mt7915_get_phy_mode (phy->dev, vif, band,NULL ); bss->wmm_idx = mvif->wmm_idx; bss->active = enable; +if (vif->type !=NL80211_IFTYPE_MONITOR ) { +memcpy (bss->bssid, vif->bss_conf.bssid,ETH_ALEN ); + bss->bcn_interval =cpu_to_le16 (vif->bss_conf.beacon_int); + bss->dtim_period = vif->bss_conf.dtim_period; + bss->phy_mode =mt7915_get_phy_mode (phy->dev, vif, band,NULL ); + }else { +memcpy (bss->bssid, phy->mt76->macaddr,ETH_ALEN ); + } +return 0 ; }
@@ -727,6 +733,7 @@ mt7915_mcu_bss_omac_tlv(struct sk_buff *skb, struct ieee80211_vif *vif) tlv =mt7915_mcu_add_tlv (skb,BSS_INFO_OMAC ,sizeof (*omac));switch (vif->type) { +case NL80211_IFTYPE_MONITOR :case NL80211_IFTYPE_MESH_POINT :case NL80211_IFTYPE_AP : type =CONNECTION_INFRA_AP ;
@@ -996,6 +1003,9 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy,mt7915_mcu_bss_basic_tlv (skb, vif, phy, enable); +if (vif->type ==NL80211_IFTYPE_MONITOR ) + goto out; +if (enable) {mt7915_mcu_bss_rfch_tlv (skb, vif, phy);mt7915_mcu_bss_bmc_tlv (skb, phy);
@@ -1009,7 +1019,7 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy, mvif->omac_idx < REPEATER_BSSID_START)mt7915_mcu_bss_ext_tlv (skb, mvif); } - +out:return mt76_mcu_skb_send_msg (&phy->dev->mt76, skb,MCU_EXT_CMD_BSS_INFO_UPDATE , true); }
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +2 -0
@@ -192,6 +192,8 @@ mt7915_tm_init(struct mt7915_dev *dev)mt7915_tm_mode_ctrl (dev, en);mt7915_tm_reg_backup_restore (dev, &dev->phy);mt7915_tm_set_trx (dev, &dev->phy,TM_MAC_TXRX , !en); + +mt7915_mcu_add_bss_info (&dev->phy, dev->phy.monitor_vif, en); } static void
Signature · 5 lines
2.17.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Shayne Chen
reviewerPATCH 2/5 mt76: testmode: introduce dbdc support
Add testmode support for DBDC NICs (both MT7615D and MT7915D work). Testmode data and parameters are moved from per-dev to per-phy for maintaining the value of each band.
--- drivers/net/wireless/mediatek/mt76/dma.c | 8 +- drivers/net/wireless/mediatek/mt76/eeprom.c | 4 +- drivers/net/wireless/mediatek/mt76/mac80211.c | 6 +- drivers/net/wireless/mediatek/mt76/mt76.h | 43 ++++++-- .../net/wireless/mediatek/mt76/mt7615/main.c | 18 +-- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- .../wireless/mediatek/mt76/mt7615/testmode.c | 82 +++++++------- .../net/wireless/mediatek/mt76/mt7915/mac.c | 22 ++-- .../net/wireless/mediatek/mt76/mt7915/main.c | 18 +-- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 18 ++- .../wireless/mediatek/mt76/mt7915/testmode.c | 104 ++++++++++-------- drivers/net/wireless/mediatek/mt76/testmode.c | 88 ++++++++------- drivers/net/wireless/mediatek/mt76/tx.c | 24 ++-- 13 files changed, 244 insertions(+), 193 deletions(-)
drivers/net/wireless/mediatek/mt76/dma.c +6 -2
@@ -418,8 +418,12 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, free:#ifdef CONFIG_NL80211_TESTMODE /* fix tx_done accounting on queue overflow */ -if (tx_info.skb == dev->test.tx_skb) - dev->test.tx_done--; +if (mt76_is_testmode_skb (dev, skb, &hw)) { +struct mt76_phy *phy = hw->priv; + +if (tx_info.skb == phy->test.tx_skb) + phy->test.tx_done--; + }#endif e.skb = tx_info.skb;
drivers/net/wireless/mediatek/mt76/eeprom.c +2 -2
@@ -75,8 +75,8 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len) }#ifdef CONFIG_NL80211_TESTMODE - dev->test.mtd_name =devm_kstrdup (dev->dev, part,GFP_KERNEL ); - dev->test.mtd_offset = offset; + dev->phy.test.mtd_name =devm_kstrdup (dev->dev, part,GFP_KERNEL ); + dev->phy.test.mtd_offset = offset;#endif out_put_node:
drivers/net/wireless/mediatek/mt76/mac80211.c +3 -3
@@ -519,10 +519,10 @@ void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb) }#ifdef CONFIG_NL80211_TESTMODE -if (dev->test.state ==MT76_TM_STATE_RX_FRAMES ) { - dev->test.rx_stats.packets[q]++; +if (phy->test.state ==MT76_TM_STATE_RX_FRAMES ) { + phy->test.rx_stats.packets[q]++;if (status->flag &RX_FLAG_FAILED_FCS_CRC ) - dev->test.rx_stats.fcs_error[q]++; + phy->test.rx_stats.fcs_error[q]++; }#endif __skb_queue_tail (&dev->rx_skb[q], skb);
drivers/net/wireless/mediatek/mt76/mt76.h +31 -12
90 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/main.c +9 -9
@@ -97,7 +97,7 @@ static void mt7615_stop(struct ieee80211_hw *hw)mt7615_mutex_acquire (dev); -mt76_testmode_reset (&dev->mt76, true); +mt76_testmode_reset (phy->mt76, true);clear_bit (MT76_STATE_RUNNING , &phy->mt76->state);cancel_delayed_work_sync (&phy->scan_work);
@@ -181,7 +181,7 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,mt7615_mutex_acquire (dev); -mt76_testmode_reset (&dev->mt76, true); +mt76_testmode_reset (phy->mt76, true);if (vif->type ==NL80211_IFTYPE_MONITOR &&is_zero_ether_addr (vif->addr))
@@ -252,7 +252,7 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,mt7615_mutex_acquire (dev); -mt76_testmode_reset (&dev->mt76, true); +mt76_testmode_reset (phy->mt76, true);if (vif == phy->monitor_vif) phy->monitor_vif =NULL ;
@@ -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 (&dev->mt76)); +mt7615_mcu_set_sku_en (phy, !mt76_testmode_enabled (phy->mt76));mt7615_mac_reset_counters (dev); phy->noise =0 ;
@@ -334,7 +334,7 @@ int mt7615_set_channel(struct mt7615_phy *phy)mt76_txq_schedule_all (phy->mt76); -if (!mt76_testmode_enabled (&dev->mt76)) +if (!mt76_testmode_enabled (phy->mt76))ieee80211_queue_delayed_work (phy->mt76->hw, &phy->mac_work,MT7615_WATCHDOG_TIME );
@@ -411,9 +411,9 @@ static int mt7615_config(struct ieee80211_hw *hw, u32 changed)if (changed & (IEEE80211_CONF_CHANGE_CHANNEL |IEEE80211_CONF_CHANGE_POWER )) {#ifdef CONFIG_NL80211_TESTMODE -if (dev->mt76.test.state !=MT76_TM_STATE_OFF ) { +if (phy->mt76->test.state !=MT76_TM_STATE_OFF ) {mt7615_mutex_acquire (dev); -mt76_testmode_reset (&dev->mt76, false); +mt76_testmode_reset (phy->mt76, false);mt7615_mutex_release (dev); }#endif
@@ -425,7 +425,7 @@ static int mt7615_config(struct ieee80211_hw *hw, u32 changed)mt7615_mutex_acquire (dev);if (changed &IEEE80211_CONF_CHANGE_MONITOR ) { -mt76_testmode_reset (&dev->mt76, true); +mt76_testmode_reset (phy->mt76, true);if (!(hw->conf.flags &IEEE80211_CONF_MONITOR )) phy->rxfilter |=MT_WF_RFCR_DROP_OTHER_UC ;
@@ -480,7 +480,7 @@ static void mt7615_configure_filter(struct ieee80211_hw *hw,#define MT76_FILTER (_flag, _hw) do { \ flags |= *total_flags & FIF_##_flag; \ phy->rxfilter &= ~(_hw); \ - if (!mt76_testmode_enabled(&dev->mt76)) \ + if (!mt76_testmode_enabled(phy->mt76)) \ phy->rxfilter |= !(flags & FIF_##_flag) * (_hw);\ } while (0)
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +1 -1
@@ -2895,7 +2895,7 @@ int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd) req.band_idx = phy != &dev->phy; req.bw =mt7615_mcu_chan_bw (chandef); -if (mt76_testmode_enabled (&dev->mt76)) +if (mt76_testmode_enabled (phy->mt76))memset (req.txpower_sku,0x3f ,49 );else mt7615_mcu_set_txpower_sku (phy, req.txpower_sku);
drivers/net/wireless/mediatek/mt76/mt7615/testmode.c +39 -43
194 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +11 -11
@@ -601,18 +601,19 @@ void mt7915_mac_fill_rx_vector(struct mt7915_dev *dev, struct sk_buff *skb)#endif static void -mt7915_mac_write_txwi_tm (struct mt7915_dev *dev,struct mt76_phy *mphy, -__le32 *txwi,struct sk_buff *skb) +mt7915_mac_write_txwi_tm (struct mt7915_phy *phy,__le32 *txwi, +struct sk_buff *skb) {#ifdef CONFIG_NL80211_TESTMODE -struct mt76_testmode_data *td = &dev->mt76.test; +struct mt76_testmode_data *td = &phy->mt76->test; +struct mt7915_dev *dev = phy->dev;u8 rate_idx = td->tx_rate_idx;u8 nss = td->tx_rate_nss;u8 bw, mode;u16 rateval =0 ;u32 val; -if (skb != dev->mt76.test.tx_skb) +if (skb != phy->mt76->test.tx_skb)return ;switch (td->tx_rate_mode) {
@@ -644,7 +645,7 @@ mt7915_mac_write_txwi_tm(struct mt7915_dev *dev, struct mt76_phy *mphy,break ; } -switch (mphy->chandef.width) { +switch (phy->mt76->chandef.width) {case NL80211_CHAN_WIDTH_40 : bw =1 ;break ;
@@ -902,8 +903,8 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi, txwi[3 ] |=cpu_to_le32 (MT_TXD3_BA_DISABLE ); } -if (mt76_testmode_enabled (&dev->mt76)) -mt7915_mac_write_txwi_tm (dev, mphy, txwi, skb); +if (mt76_testmode_enabled (mphy)) +mt7915_mac_write_txwi_tm (mphy->priv, txwi, skb); } int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
@@ -1022,20 +1023,19 @@ mt7915_tx_complete_status(struct mt76_dev *mdev, struct sk_buff *skb, status.rate = &msta->stats.tx_rate; } - hw =mt76_tx_status_get_hw (mdev, skb); -#ifdef CONFIG_NL80211_TESTMODE -if (skb == mdev->test.tx_skb) { +if (mt76_is_testmode_skb (mdev, skb, &hw)) {struct mt7915_phy *phy =mt7915_hw_phy (hw);struct ieee80211_vif *vif = phy->monitor_vif;struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;mt76_tx_complete_skb (mdev, mvif->sta.wcid.idx, skb); -return ; }#endif + hw =mt76_tx_status_get_hw (mdev, skb); +if (info->flags &IEEE80211_TX_CTL_AMPDU ) info->flags |=IEEE80211_TX_STAT_AMPDU ;
drivers/net/wireless/mediatek/mt76/mt7915/main.c +9 -9
@@ -44,12 +44,12 @@ static int mt7915_start(struct ieee80211_hw *hw)mt7915_mac_enable_nf (dev,1 ); } -mt7915_mcu_set_sku_en (phy, !mt76_testmode_enabled (&dev->mt76)); +mt7915_mcu_set_sku_en (phy, !mt76_testmode_enabled (phy->mt76));mt7915_mcu_set_chan_info (phy,MCU_EXT_CMD_SET_RX_PATH );set_bit (MT76_STATE_RUNNING , &phy->mt76->state); -if (!mt76_testmode_enabled (&dev->mt76)) +if (!mt76_testmode_enabled (phy->mt76))ieee80211_queue_delayed_work (hw, &phy->mac_work,MT7915_WATCHDOG_TIME );
@@ -70,7 +70,7 @@ static void mt7915_stop(struct ieee80211_hw *hw)mutex_lock (&dev->mt76.mutex); -mt76_testmode_reset (&dev->mt76, true); +mt76_testmode_reset (phy->mt76, true);clear_bit (MT76_STATE_RUNNING , &phy->mt76->state);
@@ -153,7 +153,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,mutex_lock (&dev->mt76.mutex); -mt76_testmode_reset (&dev->mt76, true); +mt76_testmode_reset (phy->mt76, true);if (vif->type ==NL80211_IFTYPE_MONITOR &&is_zero_ether_addr (vif->addr))
@@ -228,7 +228,7 @@ 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); +mt76_testmode_reset (phy->mt76, true);mutex_unlock (&dev->mt76.mutex);if (vif == phy->monitor_vif)
@@ -298,7 +298,7 @@ int mt7915_set_channel(struct mt7915_phy *phy)mt76_txq_schedule_all (phy->mt76); -if (!mt76_testmode_enabled (&dev->mt76)) +if (!mt76_testmode_enabled (phy->mt76))ieee80211_queue_delayed_work (phy->mt76->hw, &phy->mac_work,MT7915_WATCHDOG_TIME );
@@ -365,9 +365,9 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)if (changed &IEEE80211_CONF_CHANGE_CHANNEL ) {#ifdef CONFIG_NL80211_TESTMODE -if (dev->mt76.test.state !=MT76_TM_STATE_OFF ) { +if (phy->mt76->test.state !=MT76_TM_STATE_OFF ) {mutex_lock (&dev->mt76.mutex); -mt76_testmode_reset (&dev->mt76, false); +mt76_testmode_reset (phy->mt76, false);mutex_unlock (&dev->mt76.mutex); }#endif
@@ -396,7 +396,7 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)mt76_rmw_field (dev,MT_DMA_DCR0 (band),MT_DMA_DCR0_RXD_G5_EN , enabled); -mt76_testmode_reset (&dev->mt76, true); +mt76_testmode_reset (phy->mt76, true);mt76_wr (dev,MT_WF_RFCR (band), phy->rxfilter); }
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +12 -6
@@ -3183,6 +3183,7 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)struct mt7915_dev *dev = phy->dev;struct cfg80211_chan_def *chandef = &phy->mt76->chandef;int freq1 = chandef->center_freq1; +bool ext_phy = phy != &dev->phy;struct {u8 control_ch;u8 center_ch;
@@ -3206,16 +3207,21 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd) .bw = mt7915_mcu_chan_bw(chandef), .tx_streams_num = hweight8(phy->mt76->antenna_mask), .rx_streams = phy->mt76->antenna_mask, - .band_idx = phy != &dev->phy, + .band_idx = ext_phy, .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; +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 )) { + req.tx_streams_num =fls (phy->mt76->test.tx_antenna_mask); + req.rx_streams = phy->mt76->test.tx_antenna_mask; + +if (ext_phy) { + req.tx_streams_num =2 ; + req.rx_streams >>=2 ; + } }#endif
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +57 -47
234 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/testmode.c +48 -40
247 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/tx.c +16 -8
@@ -202,16 +202,22 @@ void mt76_tx_complete_skb(struct mt76_dev *dev, u16 wcid_idx, struct sk_buff *skstruct ieee80211_hw *hw;struct sk_buff_head list; +mt76_tx_check_non_aql (dev, wcid_idx, skb); +#ifdef CONFIG_NL80211_TESTMODE -if (skb == dev->test.tx_skb) { - dev->test.tx_done++; -if (dev->test.tx_queued == dev->test.tx_done) +if (mt76_is_testmode_skb (dev, skb, &hw)) { +struct mt76_phy *phy = hw->priv; + +if (skb == phy->test.tx_skb) + phy->test.tx_done++; +if (phy->test.tx_queued == phy->test.tx_done)wake_up (&dev->tx_wait); + +ieee80211_free_txskb (hw, skb); +return ; }#endif -mt76_tx_check_non_aql (dev, wcid_idx, skb); -if (!skb->prev) { hw =mt76_tx_status_get_hw (dev, skb);ieee80211_free_txskb (hw, skb);
@@ -261,7 +267,7 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta,int qid =skb_get_queue_mapping (skb);bool ext_phy = phy != &dev->phy; -if (mt76_testmode_enabled (dev)) { +if (mt76_testmode_enabled (phy)) {ieee80211_free_txskb (phy->hw, skb);return ; }
@@ -533,8 +539,10 @@ void mt76_tx_worker(struct mt76_worker *w)mt76_txq_schedule_all (dev->phy2);#ifdef CONFIG_NL80211_TESTMODE -if (dev->test.tx_pending) -mt76_testmode_tx_pending (dev); +if (dev->phy.test.tx_pending) +mt76_testmode_tx_pending (&dev->phy); +if (dev->phy2 && dev->phy2->test.tx_pending) +mt76_testmode_tx_pending (dev->phy2);#endif }
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH 3/5 mt76: testmode: move mtd part to mt76_dev
In reply to Shayne ChenMove testmode mtd variables to mt76_dev, since they are the same on each phy.
--- drivers/net/wireless/mediatek/mt76/eeprom.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt76.h | 7 ++++--- drivers/net/wireless/mediatek/mt76/testmode.c | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-)
drivers/net/wireless/mediatek/mt76/eeprom.c +2 -2
@@ -75,8 +75,8 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len) }#ifdef CONFIG_NL80211_TESTMODE - dev->phy.test.mtd_name =devm_kstrdup (dev->dev, part,GFP_KERNEL ); - dev->phy.test.mtd_offset = offset; + dev->test_mtd.name =devm_kstrdup (dev->dev, part,GFP_KERNEL ); + dev->test_mtd.offset = offset;#endif out_put_node:
drivers/net/wireless/mediatek/mt76/mt76.h +4 -3
@@ -543,9 +543,6 @@ struct mt76_testmode_data {u8 tx_power[4 ];u8 tx_power_control; -const char *mtd_name; -u32 mtd_offset; -u32 tx_pending;u32 tx_queued;u32 tx_done;
@@ -663,6 +660,10 @@ struct mt76_dev {#ifdef CONFIG_NL80211_TESTMODE const struct mt76_testmode_ops *test_ops; +struct { +const char *name; +u32 offset; + } test_mtd;#endif struct workqueue_struct *wq;
drivers/net/wireless/mediatek/mt76/testmode.c +3 -3
@@ -482,9 +482,9 @@ int mt76_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg,if (nla_put_u32 (msg,MT76_TM_ATTR_STATE , td->state)) goto out; -if (td->mtd_name && - (nla_put_string (msg,MT76_TM_ATTR_MTD_PART , td->mtd_name) || -nla_put_u32 (msg,MT76_TM_ATTR_MTD_OFFSET , td->mtd_offset))) +if (dev->test_mtd.name && + (nla_put_string (msg,MT76_TM_ATTR_MTD_PART , dev->test_mtd.name) || +nla_put_u32 (msg,MT76_TM_ATTR_MTD_OFFSET , dev->test_mtd.offset))) goto out; if (nla_put_u32(msg, MT76_TM_ATTR_TX_COUNT, td->tx_count) ||
Signature · 5 lines
2.17.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Shayne Chen
reviewerPATCH 4/5 mt76: mt7915: move testmode data from dev to phy
In reply to Shayne ChenMove per-chip testmode data to mt7915_phy, to properly support reg_backup and rx status of each band in testmode.
--- .../net/wireless/mediatek/mt76/mt7915/mac.c | 20 ++++++++----- .../net/wireless/mediatek/mt76/mt7915/mac.h | 2 ++ .../wireless/mediatek/mt76/mt7915/mt7915.h | 28 +++++++++---------- .../wireless/mediatek/mt76/mt7915/testmode.c | 25 ++++++++--------- 4 files changed, 41 insertions(+), 34 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +13 -7
@@ -565,13 +565,20 @@ int mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb)#ifdef CONFIG_NL80211_TESTMODE void mt7915_mac_fill_rx_vector (struct mt7915_dev *dev,struct sk_buff *skb) { +struct mt7915_phy *phy = &dev->phy;__le32 *rxd = (__le32 *)skb->data; +__le32 *rxv_hdr = rxd +2 ;__le32 *rxv = rxd +4 ;u32 rcpi, ib_rssi, wb_rssi, v20, v21; +bool ext_phy;s32 foe;u8 snr;int i; + ext_phy =FIELD_GET (MT_RXV_HDR_BAND_IDX ,le32_to_cpu (rxv_hdr[1 ])); +if (ext_phy) + phy =mt7915_ext_phy (dev); + rcpi =le32_to_cpu (rxv[6 ]); ib_rssi =le32_to_cpu (rxv[7 ]); wb_rssi =le32_to_cpu (rxv[8 ]) >>5 ;
@@ -580,9 +587,9 @@ void mt7915_mac_fill_rx_vector(struct mt7915_dev *dev, struct sk_buff *skb)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 ; + phy->test.last_rcpi[i] = rcpi &0xff ; + phy->test.last_ib_rssi[i] = ib_rssi &0xff ; + phy->test.last_wb_rssi[i] = wb_rssi &0xff ; } v20 =le32_to_cpu (rxv[20 ]);
@@ -593,8 +600,8 @@ void mt7915_mac_fill_rx_vector(struct mt7915_dev *dev, struct sk_buff *skb) snr =FIELD_GET (MT_CRXV_SNR , v20) -16 ; - dev->test.last_freq_offset = foe; - dev->test.last_snr = snr; + phy->test.last_freq_offset = foe; + phy->test.last_snr = snr;dev_kfree_skb (skb); }
@@ -606,7 +613,6 @@ mt7915_mac_write_txwi_tm(struct mt7915_phy *phy, __le32 *txwi, {#ifdef CONFIG_NL80211_TESTMODE struct mt76_testmode_data *td = &phy->mt76->test; -struct mt7915_dev *dev = phy->dev;u8 rate_idx = td->tx_rate_idx;u8 nss = td->tx_rate_nss;u8 bw, mode;
@@ -699,7 +705,7 @@ mt7915_mac_write_txwi_tm(struct mt7915_phy *phy, __le32 *txwi, txwi[6 ] |=cpu_to_le32 (val); txwi[7 ] |=cpu_to_le32 (FIELD_PREP (MT_TXD7_SPE_IDX , - dev->test.spe_idx)); + phy->test.spe_idx));#endif }
drivers/net/wireless/mediatek/mt76/mt7915/mac.h +2 -0
@@ -95,6 +95,8 @@ enum rx_pkt_type {#define MT_RXD3_NORMAL_PF_MODE BIT(29)#define MT_RXD3_NORMAL_PF_STS GENMASK(31, 30) +#define MT_RXV_HDR_BAND_IDX BIT(24) +/* P-RXV */ #define MT_PRXV_TX_RATE GENMASK(6, 0)#define MT_PRXV_TX_DCM BIT(4)
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +14 -14
@@ -135,6 +135,20 @@ struct mt7915_phy {struct delayed_work mac_work;u8 mac_work_count;u8 sta_work_count; + +#ifdef CONFIG_NL80211_TESTMODE +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 };struct mt7915_dev {
@@ -167,20 +181,6 @@ struct mt7915_dev {bool dbdc_support;bool fw_debug; - -#ifdef CONFIG_NL80211_TESTMODE -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 };enum {
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +12 -13
@@ -138,10 +138,10 @@ mt7915_tm_reg_backup_restore(struct mt7915_phy *phy)int n_regs =ARRAY_SIZE (reg_backup_list);struct mt7915_dev *dev = phy->dev;bool ext_phy = phy != &dev->phy; -u32 *b = dev->test.reg_backup; +u32 *b = phy->test.reg_backup;int i; -if (dev->mphy.test.state ==MT76_TM_STATE_OFF ) { +if (phy->mt76->test.state ==MT76_TM_STATE_OFF ) {for (i =0 ; i < n_regs; i++)mt76_wr (dev, reg_backup_list[i].band[ext_phy], b[i]);return ;
@@ -154,7 +154,7 @@ mt7915_tm_reg_backup_restore(struct mt7915_phy *phy)if (!b)return ; - dev->test.reg_backup = b; + phy->test.reg_backup = b;for (i =0 ; i < n_regs; i++) b[i] =mt76_rr (dev, reg_backup_list[i].band[ext_phy]);
@@ -222,7 +222,7 @@ mt7915_tm_set_tx_frames(struct mt7915_phy *phy, bool en)if (phy != &dev->phy) tx_ant >>=2 ; - dev->test.spe_idx = spe_idx_map[tx_ant]; + phy->test.spe_idx = spe_idx_map[tx_ant]; }mt7915_tm_set_trx (phy,TM_MAC_TX , en);
@@ -333,7 +333,6 @@ static int mt7915_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg) { struct mt7915_phy *phy = mphy->priv; -struct mt7915_dev *dev = phy->dev;void *rx, *rssi;int i;
@@ -341,15 +340,15 @@ mt7915_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg)if (!rx)return -ENOMEM ; -if (nla_put_s32 (msg,MT76_TM_RX_ATTR_FREQ_OFFSET , dev->test.last_freq_offset)) +if (nla_put_s32 (msg,MT76_TM_RX_ATTR_FREQ_OFFSET , phy->test.last_freq_offset))return -ENOMEM ; rssi =nla_nest_start (msg,MT76_TM_RX_ATTR_RCPI );if (!rssi)return -ENOMEM ; -for (i =0 ; i <ARRAY_SIZE (dev->test.last_rcpi); i++) -if (nla_put_u8 (msg, i, dev->test.last_rcpi[i])) +for (i =0 ; i <ARRAY_SIZE (phy->test.last_rcpi); i++) +if (nla_put_u8 (msg, i, phy->test.last_rcpi[i]))return -ENOMEM ;nla_nest_end (msg, rssi);
@@ -358,8 +357,8 @@ mt7915_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg)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])) +for (i =0 ; i <ARRAY_SIZE (phy->test.last_ib_rssi); i++) +if (nla_put_s8 (msg, i, phy->test.last_ib_rssi[i]))return -ENOMEM ;nla_nest_end (msg, rssi);
@@ -368,13 +367,13 @@ mt7915_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg)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])) +for (i =0 ; i <ARRAY_SIZE (phy->test.last_wb_rssi); i++) +if (nla_put_s8 (msg, i, phy->test.last_wb_rssi[i]))return -ENOMEM ;nla_nest_end (msg, rssi); -if (nla_put_u8 (msg,MT76_TM_RX_ATTR_SNR , dev->test.last_snr)) +if (nla_put_u8 (msg,MT76_TM_RX_ATTR_SNR , phy->test.last_snr))return -ENOMEM ;nla_nest_end (msg, rx);
Signature · 5 lines
2.17.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Shayne Chen
reviewerPATCH 5/5 mt76: mt7615: move testmode data from dev to phy
In reply to Shayne ChenMove per-chip testmode data to mt7615_phy, to properly support reg_backup and rx status of each band in testmode.
--- .../net/wireless/mediatek/mt76/mt7615/mac.c | 18 +++++++-------- .../wireless/mediatek/mt76/mt7615/mt7615.h | 22 +++++++++---------- .../wireless/mediatek/mt76/mt7615/testmode.c | 21 +++++++++--------- 3 files changed, 30 insertions(+), 31 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +9 -9
@@ -186,7 +186,7 @@ mt7615_get_status_freq_info(struct mt7615_dev *dev, struct mt76_phy *mphy, status->freq =ieee80211_channel_to_frequency (chfreq, status->band); } -static void mt7615_mac_fill_tm_rx (struct mt7615_dev *dev,__le32 *rxv) +static void mt7615_mac_fill_tm_rx (struct mt7615_phy *phy,__le32 *rxv) {#ifdef CONFIG_NL80211_TESTMODE u32 rxv1 =le32_to_cpu (rxv[0 ]);
@@ -210,13 +210,13 @@ static void mt7615_mac_fill_tm_rx(struct mt7615_dev *dev, __le32 *rxv) foe = (foe * foe_const) >> 15; } - dev->test.last_freq_offset = foe; - dev->test.last_rcpi[0 ] =FIELD_GET (MT_RXV4_RCPI0 , rxv4); - 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[0 ] =FIELD_GET (MT_RXV3_IB_RSSI , rxv3); - dev->test.last_wb_rssi[0 ] =FIELD_GET (MT_RXV3_WB_RSSI , rxv3); + phy->test.last_freq_offset = foe; + phy->test.last_rcpi[0 ] =FIELD_GET (MT_RXV4_RCPI0 , rxv4); + phy->test.last_rcpi[1 ] =FIELD_GET (MT_RXV4_RCPI1 , rxv4); + phy->test.last_rcpi[2 ] =FIELD_GET (MT_RXV4_RCPI2 , rxv4); + phy->test.last_rcpi[3 ] =FIELD_GET (MT_RXV4_RCPI3 , rxv4); + phy->test.last_ib_rssi[0 ] =FIELD_GET (MT_RXV3_IB_RSSI , rxv3); + phy->test.last_wb_rssi[0 ] =FIELD_GET (MT_RXV3_WB_RSSI , rxv3);#endif }
@@ -435,7 +435,7 @@ static int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb) status->chain_signal[i]); } -mt7615_mac_fill_tm_rx (dev, rxd); +mt7615_mac_fill_tm_rx (mphy->priv, rxd); rxd +=6 ;if ((u8 *)rxd - skb->data >= skb->len)
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +11 -11
@@ -195,6 +195,17 @@ struct mt7615_phy {struct timer_list roc_timer;wait_queue_head_t roc_wait;bool roc_grant; + +#ifdef CONFIG_NL80211_TESTMODE +struct { +u32 *reg_backup; + +s16 last_freq_offset; +u8 last_rcpi[4 ]; +s8 last_ib_rssi[4 ]; +s8 last_wb_rssi[4 ]; + } test; +#endif };#define mt7615_mcu_add_tx_ba (dev, ...) (dev)->mcu_ops->add_tx_ba((dev), __VA_ARGS__)
@@ -281,17 +292,6 @@ struct mt7615_dev {u32 muar_mask; -#ifdef CONFIG_NL80211_TESTMODE -struct { -u32 *reg_backup; - -s16 last_freq_offset; -u8 last_rcpi[4 ]; -s8 last_ib_rssi[4 ]; -s8 last_wb_rssi[4 ]; - } test; -#endif -struct {bool enable;
drivers/net/wireless/mediatek/mt76/mt7615/testmode.c +10 -11
@@ -98,12 +98,12 @@ static void mt7615_tm_reg_backup_restore(struct mt7615_phy *phy) {struct mt7615_dev *dev = phy->dev; -u32 *b = dev->test.reg_backup; +u32 *b = phy->test.reg_backup;int n_regs =ARRAY_SIZE (reg_backup_list);int n_rf_regs =ARRAY_SIZE (rf_backup_list);int i; -if (dev->mphy.test.state ==MT76_TM_STATE_OFF ) { +if (phy->mt76->test.state ==MT76_TM_STATE_OFF ) {for (i =0 ; i < n_regs; i++)mt76_wr (dev, reg_backup_list[i], b[i]);
@@ -121,7 +121,7 @@ mt7615_tm_reg_backup_restore(struct mt7615_phy *phy)if (!b)return ; - dev->test.reg_backup = b; + phy->test.reg_backup = b;for (i =0 ; i < n_regs; i++) b[i] =mt76_rr (dev, reg_backup_list[i]);for (i =0 ; i < n_rf_regs; i++)
@@ -323,7 +323,6 @@ static int mt7615_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg) { struct mt7615_phy *phy = mphy->priv; -struct mt7615_dev *dev = phy->dev;void *rx, *rssi;int i;
@@ -331,15 +330,15 @@ mt7615_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg)if (!rx)return -ENOMEM ; -if (nla_put_s32 (msg,MT76_TM_RX_ATTR_FREQ_OFFSET , dev->test.last_freq_offset)) +if (nla_put_s32 (msg,MT76_TM_RX_ATTR_FREQ_OFFSET , phy->test.last_freq_offset))return -ENOMEM ; rssi =nla_nest_start (msg,MT76_TM_RX_ATTR_RCPI );if (!rssi)return -ENOMEM ; -for (i =0 ; i <ARRAY_SIZE (dev->test.last_rcpi); i++) -if (nla_put_u8 (msg, i, dev->test.last_rcpi[i])) +for (i =0 ; i <ARRAY_SIZE (phy->test.last_rcpi); i++) +if (nla_put_u8 (msg, i, phy->test.last_rcpi[i]))return -ENOMEM ;nla_nest_end (msg, rssi);
@@ -348,8 +347,8 @@ mt7615_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg)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])) +for (i =0 ; i <ARRAY_SIZE (phy->test.last_ib_rssi); i++) +if (nla_put_s8 (msg, i, phy->test.last_ib_rssi[i]))return -ENOMEM ;nla_nest_end (msg, rssi);
@@ -358,8 +357,8 @@ mt7615_tm_dump_stats(struct mt76_phy *mphy, struct sk_buff *msg)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])) +for (i =0 ; i <ARRAY_SIZE (phy->test.last_wb_rssi); i++) +if (nla_put_s8 (msg, i, phy->test.last_wb_rssi[i]))return -ENOMEM ;nla_nest_end (msg, rssi);
Signature · 1 line
2.17.1