mt76: mt7615: schedule tx tasklet and sta poll on mac tx free
Subsystems (3)
Felix Fietkau
maintainerPATCH 1/7 mt76: mt7615: schedule tx tasklet and sta poll on mac tx free
Unlike on earlier chips, DMA completion on MT7615 does not imply actually having sent out any packets.
Since AQL will prevent filling the hardware queues and will only allow more packets to be passed to the driver after tx completion, it makes much more sense to schedule the tx tasklet there.
This is also needed for scheduling tx in testmode support
--- drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 4 ---- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/dma.c +0 -4
@@ -122,10 +122,6 @@ static int mt7615_poll_tx(struct napi_struct *napi, int budget)mt7615_tx_cleanup (dev); -rcu_read_lock (); -mt7615_mac_sta_poll (dev); -rcu_read_unlock (); -tasklet_schedule (&dev->mt76.tx_tasklet);return 0 ;
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +6 -0
@@ -1399,6 +1399,12 @@ static void mt7615_mac_tx_free(struct mt7615_dev *dev, struct sk_buff *skb) }dev_kfree_skb (skb); + +rcu_read_lock (); +mt7615_mac_sta_poll (dev); +rcu_read_unlock (); + +tasklet_schedule (&dev->mt76.tx_tasklet); } void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 2/7 mt76: mt7615: add support for accessing mapped registers via bus ops
Makes it possible to read/write them via debugfs, similar to mt7603
--- .../net/wireless/mediatek/mt76/mt7615/mmio.c | 46 +++++++++++++++++++ .../wireless/mediatek/mt76/mt7615/mt7615.h | 1 + 2 files changed, 47 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/mmio.c +46 -0
@@ -140,6 +140,38 @@ static void mt7615_irq_tasklet(unsigned long data)mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR , mask,0 ); } +static u32 __mt7615_reg_addr (struct mt7615_dev *dev,u32 addr) +{ +if (addr <0x100000 ) +return addr; + +return mt7615_reg_map (dev, addr); +} + +static u32 mt7615_rr (struct mt76_dev *mdev,u32 offset) +{ + struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76); +u32 addr =__mt7615_reg_addr (dev, offset); + +return dev->bus_ops->rr (mdev, addr); +} + +static void mt7615_wr (struct mt76_dev *mdev,u32 offset,u32 val) +{ + struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76); +u32 addr =__mt7615_reg_addr (dev, offset); + + dev->bus_ops->wr (mdev, addr, val); +} + +static u32 mt7615_rmw (struct mt76_dev *mdev,u32 offset,u32 mask,u32 val) +{ + struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76); +u32 addr =__mt7615_reg_addr (dev, offset); + +return dev->bus_ops->rmw (mdev, addr, mask, val); +} +int mt7615_mmio_probe (struct device *pdev,void __iomem *mem_base,int irq,const u32 *map) {
@@ -159,6 +191,7 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base, .sta_remove = mt7615_mac_sta_remove, .update_survey = mt7615_update_channel, }; +struct mt76_bus_ops *bus_ops;struct ieee80211_ops *ops;struct mt7615_dev *dev;struct mt76_dev *mdev;
@@ -182,6 +215,19 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base, (mt76_rr (dev,MT_HW_REV ) &0xff );dev_dbg (mdev->dev,"ASIC revision: %04x\n" , mdev->rev); + dev->bus_ops = dev->mt76.bus; + bus_ops =devm_kmemdup (dev->mt76.dev, dev->bus_ops,sizeof (*bus_ops), +GFP_KERNEL ); +if (!bus_ops) { + ret = -ENOMEM ; + goto error; + } + + bus_ops->rr = mt7615_rr; + bus_ops->wr = mt7615_wr; + bus_ops->rmw = mt7615_rmw; + dev->mt76.bus = bus_ops; + ret =devm_request_irq (mdev->dev, irq, mt7615_irq_handler,IRQF_SHARED ,KBUILD_MODNAME , dev);if (ret)
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -0
@@ -240,6 +240,7 @@ struct mt7615_dev {struct mt76_phy mphy; }; +const struct mt76_bus_ops *bus_ops;struct tasklet_struct irq_tasklet;struct mt7615_phy phy;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 3/7 mt76: mt7615: add support for accessing RF registers via MCU
In reply to Felix FietkauIncludes debugfs files for testing it.
Will be used for testmode support.
--- .../wireless/mediatek/mt76/mt7615/debugfs.c | 28 ++++++++++++ .../net/wireless/mediatek/mt76/mt7615/mcu.c | 43 ++++++++++++++++++- .../net/wireless/mediatek/mt76/mt7615/mcu.h | 4 +- .../wireless/mediatek/mt76/mt7615/mt7615.h | 5 +++ 4 files changed, 77 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +28 -0
@@ -285,6 +285,29 @@ mt7615_queues_read(struct seq_file *s, void *data)return 0 ; } +static int +mt7615_rf_reg_set (void *data,u64 val) +{ +struct mt7615_dev *dev = data; + +mt7615_rf_wr (dev, dev->debugfs_rf_wf, dev->debugfs_rf_reg, val); + +return 0 ; +} + +static int +mt7615_rf_reg_get (void *data,u64 *val) +{ +struct mt7615_dev *dev = data; + + *val =mt7615_rf_rr (dev, dev->debugfs_rf_wf, dev->debugfs_rf_reg); + +return 0 ; +} + +DEFINE_DEBUGFS_ATTRIBUTE (fops_rf_reg, mt7615_rf_reg_get, mt7615_rf_reg_set, +"0x%08llx\n" ); +int mt7615_init_debugfs (struct mt7615_dev *dev) {struct dentry *dir;
@@ -324,6 +347,11 @@ int mt7615_init_debugfs(struct mt7615_dev *dev)debugfs_create_devm_seqfile (dev->mt76.dev,"temperature" , dir, mt7615_read_temperature); +debugfs_create_u32 ("rf_wfidx" ,0600 , dir, &dev->debugfs_rf_wf); +debugfs_create_u32 ("rf_regidx" ,0600 , dir, &dev->debugfs_rf_reg); +debugfs_create_file_unsafe ("rf_regval" ,0600 , dir, dev, + &fops_rf_reg); +return 0 ; }EXPORT_SYMBOL_GPL (mt7615_init_debugfs);
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +41 -2
61 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mcu.h +3 -1
@@ -238,8 +238,9 @@ enum {#define MCU_FW_PREFIX BIT(31)#define MCU_UNI_PREFIX BIT(30)#define MCU_CE_PREFIX BIT(29) +#define MCU_QUERY_PREFIX BIT(28)#define MCU_CMD_MASK ~(MCU_FW_PREFIX | MCU_UNI_PREFIX | \ - MCU_CE_PREFIX) + MCU_CE_PREFIX | MCU_QUERY_PREFIX)enum {MCU_CMD_TARGET_ADDRESS_LEN_REQ =MCU_FW_PREFIX |0x01 ,
@@ -254,6 +255,7 @@ enum { };enum { +MCU_EXT_CMD_RF_REG_ACCESS =0x02 ,MCU_EXT_CMD_PM_STATE_CTRL =0x07 ,MCU_EXT_CMD_CHANNEL_SWITCH =0x08 ,MCU_EXT_CMD_SET_TX_POWER_CTRL =0x11 ,
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +5 -0
@@ -281,6 +281,9 @@ struct mt7615_dev {struct work_struct wtbl_work;struct list_head wd_head; + +u32 debugfs_rf_wf; +u32 debugfs_rf_reg; };enum tx_pkt_queue_idx {
@@ -522,6 +525,8 @@ u32 mt7615_mac_get_sta_tid_sn(struct mt7615_dev *dev, int wcid, u8 tid);int mt7615_mcu_wait_response (struct mt7615_dev *dev,int cmd,int seq);int mt7615_mcu_msg_send (struct mt76_dev *mdev,int cmd,const void *data,int len,bool wait_resp); +u32 mt7615_rf_rr (struct mt7615_dev *dev,u32 wf,u32 reg); +int mt7615_rf_wr (struct mt7615_dev *dev,u32 wf,u32 reg,u32 val);int mt7615_mcu_set_dbdc (struct mt7615_dev *dev);int mt7615_mcu_set_eeprom (struct mt7615_dev *dev);int mt7615_mcu_set_mac_enable (struct mt7615_dev *dev,int band,bool enable);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 4/7 mt76: mt7615: use full on-chip memory address for WF_PHY registers
In reply to Felix FietkauNow that the bus access functions can use mapping for accessing full register addresses, use it for WF_PHY registers to keep them constant. Needed for follow-up work on testmode support
--- drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 2 -- drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 3 +-- drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 1 - 3 files changed, 1 insertion(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mmio.c +0 -2
@@ -17,7 +17,6 @@ const u32 mt7615e_reg_map[] = { [MT_CSR_BASE] = 0x07000, [MT_PLE_BASE] = 0x08000, [MT_PSE_BASE] = 0x0c000, - [MT_PHY_BASE] = 0x10000, [MT_CFG_BASE] = 0x20200, [MT_AGG_BASE] = 0x20a00, [MT_TMAC_BASE] = 0x21000,
@@ -44,7 +43,6 @@ const u32 mt7663e_reg_map[] = { [MT_CSR_BASE] = 0x07000, [MT_PLE_BASE] = 0x08000, [MT_PSE_BASE] = 0x0c000, - [MT_PHY_BASE] = 0x10000, [MT_CFG_BASE] = 0x20000, [MT_AGG_BASE] = 0x22000, [MT_TMAC_BASE] = 0x24000,
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +1 -2
@@ -14,7 +14,6 @@ enum mt7615_reg_base {MT_CSR_BASE ,MT_PLE_BASE ,MT_PSE_BASE , -MT_PHY_BASE ,MT_CFG_BASE ,MT_AGG_BASE , MT_TMAC_BASE,
@@ -169,7 +168,7 @@ enum mt7615_reg_base {#define MT_PSE_PG_INFO MT_PSE(0x194)#define MT_PSE_SRC_CNT GENMASK(27, 16) -#define MT_WF_PHY_BASE ((dev)->reg_map[MT_PHY_BASE]) +#define MT_WF_PHY_BASE 0x82070000#define MT_WF_PHY (ofs) (MT_WF_PHY_BASE + (ofs))#define MT_WF_PHY_WF2_RFCTRL0 (n) MT_WF_PHY(0x1900 + (n) * 0x400)
drivers/net/wireless/mediatek/mt76/mt7615/usb.c +0 -1
@@ -25,7 +25,6 @@ static const u32 mt7663u_reg_map[] = { [MT_TOP_MISC_BASE] = 0x81020000, [MT_PLE_BASE] = 0x82060000, [MT_PSE_BASE] = 0x82068000, - [MT_PHY_BASE] = 0x82070000, [MT_WTBL_BASE_ADDR] = 0x820e0000, [MT_CFG_BASE] = 0x820f0000, [MT_AGG_BASE] = 0x820f2000,
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 5/7 mt76: vif_mask to struct mt76_phy
In reply to Felix FietkauAll drivers use this in pretty much the same way. Moving it to core helps with some checks for the upcoming testmode support
--- drivers/net/wireless/mediatek/mt76/mt76.h | 2 ++ drivers/net/wireless/mediatek/mt76/mt7603/main.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 2 -- drivers/net/wireless/mediatek/mt76/mt7615/main.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 1 - drivers/net/wireless/mediatek/mt76/mt76x02.h | 1 - drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 8 ++++---- drivers/net/wireless/mediatek/mt76/mt7915/main.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 1 - 10 files changed, 16 insertions(+), 19 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +2 -0
@@ -491,6 +491,8 @@ struct mt76_phy {struct mt76_sband sband_2g;struct mt76_sband sband_5g; +u32 vif_mask; +int txpower_cur;u8 antenna_mask; };
drivers/net/wireless/mediatek/mt76/mt7603/main.c +3 -3
@@ -44,7 +44,7 @@ mt7603_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)mutex_lock (&dev->mt76.mutex); - mvif->idx =ffs (~dev->vif_mask) -1 ; + mvif->idx =ffs (~dev->mphy.vif_mask) -1 ;if (mvif->idx >=MT7603_MAX_INTERFACES ) { ret = -ENOSPC ; goto out;
@@ -65,7 +65,7 @@ mt7603_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) } idx =MT7603_WTBL_RESERVED -1 - mvif->idx; - dev->vif_mask |=BIT (mvif->idx); + dev->mphy.vif_mask |=BIT (mvif->idx);INIT_LIST_HEAD (&mvif->sta.poll_list); mvif->sta.wcid.idx = idx; mvif->sta.wcid.hw_key_idx =-1 ;
@@ -107,7 +107,7 @@ mt7603_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)spin_unlock_bh (&dev->sta_poll_lock);mutex_lock (&dev->mt76.mutex); - dev->vif_mask &= ~BIT (mvif->idx); + dev->mphy.vif_mask &= ~BIT (mvif->idx);mutex_unlock (&dev->mt76.mutex); }
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h +0 -2
@@ -108,8 +108,6 @@ struct mt7603_dev {u32 rxfilter; -u8 vif_mask; -struct list_head sta_poll_list;spinlock_t sta_poll_lock;
drivers/net/wireless/mediatek/mt76/mt7615/main.c +3 -3
@@ -137,7 +137,7 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,mutex_lock (&dev->mt76.mutex); - mvif->idx =ffs (~dev->vif_mask) -1 ; + mvif->idx =ffs (~dev->mphy.vif_mask) -1 ;if (mvif->idx >=MT7615_MAX_INTERFACES ) { ret = -ENOSPC ; goto out;
@@ -157,7 +157,7 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,else mvif->wmm_idx = mvif->idx %MT7615_MAX_WMM_SETS ; - dev->vif_mask |=BIT (mvif->idx); + dev->mphy.vif_mask |=BIT (mvif->idx); dev->omac_mask |=BIT (mvif->omac_idx); phy->omac_mask |=BIT (mvif->omac_idx);
@@ -204,7 +204,7 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,mt76_txq_remove (&dev->mt76, vif->txq);mutex_lock (&dev->mt76.mutex); - dev->vif_mask &= ~BIT (mvif->idx); + dev->mphy.vif_mask &= ~BIT (mvif->idx); dev->omac_mask &= ~BIT (mvif->omac_idx); phy->omac_mask &= ~BIT (mvif->omac_idx);mutex_unlock (&dev->mt76.mutex);
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +0 -1
@@ -244,7 +244,6 @@ struct mt7615_dev {struct tasklet_struct irq_tasklet;struct mt7615_phy phy; -u32 vif_mask;u32 omac_mask;u16 chainmask;
drivers/net/wireless/mediatek/mt76/mt76x02.h +0 -1
@@ -80,7 +80,6 @@ struct mt76x02_dev {struct mutex phy_mutex; -u16 vif_mask;u16 chainmask;u8 txdone_seq;
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +1 -1
@@ -439,7 +439,7 @@ static void mt76x02_reset_state(struct mt76x02_dev *dev)memset (msta,0 ,sizeof (*msta)); } - dev->vif_mask =0 ; + dev->mphy.vif_mask =0 ; dev->mt76.beacon_mask =0 ; }
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +4 -4
@@ -305,7 +305,7 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)unsigned int idx =0 ;/* Allow to change address in HW if we create first interface. */ -if (!dev->vif_mask && +if (!dev->mphy.vif_mask && (((vif->addr[0 ] ^ dev->mt76.macaddr[0 ]) & ~GENMASK (4 ,1 )) ||memcmp (vif->addr +1 , dev->mt76.macaddr +1 ,ETH_ALEN -1 )))mt76x02_mac_setaddr (dev, vif->addr);
@@ -330,11 +330,11 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) idx +=8 ;/* vif is already set or idx is 8 for AP/Mesh/... */ -if (dev->vif_mask &BIT (idx) || +if (dev->mphy.vif_mask &BIT (idx) || (vif->type !=NL80211_IFTYPE_STATION && idx >7 ))return -EBUSY ; - dev->vif_mask |=BIT (idx); + dev->mphy.vif_mask |=BIT (idx);mt76x02_vif_init (dev, vif, idx);return 0 ;
@@ -348,7 +348,7 @@ void mt76x02_remove_interface(struct ieee80211_hw *hw,struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;mt76_txq_remove (&dev->mt76, vif->txq); - dev->vif_mask &= ~BIT (mvif->idx); + dev->mphy.vif_mask &= ~BIT (mvif->idx); }EXPORT_SYMBOL_GPL (mt76x02_remove_interface);
drivers/net/wireless/mediatek/mt76/mt7915/main.c +3 -3
@@ -125,7 +125,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,mutex_lock (&dev->mt76.mutex); - mvif->idx =ffs (~phy->vif_mask) -1 ; + mvif->idx =ffs (~phy->mt76->vif_mask) -1 ;if (mvif->idx >=MT7915_MAX_INTERFACES ) { ret = -ENOSPC ; goto out;
@@ -150,7 +150,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,if (ret) goto out; - phy->vif_mask |=BIT (mvif->idx); + phy->mt76->vif_mask |=BIT (mvif->idx); phy->omac_mask |=BIT (mvif->omac_idx); idx =MT7915_WTBL_RESERVED - mvif->idx;
@@ -194,7 +194,7 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,mt76_txq_remove (&dev->mt76, vif->txq);mutex_lock (&dev->mt76.mutex); - phy->vif_mask &= ~BIT (mvif->idx); + phy->mt76->vif_mask &= ~BIT (mvif->idx); phy->omac_mask &= ~BIT (mvif->omac_idx);mutex_unlock (&dev->mt76.mutex);
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +0 -1
@@ -116,7 +116,6 @@ struct mt7915_phy {struct ieee80211_sband_iftype_data iftype[2 ][NUM_NL80211_IFTYPES ];u32 rxfilter; -u32 vif_mask;u32 omac_mask;u16 noise;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 6/7 mt76: add API for testmode support
In reply to Felix FietkauThis can be used for calibration in the manufacturing process. It supports sending a configurable number of packets with a specific rate and configurable tx power levels / antenna settings.
It also supports receiving packets and showing some statistics, including packet counters and detailed RSSI information.
It will only be compiled in if CONFIG_NL80211_TESTMODE is enabled
--- drivers/net/wireless/mediatek/mt76/Makefile | 1 + drivers/net/wireless/mediatek/mt76/eeprom.c | 5 + drivers/net/wireless/mediatek/mt76/mac80211.c | 7 + drivers/net/wireless/mediatek/mt76/mt76.h | 75 +++ drivers/net/wireless/mediatek/mt76/testmode.c | 497 ++++++++++++++++++ drivers/net/wireless/mediatek/mt76/testmode.h | 156 ++++++ drivers/net/wireless/mediatek/mt76/tx.c | 18 + 7 files changed, 759 insertions(+) create mode 100644 drivers/net/wireless/mediatek/mt76/testmode.c create mode 100644 drivers/net/wireless/mediatek/mt76/testmode.h
drivers/net/wireless/mediatek/mt76/Makefile +1 -0
@@ -9,6 +9,7 @@ mt76-y := \ tx.o agg-rx.o mcu.o mt76-$(CONFIG_PCI) += pci.o +mt76-$(CONFIG_NL80211_TESTMODE) += testmode.o mt76-usb-y := usb.o usb_trace.o
drivers/net/wireless/mediatek/mt76/eeprom.c +5 -0
@@ -74,6 +74,11 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len) &data[i]); } +#ifdef CONFIG_NL80211_TESTMODE + dev->test.mtd_name =devm_kstrdup (dev->dev, part,GFP_KERNEL ); + dev->test.mtd_offset = offset; +#endif + out_put_node:of_node_put (np);return ret;
drivers/net/wireless/mediatek/mt76/mac80211.c +7 -0
@@ -505,6 +505,13 @@ void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb)return ; } +#ifdef CONFIG_NL80211_TESTMODE +if (dev->test.state ==MT76_TM_STATE_RX_FRAMES ) { + dev->test.rx_stats.packets[q]++; +if (status->flag &RX_FLAG_FAILED_FCS_CRC ) + dev->test.rx_stats.fcs_error[q]++; + } +#endif __skb_queue_tail (&dev->rx_skb[q], skb); }EXPORT_SYMBOL_GPL (mt76_rx);
drivers/net/wireless/mediatek/mt76/mt76.h +75 -0
111 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/testmode.c new file +497 -0
497 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/testmode.h new file +156 -0
156 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/tx.c +18 -0
@@ -236,6 +236,14 @@ void mt76_tx_complete_skb(struct mt76_dev *dev, struct sk_buff *skb)struct ieee80211_hw *hw;struct sk_buff_head list; +#ifdef CONFIG_NL80211_TESTMODE +if (skb == dev->test.tx_skb) { + dev->test.tx_done++; +if (dev->test.tx_queued == dev->test.tx_done) +wake_up (&dev->tx_wait); + } +#endif +if (!skb->prev) { hw =mt76_tx_status_get_hw (dev, skb);ieee80211_free_txskb (hw, skb);
@@ -259,6 +267,11 @@ 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)) { +ieee80211_free_txskb (phy->hw, skb); +return ; + } +if (WARN_ON (qid >=MT_TXQ_PSD )) { qid =MT_TXQ_BE ;skb_set_queue_mapping (skb, qid);
@@ -579,6 +592,11 @@ void mt76_tx_tasklet(unsigned long data)mt76_txq_schedule_all (&dev->phy);if (dev->phy2)mt76_txq_schedule_all (dev->phy2); + +#ifdef CONFIG_NL80211_TESTMODE +if (dev->test.tx_pending) +mt76_testmode_tx_pending (dev); +#endif } void mt76_stop_tx_queues(struct mt76_dev *dev, struct ieee80211_sta *sta,
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 7/7 mt76: mt7615: implement testmode support
In reply to Felix FietkauSupports sending a configurable number of packets with a specific rate and configurable tx power levels / antenna settings, as well as displaying rx statistics.
--- .../wireless/mediatek/mt76/mt7615/Makefile | 1 + .../net/wireless/mediatek/mt76/mt7615/init.c | 8 +- .../net/wireless/mediatek/mt76/mt7615/mac.c | 36 ++ .../net/wireless/mediatek/mt76/mt7615/mac.h | 5 + .../net/wireless/mediatek/mt76/mt7615/main.c | 44 ++- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 35 +- .../net/wireless/mediatek/mt76/mt7615/mcu.h | 6 + .../wireless/mediatek/mt76/mt7615/mt7615.h | 18 + .../net/wireless/mediatek/mt76/mt7615/regs.h | 16 + .../wireless/mediatek/mt76/mt7615/testmode.c | 363 ++++++++++++++++++ 10 files changed, 523 insertions(+), 9 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/testmode.c
drivers/net/wireless/mediatek/mt76/mt7615/Makefile +1 -0
@@ -8,6 +8,7 @@ CFLAGS_trace.o := -I$(src) mt7615-common-y := main.o init.o mcu.o eeprom.o mac.o \ debugfs.o trace.o +mt7615-common-$(CONFIG_NL80211_TESTMODE) += testmode.o mt7615e-y := pci.o pci_init.o dma.o pci_mac.o mmio.o mt7615e-$(CONFIG_MT7622_WMAC) += soc.o
drivers/net/wireless/mediatek/mt76/mt7615/init.c +5 -3
@@ -321,6 +321,7 @@ mt7615_init_wiphy(struct ieee80211_hw *hw)ieee80211_hw_set (hw,SINGLE_SCAN_ON_ALL_BANDS );ieee80211_hw_set (hw,TX_STATUS_NO_AMPDU_LEN ); +ieee80211_hw_set (hw,WANT_MONITOR_VIF );if (is_mt7615 (&phy->dev->mt76)) hw->max_tx_fragments =MT_TXP_MAX_BUF_NUM ;
@@ -405,9 +406,6 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev) mphy->sband_2g.sband.n_channels =0 ; mphy->hw->wiphy->bands[NL80211_BAND_2GHZ ] =NULL ; -/* 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);
@@ -457,5 +455,9 @@ void mt7615_init_device(struct mt7615_dev *dev)IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK ;mt7615_cap_dbdc_disable (dev); dev->phy.dfs_state =-1 ; + +#ifdef CONFIG_NL80211_TESTMODE + dev->mt76.test_ops = &mt7615_testmode_ops; +#endif }EXPORT_SYMBOL_GPL (mt7615_init_device);
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +36 -0
@@ -186,6 +186,40 @@ 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) +{ +#ifdef CONFIG_NL80211_TESTMODE +u32 rxv1 =le32_to_cpu (rxv[0 ]); +u32 rxv3 =le32_to_cpu (rxv[2 ]); +u32 rxv4 =le32_to_cpu (rxv[3 ]); +u32 rxv5 =le32_to_cpu (rxv[4 ]); +u8 cbw =FIELD_GET (MT_RXV1_FRAME_MODE , rxv1); +u8 mode =FIELD_GET (MT_RXV1_TX_MODE , rxv1); +s16 foe =FIELD_GET (MT_RXV5_FOE , rxv5); +u32 foe_const = (BIT (cbw +1 ) &0xf ) *10000 ; + +if (!mode) { +/* CCK */ + foe &= ~BIT (11 ); + foe *=1000 ; + foe >>=11 ; + }else { +if (foe >2048 ) + foe -=4096 ; + + 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 =FIELD_GET (MT_RXV3_IB_RSSI , rxv3); + dev->test.last_ib_rssi =FIELD_GET (MT_RXV3_WB_RSSI , rxv3); +#endif +} +static int mt7615_mac_fill_rx (struct mt7615_dev *dev,struct sk_buff *skb) {struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
@@ -401,6 +435,8 @@ 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); + rxd +=6 ;if ((u8 *)rxd - skb->data >= skb->len)return -EINVAL ;
drivers/net/wireless/mediatek/mt76/mt7615/mac.h +5 -0
@@ -100,11 +100,16 @@ enum rx_pkt_type {#define MT_RXV2_GROUP_ID GENMASK(26, 21)#define MT_RXV2_LENGTH GENMASK(20, 0) +#define MT_RXV3_WB_RSSI GENMASK(31, 24) +#define MT_RXV3_IB_RSSI GENMASK(23, 16) +#define MT_RXV4_RCPI3 GENMASK(31, 24)#define MT_RXV4_RCPI2 GENMASK(23, 16)#define MT_RXV4_RCPI1 GENMASK(15, 8)#define MT_RXV4_RCPI0 GENMASK(7, 0) +#define MT_RXV5_FOE GENMASK(11, 0) +#define MT_RXV6_NF3 GENMASK(31, 24)#define MT_RXV6_NF2 GENMASK(23, 16)#define MT_RXV6_NF1 GENMASK(15, 8)
drivers/net/wireless/mediatek/mt76/mt7615/main.c +39 -5
113 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +34 -1
@@ -2806,6 +2806,14 @@ int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd) .center_chan2 = ieee80211_frequency_to_channel(freq2), }; +#ifdef CONFIG_NL80211_TESTMODE +if (dev->mt76.test.state ==MT76_TM_STATE_TX_FRAMES && + dev->mt76.test.tx_antenna_mask) { + req.tx_streams =hweight8 (dev->mt76.test.tx_antenna_mask); + req.rx_streams_mask = 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) &&
@@ -2817,7 +2825,10 @@ 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); -mt7615_mcu_set_txpower_sku (phy, req.txpower_sku); +if (mt76_testmode_enabled (&dev->mt76)) +memset (req.txpower_sku,0x3f ,49 ); +else +mt7615_mcu_set_txpower_sku (phy, req.txpower_sku);return __mt76_mcu_send_msg (&dev->mt76, cmd, &req,sizeof (req), true); }
@@ -2835,6 +2846,28 @@ int mt7615_mcu_get_temperature(struct mt7615_dev *dev, int index) sizeof(req), true); } +int mt7615_mcu_set_test_param (struct mt7615_dev *dev,u8 param,bool test_mode, +bool en) +{ +struct { +u8 test_mode_en; +u8 param_idx; +u8 _rsv[2 ]; + +u8 enable; +u8 _rsv2[3 ]; + +u8 pad[8 ]; + } 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 mt7615_mcu_set_sku_en (struct mt7615_phy *phy,bool enable) {struct mt7615_dev *dev = phy->dev;
drivers/net/wireless/mediatek/mt76/mt7615/mcu.h +6 -0
@@ -268,6 +268,7 @@ enum {MCU_EXT_CMD_GET_TEMP =0x2c ,MCU_EXT_CMD_WTBL_UPDATE =0x32 ,MCU_EXT_CMD_SET_RDD_CTRL =0x3a , +MCU_EXT_CMD_ATE_CTRL =0x3d ,MCU_EXT_CMD_PROTECT_CTRL =0x3e ,MCU_EXT_CMD_DBDC_CTRL =0x45 , MCU_EXT_CMD_MAC_INIT_CTRL = 0x46,
@@ -289,6 +290,11 @@ enum { MCU_UNI_CMD_HIF_CTRL = MCU_UNI_PREFIX | 0x07, }; +enum { +MCU_ATE_SET_FREQ_OFFSET =0xa , +MCU_ATE_SET_TX_POWER_CONTROL =0x15 , +}; +struct mt7615_mcu_uni_event {u8 cid;u8 pad[3 ];
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +18 -0
@@ -169,6 +169,8 @@ struct mt7615_phy {struct mt76_phy *mt76;struct mt7615_dev *dev; +struct ieee80211_vif *monitor_vif; +u32 rxfilter;u32 omac_mask;
@@ -283,6 +285,17 @@ struct mt7615_dev {u32 debugfs_rf_wf;u32 debugfs_rf_reg; + +#ifdef CONFIG_NL80211_TESTMODE +struct { +u32 *reg_backup; + +s16 last_freq_offset; +u8 last_rcpi[4 ]; +s8 last_ib_rssi; +s8 last_wb_rssi; + } test; +#endif };enum tx_pkt_queue_idx {
@@ -377,6 +390,7 @@ extern const u32 mt7615e_reg_map[__MT_BASE_MAX];extern const u32 mt7663e_reg_map[__MT_BASE_MAX];extern struct pci_driver mt7615_pci_driver;extern struct platform_driver mt7622_wmac_driver; +extern const struct mt76_testmode_ops mt7615_testmode_ops;#ifdef CONFIG_MT7622_WMAC int mt7622_wmac_init (struct mt7615_dev *dev);
@@ -488,6 +502,7 @@ void mt7615_init_txpower(struct mt7615_dev *dev, struct ieee80211_supported_band *sband);void mt7615_phy_init (struct mt7615_dev *dev);void mt7615_mac_init (struct mt7615_dev *dev); +int mt7615_set_channel (struct mt7615_phy *phy);int mt7615_mcu_restart (struct mt76_dev *dev);void mt7615_update_channel (struct mt76_dev *mdev);
@@ -531,6 +546,7 @@ int mt7615_mcu_set_eeprom(struct mt7615_dev *dev);int mt7615_mcu_set_mac_enable (struct mt7615_dev *dev,int band,bool enable);int mt7615_mcu_set_rts_thresh (struct mt7615_phy *phy,u32 val);int mt7615_mcu_get_temperature (struct mt7615_dev *dev,int index); +int mt7615_mcu_set_tx_power (struct mt7615_phy *phy);void mt7615_mcu_exit (struct mt7615_dev *dev);void mt7615_mcu_fill_msg (struct mt7615_dev *dev,struct sk_buff *skb,int cmd,int *wait_seq);
@@ -569,6 +585,8 @@ int mt7615_mcu_set_pulse_th(struct mt7615_dev *dev, const struct mt7615_dfs_pulse *pulse);int mt7615_mcu_set_radar_th (struct mt7615_dev *dev,int index,const struct mt7615_dfs_pattern *pattern); +int mt7615_mcu_set_test_param (struct mt7615_dev *dev,u8 param,bool test_mode, +bool en);int mt7615_mcu_set_sku_en (struct mt7615_phy *phy,bool enable);int mt7615_mcu_apply_rx_dcoc (struct mt7615_phy *phy);int mt7615_mcu_apply_tx_dpd (struct mt7615_phy *phy);
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +16 -0
@@ -212,6 +212,9 @@ enum mt7615_reg_base {#define MT_WF_PHY_RXTD2_BASE MT_WF_PHY(0x2a00)#define MT_WF_PHY_RXTD2 (_n) (MT_WF_PHY_RXTD2_BASE + ((_n) << 2)) +#define MT_WF_PHY_RFINTF3_0 (_n) MT_WF_PHY(0x1100 + (_n) * 0x400) +#define MT_WF_PHY_RFINTF3_0_ANT GENMASK(7, 4) +#define MT_WF_CFG_BASE ((dev)->reg_map[MT_CFG_BASE])#define MT_WF_CFG (ofs) (MT_WF_CFG_BASE + (ofs))
@@ -255,6 +258,13 @@ enum mt7615_reg_base {#define MT_WF_ARB_BASE ((dev)->reg_map[MT_ARB_BASE])#define MT_WF_ARB (ofs) (MT_WF_ARB_BASE + (ofs)) +#define MT_ARB_RQCR MT_WF_ARB(0x070) +#define MT_ARB_RQCR_RX_START BIT(0) +#define MT_ARB_RQCR_RXV_START BIT(4) +#define MT_ARB_RQCR_RXV_R_EN BIT(7) +#define MT_ARB_RQCR_RXV_T_EN BIT(8) +#define MT_ARB_RQCR_BAND_SHIFT 16 +#define MT_ARB_SCR MT_WF_ARB(0x080)#define MT_ARB_SCR_TX0_DISABLE BIT(8)#define MT_ARB_SCR_RX0_DISABLE BIT(9)
@@ -550,4 +560,10 @@ enum mt7615_reg_base {#define MT_WL_RX_BUSY BIT(30)#define MT_WL_TX_BUSY BIT(31) +#define MT_MCU_PTA_BASE 0x81060000 +#define MT_MCU_PTA (_n) (MT_MCU_PTA_BASE + (_n)) + +#define MT_ANT_SWITCH_CON (n) MT_MCU_PTA(0x0c8) +#define MT_ANT_SWITCH_CON_MODE (_n) (GENMASK(4, 0) << (_n * 8)) +#endif
drivers/net/wireless/mediatek/mt76/mt7615/testmode.c new file +363 -0
363 lines not on this page · raw message
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH v2 7/7 mt76: mt7615: implement testmode support
Supports sending a configurable number of packets with a specific rate and configurable tx power levels / antenna settings, as well as displaying rx statistics.
---
v2: fix reporting wideband rssi
.../wireless/mediatek/mt76/mt7615/Makefile | 1 + .../net/wireless/mediatek/mt76/mt7615/init.c | 8 +- .../net/wireless/mediatek/mt76/mt7615/mac.c | 36 ++ .../net/wireless/mediatek/mt76/mt7615/mac.h | 5 + .../net/wireless/mediatek/mt76/mt7615/main.c | 44 ++- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 35 +- .../net/wireless/mediatek/mt76/mt7615/mcu.h | 6 + .../wireless/mediatek/mt76/mt7615/mt7615.h | 18 + .../net/wireless/mediatek/mt76/mt7615/regs.h | 16 + .../wireless/mediatek/mt76/mt7615/testmode.c | 363 ++++++++++++++++++ 10 files changed, 523 insertions(+), 9 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mt7615/testmode.c
drivers/net/wireless/mediatek/mt76/mt7615/Makefile +1 -0
@@ -8,6 +8,7 @@ CFLAGS_trace.o := -I$(src) mt7615-common-y := main.o init.o mcu.o eeprom.o mac.o \ debugfs.o trace.o +mt7615-common-$(CONFIG_NL80211_TESTMODE) += testmode.o mt7615e-y := pci.o pci_init.o dma.o pci_mac.o mmio.o mt7615e-$(CONFIG_MT7622_WMAC) += soc.o
drivers/net/wireless/mediatek/mt76/mt7615/init.c +5 -3
@@ -330,6 +330,7 @@ mt7615_init_wiphy(struct ieee80211_hw *hw)ieee80211_hw_set (hw,SINGLE_SCAN_ON_ALL_BANDS );ieee80211_hw_set (hw,TX_STATUS_NO_AMPDU_LEN ); +ieee80211_hw_set (hw,WANT_MONITOR_VIF );if (is_mt7615 (&phy->dev->mt76)) hw->max_tx_fragments =MT_TXP_MAX_BUF_NUM ;
@@ -414,9 +415,6 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev) mphy->sband_2g.sband.n_channels =0 ; mphy->hw->wiphy->bands[NL80211_BAND_2GHZ ] =NULL ; -/* 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);
@@ -466,5 +464,9 @@ void mt7615_init_device(struct mt7615_dev *dev)IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK ;mt7615_cap_dbdc_disable (dev); dev->phy.dfs_state =-1 ; + +#ifdef CONFIG_NL80211_TESTMODE + dev->mt76.test_ops = &mt7615_testmode_ops; +#endif }EXPORT_SYMBOL_GPL (mt7615_init_device);
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +36 -0
@@ -186,6 +186,40 @@ 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) +{ +#ifdef CONFIG_NL80211_TESTMODE +u32 rxv1 =le32_to_cpu (rxv[0 ]); +u32 rxv3 =le32_to_cpu (rxv[2 ]); +u32 rxv4 =le32_to_cpu (rxv[3 ]); +u32 rxv5 =le32_to_cpu (rxv[4 ]); +u8 cbw =FIELD_GET (MT_RXV1_FRAME_MODE , rxv1); +u8 mode =FIELD_GET (MT_RXV1_TX_MODE , rxv1); +s16 foe =FIELD_GET (MT_RXV5_FOE , rxv5); +u32 foe_const = (BIT (cbw +1 ) &0xf ) *10000 ; + +if (!mode) { +/* CCK */ + foe &= ~BIT (11 ); + foe *=1000 ; + foe >>=11 ; + }else { +if (foe >2048 ) + foe -=4096 ; + + 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 =FIELD_GET (MT_RXV3_IB_RSSI , rxv3); + dev->test.last_wb_rssi =FIELD_GET (MT_RXV3_WB_RSSI , rxv3); +#endif +} +static int mt7615_mac_fill_rx (struct mt7615_dev *dev,struct sk_buff *skb) {struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
@@ -401,6 +435,8 @@ 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); + rxd +=6 ;if ((u8 *)rxd - skb->data >= skb->len)return -EINVAL ;
drivers/net/wireless/mediatek/mt76/mt7615/mac.h +5 -0
@@ -100,11 +100,16 @@ enum rx_pkt_type {#define MT_RXV2_GROUP_ID GENMASK(26, 21)#define MT_RXV2_LENGTH GENMASK(20, 0) +#define MT_RXV3_WB_RSSI GENMASK(31, 24) +#define MT_RXV3_IB_RSSI GENMASK(23, 16) +#define MT_RXV4_RCPI3 GENMASK(31, 24)#define MT_RXV4_RCPI2 GENMASK(23, 16)#define MT_RXV4_RCPI1 GENMASK(15, 8)#define MT_RXV4_RCPI0 GENMASK(7, 0) +#define MT_RXV5_FOE GENMASK(11, 0) +#define MT_RXV6_NF3 GENMASK(31, 24)#define MT_RXV6_NF2 GENMASK(23, 16)#define MT_RXV6_NF1 GENMASK(15, 8)
drivers/net/wireless/mediatek/mt76/mt7615/main.c +39 -5
113 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +34 -1
@@ -2865,6 +2865,14 @@ int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd) .center_chan2 = ieee80211_frequency_to_channel(freq2), }; +#ifdef CONFIG_NL80211_TESTMODE +if (dev->mt76.test.state ==MT76_TM_STATE_TX_FRAMES && + dev->mt76.test.tx_antenna_mask) { + req.tx_streams =hweight8 (dev->mt76.test.tx_antenna_mask); + req.rx_streams_mask = 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) &&
@@ -2876,7 +2884,10 @@ 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); -mt7615_mcu_set_txpower_sku (phy, req.txpower_sku); +if (mt76_testmode_enabled (&dev->mt76)) +memset (req.txpower_sku,0x3f ,49 ); +else +mt7615_mcu_set_txpower_sku (phy, req.txpower_sku);return __mt76_mcu_send_msg (&dev->mt76, cmd, &req,sizeof (req), true); }
@@ -2894,6 +2905,28 @@ int mt7615_mcu_get_temperature(struct mt7615_dev *dev, int index) sizeof(req), true); } +int mt7615_mcu_set_test_param (struct mt7615_dev *dev,u8 param,bool test_mode, +bool en) +{ +struct { +u8 test_mode_en; +u8 param_idx; +u8 _rsv[2 ]; + +u8 enable; +u8 _rsv2[3 ]; + +u8 pad[8 ]; + } 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 mt7615_mcu_set_sku_en (struct mt7615_phy *phy,bool enable) {struct mt7615_dev *dev = phy->dev;
drivers/net/wireless/mediatek/mt76/mt7615/mcu.h +6 -0
@@ -268,6 +268,7 @@ enum {MCU_EXT_CMD_GET_TEMP =0x2c ,MCU_EXT_CMD_WTBL_UPDATE =0x32 ,MCU_EXT_CMD_SET_RDD_CTRL =0x3a , +MCU_EXT_CMD_ATE_CTRL =0x3d ,MCU_EXT_CMD_PROTECT_CTRL =0x3e ,MCU_EXT_CMD_DBDC_CTRL =0x45 , MCU_EXT_CMD_MAC_INIT_CTRL = 0x46,
@@ -289,6 +290,11 @@ enum { MCU_UNI_CMD_HIF_CTRL = MCU_UNI_PREFIX | 0x07, }; +enum { +MCU_ATE_SET_FREQ_OFFSET =0xa , +MCU_ATE_SET_TX_POWER_CONTROL =0x15 , +}; +struct mt7615_mcu_uni_event {u8 cid;u8 pad[3 ];
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +18 -0
@@ -169,6 +169,8 @@ struct mt7615_phy {struct mt76_phy *mt76;struct mt7615_dev *dev; +struct ieee80211_vif *monitor_vif; +u32 rxfilter;u32 omac_mask;
@@ -283,6 +285,17 @@ struct mt7615_dev {u32 debugfs_rf_wf;u32 debugfs_rf_reg; + +#ifdef CONFIG_NL80211_TESTMODE +struct { +u32 *reg_backup; + +s16 last_freq_offset; +u8 last_rcpi[4 ]; +s8 last_ib_rssi; +s8 last_wb_rssi; + } test; +#endif };enum tx_pkt_queue_idx {
@@ -377,6 +390,7 @@ extern const u32 mt7615e_reg_map[__MT_BASE_MAX];extern const u32 mt7663e_reg_map[__MT_BASE_MAX];extern struct pci_driver mt7615_pci_driver;extern struct platform_driver mt7622_wmac_driver; +extern const struct mt76_testmode_ops mt7615_testmode_ops;#ifdef CONFIG_MT7622_WMAC int mt7622_wmac_init (struct mt7615_dev *dev);
@@ -488,6 +502,7 @@ void mt7615_init_txpower(struct mt7615_dev *dev, struct ieee80211_supported_band *sband);void mt7615_phy_init (struct mt7615_dev *dev);void mt7615_mac_init (struct mt7615_dev *dev); +int mt7615_set_channel (struct mt7615_phy *phy);int mt7615_mcu_restart (struct mt76_dev *dev);void mt7615_update_channel (struct mt76_dev *mdev);
@@ -531,6 +546,7 @@ int mt7615_mcu_set_eeprom(struct mt7615_dev *dev);int mt7615_mcu_set_mac_enable (struct mt7615_dev *dev,int band,bool enable);int mt7615_mcu_set_rts_thresh (struct mt7615_phy *phy,u32 val);int mt7615_mcu_get_temperature (struct mt7615_dev *dev,int index); +int mt7615_mcu_set_tx_power (struct mt7615_phy *phy);void mt7615_mcu_exit (struct mt7615_dev *dev);void mt7615_mcu_fill_msg (struct mt7615_dev *dev,struct sk_buff *skb,int cmd,int *wait_seq);
@@ -569,6 +585,8 @@ int mt7615_mcu_set_pulse_th(struct mt7615_dev *dev, const struct mt7615_dfs_pulse *pulse);int mt7615_mcu_set_radar_th (struct mt7615_dev *dev,int index,const struct mt7615_dfs_pattern *pattern); +int mt7615_mcu_set_test_param (struct mt7615_dev *dev,u8 param,bool test_mode, +bool en);int mt7615_mcu_set_sku_en (struct mt7615_phy *phy,bool enable);int mt7615_mcu_apply_rx_dcoc (struct mt7615_phy *phy);int mt7615_mcu_apply_tx_dpd (struct mt7615_phy *phy);
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +16 -0
@@ -212,6 +212,9 @@ enum mt7615_reg_base {#define MT_WF_PHY_RXTD2_BASE MT_WF_PHY(0x2a00)#define MT_WF_PHY_RXTD2 (_n) (MT_WF_PHY_RXTD2_BASE + ((_n) << 2)) +#define MT_WF_PHY_RFINTF3_0 (_n) MT_WF_PHY(0x1100 + (_n) * 0x400) +#define MT_WF_PHY_RFINTF3_0_ANT GENMASK(7, 4) +#define MT_WF_CFG_BASE ((dev)->reg_map[MT_CFG_BASE])#define MT_WF_CFG (ofs) (MT_WF_CFG_BASE + (ofs))
@@ -255,6 +258,13 @@ enum mt7615_reg_base {#define MT_WF_ARB_BASE ((dev)->reg_map[MT_ARB_BASE])#define MT_WF_ARB (ofs) (MT_WF_ARB_BASE + (ofs)) +#define MT_ARB_RQCR MT_WF_ARB(0x070) +#define MT_ARB_RQCR_RX_START BIT(0) +#define MT_ARB_RQCR_RXV_START BIT(4) +#define MT_ARB_RQCR_RXV_R_EN BIT(7) +#define MT_ARB_RQCR_RXV_T_EN BIT(8) +#define MT_ARB_RQCR_BAND_SHIFT 16 +#define MT_ARB_SCR MT_WF_ARB(0x080)#define MT_ARB_SCR_TX0_DISABLE BIT(8)#define MT_ARB_SCR_RX0_DISABLE BIT(9)
@@ -550,4 +560,10 @@ enum mt7615_reg_base {#define MT_WL_RX_BUSY BIT(30)#define MT_WL_TX_BUSY BIT(31) +#define MT_MCU_PTA_BASE 0x81060000 +#define MT_MCU_PTA (_n) (MT_MCU_PTA_BASE + (_n)) + +#define MT_ANT_SWITCH_CON (n) MT_MCU_PTA(0x0c8) +#define MT_ANT_SWITCH_CON_MODE (_n) (GENMASK(4, 0) << (_n * 8)) +#endif
drivers/net/wireless/mediatek/mt76/mt7615/testmode.c new file +363 -0
363 lines not on this page · raw message
Signature · 1 line
2.24.0