mt76: move initialization of some struct members to mt76_alloc_device
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/29 mt76: move initialization of some struct members to mt76_alloc_device
Reduces duplication and prepares for further rework
--- drivers/net/wireless/mediatek/mt76/dma.c | 1 - drivers/net/wireless/mediatek/mt76/mac80211.c | 8 ++++++-- drivers/net/wireless/mediatek/mt76/usb.c | 1 - 3 files changed, 6 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/dma.c +0 -1
@@ -555,7 +555,6 @@ mt76_dma_init(struct mt76_dev *dev)netif_napi_add (&dev->napi_dev, &dev->napi[i], mt76_dma_rx_poll,64 );mt76_dma_rx_fill (dev, &dev->q_rx[i]); -skb_queue_head_init (&dev->rx_skb[i]);napi_enable (&dev->napi[i]); }
drivers/net/wireless/mediatek/mt76/mac80211.c +6 -2
@@ -275,6 +275,7 @@ mt76_alloc_device(struct device *pdev, unsigned int size, {struct ieee80211_hw *hw;struct mt76_dev *dev; +int i; hw =ieee80211_alloc_hw (size, ops);if (!hw)
@@ -292,6 +293,11 @@ mt76_alloc_device(struct device *pdev, unsigned int size,init_waitqueue_head (&dev->tx_wait);skb_queue_head_init (&dev->status_list); +INIT_LIST_HEAD (&dev->txwi_cache); + +for (i =0 ; i <ARRAY_SIZE (dev->q_rx); i++) +skb_queue_head_init (&dev->rx_skb[i]); +tasklet_init (&dev->tx_tasklet, mt76_tx_tasklet, (unsigned long )dev);return dev;
@@ -307,8 +313,6 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,dev_set_drvdata (dev->dev, dev); -INIT_LIST_HEAD (&dev->txwi_cache); -SET_IEEE80211_DEV (hw, dev->dev);SET_IEEE80211_PERM_ADDR (hw, dev->macaddr);
drivers/net/wireless/mediatek/mt76/usb.c +0 -1
@@ -956,7 +956,6 @@ int mt76u_init(struct mt76_dev *dev,tasklet_init (&usb->rx_tasklet, mt76u_rx_tasklet, (unsigned long )dev);tasklet_init (&dev->tx_tasklet, mt76u_tx_tasklet, (unsigned long )dev);INIT_WORK (&usb->stat_work, mt76u_tx_status_data); -skb_queue_head_init (&dev->rx_skb[MT_RXQ_MAIN ]); usb->stat_wq =alloc_workqueue ("mt76u" ,WQ_UNBOUND ,0 );if (!usb->stat_wq)
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 2/29 mt76: introduce struct mt76_phy
This is preparation for supporting multiple wiphys per device to support the concurrent dual-band feature of MT7615D
On the first wiphy, hw->priv will point to struct mt76_dev, which contains a struct mt76_phy at the start. For the secondary wiphy, hw->priv will point to a mt76_phy encapsulated in a driver specific struct
To simplify access to struct mt76_phy members from drivers, the driver specific device struct is changed to add a union of struct mt76_dev and struct mt76_phy as the first element
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 5 +++++ drivers/net/wireless/mediatek/mt76/mt76.h | 9 ++++++++- drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 5 ++++- drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 6 +++++- drivers/net/wireless/mediatek/mt76/mt76x02.h | 5 ++++- 5 files changed, 26 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +5 -0
@@ -274,6 +274,7 @@ mt76_alloc_device(struct device *pdev, unsigned int size, const struct mt76_driver_ops *drv_ops) {struct ieee80211_hw *hw; +struct mt76_phy *phy;struct mt76_dev *dev;int i;
@@ -286,6 +287,10 @@ mt76_alloc_device(struct device *pdev, unsigned int size, dev->dev = pdev; dev->drv = drv_ops; + phy = &dev->phy; + phy->dev = dev; + phy->hw = hw; +spin_lock_init (&dev->rx_lock);spin_lock_init (&dev->lock);spin_lock_init (&dev->cc_lock);
drivers/net/wireless/mediatek/mt76/mt76.h +8 -1
@@ -449,7 +449,14 @@ struct mt76_rx_status {s8 chain_signal[IEEE80211_MAX_CHAINS ]; }; +struct mt76_phy { +struct ieee80211_hw *hw; +struct mt76_dev *dev; +}; +struct mt76_dev { +struct mt76_phy phy;/* must be first */ +struct ieee80211_hw *hw;struct cfg80211_chan_def chandef;struct ieee80211_channel *main_chan;
@@ -581,7 +588,7 @@ enum mt76_phy_type {#define __mt76_rmw_field (_dev, _reg, _field, _val) \ __mt76_rmw(_dev, _reg, _field, FIELD_PREP(_field, _val)) -#define mt76_hw (dev) (dev)->mt76.hw +#define mt76_hw (dev) (dev)->mphy.hwbool __mt76_poll (struct mt76_dev *dev,u32 offset,u32 mask,u32 val,int timeout);
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h +4 -1
@@ -98,7 +98,10 @@ enum mt7603_reset_cause { };struct mt7603_dev { -struct mt76_dev mt76;/* must be first */ +union {/* must be first */ +struct mt76_dev mt76; +struct mt76_phy mphy; + };const struct mt76_bus_ops *bus_ops;
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +5 -1
@@ -80,7 +80,11 @@ struct mt7615_vif { };struct mt7615_dev { -struct mt76_dev mt76;/* must be first */ +union {/* must be first */ +struct mt76_dev mt76; +struct mt76_phy mphy; + }; +u32 vif_mask;u32 omac_mask;
drivers/net/wireless/mediatek/mt76/mt76x02.h +4 -1
@@ -70,7 +70,10 @@ struct mt76x02_beacon_ops { (dev)->beacon_ops->pre_tbtt_enable(dev, enable)struct mt76x02_dev { -struct mt76_dev mt76;/* must be first */ +union {/* must be first */ +struct mt76_dev mt76; +struct mt76_phy mphy; + };struct mac_address macaddr_list[8 ];
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 3/29 mt76: add support for an extra wiphy in the rx path
In reply to Felix FietkauThis is preparation for supporting multiple wiphys per device to support the concurrent dual-band feature of MT7615D
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 20 +++++++++++++------ drivers/net/wireless/mediatek/mt76/mt76.h | 11 ++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +14 -6
@@ -563,8 +563,12 @@ void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid, }EXPORT_SYMBOL (mt76_wcid_key_setup); -static struct ieee80211_sta *mt76_rx_convert (struct sk_buff *skb) +static void +mt76_rx_convert (struct mt76_dev *dev,struct sk_buff *skb, +struct ieee80211_hw **hw, +struct ieee80211_sta **sta) { +struct ieee80211_rx_status *status =IEEE80211_SKB_RXCB (skb);struct mt76_rx_status mstat;
@@ -589,7 +593,8 @@ static struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb)memcpy (status->chain_signal, mstat.chain_signal,sizeof (mstat.chain_signal)); -return wcid_to_sta (mstat.wcid); + *sta =wcid_to_sta (mstat.wcid); + *hw =mt76_phy_hw (dev, mstat.ext_phy); } static int
@@ -715,12 +720,14 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb)struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;struct ieee80211_sta *sta; +struct ieee80211_hw *hw;struct mt76_wcid *wcid = status->wcid;bool ps;int i; + hw =mt76_phy_hw (dev, status->ext_phy);if (ieee80211_is_pspoll (hdr->frame_control) && !wcid) { - sta =ieee80211_find_sta_by_ifaddr (dev->hw, hdr->addr2,NULL ); + sta =ieee80211_find_sta_by_ifaddr (hw, hdr->addr2,NULL );if (sta) wcid = status->wcid = (struct mt76_wcid *)sta->drv_priv; }
@@ -778,7 +785,7 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb) mtxq = (struct mt76_txq *)sta->txq[i]->drv_priv;if (!skb_queue_empty (&mtxq->retry_q)) -ieee80211_schedule_txq (dev->hw, sta->txq[i]); +ieee80211_schedule_txq (hw, sta->txq[i]); } }
@@ -786,6 +793,7 @@ void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames, struct napi_struct *napi) {struct ieee80211_sta *sta; +struct ieee80211_hw *hw;struct sk_buff *skb;spin_lock (&dev->rx_lock);
@@ -795,8 +803,8 @@ void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames,continue ; } - sta =mt76_rx_convert (skb); -ieee80211_rx_napi (dev->hw, sta, skb, napi); +mt76_rx_convert (dev, skb, &hw, &sta); +ieee80211_rx_napi (hw, sta, skb, napi); }spin_unlock (&dev->rx_lock); }
drivers/net/wireless/mediatek/mt76/mt76.h +11 -0
@@ -433,6 +433,7 @@ struct mt76_rx_status {u8 iv[6 ]; + u8 ext_phy:1; u8 aggr:1;u8 tid;u16 seqno;
@@ -457,6 +458,8 @@ struct mt76_phy {struct mt76_dev {struct mt76_phy phy;/* must be first */ +struct mt76_phy *phy2; +struct ieee80211_hw *hw;struct cfg80211_chan_def chandef;struct ieee80211_channel *main_chan;
@@ -640,6 +643,14 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,int mt76_eeprom_init (struct mt76_dev *dev,int len);void mt76_eeprom_override (struct mt76_dev *dev); +static inline struct ieee80211_hw * +mt76_phy_hw (struct mt76_dev *dev,bool phy_ext) +{ +if (phy_ext && dev->phy2) +return dev->phy2->hw; +return dev->phy.hw; +} +static inline u8 *mt76_get_txwi_ptr (struct mt76_dev *dev,struct mt76_txwi_cache *t) {
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 4/29 mt76: add support for an extra wiphy in the main tx path
In reply to Felix FietkauThis is preparation for supporting multiple wiphys per device to support the concurrent dual-band feature of MT7615D
--- drivers/net/wireless/mediatek/mt76/mt76.h | 6 +-- .../net/wireless/mediatek/mt76/mt7603/mac.c | 4 +- .../net/wireless/mediatek/mt76/mt7603/main.c | 4 +- .../net/wireless/mediatek/mt76/mt7615/main.c | 4 +- .../net/wireless/mediatek/mt76/mt76x0/main.c | 2 +- .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 4 +- .../net/wireless/mediatek/mt76/mt76x02_txrx.c | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_main.c | 2 +- .../wireless/mediatek/mt76/mt76x2/usb_main.c | 2 +- drivers/net/wireless/mediatek/mt76/tx.c | 50 +++++++++++-------- drivers/net/wireless/mediatek/mt76/usb.c | 2 +- 11 files changed, 45 insertions(+), 37 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +3 -3
@@ -720,15 +720,15 @@ static inline bool mt76_is_skb_pktid(u8 pktid) }void mt76_rx (struct mt76_dev *dev,enum mt76_rxq_id q,struct sk_buff *skb); -void mt76_tx (struct mt76_dev *dev,struct ieee80211_sta *sta, +void mt76_tx (struct mt76_phy *dev,struct ieee80211_sta *sta,struct mt76_wcid *wcid,struct sk_buff *skb);void mt76_txq_init (struct mt76_dev *dev,struct ieee80211_txq *txq);void mt76_txq_remove (struct mt76_dev *dev,struct ieee80211_txq *txq);void mt76_wake_tx_queue (struct ieee80211_hw *hw,struct ieee80211_txq *txq);void mt76_stop_tx_queues (struct mt76_dev *dev,struct ieee80211_sta *sta,bool send_bar); -void mt76_txq_schedule (struct mt76_dev *dev,enum mt76_txq_id qid); -void mt76_txq_schedule_all (struct mt76_dev *dev); +void mt76_txq_schedule (struct mt76_phy *phy,enum mt76_txq_id qid); +void mt76_txq_schedule_all (struct mt76_phy *phy);void mt76_tx_tasklet (unsigned long data); void mt76_release_buffered_frames(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +2 -2
@@ -1392,7 +1392,7 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)set_bit (MT76_RESET , &dev->mt76.state);/* lock/unlock all queues to ensure that no tx is pending */ -mt76_txq_schedule_all (&dev->mt76); +mt76_txq_schedule_all (&dev->mphy);tasklet_disable (&dev->mt76.tx_tasklet);tasklet_disable (&dev->mt76.pre_tbtt_tasklet);
@@ -1456,7 +1456,7 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)napi_schedule (&dev->mt76.napi[1 ]);ieee80211_wake_queues (dev->mt76.hw); -mt76_txq_schedule_all (&dev->mt76); +mt76_txq_schedule_all (&dev->mphy); }static u32 mt7603_dma_debug (struct mt7603_dev *dev,u8 index)
drivers/net/wireless/mediatek/mt76/mt7603/main.c +2 -2
@@ -178,7 +178,7 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)clear_bit (MT76_RESET , &dev->mt76.state); -mt76_txq_schedule_all (&dev->mt76); +mt76_txq_schedule_all (&dev->mphy);ieee80211_queue_delayed_work (mt76_hw (dev), &dev->mt76.mac_work,msecs_to_jiffies (MT7603_WATCHDOG_TIME ));
@@ -667,7 +667,7 @@ static void mt7603_tx(struct ieee80211_hw *hw, wcid = &mvif->sta.wcid; } -mt76_tx (&dev->mt76, control->sta, wcid, skb); +mt76_tx (&dev->mphy, control->sta, wcid, skb); }const struct ieee80211_ops mt7603_ops = {
drivers/net/wireless/mediatek/mt76/mt7615/main.c +2 -2
@@ -171,7 +171,7 @@ static int mt7615_set_channel(struct mt7615_dev *dev)clear_bit (MT76_RESET , &dev->mt76.state);mutex_unlock (&dev->mt76.mutex); -mt76_txq_schedule_all (&dev->mt76); +mt76_txq_schedule_all (&dev->mphy);ieee80211_queue_delayed_work (mt76_hw (dev), &dev->mt76.mac_work,MT7615_WATCHDOG_TIME );return ret;
@@ -458,7 +458,7 @@ static void mt7615_tx(struct ieee80211_hw *hw, wcid = &mvif->sta.wcid; } -mt76_tx (&dev->mt76, control->sta, wcid, skb); +mt76_tx (&dev->mphy, control->sta, wcid, skb); }static int mt7615_set_rts_threshold (struct ieee80211_hw *hw,u32 val)
drivers/net/wireless/mediatek/mt76/mt76x0/main.c +1 -1
@@ -28,7 +28,7 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef) }mt76x02_pre_tbtt_enable (dev, true); -mt76_txq_schedule_all (&dev->mt76); +mt76_txq_schedule_all (&dev->mphy); }int mt76x0_config (struct ieee80211_hw *hw,u32 changed)
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +2 -2
@@ -151,7 +151,7 @@ static void mt76x02_tx_tasklet(unsigned long data)mt76x02_mac_poll_tx_status (dev, false);mt76x02_process_tx_status_fifo (dev); -mt76_txq_schedule_all (&dev->mt76); +mt76_txq_schedule_all (&dev->mphy); }static int mt76x02_poll_tx (struct napi_struct *napi,int budget)
@@ -514,7 +514,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)ieee80211_restart_hw (dev->mt76.hw); }else {ieee80211_wake_queues (dev->mt76.hw); -mt76_txq_schedule_all (&dev->mt76); +mt76_txq_schedule_all (&dev->mphy); } }
drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c +1 -1
@@ -28,7 +28,7 @@ void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, wcid = &mvif->group_wcid; } -mt76_tx (&dev->mt76, control->sta, wcid, skb); +mt76_tx (&dev->mphy, control->sta, wcid, skb); }EXPORT_SYMBOL_GPL (mt76x02_tx);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +1 -1
@@ -63,7 +63,7 @@ mt76x2_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)tasklet_enable (&dev->dfs_pd.dfs_tasklet);tasklet_enable (&dev->mt76.pre_tbtt_tasklet); -mt76_txq_schedule_all (&dev->mt76); +mt76_txq_schedule_all (&dev->mphy);return ret; }
drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c +1 -1
@@ -56,7 +56,7 @@ mt76x2u_set_channel(struct mt76x02_dev *dev,mutex_unlock (&dev->mt76.mutex);mt76x02_pre_tbtt_enable (dev, true); -mt76_txq_schedule_all (&dev->mt76); +mt76_txq_schedule_all (&dev->mphy);return err; }
drivers/net/wireless/mediatek/mt76/tx.c +29 -21
162 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/usb.c +1 -1
@@ -694,7 +694,7 @@ static void mt76u_tx_tasklet(unsigned long data)spin_unlock_bh (&q->lock); -mt76_txq_schedule (dev, i); +mt76_txq_schedule (&dev->phy, i);if (!test_and_set_bit (MT76_READING_STATS , &dev->state))queue_work (dev->usb.stat_wq, &dev->usb.stat_work);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 5/29 mt76: add support for an extra wiphy in the tx status path
In reply to Felix FietkauThis is preparation for supporting multiple wiphys per device to support the concurrent dual-band feature of MT7615D
--- drivers/net/wireless/mediatek/mt76/dma.c | 4 +++- drivers/net/wireless/mediatek/mt76/mt76.h | 17 +++++++++++++ drivers/net/wireless/mediatek/mt76/tx.c | 29 +++++++++++++++++++---- 3 files changed, 44 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/dma.c +3 -1
@@ -286,6 +286,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,struct mt76_tx_info tx_info = { .skb = skb, }; +struct ieee80211_hw *hw;int len, n =0 , ret = -ENOMEM ;struct mt76_queue_entry e;struct mt76_txwi_cache *t;
@@ -295,7 +296,8 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, t =mt76_get_txwi (dev);if (!t) { -ieee80211_free_txskb (dev->hw, skb); + hw =mt76_tx_status_get_hw (dev, skb); +ieee80211_free_txskb (hw, skb);return -ENOMEM ; } txwi =mt76_get_txwi_ptr (dev, t);
drivers/net/wireless/mediatek/mt76/mt76.h +17 -0
@@ -177,6 +177,9 @@ enum mt76_wcid_flags {#define MT76_N_WCIDS 128 +/* stored in ieee80211_tx_info::hw_queue */ +#define MT_TX_HW_QUEUE_EXT_PHY BIT(7) +DECLARE_EWMA (signal,10 ,8 );#define MT_WCID_TX_INFO_RATE GENMASK(15, 0)
@@ -793,6 +796,20 @@ u32 mt76_calc_tx_airtime(struct mt76_dev *dev, struct ieee80211_tx_info *info, int len);/* internal */ +static inline struct ieee80211_hw * +mt76_tx_status_get_hw (struct mt76_dev *dev,struct sk_buff *skb) +{ +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); +struct ieee80211_hw *hw = dev->phy.hw; + +if ((info->hw_queue &MT_TX_HW_QUEUE_EXT_PHY ) && dev->phy2) + hw = dev->phy2->hw; + + info->hw_queue &= ~MT_TX_HW_QUEUE_EXT_PHY ; + +return hw; +} +void mt76_tx_free (struct mt76_dev *dev);struct mt76_txwi_cache *mt76_get_txwi (struct mt76_dev *dev);void mt76_put_txwi (struct mt76_dev *dev,struct mt76_txwi_cache *t);
drivers/net/wireless/mediatek/mt76/tx.c +24 -5
@@ -109,13 +109,17 @@ void mt76_tx_status_unlock(struct mt76_dev *dev, struct sk_buff_head *list) __releases(&dev->status_list.unlock) { + struct ieee80211_hw *hw;struct sk_buff *skb;spin_unlock_bh (&dev->status_list.lock);__release (&dev->status_list.unlock); -while ((skb =__skb_dequeue (list)) !=NULL ) -ieee80211_tx_status (dev->hw, skb); +while ((skb =__skb_dequeue (list)) !=NULL ) { + hw =mt76_tx_status_get_hw (dev, skb); +ieee80211_tx_status (hw, skb); + } + }EXPORT_SYMBOL_GPL (mt76_tx_status_unlock);
@@ -231,10 +235,12 @@ EXPORT_SYMBOL_GPL(mt76_tx_status_check);void mt76_tx_complete_skb (struct mt76_dev *dev,struct sk_buff *skb) { +struct ieee80211_hw *hw;struct sk_buff_head list;if (!skb->prev) { -ieee80211_free_txskb (dev->hw, skb); + hw =mt76_tx_status_get_hw (dev, skb); +ieee80211_free_txskb (hw, skb);return ; }
@@ -253,6 +259,7 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta,struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;struct mt76_queue *q;int qid =skb_get_queue_mapping (skb); +bool ext_phy = phy != &dev->phy;if (WARN_ON (qid >=MT_TXQ_PSD )) { qid =MT_TXQ_BE ;
@@ -276,6 +283,9 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta,mt76_check_agg_ssn (mtxq, skb); } +if (ext_phy) + info->hw_queue |=MT_TX_HW_QUEUE_EXT_PHY ; + q = dev->q_tx[qid].q;spin_lock_bh (&q->lock);
@@ -295,6 +305,8 @@ static struct sk_buff * mt76_txq_dequeue(struct mt76_phy *phy, struct mt76_txq *mtxq, bool ps) { struct ieee80211_txq *txq = mtxq_to_txq(mtxq); +struct ieee80211_tx_info *info; +bool ext_phy = phy != &phy->dev->phy;struct sk_buff *skb; skb =skb_dequeue (&mtxq->retry_q);
@@ -311,6 +323,10 @@ mt76_txq_dequeue(struct mt76_phy *phy, struct mt76_txq *mtxq, bool ps)if (!skb)return NULL ; + info =IEEE80211_SKB_CB (skb); +if (ext_phy) + info->hw_queue |=MT_TX_HW_QUEUE_EXT_PHY ; +return skb; }
@@ -597,6 +613,7 @@ EXPORT_SYMBOL_GPL(mt76_wake_tx_queue);void mt76_txq_remove (struct mt76_dev *dev,struct ieee80211_txq *txq) { +struct ieee80211_hw *hw;struct mt76_txq *mtxq;struct sk_buff *skb;
@@ -605,8 +622,10 @@ void mt76_txq_remove(struct mt76_dev *dev, struct ieee80211_txq *txq) mtxq = (struct mt76_txq *)txq->drv_priv; -while ((skb =skb_dequeue (&mtxq->retry_q)) !=NULL ) -ieee80211_free_txskb (dev->hw, skb); +while ((skb =skb_dequeue (&mtxq->retry_q)) !=NULL ) { + hw =mt76_tx_status_get_hw (dev, skb); +ieee80211_free_txskb (hw, skb); + } }EXPORT_SYMBOL_GPL (mt76_txq_remove);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 6/29 mt76: add support for an extra wiphy in mt76_sta_state()
In reply to Felix FietkauThis is preparation for supporting multiple wiphys per device to support the concurrent dual-band feature of MT7615D
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 13 +++++++++---- drivers/net/wireless/mediatek/mt76/mt76.h | 11 +++++++++++ drivers/net/wireless/mediatek/mt76/util.h | 14 +++++++++++++- 3 files changed, 33 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +9 -4
@@ -828,7 +828,7 @@ EXPORT_SYMBOL_GPL(mt76_rx_poll_complete);static int mt76_sta_add (struct mt76_dev *dev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta) +struct ieee80211_sta *sta,bool ext_phy) {struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv;int ret;
@@ -853,6 +853,8 @@ mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif, }ewma_signal_init (&wcid->rssi); +if (ext_phy) +mt76_wcid_mask_set (dev->wcid_phy_mask, wcid->idx);rcu_assign_pointer (dev->wcid[wcid->idx], wcid); out:
@@ -879,7 +881,8 @@ void __mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,mt76_tx_status_check (dev, wcid, true);for (i =0 ; i <ARRAY_SIZE (sta->txq); i++)mt76_txq_remove (dev, sta->txq[i]); -mt76_wcid_free (dev->wcid_mask, idx); +mt76_wcid_mask_clear (dev->wcid_mask, idx); +mt76_wcid_mask_clear (dev->wcid_phy_mask, idx); }EXPORT_SYMBOL_GPL (__mt76_sta_remove);
@@ -897,11 +900,13 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,enum ieee80211_sta_state old_state, enum ieee80211_sta_state new_state) { - struct mt76_dev *dev = hw->priv; + struct mt76_phy *phy = hw->priv; +struct mt76_dev *dev = phy->dev; +bool ext_phy = phy != &dev->phy;if (old_state ==IEEE80211_STA_NOTEXIST && new_state ==IEEE80211_STA_NONE ) -return mt76_sta_add (dev, vif, sta); +return mt76_sta_add (dev, vif, sta, ext_phy); if (old_state == IEEE80211_STA_AUTH && new_state == IEEE80211_STA_ASSOC &&
drivers/net/wireless/mediatek/mt76/mt76.h +11 -0
@@ -504,6 +504,7 @@ struct mt76_dev {struct sk_buff_head status_list;unsigned long wcid_mask[MT76_N_WCIDS /BITS_PER_LONG ]; +unsigned long wcid_phy_mask[MT76_N_WCIDS /BITS_PER_LONG ];struct mt76_wcid global_wcid;struct mt76_wcid __rcu *wcid[MT76_N_WCIDS ];
@@ -596,6 +597,16 @@ enum mt76_phy_type {#define mt76_hw (dev) (dev)->mphy.hw +static inline struct ieee80211_hw * +mt76_wcid_hw (struct mt76_dev *dev,u8 wcid) +{ +if (wcid <=MT76_N_WCIDS && +mt76_wcid_mask_test (dev->wcid_phy_mask, wcid)) +return dev->phy2->hw; + +return dev->phy.hw; +} +bool __mt76_poll (struct mt76_dev *dev,u32 offset,u32 mask,u32 val,int timeout);
drivers/net/wireless/mediatek/mt76/util.h +13 -1
@@ -16,8 +16,20 @@int mt76_wcid_alloc (unsigned long *mask,int size); +static inline bool +mt76_wcid_mask_test (unsigned long *mask,int idx) +{ +return mask[idx /BITS_PER_LONG ] &BIT (idx %BITS_PER_LONG ); +} + +static inline void +mt76_wcid_mask_set (unsigned long *mask,int idx) +{ + mask[idx /BITS_PER_LONG ] |=BIT (idx %BITS_PER_LONG ); +} +static inline void -mt76_wcid_free (unsigned long *mask,int idx) +mt76_wcid_mask_clear (unsigned long *mask,int idx) { mask[idx /BITS_PER_LONG ] &= ~BIT (idx %BITS_PER_LONG ); }
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 7/29 mt76: move channel state to struct mt76_phy
In reply to Felix FietkauAdd support for an extra wiphy in mt76_set_channel and mt76_get_survey This is preparation for supporting multiple wiphys per device to support the concurrent dual-band feature of MT7615D
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 71 +++++++++++-------- drivers/net/wireless/mediatek/mt76/mt76.h | 19 ++--- .../net/wireless/mediatek/mt76/mt7603/init.c | 2 +- .../net/wireless/mediatek/mt76/mt7603/mac.c | 16 ++--- .../net/wireless/mediatek/mt76/mt7603/main.c | 8 +-- .../net/wireless/mediatek/mt76/mt7603/mcu.c | 6 +- .../net/wireless/mediatek/mt76/mt7615/init.c | 12 ++-- .../net/wireless/mediatek/mt76/mt7615/mac.c | 24 +++---- .../net/wireless/mediatek/mt76/mt7615/main.c | 6 +- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 6 +- .../wireless/mediatek/mt76/mt7615/mt7615.h | 4 +- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 4 +- .../net/wireless/mediatek/mt76/mt76x0/init.c | 6 +- .../net/wireless/mediatek/mt76/mt76x0/main.c | 2 +- .../net/wireless/mediatek/mt76/mt76x0/phy.c | 16 ++--- .../net/wireless/mediatek/mt76/mt76x02_dfs.c | 12 ++-- .../net/wireless/mediatek/mt76/mt76x02_mac.c | 18 ++--- .../net/wireless/mediatek/mt76/mt76x02_phy.h | 4 +- .../net/wireless/mediatek/mt76/mt76x02_txrx.c | 2 +- .../net/wireless/mediatek/mt76/mt76x02_util.c | 4 +- .../wireless/mediatek/mt76/mt76x2/eeprom.c | 4 +- .../wireless/mediatek/mt76/mt76x2/eeprom.h | 2 +- .../wireless/mediatek/mt76/mt76x2/mt76x2.h | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_init.c | 4 +- .../wireless/mediatek/mt76/mt76x2/pci_main.c | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_phy.c | 4 +- .../net/wireless/mediatek/mt76/mt76x2/phy.c | 20 +++--- .../wireless/mediatek/mt76/mt76x2/usb_init.c | 4 +- .../wireless/mediatek/mt76/mt76x2/usb_main.c | 2 +- .../wireless/mediatek/mt76/mt76x2/usb_phy.c | 4 +- 30 files changed, 153 insertions(+), 137 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +42 -29
@@ -156,9 +156,9 @@ static void mt76_init_stream_cap(struct mt76_dev *dev,void mt76_set_stream_caps (struct mt76_dev *dev,bool vht) {if (dev->cap.has_2ghz) -mt76_init_stream_cap (dev, &dev->sband_2g.sband, false); +mt76_init_stream_cap (dev, &dev->phy.sband_2g.sband, false);if (dev->cap.has_5ghz) -mt76_init_stream_cap (dev, &dev->sband_5g.sband, vht); +mt76_init_stream_cap (dev, &dev->phy.sband_5g.sband, vht); }EXPORT_SYMBOL_GPL (mt76_set_stream_caps);
@@ -187,8 +187,8 @@ mt76_init_sband(struct mt76_dev *dev, struct mt76_sband *msband, sband->n_channels = n_chan; sband->bitrates = rates; sband->n_bitrates = n_rates; - dev->chandef.chan = &sband->channels[0 ]; - dev->chan_state = &msband->chan[0 ]; + dev->phy.chandef.chan = &sband->channels[0 ]; + dev->phy.chan_state = &msband->chan[0 ]; ht_cap = &sband->ht_cap; ht_cap->ht_supported = true;
@@ -223,9 +223,9 @@ static int mt76_init_sband_2g(struct mt76_dev *dev, struct ieee80211_rate *rates, int n_rates) { - dev->hw->wiphy->bands[NL80211_BAND_2GHZ] = &dev->sband_2g.sband; + dev->hw->wiphy->bands[NL80211_BAND_2GHZ] = &dev->phy.sband_2g.sband; -return mt76_init_sband (dev, &dev->sband_2g, +return mt76_init_sband (dev, &dev->phy.sband_2g, mt76_channels_2ghz,ARRAY_SIZE (mt76_channels_2ghz), rates, n_rates, false);
@@ -235,9 +235,9 @@ static int mt76_init_sband_5g(struct mt76_dev *dev, struct ieee80211_rate *rates, int n_rates, bool vht) { - dev->hw->wiphy->bands[NL80211_BAND_5GHZ] = &dev->sband_5g.sband; + dev->hw->wiphy->bands[NL80211_BAND_5GHZ] = &dev->phy.sband_5g.sband; -return mt76_init_sband (dev, &dev->sband_5g, +return mt76_init_sband (dev, &dev->phy.sband_5g, mt76_channels_5ghz,ARRAY_SIZE (mt76_channels_5ghz), rates, n_rates, vht);
@@ -427,23 +427,32 @@ bool mt76_has_tx_pending(struct mt76_dev *dev)EXPORT_SYMBOL_GPL (mt76_has_tx_pending);static struct mt76_channel_state * -mt76_channel_state (struct mt76_dev *dev,struct ieee80211_channel *c) +mt76_channel_state (struct mt76_phy *phy,struct ieee80211_channel *c) {struct mt76_sband *msband;int idx;if (c->band ==NL80211_BAND_2GHZ ) - msband = &dev->sband_2g; + msband = &phy->sband_2g;else - msband = &dev->sband_5g; + msband = &phy->sband_5g; idx = c - &msband->sband.channels[0 ];return &msband->chan[idx]; } +static void +mt76_update_survey_active_time (struct mt76_phy *phy,ktime_t time) +{ +struct mt76_channel_state *state = phy->chan_state; + + state->cc_active +=ktime_to_us (ktime_sub (time, + phy->survey_time)); + phy->survey_time = time; +} +void mt76_update_survey (struct mt76_dev *dev) { -struct mt76_channel_state *state = dev->chan_state;ktime_t cur_time;if (!test_bit (MT76_STATE_RUNNING , &dev->state))
@@ -453,11 +462,13 @@ void mt76_update_survey(struct mt76_dev *dev) dev->drv->update_survey (dev); cur_time =ktime_get_boottime (); - state->cc_active +=ktime_to_us (ktime_sub (cur_time, - dev->survey_time)); - dev->survey_time = cur_time; +mt76_update_survey_active_time (&dev->phy, cur_time); +if (dev->phy2) +mt76_update_survey_active_time (dev->phy2, cur_time);if (dev->drv->drv_flags &MT_DRV_SW_RX_AIRTIME ) { +struct mt76_channel_state *state = dev->phy.chan_state; +spin_lock_bh (&dev->cc_lock); state->cc_bss_rx += dev->cur_cc_bss_rx; dev->cur_cc_bss_rx =0 ;
@@ -466,9 +477,10 @@ void mt76_update_survey(struct mt76_dev *dev) }EXPORT_SYMBOL_GPL (mt76_update_survey); -void mt76_set_channel (struct mt76_dev *dev) +void mt76_set_channel (struct mt76_phy *phy) { -struct ieee80211_hw *hw = dev->hw; +struct mt76_dev *dev = phy->dev; +struct ieee80211_hw *hw = phy->hw;struct cfg80211_chan_def *chandef = &hw->conf.chandef;bool offchannel = hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ;int timeout =HZ /5 ;
@@ -476,21 +488,22 @@ void mt76_set_channel(struct mt76_dev *dev)wait_event_timeout (dev->tx_wait, !mt76_has_tx_pending (dev), timeout);mt76_update_survey (dev); - dev->chandef = *chandef; - dev->chan_state =mt76_channel_state (dev, chandef->chan); + phy->chandef = *chandef; + phy->chan_state =mt76_channel_state (phy, chandef->chan);if (!offchannel) - dev->main_chan = chandef->chan; + phy->main_chan = chandef->chan; -if (chandef->chan != dev->main_chan) -memset (dev->chan_state,0 ,sizeof (*dev->chan_state)); +if (chandef->chan != phy->main_chan) +memset (phy->chan_state,0 ,sizeof (*phy->chan_state)); }EXPORT_SYMBOL_GPL (mt76_set_channel);int mt76_get_survey (struct ieee80211_hw *hw,int idx,struct survey_info *survey) { -struct mt76_dev *dev = hw->priv; +struct mt76_phy *phy = hw->priv; +struct mt76_dev *dev = phy->dev;struct mt76_sband *sband;struct ieee80211_channel *chan;struct mt76_channel_state *state;
@@ -500,10 +513,10 @@ int mt76_get_survey(struct ieee80211_hw *hw, int idx,if (idx ==0 && dev->drv->update_survey)mt76_update_survey (dev); - sband = &dev->sband_2g; + sband = &phy->sband_2g;if (idx >= sband->sband.n_channels) { idx -= sband->sband.n_channels; - sband = &dev->sband_5g; + sband = &phy->sband_5g; }if (idx >= sband->sband.n_channels) {
@@ -512,13 +525,13 @@ int mt76_get_survey(struct ieee80211_hw *hw, int idx, } chan = &sband->sband.channels[idx]; - state =mt76_channel_state (dev, chan); + state =mt76_channel_state (phy, chan);memset (survey,0 ,sizeof (*survey)); survey->channel = chan; survey->filled =SURVEY_INFO_TIME |SURVEY_INFO_TIME_BUSY ; survey->filled |= dev->drv->survey_flags; -if (chan == dev->main_chan) { +if (chan == phy->main_chan) { survey->filled |=SURVEY_INFO_IN_USE ;if (dev->drv->drv_flags &MT_DRV_SW_RX_AIRTIME )
@@ -1026,11 +1039,11 @@ int mt76_get_rate(struct mt76_dev *dev,int i, offset =0 , len = sband->n_bitrates;if (cck) { -if (sband == &dev->sband_5g.sband) +if (sband == &dev->phy.sband_5g.sband)return 0 ; idx &= ~BIT (2 );/* short preamble */ - }else if (sband == &dev->sband_2g.sband) { + }else if (sband == &dev->phy.sband_2g.sband) { offset =4 ; }
drivers/net/wireless/mediatek/mt76/mt76.h +11 -8
@@ -22,6 +22,7 @@#define MT_SKB_HEAD_LEN 128struct mt76_dev ; +struct mt76_phy ;struct mt76_wcid ;struct mt76_reg_pair {
@@ -456,6 +457,15 @@ struct mt76_rx_status {struct mt76_phy {struct ieee80211_hw *hw;struct mt76_dev *dev; + +struct cfg80211_chan_def chandef; +struct ieee80211_channel *main_chan; + +struct mt76_channel_state *chan_state; +ktime_t survey_time; + +struct mt76_sband sband_2g; +struct mt76_sband sband_5g; };struct mt76_dev {
@@ -464,10 +474,7 @@ struct mt76_dev {struct mt76_phy *phy2;struct ieee80211_hw *hw; -struct cfg80211_chan_def chandef; -struct ieee80211_channel *main_chan; -struct mt76_channel_state *chan_state;spinlock_t lock;spinlock_t cc_lock;
@@ -522,8 +529,6 @@ struct mt76_dev {int beacon_int;u8 beacon_mask; -struct mt76_sband sband_2g; -struct mt76_sband sband_5g;struct debugfs_blob_wrapper eeprom;struct debugfs_blob_wrapper otp;struct mt76_hw_cap cap;
@@ -543,8 +548,6 @@ struct mt76_dev {u8 csa_complete; -ktime_t survey_time; -u32 rxfilter;union {
@@ -750,7 +753,7 @@ void mt76_release_buffered_frames(struct ieee80211_hw *hw,enum ieee80211_frame_release_type reason, bool more_data);bool mt76_has_tx_pending (struct mt76_dev *dev); -void mt76_set_channel (struct mt76_dev *dev); +void mt76_set_channel (struct mt76_phy *phy);void mt76_update_survey (struct mt76_dev *dev);int mt76_get_survey (struct ieee80211_hw *hw,int idx,struct survey_info *survey);
drivers/net/wireless/mediatek/mt76/mt7603/init.c +1 -1
@@ -573,7 +573,7 @@ int mt7603_register_device(struct mt7603_dev *dev)return ret;mt7603_init_debugfs (dev); -mt7603_init_txpower (dev, &dev->mt76.sband_2g.sband); +mt7603_init_txpower (dev, &dev->mphy.sband_2g.sband);return 0 ; }
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +8 -8
@@ -53,7 +53,7 @@ void mt7603_mac_set_timing(struct mt7603_dev *dev)int sifs;u32 val; -if (dev->mt76.chandef.chan->band ==NL80211_BAND_5GHZ ) +if (dev->mphy.chandef.chan->band ==NL80211_BAND_5GHZ ) sifs =16 ;else sifs =10 ;
@@ -456,7 +456,7 @@ void mt7603_mac_sta_poll(struct mt7603_dev *dev)return ;spin_lock_bh (&dev->mt76.cc_lock); - dev->mt76.chan_state->cc_tx += total_airtime; + dev->mphy.chan_state->cc_tx += total_airtime;spin_unlock_bh (&dev->mt76.cc_lock); }
@@ -502,7 +502,7 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb)memset (status,0 ,sizeof (*status)); i =FIELD_GET (MT_RXD1_NORMAL_CH_FREQ , rxd1); - sband = (i &1 ) ? &dev->mt76.sband_5g.sband : &dev->mt76.sband_2g.sband; + sband = (i &1 ) ? &dev->mphy.sband_5g.sband : &dev->mphy.sband_2g.sband; i >>=1 ; idx =FIELD_GET (MT_RXD2_NORMAL_WLAN_IDX , rxd2);
@@ -668,7 +668,7 @@ mt7603_mac_tx_rate_val(struct mt7603_dev *dev, *bw =1 ; }else {const struct ieee80211_rate *r; -int band = dev->mt76.chandef.chan->band; +int band = dev->mphy.chandef.chan->band;u16 val; nss =1 ;
@@ -1156,10 +1156,10 @@ mt7603_fill_txs(struct mt7603_dev *dev, struct mt7603_sta *sta, cck = true;/* fall through */ case MT_PHY_TYPE_OFDM : -if (dev->mt76.chandef.chan->band ==NL80211_BAND_5GHZ ) - sband = &dev->mt76.sband_5g.sband; +if (dev->mphy.chandef.chan->band ==NL80211_BAND_5GHZ ) + sband = &dev->mphy.sband_5g.sband;else - sband = &dev->mt76.sband_2g.sband; + sband = &dev->mphy.sband_2g.sband; final_rate &=GENMASK (5 ,0 ); final_rate =mt76_get_rate (&dev->mt76, sband, final_rate, cck);
@@ -1574,7 +1574,7 @@ void mt7603_update_channel(struct mt76_dev *mdev) struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);struct mt76_channel_state *state; - state = mdev->chan_state; + state = mdev->phy.chan_state; state->cc_busy +=mt76_rr (dev,MT_MIB_STAT_CCA ); }
drivers/net/wireless/mediatek/mt76/mt7603/main.c +4 -4
@@ -15,7 +15,7 @@ mt7603_start(struct ieee80211_hw *hw)mt7603_mac_reset_counters (dev);mt7603_mac_start (dev); - dev->mt76.survey_time =ktime_get_boottime (); + dev->mphy.survey_time =ktime_get_boottime ();set_bit (MT76_STATE_RUNNING , &dev->mt76.state);mt7603_mac_work (&dev->mt76.mac_work.work);
@@ -146,13 +146,13 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)set_bit (MT76_RESET , &dev->mt76.state);mt7603_beacon_set_timer (dev,-1 ,0 ); -mt76_set_channel (&dev->mt76); +mt76_set_channel (&dev->mphy);mt7603_mac_stop (dev);if (def->width ==NL80211_CHAN_WIDTH_40 ) bw =MT_BW_40 ; - dev->mt76.chandef = *def; + dev->mphy.chandef = *def;mt76_rmw_field (dev,MT_AGG_BWCR ,MT_AGG_BWCR_BW , bw); ret =mt7603_mcu_set_channel (dev);if (ret) {
@@ -190,7 +190,7 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)mt76_rr (dev,MT_MIB_STAT_PSCCA );mt7603_cca_stats_reset (dev); - dev->mt76.survey_time =ktime_get_boottime (); + dev->mphy.survey_time =ktime_get_boottime ();mt7603_init_edcca (dev);
drivers/net/wireless/mediatek/mt76/mt7603/mcu.c +3 -3
@@ -397,7 +397,7 @@ static int mt7603_mcu_set_tx_power(struct mt7603_dev *dev)u8 temp_comp_power[17 ];u8 reserved; } req = { - .center_channel = dev->mt76.chandef.chan->hw_value, + .center_channel = dev->mphy.chandef.chan->hw_value, #define EEP_VAL(n) ((u8 *)dev->mt76.eeprom.data)[n] .tssi =EEP_VAL (MT_EE_NIC_CONF_1 +1 ), .temp_comp = EEP_VAL(MT_EE_NIC_CONF_1),
@@ -430,7 +430,7 @@ static int mt7603_mcu_set_tx_power(struct mt7603_dev *dev)int mt7603_mcu_set_channel (struct mt7603_dev *dev) { -struct cfg80211_chan_def *chandef = &dev->mt76.chandef; +struct cfg80211_chan_def *chandef = &dev->mphy.chandef;struct ieee80211_hw *hw =mt76_hw (dev);int n_chains =hweight8 (dev->mt76.antenna_mask);struct {
@@ -452,7 +452,7 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev)s8 tx_power;int i, ret; -if (dev->mt76.chandef.width ==NL80211_CHAN_WIDTH_40 ) { +if (dev->mphy.chandef.width ==NL80211_CHAN_WIDTH_40 ) { req.bw =MT_BW_40 ;if (chandef->center_freq1 > chandef->chan->center_freq) req.center_chan +=2 ;
drivers/net/wireless/mediatek/mt76/mt7615/init.c +6 -6
@@ -247,7 +247,7 @@ mt7615_regd_notifier(struct wiphy *wiphy, {struct ieee80211_hw *hw =wiphy_to_ieee80211_hw (wiphy);struct mt7615_dev *dev = hw->priv; -struct cfg80211_chan_def *chandef = &dev->mt76.chandef; +struct cfg80211_chan_def *chandef = &dev->mphy.chandef;if (request->dfs_region == dev->mt76.region)return ;
@@ -296,9 +296,9 @@ int mt7615_register_device(struct mt7615_dev *dev)ieee80211_hw_set (hw,TX_STATUS_NO_AMPDU_LEN ); - dev->mt76.sband_2g.sband.ht_cap.cap |=IEEE80211_HT_CAP_LDPC_CODING ; - dev->mt76.sband_5g.sband.ht_cap.cap |=IEEE80211_HT_CAP_LDPC_CODING ; - dev->mt76.sband_5g.sband.vht_cap.cap |= + dev->mphy.sband_2g.sband.ht_cap.cap |=IEEE80211_HT_CAP_LDPC_CODING ; + dev->mphy.sband_5g.sband.ht_cap.cap |=IEEE80211_HT_CAP_LDPC_CODING ; + dev->mphy.sband_5g.sband.vht_cap.cap |=IEEE80211_VHT_CAP_SHORT_GI_160 |IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 | IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |
@@ -310,8 +310,8 @@ int mt7615_register_device(struct mt7615_dev *dev)if (ret)return ret; -mt7615_init_txpower (dev, &dev->mt76.sband_2g.sband); -mt7615_init_txpower (dev, &dev->mt76.sband_5g.sband); +mt7615_init_txpower (dev, &dev->mphy.sband_2g.sband); +mt7615_init_txpower (dev, &dev->mphy.sband_5g.sband); hw->max_tx_fragments =MT_TXP_MAX_BUF_NUM ;
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +12 -12
@@ -92,12 +92,12 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb) }/* TODO: properly support DBDC */ - status->freq = dev->mt76.chandef.chan->center_freq; - status->band = dev->mt76.chandef.chan->band; + status->freq = dev->mphy.chandef.chan->center_freq; + status->band = dev->mphy.chandef.chan->band;if (status->band ==NL80211_BAND_5GHZ ) - sband = &dev->mt76.sband_5g.sband; + sband = &dev->mphy.sband_5g.sband;else - sband = &dev->mt76.sband_2g.sband; + sband = &dev->mphy.sband_2g.sband;if (rxd2 &MT_RXD2_NORMAL_FCS_ERR ) status->flag |=RX_FLAG_FAILED_FCS_CRC ;
@@ -319,7 +319,7 @@ mt7615_mac_tx_rate_val(struct mt7615_dev *dev, *bw =1 ; }else {const struct ieee80211_rate *r; -int band = dev->mt76.chandef.chan->band; +int band = dev->mphy.chandef.chan->band;u16 val; nss =1 ;
@@ -1059,10 +1059,10 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta, cck = true;/* fall through */ case MT_PHY_TYPE_OFDM : -if (dev->mt76.chandef.chan->band ==NL80211_BAND_5GHZ ) - sband = &dev->mt76.sband_5g.sband; +if (dev->mphy.chandef.chan->band ==NL80211_BAND_5GHZ ) + sband = &dev->mphy.sband_5g.sband;else - sband = &dev->mt76.sband_2g.sband; + sband = &dev->mphy.sband_2g.sband; final_rate &=MT_TX_RATE_IDX ; final_rate =mt76_get_rate (&dev->mt76, sband, final_rate, cck);
@@ -1383,7 +1383,7 @@ void mt7615_update_channel(struct mt76_dev *mdev) obss_time =mt76_get_field (dev,MT_WF_RMAC_MIB_TIME5 ,MT_MIB_OBSSTIME_MASK ); - state = mdev->chan_state; + state = mdev->phy.chan_state; state->cc_busy += busy_time; state->cc_tx += tx_time; state->cc_rx += rx_time + obss_time;
@@ -1423,7 +1423,7 @@ void mt7615_mac_work(struct work_struct *work)int mt7615_dfs_stop_radar_detector (struct mt7615_dev *dev) { -struct cfg80211_chan_def *chandef = &dev->mt76.chandef; +struct cfg80211_chan_def *chandef = &dev->mphy.chandef;int err; err = mt7615_mcu_rdd_cmd(dev, RDD_STOP, MT_HW_RDD0,
@@ -1452,7 +1452,7 @@ static int mt7615_dfs_start_rdd(struct mt7615_dev *dev, int chain)int mt7615_dfs_start_radar_detector (struct mt7615_dev *dev) { -struct cfg80211_chan_def *chandef = &dev->mt76.chandef; +struct cfg80211_chan_def *chandef = &dev->mphy.chandef;int err;/* start CAC */
@@ -1479,7 +1479,7 @@ int mt7615_dfs_start_radar_detector(struct mt7615_dev *dev)int mt7615_dfs_init_radar_detector (struct mt7615_dev *dev) { -struct cfg80211_chan_def *chandef = &dev->mt76.chandef; +struct cfg80211_chan_def *chandef = &dev->mphy.chandef;int err;if (dev->mt76.region ==NL80211_DFS_UNSET )
drivers/net/wireless/mediatek/mt76/mt7615/main.c +3 -3
@@ -18,7 +18,7 @@ static int mt7615_start(struct ieee80211_hw *hw)mt7615_mac_reset_counters (dev); - dev->mt76.survey_time =ktime_get_boottime (); + dev->mphy.survey_time =ktime_get_boottime ();set_bit (MT76_STATE_RUNNING , &dev->mt76.state);ieee80211_queue_delayed_work (mt76_hw (dev), &dev->mt76.mac_work,MT7615_WATCHDOG_TIME );
@@ -155,7 +155,7 @@ static int mt7615_set_channel(struct mt7615_dev *dev)mt7615_dfs_check_channel (dev); -mt76_set_channel (&dev->mt76); +mt76_set_channel (&dev->mphy); ret =mt7615_mcu_set_channel (dev);if (ret)
@@ -163,7 +163,7 @@ static int mt7615_set_channel(struct mt7615_dev *dev) ret =mt7615_dfs_init_radar_detector (dev);mt7615_mac_cca_stats_reset (dev); - dev->mt76.survey_time =ktime_get_boottime (); + dev->mphy.survey_time =ktime_get_boottime ();mt7615_mac_reset_counters (dev);
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +3 -3
@@ -1159,7 +1159,7 @@ int mt7615_mcu_set_bcn(struct mt7615_dev *dev, struct ieee80211_vif *vif,int mt7615_mcu_set_tx_power (struct mt7615_dev *dev) {int i, ret, n_chains =hweight8 (dev->mt76.antenna_mask); -struct cfg80211_chan_def *chandef = &dev->mt76.chandef; +struct cfg80211_chan_def *chandef = &dev->mphy.chandef;int freq = chandef->center_freq1, len, target_chains;u8 *req, *data, *eep = (u8 *)dev->mt76.eeprom.data;enum nl80211_band band = chandef->chan->band;
@@ -1276,7 +1276,7 @@ int mt7615_mcu_rdd_send_pattern(struct mt7615_dev *dev)int mt7615_mcu_set_channel (struct mt7615_dev *dev) { -struct cfg80211_chan_def *chandef = &dev->mt76.chandef; +struct cfg80211_chan_def *chandef = &dev->mphy.chandef;int freq1 = chandef->center_freq1, freq2 = chandef->center_freq2;struct {u8 control_chan;
@@ -1313,7 +1313,7 @@ int mt7615_mcu_set_channel(struct mt7615_dev *dev)else req.switch_reason =CH_SWITCH_NORMAL ; -switch (dev->mt76.chandef.width) { +switch (dev->mphy.chandef.width) {case NL80211_CHAN_WIDTH_40 : req.bw =CMD_CBW_40MHZ ;break ;
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +2 -2
@@ -221,8 +221,8 @@ static inline bool is_mt7622(struct mt76_dev *dev)static inline void mt7615_dfs_check_channel (struct mt7615_dev *dev) { -enum nl80211_chan_width width = dev->mt76.chandef.width; -u32 freq = dev->mt76.chandef.chan->center_freq; +enum nl80211_chan_width width = dev->mphy.chandef.width; +u32 freq = dev->mphy.chandef.chan->center_freq;struct ieee80211_hw *hw =mt76_hw (dev); if (hw->conf.chandef.chan->center_freq != freq ||
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +2 -2
@@ -109,7 +109,7 @@ static void mt76x0_set_freq_offset(struct mt76x02_dev *dev)void mt76x0_read_rx_gain (struct mt76x02_dev *dev) { -struct ieee80211_channel *chan = dev->mt76.chandef.chan; +struct ieee80211_channel *chan = dev->mphy.chandef.chan;struct mt76x02_rx_freq_cal *caldata = &dev->cal.rx;s8 val, lna_5g[3 ], lna_2g;u16 rssi_offset;
@@ -129,7 +129,7 @@ void mt76x0_read_rx_gain(struct mt76x02_dev *dev)static s8 mt76x0_get_delta (struct mt76x02_dev *dev) { -struct cfg80211_chan_def *chandef = &dev->mt76.chandef; +struct cfg80211_chan_def *chandef = &dev->mphy.chandef;u8 val;if (chandef->width ==NL80211_CHAN_WIDTH_80 ) {
drivers/net/wireless/mediatek/mt76/mt76x0/init.c +3 -3
@@ -264,12 +264,12 @@ int mt76x0_register_device(struct mt76x02_dev *dev)if (dev->mt76.cap.has_5ghz) {/* overwrite unsupported features */ -mt76x0_vht_cap_mask (&dev->mt76.sband_5g.sband); -mt76x0_init_txpower (dev, &dev->mt76.sband_5g.sband); +mt76x0_vht_cap_mask (&dev->mphy.sband_5g.sband); +mt76x0_init_txpower (dev, &dev->mphy.sband_5g.sband); }if (dev->mt76.cap.has_2ghz) -mt76x0_init_txpower (dev, &dev->mt76.sband_2g.sband); +mt76x0_init_txpower (dev, &dev->mphy.sband_2g.sband);mt76x02_init_debugfs (dev);
drivers/net/wireless/mediatek/mt76/mt76x0/main.c +1 -1
@@ -16,7 +16,7 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)if (mt76_is_mmio (&dev->mt76))tasklet_disable (&dev->dfs_pd.dfs_tasklet); -mt76_set_channel (&dev->mt76); +mt76_set_channel (&dev->mphy);mt76x0_phy_set_channel (dev, chandef);mt76x02_mac_cc_reset (dev);
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +8 -8
@@ -502,7 +502,7 @@ mt76x0_phy_bbp_set_bw(struct mt76x02_dev *dev, enum nl80211_chan_width width)static void mt76x0_phy_tssi_dc_calibrate (struct mt76x02_dev *dev) { -struct ieee80211_channel *chan = dev->mt76.chandef.chan; +struct ieee80211_channel *chan = dev->mphy.chandef.chan;u32 val;if (chan->band ==NL80211_BAND_5GHZ )
@@ -543,7 +543,7 @@ static int mt76x0_phy_tssi_adc_calibrate(struct mt76x02_dev *dev, s16 *ltssi, u8 *info) { - struct ieee80211_channel *chan = dev->mt76.chandef.chan; + struct ieee80211_channel *chan = dev->mphy.chandef.chan;u32 val; val = (chan->band ==NL80211_BAND_5GHZ ) ?0x80055 :0x80050 ;
@@ -696,7 +696,7 @@ mt76x0_phy_get_delta_power(struct mt76x02_dev *dev, u8 tx_mode, s8 target_power, s8 target_pa_power, s16 ltssi) { - struct ieee80211_channel *chan = dev->mt76.chandef.chan; + struct ieee80211_channel *chan = dev->mphy.chandef.chan;int tssi_target = target_power <<12 , tssi_slope;int tssi_offset, tssi_db, ret;u32 data;
@@ -844,8 +844,8 @@ void mt76x0_phy_set_txpower(struct mt76x02_dev *dev)struct mt76_rate_power *t = &dev->mt76.rate_power;s8 info; -mt76x0_get_tx_power_per_rate (dev, dev->mt76.chandef.chan, t); -mt76x0_get_power_info (dev, dev->mt76.chandef.chan, &info); +mt76x0_get_tx_power_per_rate (dev, dev->mphy.chandef.chan, t); +mt76x0_get_power_info (dev, dev->mphy.chandef.chan, &info);mt76x02_add_rate_power_offset (t, info);mt76x02_limit_rate_power (t, dev->mt76.txpower_conf);
@@ -858,7 +858,7 @@ void mt76x0_phy_set_txpower(struct mt76x02_dev *dev)void mt76x0_phy_calibrate (struct mt76x02_dev *dev,bool power_on) { -struct ieee80211_channel *chan = dev->mt76.chandef.chan; +struct ieee80211_channel *chan = dev->mphy.chandef.chan;int is_5ghz = (chan->band ==NL80211_BAND_5GHZ ) ?1 :0 ;u32 val, tx_alc, reg_val;
@@ -1037,7 +1037,7 @@ static void mt76x0_phy_temp_sensor(struct mt76x02_dev *dev)if (abs (val - dev->cal.temp_vco) >20 ) {mt76x02_mcu_calibrate (dev,MCU_CAL_VCO , - dev->mt76.chandef.chan->hw_value); + dev->mphy.chandef.chan->hw_value); dev->cal.temp_vco = val; }if (abs (val - dev->cal.temp) >30 ) {
@@ -1057,7 +1057,7 @@ static void mt76x0_phy_set_gain_val(struct mt76x02_dev *dev)mt76_rmw_field (dev,MT_BBP (AGC ,8 ),MT_BBP_AGC_GAIN , gain); -if ((dev->mt76.chandef.chan->flags &IEEE80211_CHAN_RADAR ) && +if ((dev->mphy.chandef.chan->flags &IEEE80211_CHAN_RADAR ) && !is_mt7630 (dev))mt76x02_phy_dfs_adjust_agc (dev); }
drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c +6 -6
@@ -307,8 +307,8 @@ static bool mt76x02_dfs_check_hw_pulse(struct mt76x02_dev *dev, pulse->period <= 100100);break ;case NL80211_DFS_JP : -if (dev->mt76.chandef.chan->center_freq >=5250 && - dev->mt76.chandef.chan->center_freq <=5350 ) { +if (dev->mphy.chandef.chan->center_freq >=5250 && + dev->mphy.chandef.chan->center_freq <=5350 ) {/* JPW53 */ if (pulse->w1 <=130 ) ret = (pulse->period >= 28360 &&
@@ -702,7 +702,7 @@ static void mt76x02_dfs_set_bbp_params(struct mt76x02_dev *dev)u8 i, shift;u32 data; -switch (dev->mt76.chandef.width) { +switch (dev->mphy.chandef.width) {case NL80211_CHAN_WIDTH_40 : shift =MT_DFS_NUM_ENGINES ;break ;
@@ -722,8 +722,8 @@ static void mt76x02_dfs_set_bbp_params(struct mt76x02_dev *dev) radar_specs = &etsi_radar_specs[shift];break ;case NL80211_DFS_JP : -if (dev->mt76.chandef.chan->center_freq >=5250 && - dev->mt76.chandef.chan->center_freq <=5350 ) +if (dev->mphy.chandef.chan->center_freq >=5250 && + dev->mphy.chandef.chan->center_freq <=5350 ) radar_specs = &jp_w53_radar_specs[shift];else radar_specs = &jp_w56_radar_specs[shift];
@@ -822,7 +822,7 @@ EXPORT_SYMBOL_GPL(mt76x02_phy_dfs_adjust_agc);void mt76x02_dfs_init_params (struct mt76x02_dev *dev) { -struct cfg80211_chan_def *chandef = &dev->mt76.chandef; +struct cfg80211_chan_def *chandef = &dev->mphy.chandef;if ((chandef->chan->flags &IEEE80211_CHAN_RADAR ) && dev->mt76.region !=NL80211_DFS_UNSET ) {
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +9 -9
@@ -200,7 +200,7 @@ mt76x02_mac_tx_rate_val(struct mt76x02_dev *dev, bw =1 ; }else {const struct ieee80211_rate *r; -int band = dev->mt76.chandef.chan->band; +int band = dev->mphy.chandef.chan->band;u16 val; r = &dev->mt76.hw->wiphy->bands[band]->bitrates[rate->idx];
@@ -487,17 +487,17 @@ mt76x02_mac_fill_tx_status(struct mt76x02_dev *dev, struct mt76x02_sta *msta, first_rate |= st->pktid &MT_PKTID_RATE ;mt76x02_mac_process_tx_rate (&rate[0 ], first_rate, - dev->mt76.chandef.chan->band); + dev->mphy.chandef.chan->band); }else if (rate[0 ].idx <0 ) {if (!msta)return ;mt76x02_mac_process_tx_rate (&rate[0 ], msta->wcid.tx_info, - dev->mt76.chandef.chan->band); + dev->mphy.chandef.chan->band); }mt76x02_mac_process_tx_rate (&last_rate, st->rate, - dev->mt76.chandef.chan->band); + dev->mphy.chandef.chan->band);for (i =0 ; i <ARRAY_SIZE (info->status.rates); i++) { retry--;
@@ -853,8 +853,8 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb, signal =max_t (s8, signal, status->chain_signal[1 ]); } status->signal = signal; - status->freq = dev->mt76.chandef.chan->center_freq; - status->band = dev->mt76.chandef.chan->band; + status->freq = dev->mphy.chandef.chan->center_freq; + status->band = dev->mphy.chandef.chan->band; status->tid =FIELD_GET (MT_RXWI_TID , tid_sn); status->seqno =FIELD_GET (MT_RXWI_SN , tid_sn);
@@ -1018,7 +1018,7 @@ void mt76x02_update_channel(struct mt76_dev *mdev) struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);struct mt76_channel_state *state; - state = mdev->chan_state; + state = mdev->phy.chan_state; state->cc_busy +=mt76_rr (dev,MT_CH_BUSY );spin_lock_bh (&dev->mt76.cc_lock);
@@ -1074,7 +1074,7 @@ void mt76x02_edcca_init(struct mt76x02_dev *dev) dev->ed_silent =0 ;if (dev->ed_monitor) { -struct ieee80211_channel *chan = dev->mt76.chandef.chan; +struct ieee80211_channel *chan = dev->mphy.chandef.chan;u8 ed_th = chan->band ==NL80211_BAND_5GHZ ?0x0e :0x20 ;mt76_clear (dev,MT_TX_LINK_CFG ,MT_TX_CFACK_EN );
@@ -1184,7 +1184,7 @@ void mt76x02_mac_work(struct work_struct *work)void mt76x02_mac_cc_reset (struct mt76x02_dev *dev) { - dev->mt76.survey_time =ktime_get_boottime (); + dev->mphy.survey_time =ktime_get_boottime (); mt76_wr(dev, MT_CH_TIME_CFG, MT_CH_TIME_CFG_TIMER_EN |
drivers/net/wireless/mediatek/mt76/mt76x02_phy.h +2 -2
@@ -11,7 +11,7 @@static inline int mt76x02_get_rssi_gain_thresh (struct mt76x02_dev *dev) { -switch (dev->mt76.chandef.width) { +switch (dev->mphy.chandef.width) {case NL80211_CHAN_WIDTH_80 :return -62 ;case NL80211_CHAN_WIDTH_40 :
@@ -24,7 +24,7 @@ mt76x02_get_rssi_gain_thresh(struct mt76x02_dev *dev)static inline int mt76x02_get_low_rssi_gain_thresh (struct mt76x02_dev *dev) { -switch (dev->mt76.chandef.width) { +switch (dev->mphy.chandef.width) {case NL80211_CHAN_WIDTH_80 :return -76 ;case NL80211_CHAN_WIDTH_40 :
drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c +1 -1
@@ -74,7 +74,7 @@ s8 mt76x02_tx_get_max_txpwr_adj(struct mt76x02_dev *dev, }else if (rate->flags &IEEE80211_TX_RC_MCS ) { max_txpwr = dev->mt76.rate_power.ht[rate->idx &0xf ]; }else { -enum nl80211_band band = dev->mt76.chandef.chan->band; +enum nl80211_band band = dev->mphy.chandef.chan->band;if (band ==NL80211_BAND_2GHZ ) {const struct ieee80211_rate *r;
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +2 -2
@@ -188,9 +188,9 @@ void mt76x02_init_device(struct mt76x02_dev *dev) dev->slottime =9 ;if (is_mt76x2 (dev)) { - dev->mt76.sband_2g.sband.ht_cap.cap |= + dev->mphy.sband_2g.sband.ht_cap.cap |=IEEE80211_HT_CAP_LDPC_CODING ; - dev->mt76.sband_5g.sband.ht_cap.cap |= + dev->mphy.sband_5g.sband.ht_cap.cap |=IEEE80211_HT_CAP_LDPC_CODING ; dev->mt76.chainmask =0x202 ; dev->mt76.antenna_mask =3 ;
drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c +2 -2
@@ -248,7 +248,7 @@ mt76x2_get_5g_rx_gain(struct mt76x02_dev *dev, u8 channel)void mt76x2_read_rx_gain (struct mt76x02_dev *dev) { -struct ieee80211_channel *chan = dev->mt76.chandef.chan; +struct ieee80211_channel *chan = dev->mphy.chandef.chan;int channel = chan->hw_value;s8 lna_5g[3 ], lna_2g;u8 lna;
@@ -455,7 +455,7 @@ EXPORT_SYMBOL_GPL(mt76x2_get_power_info);int mt76x2_get_temp_comp (struct mt76x02_dev *dev,struct mt76x2_temp_comp *t) { -enum nl80211_band band = dev->mt76.chandef.chan->band; +enum nl80211_band band = dev->mphy.chandef.chan->band;u16 val, slope;u8 bounds;
drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h +1 -1
@@ -53,7 +53,7 @@ mt76x2_has_ext_lna(struct mt76x02_dev *dev) {u32 val =mt76x02_eeprom_get (dev,MT_EE_NIC_CONF_1 ); -if (dev->mt76.chandef.chan->band ==NL80211_BAND_2GHZ ) +if (dev->mphy.chandef.chan->band ==NL80211_BAND_2GHZ )return val &MT_EE_NIC_CONF_1_LNA_EXT_2G ;else return val &MT_EE_NIC_CONF_1_LNA_EXT_5G ;
drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h +1 -1
@@ -30,7 +30,7 @@ static inline bool is_mt7612(struct mt76x02_dev *dev)static inline bool mt76x2_channel_silent (struct mt76x02_dev *dev) { -struct ieee80211_channel *chan = dev->mt76.chandef.chan; +struct ieee80211_channel *chan = dev->mphy.chandef.chan;return ((chan->flags &IEEE80211_CHAN_RADAR ) && chan->dfs_state !=NL80211_DFS_AVAILABLE );
drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c +2 -2
@@ -289,8 +289,8 @@ int mt76x2_register_device(struct mt76x02_dev *dev) goto fail;mt76x02_init_debugfs (dev); -mt76x2_init_txpower (dev, &dev->mt76.sband_2g.sband); -mt76x2_init_txpower (dev, &dev->mt76.sband_5g.sband); +mt76x2_init_txpower (dev, &dev->mphy.sband_2g.sband); +mt76x2_init_txpower (dev, &dev->mphy.sband_5g.sband);return 0 ;
drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +1 -1
@@ -47,7 +47,7 @@ mt76x2_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)mutex_lock (&dev->mt76.mutex);set_bit (MT76_RESET , &dev->mt76.state); -mt76_set_channel (&dev->mt76); +mt76_set_channel (&dev->mphy);mt76x2_mac_stop (dev, true); ret =mt76x2_phy_set_channel (dev, chandef);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c +2 -2
@@ -12,7 +12,7 @@static bool mt76x2_phy_tssi_init_cal (struct mt76x02_dev *dev) { -struct ieee80211_channel *chan = dev->mt76.chandef.chan; +struct ieee80211_channel *chan = dev->mphy.chandef.chan;u32 flag =0 ;if (!mt76x2_tssi_enabled (dev))
@@ -35,7 +35,7 @@ mt76x2_phy_tssi_init_cal(struct mt76x02_dev *dev)static void mt76x2_phy_channel_calibrate (struct mt76x02_dev *dev,bool mac_stopped) { -struct ieee80211_channel *chan = dev->mt76.chandef.chan; +struct ieee80211_channel *chan = dev->mphy.chandef.chan;bool is_5ghz = chan->band ==NL80211_BAND_5GHZ ;if (dev->cal.channel_cal_done)
drivers/net/wireless/mediatek/mt76/mt76x2/phy.c +10 -10
@@ -136,8 +136,8 @@ mt76x2_get_min_rate_power(struct mt76_rate_power *r)void mt76x2_phy_set_txpower (struct mt76x02_dev *dev) { -enum nl80211_chan_width width = dev->mt76.chandef.width; -struct ieee80211_channel *chan = dev->mt76.chandef.chan; +enum nl80211_chan_width width = dev->mphy.chandef.width; +struct ieee80211_channel *chan = dev->mphy.chandef.chan;struct mt76x2_tx_power_info txp;int txp_0, txp_1, delta =0 ;struct mt76_rate_power t = {};
@@ -202,7 +202,7 @@ EXPORT_SYMBOL_GPL(mt76x2_configure_tx_delay);void mt76x2_phy_tssi_compensate (struct mt76x02_dev *dev) { -struct ieee80211_channel *chan = dev->mt76.chandef.chan; +struct ieee80211_channel *chan = dev->mphy.chandef.chan;struct mt76x2_tx_power_info txp;struct mt76x2_tssi_comp t = {};
@@ -252,12 +252,12 @@ mt76x2_phy_set_gain_val(struct mt76x02_dev *dev) val =0x1836 <<16 ;if (!mt76x2_has_ext_lna (dev) && - dev->mt76.chandef.width >=NL80211_CHAN_WIDTH_40 ) + dev->mphy.chandef.width >=NL80211_CHAN_WIDTH_40 ) val =0x1e42 <<16 ;if (mt76x2_has_ext_lna (dev) && - dev->mt76.chandef.chan->band ==NL80211_BAND_2GHZ && - dev->mt76.chandef.width <NL80211_CHAN_WIDTH_40 ) + dev->mphy.chandef.chan->band ==NL80211_BAND_2GHZ && + dev->mphy.chandef.width <NL80211_CHAN_WIDTH_40 ) val =0x0f36 <<16 ; val |=0xf8 ;
@@ -267,7 +267,7 @@ mt76x2_phy_set_gain_val(struct mt76x02_dev *dev)mt76_wr (dev,MT_BBP (AGC ,9 ), val |FIELD_PREP (MT_BBP_AGC_GAIN , gain_val[1 ])); -if (dev->mt76.chandef.chan->flags &IEEE80211_CHAN_RADAR ) +if (dev->mphy.chandef.chan->flags &IEEE80211_CHAN_RADAR )mt76x02_phy_dfs_adjust_agc (dev); }
@@ -297,7 +297,7 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)return ; } -if (dev->mt76.chandef.width ==NL80211_CHAN_WIDTH_80 ) { +if (dev->mphy.chandef.width ==NL80211_CHAN_WIDTH_80 ) {mt76_wr (dev,MT_BBP (RXO ,14 ),0x00560211 ); val =mt76_rr (dev,MT_BBP (AGC ,26 )) & ~0xf ;if (low_gain ==2 )
@@ -315,11 +315,11 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev) low_gain_delta =14 ; agc_37 =0x2121262c ; -if (dev->mt76.chandef.chan->band ==NL80211_BAND_2GHZ ) +if (dev->mphy.chandef.chan->band ==NL80211_BAND_2GHZ ) agc_35 =0x11111516 ;else if (low_gain ==2 ) agc_35 = agc_37 =0x08080808 ; -else if (dev->mt76.chandef.width ==NL80211_CHAN_WIDTH_80 ) +else if (dev->mphy.chandef.width ==NL80211_CHAN_WIDTH_80 ) agc_35 =0x10101014 ;else agc_35 =0x11111116 ;
drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c +2 -2
@@ -221,8 +221,8 @@ int mt76x2u_register_device(struct mt76x02_dev *dev)set_bit (MT76_STATE_INITIALIZED , &dev->mt76.state);mt76x02_init_debugfs (dev); -mt76x2_init_txpower (dev, &dev->mt76.sband_2g.sband); -mt76x2_init_txpower (dev, &dev->mt76.sband_5g.sband); +mt76x2_init_txpower (dev, &dev->mphy.sband_2g.sband); +mt76x2_init_txpower (dev, &dev->mphy.sband_5g.sband);return 0 ;
drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c +1 -1
@@ -43,7 +43,7 @@ mt76x2u_set_channel(struct mt76x02_dev *dev,mutex_lock (&dev->mt76.mutex);set_bit (MT76_RESET , &dev->mt76.state); -mt76_set_channel (&dev->mt76); +mt76_set_channel (&dev->mphy);mt76x2_mac_stop (dev, false);
drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c +2 -2
@@ -10,7 +10,7 @@static void mt76x2u_phy_channel_calibrate (struct mt76x02_dev *dev,bool mac_stopped) { -struct ieee80211_channel *chan = dev->mt76.chandef.chan; +struct ieee80211_channel *chan = dev->mphy.chandef.chan;bool is_5ghz = chan->band ==NL80211_BAND_5GHZ ;if (dev->cal.channel_cal_done)
@@ -185,7 +185,7 @@ int mt76x2u_phy_set_channel(struct mt76x02_dev *dev,struct ieee80211_channel *chan;u32 flag =0 ; - chan = dev->mt76.chandef.chan; + chan = dev->mphy.chandef.chan;if (chan->band ==NL80211_BAND_5GHZ ) flag |=BIT (0 );if (mt76x02_ext_pa_enabled (dev, chan->band))
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 8/29 mt76: keep a set of software tx queues per phy
In reply to Felix FietkauAllows tracking tx scheduling separately per phy
--- drivers/net/wireless/mediatek/mt76/debugfs.c | 2 +- drivers/net/wireless/mediatek/mt76/dma.c | 12 ++++++++++-- drivers/net/wireless/mediatek/mt76/mac80211.c | 13 ++++++++----- drivers/net/wireless/mediatek/mt76/mt76.h | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 2 +- drivers/net/wireless/mediatek/mt76/usb.c | 2 +- 7 files changed, 24 insertions(+), 13 deletions(-)
drivers/net/wireless/mediatek/mt76/debugfs.c +1 -1
@@ -30,7 +30,7 @@ int mt76_queues_read(struct seq_file *s, void *data)struct mt76_dev *dev =dev_get_drvdata (s->private);int i; -for (i =0 ; i <ARRAY_SIZE (dev->q_tx); i++) { +for (i =0 ; i < __MT_TXQ_MAX; i++) {struct mt76_sw_queue *q = &dev->q_tx[i];if (!q->q)
drivers/net/wireless/mediatek/mt76/dma.c +10 -2
@@ -141,7 +141,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush)struct mt76_sw_queue *sq = &dev->q_tx[qid];struct mt76_queue *q = sq->q;struct mt76_queue_entry entry; -unsigned int n_swq_queued[4 ] = {}; +unsigned int n_swq_queued[8 ] = {};unsigned int n_queued =0 ;bool wake = false;int i, last;
@@ -178,13 +178,21 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush)spin_lock_bh (&q->lock); q->queued -= n_queued; -for (i =0 ; i <ARRAY_SIZE (n_swq_queued); i++) { +for (i =0 ; i <4 ; i++) {if (!n_swq_queued[i])continue ; dev->q_tx[i].swq_queued -= n_swq_queued[i]; } +/* ext PHY */ +for (i =0 ; i <4 ; i++) { +if (!n_swq_queued[i]) +continue ; + + dev->q_tx[__MT_TXQ_MAX + i].swq_queued -= n_swq_queued[4 + i]; + } +if (flush)mt76_dma_sync_idx (dev, q);
drivers/net/wireless/mediatek/mt76/mac80211.c +8 -5
@@ -411,13 +411,16 @@ void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb) }EXPORT_SYMBOL_GPL (mt76_rx); -bool mt76_has_tx_pending (struct mt76_dev *dev) +bool mt76_has_tx_pending (struct mt76_phy *phy) { +struct mt76_dev *dev = phy->dev;struct mt76_queue *q; -int i; +int i, offset; + + offset = __MT_TXQ_MAX * (phy != &dev->phy); -for (i =0 ; i <ARRAY_SIZE (dev->q_tx); i++) { - q = dev->q_tx[i].q; +for (i =0 ; i < __MT_TXQ_MAX; i++) { + q = dev->q_tx[offset + i].q;if (q && q->queued)return true; }
@@ -485,7 +488,7 @@ void mt76_set_channel(struct mt76_phy *phy)bool offchannel = hw->conf.flags &IEEE80211_CONF_OFFCHANNEL ;int timeout =HZ /5 ; -wait_event_timeout (dev->tx_wait, !mt76_has_tx_pending (dev), timeout); +wait_event_timeout (dev->tx_wait, !mt76_has_tx_pending (phy), timeout);mt76_update_survey (dev); phy->chandef = *chandef;
drivers/net/wireless/mediatek/mt76/mt76.h +2 -2
@@ -498,7 +498,7 @@ struct mt76_dev {u32 ampdu_ref;struct list_head txwi_cache; -struct mt76_sw_queue q_tx[__MT_TXQ_MAX]; +struct mt76_sw_queue q_tx[2 * __MT_TXQ_MAX];struct mt76_queue q_rx[__MT_RXQ_MAX];const struct mt76_queue_ops *queue_ops;int tx_dma_idx[4 ];
@@ -752,7 +752,7 @@ void mt76_release_buffered_frames(struct ieee80211_hw *hw, u16 tids, int nframes, enum ieee80211_frame_release_type reason, bool more_data); -bool mt76_has_tx_pending (struct mt76_dev *dev); +bool mt76_has_tx_pending (struct mt76_phy *phy);void mt76_set_channel (struct mt76_phy *phy);void mt76_update_survey (struct mt76_dev *dev); int mt76_get_survey(struct ieee80211_hw *hw, int idx,
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +1 -1
@@ -1426,7 +1426,7 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)mt7603_pse_client_reset (dev); -for (i =0 ; i <ARRAY_SIZE (dev->mt76.q_tx); i++) +for (i =0 ; i < __MT_TXQ_MAX; i++)mt76_queue_tx_cleanup (dev, i, true);for (i =0 ; i <ARRAY_SIZE (dev->mt76.q_rx); i++)
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +1 -1
@@ -476,7 +476,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)if (restart)mt76_mcu_restart (dev); -for (i =0 ; i <ARRAY_SIZE (dev->mt76.q_tx); i++) +for (i =0 ; i < __MT_TXQ_MAX; i++)mt76_queue_tx_cleanup (dev, i, true);for (i =0 ; i <ARRAY_SIZE (dev->mt76.q_rx); i++)
drivers/net/wireless/mediatek/mt76/usb.c +1 -1
@@ -872,7 +872,7 @@ void mt76u_stop_tx(struct mt76_dev *dev)struct mt76_queue *q;int i, j, ret; - ret =wait_event_timeout (dev->tx_wait, !mt76_has_tx_pending (dev), + ret =wait_event_timeout (dev->tx_wait, !mt76_has_tx_pending (&dev->phy),HZ /5 );if (!ret) {dev_err (dev->dev,"timed out waiting for pending tx\n" );
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 9/29 mt76: move state from struct mt76_dev to mt76_phy
In reply to Felix FietkauAllows keeping per-wiphy state separate
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 16 +++++++------- drivers/net/wireless/mediatek/mt76/mt76.h | 15 +++++++++---- .../net/wireless/mediatek/mt76/mt7603/core.c | 2 +- .../net/wireless/mediatek/mt76/mt7603/init.c | 2 +- .../net/wireless/mediatek/mt76/mt7603/mac.c | 4 ++-- .../net/wireless/mediatek/mt76/mt7603/main.c | 8 +++---- .../net/wireless/mediatek/mt76/mt7615/init.c | 2 +- .../net/wireless/mediatek/mt76/mt7615/mac.c | 4 ++-- .../net/wireless/mediatek/mt76/mt7615/main.c | 8 +++---- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 4 ++-- .../net/wireless/mediatek/mt76/mt7615/pci.c | 2 +- .../net/wireless/mediatek/mt76/mt76x0/main.c | 2 +- .../net/wireless/mediatek/mt76/mt76x0/pci.c | 8 +++---- .../wireless/mediatek/mt76/mt76x0/pci_mcu.c | 2 +- .../net/wireless/mediatek/mt76/mt76x0/phy.c | 10 ++++----- .../net/wireless/mediatek/mt76/mt76x0/usb.c | 14 ++++++------ .../wireless/mediatek/mt76/mt76x0/usb_mcu.c | 2 +- .../net/wireless/mediatek/mt76/mt76x02_dfs.c | 2 +- .../net/wireless/mediatek/mt76/mt76x02_mac.c | 4 ++-- .../net/wireless/mediatek/mt76/mt76x02_mac.h | 2 +- .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 8 +++---- .../wireless/mediatek/mt76/mt76x02_usb_core.c | 2 +- .../wireless/mediatek/mt76/mt76x02_usb_mcu.c | 2 +- .../net/wireless/mediatek/mt76/mt76x02_util.c | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_init.c | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_main.c | 10 ++++----- .../wireless/mediatek/mt76/mt76x2/pci_phy.c | 2 +- .../net/wireless/mediatek/mt76/mt76x2/usb.c | 2 +- .../wireless/mediatek/mt76/mt76x2/usb_init.c | 2 +- .../wireless/mediatek/mt76/mt76x2/usb_mac.c | 2 +- .../wireless/mediatek/mt76/mt76x2/usb_main.c | 10 ++++----- .../wireless/mediatek/mt76/mt76x2/usb_phy.c | 2 +- drivers/net/wireless/mediatek/mt76/tx.c | 6 ++--- drivers/net/wireless/mediatek/mt76/usb.c | 22 +++++++++---------- 34 files changed, 97 insertions(+), 90 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +8 -8
@@ -402,7 +402,10 @@ EXPORT_SYMBOL_GPL(mt76_free_device);void mt76_rx (struct mt76_dev *dev,enum mt76_rxq_id q,struct sk_buff *skb) { -if (!test_bit (MT76_STATE_RUNNING , &dev->state)) { +struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb; +struct mt76_phy *phy =mt76_dev_phy (dev, status->ext_phy); + +if (!test_bit (MT76_STATE_RUNNING , &phy->state)) {dev_kfree_skb (skb);return ; }
@@ -458,9 +461,6 @@ void mt76_update_survey(struct mt76_dev *dev) {ktime_t cur_time; -if (!test_bit (MT76_STATE_RUNNING , &dev->state)) -return ; -if (dev->drv->update_survey) dev->drv->update_survey (dev);
@@ -1062,17 +1062,17 @@ EXPORT_SYMBOL_GPL(mt76_get_rate);void mt76_sw_scan (struct ieee80211_hw *hw,struct ieee80211_vif *vif,const u8 *mac) { -struct mt76_dev *dev = hw->priv; +struct mt76_phy *phy = hw->priv; -set_bit (MT76_SCANNING , &dev->state); +set_bit (MT76_SCANNING , &phy->state); }EXPORT_SYMBOL_GPL (mt76_sw_scan);void mt76_sw_scan_complete (struct ieee80211_hw *hw,struct ieee80211_vif *vif) { -struct mt76_dev *dev = hw->priv; +struct mt76_phy *phy = hw->priv; -clear_bit (MT76_SCANNING , &dev->state); +clear_bit (MT76_SCANNING , &phy->state); }EXPORT_SYMBOL_GPL (mt76_sw_scan_complete);
drivers/net/wireless/mediatek/mt76/mt76.h +11 -4
@@ -458,6 +458,8 @@ struct mt76_phy {struct ieee80211_hw *hw;struct mt76_dev *dev; +unsigned long state; +struct cfg80211_chan_def chandef;struct ieee80211_channel *main_chan;
@@ -518,7 +520,6 @@ struct mt76_dev {u8 macaddr[ETH_ALEN ];u32 rev; -unsigned long state;u32 aggr_stats[32 ];
@@ -660,12 +661,18 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,int mt76_eeprom_init (struct mt76_dev *dev,int len);void mt76_eeprom_override (struct mt76_dev *dev); +static inline struct mt76_phy * +mt76_dev_phy (struct mt76_dev *dev,bool phy_ext) +{ +if (phy_ext && dev->phy2) +return dev->phy2; +return &dev->phy; +} +static inline struct ieee80211_hw *mt76_phy_hw (struct mt76_dev *dev,bool phy_ext) { -if (phy_ext && dev->phy2) -return dev->phy2->hw; -return dev->phy.hw; +return mt76_dev_phy (dev, phy_ext)->hw; } static inline u8 *
drivers/net/wireless/mediatek/mt76/mt7603/core.c +1 -1
@@ -17,7 +17,7 @@ irqreturn_t mt7603_irq_handler(int irq, void *dev_instance) intr =mt76_rr (dev,MT_INT_SOURCE_CSR );mt76_wr (dev,MT_INT_SOURCE_CSR , intr); -if (!test_bit (MT76_STATE_INITIALIZED , &dev->mt76.state)) +if (!test_bit (MT76_STATE_INITIALIZED , &dev->mphy.state))return IRQ_NONE ; intr &= dev->mt76.mmio.irqmask;
drivers/net/wireless/mediatek/mt76/mt7603/init.c +1 -1
@@ -284,7 +284,7 @@ mt7603_init_hardware(struct mt7603_dev *dev)mt76_wr (dev,MT_WPDMA_GLO_CFG ,0x52000850 );mt7603_mac_dma_start (dev); dev->rxfilter =mt76_rr (dev,MT_WF_RFCR ); -set_bit (MT76_STATE_INITIALIZED , &dev->mt76.state); +set_bit (MT76_STATE_INITIALIZED , &dev->mphy.state);for (i =0 ; i <MT7603_WTBL_SIZE ; i++) { mt76_wr(dev, MT_PSE_RTA, MT_PSE_RTA_BUSY | MT_PSE_RTA_WRITE |
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +2 -2
@@ -1389,7 +1389,7 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)int i;ieee80211_stop_queues (dev->mt76.hw); -set_bit (MT76_RESET , &dev->mt76.state); +set_bit (MT76_RESET , &dev->mphy.state);/* lock/unlock all queues to ensure that no tx is pending */ mt76_txq_schedule_all (&dev->mphy);
@@ -1439,7 +1439,7 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)mt7603_irq_enable (dev, mask); skip_dma_reset: -clear_bit (MT76_RESET , &dev->mt76.state); +clear_bit (MT76_RESET , &dev->mphy.state);mutex_unlock (&dev->mt76.mutex);tasklet_enable (&dev->mt76.tx_tasklet);
drivers/net/wireless/mediatek/mt76/mt7603/main.c +4 -4
@@ -16,7 +16,7 @@ mt7603_start(struct ieee80211_hw *hw)mt7603_mac_reset_counters (dev);mt7603_mac_start (dev); dev->mphy.survey_time =ktime_get_boottime (); -set_bit (MT76_STATE_RUNNING , &dev->mt76.state); +set_bit (MT76_STATE_RUNNING , &dev->mphy.state);mt7603_mac_work (&dev->mt76.mac_work.work);return 0 ;
@@ -27,7 +27,7 @@ mt7603_stop(struct ieee80211_hw *hw) {struct mt7603_dev *dev = hw->priv; -clear_bit (MT76_STATE_RUNNING , &dev->mt76.state); +clear_bit (MT76_STATE_RUNNING , &dev->mphy.state);cancel_delayed_work_sync (&dev->mt76.mac_work);mt7603_mac_stop (dev); }
@@ -143,7 +143,7 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)tasklet_disable (&dev->mt76.pre_tbtt_tasklet);mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &dev->mt76.state); +set_bit (MT76_RESET , &dev->mphy.state);mt7603_beacon_set_timer (dev,-1 ,0 );mt76_set_channel (&dev->mphy);
@@ -176,7 +176,7 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)mt7603_mac_set_timing (dev);mt7603_mac_start (dev); -clear_bit (MT76_RESET , &dev->mt76.state); +clear_bit (MT76_RESET , &dev->mphy.state);mt76_txq_schedule_all (&dev->mphy);
drivers/net/wireless/mediatek/mt76/mt7615/init.c +1 -1
@@ -123,7 +123,7 @@ static int mt7615_init_hardware(struct mt7615_dev *dev)if (ret)return ret; -set_bit (MT76_STATE_INITIALIZED , &dev->mt76.state); +set_bit (MT76_STATE_INITIALIZED , &dev->mphy.state); ret =mt7615_mcu_init (dev);if (ret)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +2 -2
@@ -72,7 +72,7 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)bool unicast, remove_pad, insert_ccmp_hdr = false;int i, idx; -if (!test_bit (MT76_STATE_RUNNING , &dev->mt76.state)) +if (!test_bit (MT76_STATE_RUNNING , &dev->mphy.state))return -EINVAL ;memset (status,0 ,sizeof (*status));
@@ -1485,7 +1485,7 @@ int mt7615_dfs_init_radar_detector(struct mt7615_dev *dev)if (dev->mt76.region ==NL80211_DFS_UNSET )return 0 ; -if (test_bit (MT76_SCANNING , &dev->mt76.state)) +if (test_bit (MT76_SCANNING , &dev->mphy.state))return 0 ;if (dev->dfs_state == chandef->chan->dfs_state)
drivers/net/wireless/mediatek/mt76/mt7615/main.c +4 -4
@@ -19,7 +19,7 @@ static int mt7615_start(struct ieee80211_hw *hw)mt7615_mac_reset_counters (dev); dev->mphy.survey_time =ktime_get_boottime (); -set_bit (MT76_STATE_RUNNING , &dev->mt76.state); +set_bit (MT76_STATE_RUNNING , &dev->mphy.state);ieee80211_queue_delayed_work (mt76_hw (dev), &dev->mt76.mac_work,MT7615_WATCHDOG_TIME );
@@ -30,7 +30,7 @@ static void mt7615_stop(struct ieee80211_hw *hw) {struct mt7615_dev *dev = hw->priv; -clear_bit (MT76_STATE_RUNNING , &dev->mt76.state); +clear_bit (MT76_STATE_RUNNING , &dev->mphy.state);cancel_delayed_work_sync (&dev->mt76.mac_work); }
@@ -151,7 +151,7 @@ static int mt7615_set_channel(struct mt7615_dev *dev)cancel_delayed_work_sync (&dev->mt76.mac_work);mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &dev->mt76.state); +set_bit (MT76_RESET , &dev->mphy.state);mt7615_dfs_check_channel (dev);
@@ -168,7 +168,7 @@ static int mt7615_set_channel(struct mt7615_dev *dev)mt7615_mac_reset_counters (dev); out: -clear_bit (MT76_RESET , &dev->mt76.state); +clear_bit (MT76_RESET , &dev->mphy.state);mutex_unlock (&dev->mt76.mutex);mt76_txq_schedule_all (&dev->mphy);
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +2 -2
@@ -104,7 +104,7 @@ static int __mt7615_mcu_msg_send(struct mt7615_dev *dev, struct sk_buff *skb,if (wait_seq) *wait_seq = seq; -if (test_bit (MT76_STATE_MCU_RUNNING , &dev->mt76.state)) +if (test_bit (MT76_STATE_MCU_RUNNING , &dev->mphy.state)) qid =MT_TXQ_MCU ;else qid =MT_TXQ_FWDL ;
@@ -561,7 +561,7 @@ int mt7615_mcu_init(struct mt7615_dev *dev)if (ret)return ret; -set_bit (MT76_STATE_MCU_RUNNING , &dev->mt76.state); +set_bit (MT76_STATE_MCU_RUNNING , &dev->mphy.state);return 0 ; }
drivers/net/wireless/mediatek/mt76/mt7615/pci.c +1 -1
@@ -43,7 +43,7 @@ static irqreturn_t mt7615_irq_handler(int irq, void *dev_instance) intr =mt76_rr (dev,MT_INT_SOURCE_CSR );mt76_wr (dev,MT_INT_SOURCE_CSR , intr); -if (!test_bit (MT76_STATE_INITIALIZED , &dev->mt76.state)) +if (!test_bit (MT76_STATE_INITIALIZED , &dev->mphy.state))return IRQ_NONE ; intr &= dev->mt76.mmio.irqmask;
drivers/net/wireless/mediatek/mt76/mt76x0/main.c +1 -1
@@ -46,7 +46,7 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed)if (changed &IEEE80211_CONF_CHANGE_POWER ) { dev->mt76.txpower_conf = hw->conf.power_level *2 ; -if (test_bit (MT76_STATE_RUNNING , &dev->mt76.state)) +if (test_bit (MT76_STATE_RUNNING , &dev->mphy.state))mt76x0_phy_set_txpower (dev); }
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c +4 -4
@@ -20,7 +20,7 @@ static int mt76x0e_start(struct ieee80211_hw *hw) MT_MAC_WORK_INTERVAL);ieee80211_queue_delayed_work (dev->mt76.hw, &dev->cal_work,MT_CALIBRATE_INTERVAL ); -set_bit (MT76_STATE_RUNNING , &dev->mt76.state); +set_bit (MT76_STATE_RUNNING , &dev->mphy.state);return 0 ; }
@@ -47,7 +47,7 @@ static void mt76x0e_stop(struct ieee80211_hw *hw) {struct mt76x02_dev *dev = hw->priv; -clear_bit (MT76_STATE_RUNNING , &dev->mt76.state); +clear_bit (MT76_STATE_RUNNING , &dev->mphy.state);mt76x0e_stop_hw (dev); }
@@ -124,7 +124,7 @@ static int mt76x0e_register_device(struct mt76x02_dev *dev)if (err <0 )return err; -set_bit (MT76_STATE_INITIALIZED , &dev->mt76.state); +set_bit (MT76_STATE_INITIALIZED , &dev->mphy.state);return 0 ; }
@@ -195,7 +195,7 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)static void mt76x0e_cleanup (struct mt76x02_dev *dev) { -clear_bit (MT76_STATE_INITIALIZED , &dev->mt76.state); +clear_bit (MT76_STATE_INITIALIZED , &dev->mphy.state);tasklet_disable (&dev->mt76.pre_tbtt_tasklet);mt76x0_chip_onoff (dev, false, false);mt76x0e_stop_hw (dev);
drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c +1 -1
@@ -126,7 +126,7 @@ int mt76x0e_mcu_init(struct mt76x02_dev *dev)if (err <0 )return err; -set_bit (MT76_STATE_MCU_RUNNING , &dev->mt76.state); +set_bit (MT76_STATE_MCU_RUNNING , &dev->mphy.state);return 0 ; }
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +5 -5
@@ -23,7 +23,7 @@ mt76x0_rf_csr_wr(struct mt76x02_dev *dev, u32 offset, u8 value)int ret =0 ;u8 bank, reg; -if (test_bit (MT76_REMOVED , &dev->mt76.state)) +if (test_bit (MT76_REMOVED , &dev->mphy.state))return -ENODEV ; bank =MT_RF_BANK (offset);
@@ -62,7 +62,7 @@ static int mt76x0_rf_csr_rr(struct mt76x02_dev *dev, u32 offset)u32 val;u8 bank, reg; -if (test_bit (MT76_REMOVED , &dev->mt76.state)) +if (test_bit (MT76_REMOVED , &dev->mphy.state))return -ENODEV ; bank =MT_RF_BANK (offset);
@@ -109,7 +109,7 @@ mt76x0_rf_wr(struct mt76x02_dev *dev, u32 offset, u8 val) };WARN_ON_ONCE (!test_bit (MT76_STATE_MCU_RUNNING , - &dev->mt76.state)); + &dev->mphy.state));return mt76_wr_rp (dev,MT_MCU_MEMMAP_RF , &pair,1 ); }else {return mt76x0_rf_csr_wr (dev, offset, val);
@@ -127,7 +127,7 @@ static int mt76x0_rf_rr(struct mt76x02_dev *dev, u32 offset) };WARN_ON_ONCE (!test_bit (MT76_STATE_MCU_RUNNING , - &dev->mt76.state)); + &dev->mphy.state)); ret =mt76_rd_rp (dev,MT_MCU_MEMMAP_RF , &pair,1 ); val = pair.value; }else {
@@ -933,7 +933,7 @@ void mt76x0_phy_set_channel(struct mt76x02_dev *dev,FIELD_PREP (MT_EXT_CCA_CFG_CCA3 ,0 ) | FIELD_PREP(MT_EXT_CCA_CFG_CCA_MASK, BIT(3)), }; -bool scan =test_bit (MT76_SCANNING , &dev->mt76.state); +bool scan =test_bit (MT76_SCANNING , &dev->mphy.state);int ch_group_index, freq, freq1;u8 channel;u32 val;
drivers/net/wireless/mediatek/mt76/mt76x0/usb.c +7 -7
@@ -71,7 +71,7 @@ static void mt76x0_init_usb_dma(struct mt76x02_dev *dev)static void mt76x0u_cleanup (struct mt76x02_dev *dev) { -clear_bit (MT76_STATE_INITIALIZED , &dev->mt76.state); +clear_bit (MT76_STATE_INITIALIZED , &dev->mphy.state);mt76x0_chip_onoff (dev, false, false);mt76u_queues_deinit (&dev->mt76); }
@@ -80,13 +80,13 @@ static void mt76x0u_stop(struct ieee80211_hw *hw) {struct mt76x02_dev *dev = hw->priv; -clear_bit (MT76_STATE_RUNNING , &dev->mt76.state); +clear_bit (MT76_STATE_RUNNING , &dev->mphy.state);cancel_delayed_work_sync (&dev->cal_work);cancel_delayed_work_sync (&dev->mt76.mac_work);mt76u_stop_tx (&dev->mt76);mt76x02u_exit_beacon_config (dev); -if (test_bit (MT76_REMOVED , &dev->mt76.state)) +if (test_bit (MT76_REMOVED , &dev->mphy.state))return ;if (!mt76_poll (dev,MT_USB_DMA_CFG ,MT_USB_DMA_CFG_TX_BUSY ,0 ,1000 ))
@@ -112,7 +112,7 @@ static int mt76x0u_start(struct ieee80211_hw *hw) MT_MAC_WORK_INTERVAL);ieee80211_queue_delayed_work (dev->mt76.hw, &dev->cal_work,MT_CALIBRATE_INTERVAL ); -set_bit (MT76_STATE_RUNNING , &dev->mt76.state); +set_bit (MT76_STATE_RUNNING , &dev->mphy.state);return 0 ; }
@@ -192,7 +192,7 @@ static int mt76x0u_register_device(struct mt76x02_dev *dev)else hw->max_tx_fragments =1 ; -set_bit (MT76_STATE_INITIALIZED , &dev->mt76.state); +set_bit (MT76_STATE_INITIALIZED , &dev->mphy.state);return 0 ;
@@ -283,7 +283,7 @@ static int mt76x0u_probe(struct usb_interface *usb_intf,static void mt76x0_disconnect (struct usb_interface *usb_intf) {struct mt76x02_dev *dev =usb_get_intfdata (usb_intf); -bool initialized =test_bit (MT76_STATE_INITIALIZED , &dev->mt76.state); +bool initialized =test_bit (MT76_STATE_INITIALIZED , &dev->mphy.state);if (!initialized)return ;
@@ -304,7 +304,7 @@ static int __maybe_unused mt76x0_suspend(struct usb_interface *usb_intf,struct mt76x02_dev *dev =usb_get_intfdata (usb_intf);mt76u_stop_rx (&dev->mt76); -clear_bit (MT76_STATE_MCU_RUNNING , &dev->mt76.state); +clear_bit (MT76_STATE_MCU_RUNNING , &dev->mphy.state);mt76x0_chip_onoff (dev, false, false);return 0 ;
drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c +1 -1
@@ -168,7 +168,7 @@ int mt76x0u_mcu_init(struct mt76x02_dev *dev)if (ret <0 )return ret; -set_bit (MT76_STATE_MCU_RUNNING , &dev->mt76.state); +set_bit (MT76_STATE_MCU_RUNNING , &dev->mphy.state);return 0 ; }
drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c +1 -1
@@ -616,7 +616,7 @@ static void mt76x02_dfs_tasklet(unsigned long arg)u32 engine_mask;int i; -if (test_bit (MT76_SCANNING , &dev->mt76.state)) +if (test_bit (MT76_SCANNING , &dev->mphy.state)) goto out; if (time_is_before_jiffies(dfs_pd->last_sw_check +
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +2 -2
@@ -775,7 +775,7 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,u8 wcid;int len; -if (!test_bit (MT76_STATE_RUNNING , &dev->mt76.state)) +if (!test_bit (MT76_STATE_RUNNING , &dev->mphy.state))return -EINVAL ;if (rxinfo &MT_RXINFO_L2PAD )
@@ -868,7 +868,7 @@ void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq)u8 update =1 ;bool ret; -if (!test_bit (MT76_STATE_RUNNING , &dev->mt76.state)) +if (!test_bit (MT76_STATE_RUNNING , &dev->mphy.state))return ;trace_mac_txstat_poll (dev);
drivers/net/wireless/mediatek/mt76/mt76x02_mac.h +1 -1
@@ -152,7 +152,7 @@ static inline bool mt76x02_wait_for_mac(struct mt76_dev *dev)int i;for (i =0 ; i <500 ; i++) { -if (test_bit (MT76_REMOVED , &dev->state)) +if (test_bit (MT76_REMOVED , &dev->phy.state))return false;switch (dev->bus->rr (dev,MAC_CSR0 )) {
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +4 -4
@@ -261,7 +261,7 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance) intr =mt76_rr (dev,MT_INT_SOURCE_CSR );mt76_wr (dev,MT_INT_SOURCE_CSR , intr); -if (!test_bit (MT76_STATE_INITIALIZED , &dev->mt76.state)) +if (!test_bit (MT76_STATE_INITIALIZED , &dev->mphy.state))return IRQ_NONE ;trace_dev_irq (dev, intr, dev->mt76.mmio.irqmask);
@@ -402,7 +402,7 @@ static void mt76x02_reset_state(struct mt76x02_dev *dev)lockdep_assert_held (&dev->mt76.mutex); -clear_bit (MT76_STATE_RUNNING , &dev->mt76.state); +clear_bit (MT76_STATE_RUNNING , &dev->mphy.state);rcu_read_lock ();ieee80211_iter_keys_rcu (dev->mt76.hw,NULL , mt76x02_key_sync,NULL );
@@ -441,7 +441,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)int i;ieee80211_stop_queues (dev->mt76.hw); -set_bit (MT76_RESET , &dev->mt76.state); +set_bit (MT76_RESET , &dev->mphy.state);tasklet_disable (&dev->mt76.pre_tbtt_tasklet);tasklet_disable (&dev->mt76.tx_tasklet);
@@ -496,7 +496,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)mutex_unlock (&dev->mt76.mutex); -clear_bit (MT76_RESET , &dev->mt76.state); +clear_bit (MT76_RESET , &dev->mphy.state);tasklet_enable (&dev->mt76.tx_tasklet);napi_enable (&dev->mt76.tx_napi);
drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c +1 -1
@@ -280,7 +280,7 @@ EXPORT_SYMBOL_GPL(mt76x02u_init_beacon_config);void mt76x02u_exit_beacon_config (struct mt76x02_dev *dev) { -if (!test_bit (MT76_REMOVED , &dev->mt76.state)) +if (!test_bit (MT76_REMOVED , &dev->mphy.state)) mt76_clear(dev, MT_BEACON_TIME_CFG, MT_BEACON_TIME_CFG_TIMER_EN | MT_BEACON_TIME_CFG_SYNC_MODE |
drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c +1 -1
@@ -87,7 +87,7 @@ __mt76x02u_mcu_send_msg(struct mt76_dev *dev, struct sk_buff *skb,u8 seq =0 ;u32 info; -if (test_bit (MT76_REMOVED , &dev->state)) +if (test_bit (MT76_REMOVED , &dev->phy.state))return 0 ;if (wait_resp) {
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +1 -1
@@ -602,7 +602,7 @@ void mt76x02_sw_scan_complete(struct ieee80211_hw *hw, {struct mt76x02_dev *dev = hw->priv; -clear_bit (MT76_SCANNING , &dev->mt76.state); +clear_bit (MT76_SCANNING , &dev->mphy.state);if (dev->cal.gain_init_done) {/* Restore AGC gain and resume calibration after scanning. */ dev->cal.low_gain =-1 ;
drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c +1 -1
@@ -239,7 +239,7 @@ static int mt76x2_init_hardware(struct mt76x02_dev *dev)if (ret)return ret; -set_bit (MT76_STATE_INITIALIZED , &dev->mt76.state); +set_bit (MT76_STATE_INITIALIZED , &dev->mphy.state);mt76x02_mac_start (dev); ret =mt76x2_mcu_init (dev);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +5 -5
@@ -22,7 +22,7 @@ mt76x2_start(struct ieee80211_hw *hw)ieee80211_queue_delayed_work (mt76_hw (dev), &dev->wdt_work,MT_WATCHDOG_TIME ); -set_bit (MT76_STATE_RUNNING , &dev->mt76.state); +set_bit (MT76_STATE_RUNNING , &dev->mphy.state);return 0 ; }
@@ -31,7 +31,7 @@ mt76x2_stop(struct ieee80211_hw *hw) {struct mt76x02_dev *dev = hw->priv; -clear_bit (MT76_STATE_RUNNING , &dev->mt76.state); +clear_bit (MT76_STATE_RUNNING , &dev->mphy.state);mt76x2_stop_hardware (dev); }
@@ -45,7 +45,7 @@ mt76x2_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)tasklet_disable (&dev->dfs_pd.dfs_tasklet);mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &dev->mt76.state); +set_bit (MT76_RESET , &dev->mphy.state);mt76_set_channel (&dev->mphy);
@@ -57,7 +57,7 @@ mt76x2_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)mt76x2_mac_resume (dev); -clear_bit (MT76_RESET , &dev->mt76.state); +clear_bit (MT76_RESET , &dev->mphy.state);mutex_unlock (&dev->mt76.mutex);tasklet_enable (&dev->dfs_pd.dfs_tasklet);
@@ -91,7 +91,7 @@ mt76x2_config(struct ieee80211_hw *hw, u32 changed)/* convert to per-chain power for 2x2 devices */ dev->mt76.txpower_conf -=6 ; -if (test_bit (MT76_STATE_RUNNING , &dev->mt76.state)) { +if (test_bit (MT76_STATE_RUNNING , &dev->mphy.state)) {mt76x2_phy_set_txpower (dev);mt76x02_tx_set_txpwr_auto (dev, dev->mt76.txpower_conf); }
drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c +1 -1
@@ -118,7 +118,7 @@ int mt76x2_phy_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef) {struct ieee80211_channel *chan = chandef->chan; -bool scan =test_bit (MT76_SCANNING , &dev->mt76.state); +bool scan =test_bit (MT76_SCANNING , &dev->mphy.state);enum nl80211_band band = chan->band;u8 channel;
drivers/net/wireless/mediatek/mt76/mt76x2/usb.c +1 -1
@@ -86,7 +86,7 @@ static void mt76x2u_disconnect(struct usb_interface *intf)struct mt76x02_dev *dev =usb_get_intfdata (intf);struct ieee80211_hw *hw =mt76_hw (dev); -set_bit (MT76_REMOVED , &dev->mt76.state); +set_bit (MT76_REMOVED , &dev->mphy.state);ieee80211_unregister_hw (hw);mt76x2u_cleanup (dev);mt76u_deinit (&dev->mt76);
drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c +1 -1
@@ -218,7 +218,7 @@ int mt76x2u_register_device(struct mt76x02_dev *dev)else hw->max_tx_fragments =1 ; -set_bit (MT76_STATE_INITIALIZED , &dev->mt76.state); +set_bit (MT76_STATE_INITIALIZED , &dev->mphy.state);mt76x02_init_debugfs (dev);mt76x2_init_txpower (dev, &dev->mphy.sband_2g.sband);
drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c +1 -1
@@ -98,7 +98,7 @@ int mt76x2u_mac_stop(struct mt76x02_dev *dev)bool stopped = false;u32 rts_cfg; -if (test_bit (MT76_REMOVED , &dev->mt76.state)) +if (test_bit (MT76_REMOVED , &dev->mphy.state))return -EIO ; rts_cfg =mt76_rr (dev,MT_TX_RTS_CFG );
drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c +5 -5
@@ -17,7 +17,7 @@ static int mt76x2u_start(struct ieee80211_hw *hw)ieee80211_queue_delayed_work (mt76_hw (dev), &dev->mt76.mac_work,MT_MAC_WORK_INTERVAL ); -set_bit (MT76_STATE_RUNNING , &dev->mt76.state); +set_bit (MT76_STATE_RUNNING , &dev->mphy.state);return 0 ; }
@@ -26,7 +26,7 @@ static void mt76x2u_stop(struct ieee80211_hw *hw) {struct mt76x02_dev *dev = hw->priv; -clear_bit (MT76_STATE_RUNNING , &dev->mt76.state); +clear_bit (MT76_STATE_RUNNING , &dev->mphy.state);mt76u_stop_tx (&dev->mt76);mt76x2u_stop_hw (dev); }
@@ -41,7 +41,7 @@ mt76x2u_set_channel(struct mt76x02_dev *dev,mt76x02_pre_tbtt_enable (dev, false);mutex_lock (&dev->mt76.mutex); -set_bit (MT76_RESET , &dev->mt76.state); +set_bit (MT76_RESET , &dev->mphy.state);mt76_set_channel (&dev->mphy);
@@ -52,7 +52,7 @@ mt76x2u_set_channel(struct mt76x02_dev *dev,mt76x02_mac_cc_reset (dev);mt76x2_mac_resume (dev); -clear_bit (MT76_RESET , &dev->mt76.state); +clear_bit (MT76_RESET , &dev->mphy.state);mutex_unlock (&dev->mt76.mutex);mt76x02_pre_tbtt_enable (dev, true);
@@ -83,7 +83,7 @@ mt76x2u_config(struct ieee80211_hw *hw, u32 changed)/* convert to per-chain power for 2x2 devices */ dev->mt76.txpower_conf -=6 ; -if (test_bit (MT76_STATE_RUNNING , &dev->mt76.state)) +if (test_bit (MT76_STATE_RUNNING , &dev->mphy.state))mt76x2_phy_set_txpower (dev); }
drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c +1 -1
@@ -82,7 +82,7 @@ int mt76x2u_phy_set_channel(struct mt76x02_dev *dev,FIELD_PREP (MT_EXT_CCA_CFG_CCA3 ,0 ) | FIELD_PREP(MT_EXT_CCA_CFG_CCA_MASK, BIT(3)), }; -bool scan =test_bit (MT76_SCANNING , &dev->mt76.state); +bool scan =test_bit (MT76_SCANNING , &dev->mphy.state);struct ieee80211_channel *chan = chandef->chan;u8 channel = chan->hw_value, bw, bw_index;int ch_group_index, freq, freq1, ret;
drivers/net/wireless/mediatek/mt76/tx.c +3 -3
@@ -442,7 +442,7 @@ mt76_txq_send_burst(struct mt76_phy *phy, struct mt76_sw_queue *sq,if (probe)break ; -if (test_bit (MT76_RESET , &dev->state)) +if (test_bit (MT76_RESET , &phy->state))return -EBUSY ; skb =mt76_txq_dequeue (phy, mtxq, false);
@@ -498,7 +498,7 @@ mt76_txq_schedule_list(struct mt76_phy *phy, enum mt76_txq_id qid)if (sq->swq_queued >=4 )break ; -if (test_bit (MT76_RESET , &dev->state)) { +if (test_bit (MT76_RESET , &phy->state)) { ret = -EBUSY ;break ; }
@@ -604,7 +604,7 @@ void mt76_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq)struct mt76_phy *phy = hw->priv;struct mt76_dev *dev = phy->dev; -if (!test_bit (MT76_STATE_RUNNING , &dev->state)) +if (!test_bit (MT76_STATE_RUNNING , &phy->state))return ;tasklet_schedule (&dev->tx_tasklet);
drivers/net/wireless/mediatek/mt76/usb.c +11 -11
@@ -29,13 +29,13 @@ static int __mt76u_vendor_request(struct mt76_dev *dev, u8 req, pipe = (req_type &USB_DIR_IN ) ?usb_rcvctrlpipe (udev,0 ) :usb_sndctrlpipe (udev,0 );for (i =0 ; i <MT_VEND_REQ_MAX_RETRY ; i++) { -if (test_bit (MT76_REMOVED , &dev->state)) +if (test_bit (MT76_REMOVED , &dev->phy.state))return -EIO ; ret =usb_control_msg (udev, pipe, req, req_type, val, offset, buf, len,MT_VEND_REQ_TOUT_MS );if (ret == -ENODEV ) -set_bit (MT76_REMOVED , &dev->state); +set_bit (MT76_REMOVED , &dev->phy.state);if (ret >=0 || ret == -ENODEV )return ret;usleep_range (5000 ,10000 );
@@ -200,7 +200,7 @@ static int mt76u_wr_rp(struct mt76_dev *dev, u32 base, const struct mt76_reg_pair *data, int n) { - if (test_bit(MT76_STATE_MCU_RUNNING, &dev->state)) + if (test_bit(MT76_STATE_MCU_RUNNING, &dev->phy.state)) return dev->mcu_ops->mcu_wr_rp(dev, base, data, n); else return mt76u_req_wr_rp(dev, base, data, n);
@@ -227,7 +227,7 @@ static int mt76u_rd_rp(struct mt76_dev *dev, u32 base, struct mt76_reg_pair *data, int n) { - if (test_bit(MT76_STATE_MCU_RUNNING, &dev->state)) + if (test_bit(MT76_STATE_MCU_RUNNING, &dev->phy.state)) return dev->mcu_ops->mcu_rd_rp(dev, base, data, n); else return mt76u_req_rd_rp(dev, base, data, n);
@@ -464,7 +464,7 @@ mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb)int len, nsgs =1 ;struct sk_buff *skb; -if (!test_bit (MT76_STATE_INITIALIZED , &dev->state)) +if (!test_bit (MT76_STATE_INITIALIZED , &dev->phy.state))return 0 ; len =mt76u_get_rx_entry_len (data, urb->actual_length);
@@ -696,7 +696,7 @@ static void mt76u_tx_tasklet(unsigned long data)mt76_txq_schedule (&dev->phy, i); -if (!test_and_set_bit (MT76_READING_STATS , &dev->state)) +if (!test_and_set_bit (MT76_READING_STATS , &dev->phy.state))queue_work (dev->usb.stat_wq, &dev->usb.stat_work);if (wake)ieee80211_wake_queue (dev->hw, i);
@@ -714,7 +714,7 @@ static void mt76u_tx_status_data(struct work_struct *work) dev = container_of(usb, struct mt76_dev, usb);while (true) { -if (test_bit (MT76_REMOVED , &dev->state)) +if (test_bit (MT76_REMOVED , &dev->phy.state))break ;if (!dev->drv->tx_status_data (dev, &update))
@@ -722,10 +722,10 @@ static void mt76u_tx_status_data(struct work_struct *work) count++; } -if (count &&test_bit (MT76_STATE_RUNNING , &dev->state)) +if (count &&test_bit (MT76_STATE_RUNNING , &dev->phy.state))queue_work (usb->stat_wq, &usb->stat_work);else -clear_bit (MT76_READING_STATS , &dev->state); +clear_bit (MT76_READING_STATS , &dev->phy.state); }static void mt76u_complete_tx (struct urb *urb)
@@ -806,7 +806,7 @@ static void mt76u_tx_kick(struct mt76_dev *dev, struct mt76_queue *q) err =usb_submit_urb (urb,GFP_ATOMIC );if (err <0 ) {if (err == -ENODEV ) -set_bit (MT76_REMOVED , &dev->state); +set_bit (MT76_REMOVED , &dev->phy.state);else dev_err (dev->dev,"tx urb submit failed:%d\n" , err);
@@ -905,7 +905,7 @@ void mt76u_stop_tx(struct mt76_dev *dev) }cancel_work_sync (&dev->usb.stat_work); -clear_bit (MT76_READING_STATS , &dev->state); +clear_bit (MT76_READING_STATS , &dev->phy.state);mt76_tx_status_check (dev,NULL , true); }
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 10/29 mt76: move chainmask back to driver specific structs
In reply to Felix FietkauNothing in the core uses it
--- drivers/net/wireless/mediatek/mt76/mt76.h | 1 - drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 1 + drivers/net/wireless/mediatek/mt76/mt76x02.h | 1 + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt76x02_phy.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +0 -1
@@ -524,7 +524,6 @@ struct mt76_dev {u32 aggr_stats[32 ];u8 antenna_mask; -u16 chainmask;struct tasklet_struct pre_tbtt_tasklet;int beacon_int;
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +1 -1
@@ -124,7 +124,7 @@ static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev)if (!tx_mask || tx_mask > max_nss) tx_mask = max_nss; - dev->mt76.chainmask = tx_mask <<8 | rx_mask; + dev->chainmask = tx_mask <<8 | rx_mask; dev->mt76.antenna_mask =BIT (tx_mask) -1 ; }
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +1 -1
@@ -1299,7 +1299,7 @@ int mt7615_mcu_set_channel(struct mt7615_dev *dev) } req = { .control_chan = chandef->chan->hw_value, .center_chan = ieee80211_frequency_to_channel(freq1), - .tx_streams = (dev->mt76.chainmask >> 8) & 0xf, + .tx_streams = (dev->chainmask >> 8) & 0xf, .rx_streams_mask = dev->mt76.antenna_mask, .center_chan2 = ieee80211_frequency_to_channel(freq2), };
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -0
@@ -85,6 +85,7 @@ struct mt7615_dev {struct mt76_phy mphy; }; +u16 chainmask;u32 vif_mask;u32 omac_mask;
drivers/net/wireless/mediatek/mt76/mt76x02.h +1 -0
@@ -80,6 +80,7 @@ struct mt76x02_dev {struct mutex phy_mutex;u16 vif_mask; +u16 chainmask;u8 txdone_seq; DECLARE_KFIFO_PTR(txstatus_fifo, struct mt76x02_tx_status);
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +3 -3
@@ -344,7 +344,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,u16 txwi_flags =0 ;u8 nss;s8 txpwr_adj, max_txpwr_adj; -u8 ccmp_pn[8 ], nstreams = dev->mt76.chainmask &0xf ; +u8 ccmp_pn[8 ], nstreams = dev->chainmask &0xf ;memset (txwi,0 ,sizeof (*txwi));
@@ -679,7 +679,7 @@ mt76x02_mac_process_rate(struct mt76x02_dev *dev, status->rate_idx = idx;break ;case MT_PHY_TYPE_VHT : { -u8 n_rxstream = dev->mt76.chainmask &0xf ; +u8 n_rxstream = dev->chainmask &0xf ; status->encoding =RX_ENC_VHT ; status->rate_idx =FIELD_GET (MT_RATE_INDEX_VHT_IDX , idx);
@@ -769,7 +769,7 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,u16 rate =le16_to_cpu (rxwi->rate);u16 tid_sn =le16_to_cpu (rxwi->tid_sn);bool unicast = rxwi->rxinfo &cpu_to_le32 (MT_RXINFO_UNICAST ); -int pad_len =0 , nstreams = dev->mt76.chainmask &0xf ; +int pad_len =0 , nstreams = dev->chainmask &0xf ;s8 signal;u8 pn_len;u8 wcid;
drivers/net/wireless/mediatek/mt76/mt76x02_phy.c +2 -2
@@ -16,7 +16,7 @@ void mt76x02_phy_set_rxpath(struct mt76x02_dev *dev) val =mt76_rr (dev,MT_BBP (AGC ,0 )); val &= ~BIT (4 ); -switch (dev->mt76.chainmask &0xf ) { +switch (dev->chainmask &0xf ) {case 2 : val |=BIT (3 );break ;
@@ -35,7 +35,7 @@ void mt76x02_phy_set_txdac(struct mt76x02_dev *dev) {int txpath; - txpath = (dev->mt76.chainmask >>8 ) &0xf ; + txpath = (dev->chainmask >>8 ) &0xf ;switch (txpath) {case 2 :mt76_set (dev,MT_BBP (TXBE ,5 ),0x3 );
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +2 -2
@@ -192,10 +192,10 @@ void mt76x02_init_device(struct mt76x02_dev *dev)IEEE80211_HT_CAP_LDPC_CODING ; dev->mphy.sband_5g.sband.ht_cap.cap |=IEEE80211_HT_CAP_LDPC_CODING ; - dev->mt76.chainmask =0x202 ; + dev->chainmask =0x202 ; dev->mt76.antenna_mask =3 ; }else { - dev->mt76.chainmask =0x101 ; + dev->chainmask =0x101 ; dev->mt76.antenna_mask =1 ; } }
drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c +1 -1
@@ -29,7 +29,7 @@ int mt76x2_mcu_set_channel(struct mt76x02_dev *dev, u8 channel, u8 bw, .idx = channel, .scan = scan, .bw = bw, - .chainmask = cpu_to_le16(dev->mt76.chainmask), + .chainmask = cpu_to_le16(dev->chainmask), };/* first set the channel without the extension channel info */
drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +1 -1
@@ -124,7 +124,7 @@ static int mt76x2_set_antenna(struct ieee80211_hw *hw, u32 tx_ant,mutex_lock (&dev->mt76.mutex); - dev->mt76.chainmask = (tx_ant ==3 ) ?0x202 :0x101 ; + dev->chainmask = (tx_ant ==3 ) ?0x202 :0x101 ; dev->mt76.antenna_mask = tx_ant;mt76_set_stream_caps (&dev->mt76, true);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 11/29 mt76: move txpower_conf back to driver specific structs
In reply to Felix FietkauNothing in the core uses it
--- drivers/net/wireless/mediatek/mt76/mt76.h | 1 - drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x02.h | 1 + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt76x2/phy.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +0 -1
@@ -534,7 +534,6 @@ struct mt76_dev {struct mt76_hw_cap cap;struct mt76_rate_power rate_power; -int txpower_conf;int txpower_cur;enum nl80211_dfs_regions region;
drivers/net/wireless/mediatek/mt76/mt76x0/main.c +1 -1
@@ -44,7 +44,7 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed) }if (changed &IEEE80211_CONF_CHANGE_POWER ) { - dev->mt76.txpower_conf = hw->conf.power_level *2 ; + dev->txpower_conf = hw->conf.power_level *2 ;if (test_bit (MT76_STATE_RUNNING , &dev->mphy.state))mt76x0_phy_set_txpower (dev);
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +1 -1
@@ -848,7 +848,7 @@ void mt76x0_phy_set_txpower(struct mt76x02_dev *dev)mt76x0_get_power_info (dev, dev->mphy.chandef.chan, &info);mt76x02_add_rate_power_offset (t, info); -mt76x02_limit_rate_power (t, dev->mt76.txpower_conf); +mt76x02_limit_rate_power (t, dev->txpower_conf); dev->mt76.txpower_cur =mt76x02_get_max_rate_power (t);mt76x02_add_rate_power_offset (t, -info);
drivers/net/wireless/mediatek/mt76/mt76x02.h +1 -0
@@ -108,6 +108,7 @@ struct mt76x02_dev {struct mt76x02_calibration cal; +int txpower_conf;s8 target_power;s8 target_power_delta[2 ];bool enable_tpc;
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +1 -1
@@ -386,7 +386,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi, max_txpwr_adj =mt76x02_tx_get_max_txpwr_adj (dev, rate); } - txpwr_adj =mt76x02_tx_get_txpwr_adj (dev, dev->mt76.txpower_conf, + txpwr_adj =mt76x02_tx_get_txpwr_adj (dev, dev->txpower_conf, max_txpwr_adj); txwi->ctl2 =FIELD_PREP (MT_TX_PWR_ADJ , txpwr_adj);
drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c +1 -1
@@ -96,7 +96,7 @@ s8 mt76x02_tx_get_max_txpwr_adj(struct mt76x02_dev *dev,s8 mt76x02_tx_get_txpwr_adj (struct mt76x02_dev *dev,s8 txpwr,s8 max_txpwr_adj) { - txpwr =min_t (s8, txpwr, dev->mt76.txpower_conf); + txpwr =min_t (s8, txpwr, dev->txpower_conf); txpwr -= (dev->target_power + dev->target_power_delta[0 ]); txpwr =min_t (s8, txpwr, max_txpwr_adj);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +3 -3
@@ -86,14 +86,14 @@ mt76x2_config(struct ieee80211_hw *hw, u32 changed) }if (changed &IEEE80211_CONF_CHANGE_POWER ) { - dev->mt76.txpower_conf = hw->conf.power_level *2 ; + dev->txpower_conf = hw->conf.power_level *2 ;/* convert to per-chain power for 2x2 devices */ - dev->mt76.txpower_conf -=6 ; + dev->txpower_conf -=6 ;if (test_bit (MT76_STATE_RUNNING , &dev->mphy.state)) {mt76x2_phy_set_txpower (dev); -mt76x02_tx_set_txpwr_auto (dev, dev->mt76.txpower_conf); +mt76x02_tx_set_txpwr_auto (dev, dev->txpower_conf); } }
drivers/net/wireless/mediatek/mt76/mt76x2/phy.c +1 -1
@@ -152,7 +152,7 @@ void mt76x2_phy_set_txpower(struct mt76x02_dev *dev)mt76x2_get_rate_power (dev, &t, chan);mt76x02_add_rate_power_offset (&t, txp.target_power + delta); -mt76x02_limit_rate_power (&t, dev->mt76.txpower_conf); +mt76x02_limit_rate_power (&t, dev->txpower_conf); dev->mt76.txpower_cur =mt76x02_get_max_rate_power (&t); base_power =mt76x2_get_min_rate_power (&t);
drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c +2 -2
@@ -78,10 +78,10 @@ mt76x2u_config(struct ieee80211_hw *hw, u32 changed) }if (changed &IEEE80211_CONF_CHANGE_POWER ) { - dev->mt76.txpower_conf = hw->conf.power_level *2 ; + dev->txpower_conf = hw->conf.power_level *2 ;/* convert to per-chain power for 2x2 devices */ - dev->mt76.txpower_conf -=6 ; + dev->txpower_conf -=6 ;if (test_bit (MT76_STATE_RUNNING , &dev->mphy.state))mt76x2_phy_set_txpower (dev);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 12/29 mt76: move txpower and antenna mask to struct mt76_phy
In reply to Felix FietkauAdds multiple wiphy support to mt76_get_txpower
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 19 ++++++++++--------- drivers/net/wireless/mediatek/mt76/mt76.h | 6 +++--- .../net/wireless/mediatek/mt76/mt7603/init.c | 10 +++++----- .../net/wireless/mediatek/mt76/mt7603/mac.c | 2 +- .../net/wireless/mediatek/mt76/mt7603/mcu.c | 6 +++--- .../wireless/mediatek/mt76/mt7615/eeprom.c | 2 +- .../net/wireless/mediatek/mt76/mt7615/init.c | 2 +- .../net/wireless/mediatek/mt76/mt7615/mac.c | 4 ++-- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 6 +++--- .../net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +- .../net/wireless/mediatek/mt76/mt76x02_util.c | 4 ++-- .../wireless/mediatek/mt76/mt76x2/pci_main.c | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_phy.c | 2 +- .../net/wireless/mediatek/mt76/mt76x2/phy.c | 2 +- 14 files changed, 35 insertions(+), 34 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +10 -9
@@ -121,7 +121,7 @@ static void mt76_init_stream_cap(struct mt76_dev *dev, bool vht) {struct ieee80211_sta_ht_cap *ht_cap = &sband->ht_cap; -int i, nstream =hweight8 (dev->antenna_mask); +int i, nstream =hweight8 (dev->phy.antenna_mask);struct ieee80211_sta_vht_cap *vht_cap;u16 mcs_map =0 ;
@@ -326,8 +326,8 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_CQM_RSSI_LIST );wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_AIRTIME_FAIRNESS ); - wiphy->available_antennas_tx = dev->antenna_mask; - wiphy->available_antennas_rx = dev->antenna_mask; + wiphy->available_antennas_tx = dev->phy.antenna_mask; + wiphy->available_antennas_rx = dev->phy.antenna_mask; hw->txq_data_size =sizeof (struct mt76_txq ); hw->max_tx_fragments =16 ;
@@ -940,10 +940,10 @@ EXPORT_SYMBOL_GPL(mt76_sta_state);int mt76_get_txpower (struct ieee80211_hw *hw,struct ieee80211_vif *vif,int *dbm) { -struct mt76_dev *dev = hw->priv; -int n_chains =hweight8 (dev->antenna_mask); +struct mt76_phy *phy = hw->priv; +int n_chains =hweight8 (phy->antenna_mask); - *dbm =DIV_ROUND_UP (dev->txpower_cur,2 ); + *dbm =DIV_ROUND_UP (phy->txpower_cur,2 );/* convert from per-chain power to combined * output power
@@ -1078,11 +1078,12 @@ EXPORT_SYMBOL_GPL(mt76_sw_scan_complete);int mt76_get_antenna (struct ieee80211_hw *hw,u32 *tx_ant,u32 *rx_ant) { -struct mt76_dev *dev = hw->priv; +struct mt76_phy *phy = hw->priv; +struct mt76_dev *dev = phy->dev;mutex_lock (&dev->mutex); - *tx_ant = dev->antenna_mask; - *rx_ant = dev->antenna_mask; + *tx_ant = phy->antenna_mask; + *rx_ant = phy->antenna_mask;mutex_unlock (&dev->mutex);return 0 ;
drivers/net/wireless/mediatek/mt76/mt76.h +3 -3
@@ -468,6 +468,9 @@ struct mt76_phy {struct mt76_sband sband_2g;struct mt76_sband sband_5g; + +int txpower_cur; +u8 antenna_mask; };struct mt76_dev {
@@ -523,8 +526,6 @@ struct mt76_dev {u32 aggr_stats[32 ]; -u8 antenna_mask; -struct tasklet_struct pre_tbtt_tasklet;int beacon_int;u8 beacon_mask;
@@ -534,7 +535,6 @@ struct mt76_dev {struct mt76_hw_cap cap;struct mt76_rate_power rate_power; -int txpower_cur;enum nl80211_dfs_regions region;
drivers/net/wireless/mediatek/mt76/mt7603/init.c +5 -5
@@ -113,7 +113,7 @@ mt7603_dma_sched_init(struct mt7603_dev *dev)static void mt7603_phy_init (struct mt7603_dev *dev) { -int rx_chains = dev->mt76.antenna_mask; +int rx_chains = dev->mphy.antenna_mask;int tx_chains =hweight8 (rx_chains) -1 ; mt76_rmw(dev, MT_WF_RMAC_RMCR,
@@ -493,12 +493,12 @@ mt7603_init_txpower(struct mt7603_dev *dev, target_power += max_offset; dev->tx_power_limit = target_power; - dev->mt76.txpower_cur = target_power; + dev->mphy.txpower_cur = target_power; target_power =DIV_ROUND_UP (target_power,2 );/* add 3 dBm for 2SS devices (combined output) */ -if (dev->mt76.antenna_mask &BIT (1 )) +if (dev->mphy.antenna_mask &BIT (1 )) target_power +=3 ;for (i =0 ; i < sband->n_channels; i++) {
@@ -535,9 +535,9 @@ int mt7603_register_device(struct mt7603_dev *dev) (unsigned long)dev);/* Check for 7688, which only has 1SS */ - dev->mt76.antenna_mask =3 ; + dev->mphy.antenna_mask =3 ;if (mt76_rr (dev,MT_EFUSE_BASE +0x64 ) &BIT (4 )) - dev->mt76.antenna_mask =1 ; + dev->mphy.antenna_mask =1 ; dev->slottime =9 ;
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +1 -1
@@ -609,7 +609,7 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb) status->rate_idx = i; - status->chains = dev->mt76.antenna_mask; + status->chains = dev->mphy.antenna_mask; status->chain_signal[0 ] =FIELD_GET (MT_RXV4_IB_RSSI0 , rxdg3) + dev->rssi_offset[0 ]; status->chain_signal[1] = FIELD_GET(MT_RXV4_IB_RSSI1, rxdg3) +
drivers/net/wireless/mediatek/mt76/mt7603/mcu.c +3 -3
@@ -432,7 +432,7 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev) {struct cfg80211_chan_def *chandef = &dev->mphy.chandef;struct ieee80211_hw *hw =mt76_hw (dev); -int n_chains =hweight8 (dev->mt76.antenna_mask); +int n_chains =hweight8 (dev->mphy.antenna_mask);struct {u8 control_chan;u8 center_chan;
@@ -461,11 +461,11 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev) } tx_power = hw->conf.power_level *2 ; -if (dev->mt76.antenna_mask ==3 ) +if (dev->mphy.antenna_mask ==3 ) tx_power -=6 ; tx_power =min (tx_power, dev->tx_power_limit); - dev->mt76.txpower_cur = tx_power; + dev->mphy.txpower_cur = tx_power;for (i =0 ; i <ARRAY_SIZE (req.txpower); i++) req.txpower[i] = tx_power;
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +1 -1
@@ -125,7 +125,7 @@ static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev) tx_mask = max_nss; dev->chainmask = tx_mask <<8 | rx_mask; - dev->mt76.antenna_mask =BIT (tx_mask) -1 ; + dev->mphy.antenna_mask =BIT (tx_mask) -1 ; } int mt7615_eeprom_get_power_index(struct mt7615_dev *dev,
drivers/net/wireless/mediatek/mt76/mt7615/init.c +1 -1
@@ -203,7 +203,7 @@ static void mt7615_init_txpower(struct mt7615_dev *dev, struct ieee80211_supported_band *sband) { - int i, n_chains = hweight8(dev->mt76.antenna_mask), target_chains; + int i, n_chains = hweight8(dev->mphy.antenna_mask), target_chains;u8 *eep = (u8 *)dev->mt76.eeprom.data;enum nl80211_band band = sband->band;
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +2 -2
@@ -218,14 +218,14 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb) status->enc_flags |=RX_ENC_FLAG_STBC_MASK * stbc; - status->chains = dev->mt76.antenna_mask; + status->chains = dev->mphy.antenna_mask; status->chain_signal[0 ] =to_rssi (MT_RXV4_RCPI0 , rxdg3); status->chain_signal[1 ] =to_rssi (MT_RXV4_RCPI1 , rxdg3); status->chain_signal[2 ] =to_rssi (MT_RXV4_RCPI2 , rxdg3); status->chain_signal[3 ] =to_rssi (MT_RXV4_RCPI3 , rxdg3); status->signal = status->chain_signal[0 ]; -for (i =1 ; i <hweight8 (dev->mt76.antenna_mask); i++) { +for (i =1 ; i <hweight8 (dev->mphy.antenna_mask); i++) {if (!(status->chains &BIT (i)))continue ;
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +3 -3
@@ -1158,7 +1158,7 @@ int mt7615_mcu_set_bcn(struct mt7615_dev *dev, struct ieee80211_vif *vif,int mt7615_mcu_set_tx_power (struct mt7615_dev *dev) { -int i, ret, n_chains =hweight8 (dev->mt76.antenna_mask); +int i, ret, n_chains =hweight8 (dev->mphy.antenna_mask);struct cfg80211_chan_def *chandef = &dev->mphy.chandef;int freq = chandef->center_freq1, len, target_chains;u8 *req, *data, *eep = (u8 *)dev->mt76.eeprom.data;
@@ -1200,7 +1200,7 @@ int mt7615_mcu_set_tx_power(struct mt7615_dev *dev)break ; } tx_power =max_t (s8, tx_power,0 ); - dev->mt76.txpower_cur = tx_power; + dev->mphy.txpower_cur = tx_power; target_chains =mt7615_ext_pa_enabled (dev, band) ?1 : n_chains;for (i =0 ; i < target_chains; i++) {
@@ -1300,7 +1300,7 @@ int mt7615_mcu_set_channel(struct mt7615_dev *dev) .control_chan = chandef->chan->hw_value, .center_chan = ieee80211_frequency_to_channel(freq1), .tx_streams = (dev->chainmask >> 8) & 0xf, - .rx_streams_mask = dev->mt76.antenna_mask, + .rx_streams_mask = dev->mphy.antenna_mask, .center_chan2 = ieee80211_frequency_to_channel(freq2), };int ret;
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +1 -1
@@ -849,7 +849,7 @@ void mt76x0_phy_set_txpower(struct mt76x02_dev *dev)mt76x02_add_rate_power_offset (t, info);mt76x02_limit_rate_power (t, dev->txpower_conf); - dev->mt76.txpower_cur =mt76x02_get_max_rate_power (t); + dev->mphy.txpower_cur =mt76x02_get_max_rate_power (t);mt76x02_add_rate_power_offset (t, -info); dev->target_power = info;
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +2 -2
@@ -193,10 +193,10 @@ void mt76x02_init_device(struct mt76x02_dev *dev) dev->mphy.sband_5g.sband.ht_cap.cap |=IEEE80211_HT_CAP_LDPC_CODING ; dev->chainmask =0x202 ; - dev->mt76.antenna_mask =3 ; + dev->mphy.antenna_mask =3 ; }else { dev->chainmask =0x101 ; - dev->mt76.antenna_mask =1 ; + dev->mphy.antenna_mask =1 ; } }EXPORT_SYMBOL_GPL (mt76x02_init_device);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +1 -1
@@ -125,7 +125,7 @@ static int mt76x2_set_antenna(struct ieee80211_hw *hw, u32 tx_ant,mutex_lock (&dev->mt76.mutex); dev->chainmask = (tx_ant ==3 ) ?0x202 :0x101 ; - dev->mt76.antenna_mask = tx_ant; + dev->mphy.antenna_mask = tx_ant;mt76_set_stream_caps (&dev->mt76, true);mt76x2_phy_set_antenna (dev);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c +1 -1
@@ -74,7 +74,7 @@ void mt76x2_phy_set_antenna(struct mt76x02_dev *dev) val =mt76_rr (dev,MT_BBP (AGC ,0 )); val &= ~(BIT (4 ) |BIT (1 )); -switch (dev->mt76.antenna_mask) { +switch (dev->mphy.antenna_mask) {case 1 :/* disable mac DAC control */ mt76_clear (dev,MT_BBP (IBI ,9 ),BIT (11 ));
drivers/net/wireless/mediatek/mt76/mt76x2/phy.c +1 -1
@@ -153,7 +153,7 @@ void mt76x2_phy_set_txpower(struct mt76x02_dev *dev)mt76x2_get_rate_power (dev, &t, chan);mt76x02_add_rate_power_offset (&t, txp.target_power + delta);mt76x02_limit_rate_power (&t, dev->txpower_conf); - dev->mt76.txpower_cur =mt76x02_get_max_rate_power (&t); + dev->mphy.txpower_cur =mt76x02_get_max_rate_power (&t); base_power =mt76x2_get_min_rate_power (&t); delta = base_power - txp.target_power;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 13/29 mt76: add multiple wiphy support to mt76_get_min_avg_rssi
In reply to Felix FietkauAllow tracking clients of both wiphys separately
--- drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x2/phy.c | 2 +- drivers/net/wireless/mediatek/mt76/util.c | 8 ++++++-- 6 files changed, 11 insertions(+), 7 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -1
@@ -793,7 +793,7 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,void __mt76_sta_remove (struct mt76_dev *dev,struct ieee80211_vif *vif,struct ieee80211_sta *sta); -int mt76_get_min_avg_rssi (struct mt76_dev *dev); +int mt76_get_min_avg_rssi (struct mt76_dev *dev,bool ext_phy);int mt76_get_txpower (struct ieee80211_hw *hw,struct ieee80211_vif *vif,int *dbm);
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +1 -1
@@ -1737,7 +1737,7 @@ mt7603_false_cca_check(struct mt7603_dev *dev)mt7603_cca_stats_reset (dev); - min_signal =mt76_get_min_avg_rssi (&dev->mt76); + min_signal =mt76_get_min_avg_rssi (&dev->mt76, false);if (!min_signal) { dev->sensitivity =0 ; dev->last_cca_adj = jiffies;
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +1 -1
@@ -1266,7 +1266,7 @@ mt7615_mac_adjust_sensitivity(struct mt7615_dev *dev,int signal; sensitivity = ofdm ? &dev->ofdm_sensitivity : &dev->cck_sensitivity; - signal =mt76_get_min_avg_rssi (&dev->mt76); + signal =mt76_get_min_avg_rssi (&dev->mt76, false);if (!signal) {mt7615_mac_set_default_sensitivity (dev);return ;
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +1 -1
@@ -1069,7 +1069,7 @@ mt76x0_phy_update_channel_gain(struct mt76x02_dev *dev)u8 gain_delta;int low_gain; - dev->cal.avg_rssi_all =mt76_get_min_avg_rssi (&dev->mt76); + dev->cal.avg_rssi_all =mt76_get_min_avg_rssi (&dev->mt76, false);if (!dev->cal.avg_rssi_all) dev->cal.avg_rssi_all =-75 ;
drivers/net/wireless/mediatek/mt76/mt76x2/phy.c +1 -1
@@ -280,7 +280,7 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)int low_gain;u32 val; - dev->cal.avg_rssi_all =mt76_get_min_avg_rssi (&dev->mt76); + dev->cal.avg_rssi_all =mt76_get_min_avg_rssi (&dev->mt76, false);if (!dev->cal.avg_rssi_all) dev->cal.avg_rssi_all =-75 ;
drivers/net/wireless/mediatek/mt76/util.c +6 -2
@@ -64,7 +64,7 @@ int mt76_wcid_alloc(unsigned long *mask, int size) }EXPORT_SYMBOL_GPL (mt76_wcid_alloc); -int mt76_get_min_avg_rssi (struct mt76_dev *dev) +int mt76_get_min_avg_rssi (struct mt76_dev *dev,bool ext_phy) {struct mt76_wcid *wcid;int i, j, min_rssi =0 ;
@@ -75,14 +75,18 @@ int mt76_get_min_avg_rssi(struct mt76_dev *dev)for (i =0 ; i <ARRAY_SIZE (dev->wcid_mask); i++) {unsigned long mask = dev->wcid_mask[i]; +unsigned long phy_mask = dev->wcid_phy_mask[i];if (!mask)continue ; -for (j = i *BITS_PER_LONG ; mask; j++, mask >>=1 ) { +for (j = i *BITS_PER_LONG ; mask; j++, mask >>=1 , phy_mask >>=1 ) {if (!(mask &1 ))continue ; +if (!!(phy_mask &1 ) != ext_phy) +continue ; + wcid =rcu_dereference (dev->wcid[j]);if (!wcid)continue ;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 14/29 mt76: add priv pointer to struct mt76_phy
In reply to Felix FietkauWill be used for per-phy driver private data
--- drivers/net/wireless/mediatek/mt76/mt76.h | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -457,6 +457,7 @@ struct mt76_rx_status {struct mt76_phy {struct ieee80211_hw *hw;struct mt76_dev *dev; +void *priv;unsigned long state;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 15/29 mt76: add function for allocating an external wiphy
In reply to Felix FietkauUnlike the core phy, this will have extra allocated memory for a driver private struct.
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 181 +++++++++++++----- drivers/net/wireless/mediatek/mt76/mt76.h | 5 + 2 files changed, 137 insertions(+), 49 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +132 -49
@@ -187,8 +187,6 @@ mt76_init_sband(struct mt76_dev *dev, struct mt76_sband *msband, sband->n_channels = n_chan; sband->bitrates = rates; sband->n_bitrates = n_rates; - dev->phy.chandef.chan = &sband->channels[0 ]; - dev->phy.chan_state = &msband->chan[0 ]; ht_cap = &sband->ht_cap; ht_cap->ht_supported = true;
@@ -224,6 +222,7 @@ mt76_init_sband_2g(struct mt76_dev *dev, struct ieee80211_rate *rates, int n_rates) { dev->hw->wiphy->bands[NL80211_BAND_2GHZ ] = &dev->phy.sband_2g.sband; + dev->phy.sband_2g.sband.band =NL80211_BAND_2GHZ ; return mt76_init_sband(dev, &dev->phy.sband_2g, mt76_channels_2ghz,
@@ -236,6 +235,7 @@ mt76_init_sband_5g(struct mt76_dev *dev, struct ieee80211_rate *rates, int n_rates, bool vht) { dev->hw->wiphy->bands[NL80211_BAND_5GHZ ] = &dev->phy.sband_5g.sband; + dev->phy.sband_5g.sband.band =NL80211_BAND_5GHZ ; return mt76_init_sband(dev, &dev->phy.sband_5g, mt76_channels_5ghz,
@@ -244,9 +244,10 @@ mt76_init_sband_5g(struct mt76_dev *dev, struct ieee80211_rate *rates, }static void -mt76_check_sband (struct mt76_dev *dev,int band) +mt76_check_sband (struct mt76_phy *phy,struct mt76_sband *msband) { -struct ieee80211_supported_band *sband = dev->hw->wiphy->bands[band]; +struct ieee80211_supported_band *sband = &msband->sband; +enum nl80211_band band = sband->band;bool found = false;int i;
@@ -261,12 +262,132 @@ mt76_check_sband(struct mt76_dev *dev, int band)break ; } -if (found) +if (found) { + phy->chandef.chan = &sband->channels[0 ]; + phy->chan_state = &msband->chan[0 ];return ; + } sband->n_channels =0 ; - dev->hw->wiphy->bands[band] =NULL ; + phy->hw->wiphy->bands[band] =NULL ; +} + +static void +mt76_phy_init (struct mt76_dev *dev,struct ieee80211_hw *hw) +{ +struct wiphy *wiphy = hw->wiphy; + +SET_IEEE80211_DEV (hw, dev->dev); +SET_IEEE80211_PERM_ADDR (hw, dev->macaddr); + + wiphy->features |=NL80211_FEATURE_ACTIVE_MONITOR ; + +wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_CQM_RSSI_LIST ); +wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_AIRTIME_FAIRNESS ); + + wiphy->available_antennas_tx = dev->phy.antenna_mask; + wiphy->available_antennas_rx = dev->phy.antenna_mask; + + hw->txq_data_size =sizeof (struct mt76_txq ); + hw->max_tx_fragments =16 ; + +ieee80211_hw_set (hw,SIGNAL_DBM ); +ieee80211_hw_set (hw,PS_NULLFUNC_STACK ); +ieee80211_hw_set (hw,HOST_BROADCAST_PS_BUFFERING ); +ieee80211_hw_set (hw,AMPDU_AGGREGATION ); +ieee80211_hw_set (hw,SUPPORTS_RC_TABLE ); +ieee80211_hw_set (hw,SUPPORT_FAST_XMIT ); +ieee80211_hw_set (hw,SUPPORTS_CLONED_SKBS ); +ieee80211_hw_set (hw,SUPPORTS_AMSDU_IN_AMPDU ); +ieee80211_hw_set (hw,TX_AMSDU ); +ieee80211_hw_set (hw,TX_FRAG_LIST ); +ieee80211_hw_set (hw,MFP_CAPABLE ); +ieee80211_hw_set (hw,AP_LINK_PS ); +ieee80211_hw_set (hw,REPORTS_TX_ACK_STATUS ); +ieee80211_hw_set (hw,NEEDS_UNIQUE_STA_ADDR ); + + wiphy->flags |=WIPHY_FLAG_IBSS_RSN ; + wiphy->interface_modes = + BIT(NL80211_IFTYPE_STATION) | + BIT(NL80211_IFTYPE_AP) | +#ifdef CONFIG_MAC80211_MESH + BIT(NL80211_IFTYPE_MESH_POINT) | +#endif +BIT (NL80211_IFTYPE_ADHOC ); +} + +struct mt76_phy * +mt76_alloc_phy (struct mt76_dev *dev,unsigned int size, +const struct ieee80211_ops *ops) +{ +struct ieee80211_hw *hw; +struct mt76_phy *phy; +unsigned int phy_size, chan_size; +unsigned int size_2g, size_5g; +void *priv; + + phy_size =ALIGN (sizeof (*phy),8 ); + chan_size =sizeof (dev->phy.sband_2g.chan[0 ]); + size_2g =ALIGN (ARRAY_SIZE (mt76_channels_2ghz) * chan_size,8 ); + size_5g =ALIGN (ARRAY_SIZE (mt76_channels_5ghz) * chan_size,8 ); + + size += phy_size + size_2g + size_5g; + hw =ieee80211_alloc_hw (size, ops); +if (!hw) +return NULL ; + + phy = hw->priv; + phy->dev = dev; + phy->hw = hw; + +mt76_phy_init (dev, hw); + + priv = hw->priv + phy_size; + + phy->sband_2g = dev->phy.sband_2g; + phy->sband_2g.chan = priv; + priv += size_2g; + + phy->sband_5g = dev->phy.sband_5g; + phy->sband_5g.chan = priv; + priv += size_5g; + + phy->priv = priv; + + hw->wiphy->bands[NL80211_BAND_2GHZ ] = &phy->sband_2g.sband; + hw->wiphy->bands[NL80211_BAND_5GHZ ] = &phy->sband_5g.sband; + +mt76_check_sband (phy, &phy->sband_2g); +mt76_check_sband (phy, &phy->sband_5g); + +return phy; +} +EXPORT_SYMBOL_GPL (mt76_alloc_phy); + +int +mt76_register_phy (struct mt76_phy *phy) +{ +int ret; + + ret =ieee80211_register_hw (phy->hw); +if (ret) +return ret; + + phy->dev->phy2 = phy; +return 0 ; } +EXPORT_SYMBOL_GPL (mt76_register_phy); + +void +mt76_unregister_phy (struct mt76_phy *phy) +{ +struct mt76_dev *dev = phy->dev; + + dev->phy2 =NULL ; +mt76_tx_status_check (dev,NULL , true); +ieee80211_unregister_hw (phy->hw); +} +EXPORT_SYMBOL_GPL (mt76_unregister_phy);struct mt76_dev * mt76_alloc_device(struct device *pdev, unsigned int size,
@@ -313,49 +434,11 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, struct ieee80211_rate *rates, int n_rates) {struct ieee80211_hw *hw = dev->hw; -struct wiphy *wiphy = hw->wiphy; +struct mt76_phy *phy = &dev->phy;int ret;dev_set_drvdata (dev->dev, dev); - -SET_IEEE80211_DEV (hw, dev->dev); -SET_IEEE80211_PERM_ADDR (hw, dev->macaddr); - - wiphy->features |=NL80211_FEATURE_ACTIVE_MONITOR ; - -wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_CQM_RSSI_LIST ); -wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_AIRTIME_FAIRNESS ); - - wiphy->available_antennas_tx = dev->phy.antenna_mask; - wiphy->available_antennas_rx = dev->phy.antenna_mask; - - hw->txq_data_size =sizeof (struct mt76_txq ); - hw->max_tx_fragments =16 ; - -ieee80211_hw_set (hw,SIGNAL_DBM ); -ieee80211_hw_set (hw,PS_NULLFUNC_STACK ); -ieee80211_hw_set (hw,HOST_BROADCAST_PS_BUFFERING ); -ieee80211_hw_set (hw,AMPDU_AGGREGATION ); -ieee80211_hw_set (hw,SUPPORTS_RC_TABLE ); -ieee80211_hw_set (hw,SUPPORT_FAST_XMIT ); -ieee80211_hw_set (hw,SUPPORTS_CLONED_SKBS ); -ieee80211_hw_set (hw,SUPPORTS_AMSDU_IN_AMPDU ); -ieee80211_hw_set (hw,TX_AMSDU ); -ieee80211_hw_set (hw,TX_FRAG_LIST ); -ieee80211_hw_set (hw,MFP_CAPABLE ); -ieee80211_hw_set (hw,AP_LINK_PS ); -ieee80211_hw_set (hw,REPORTS_TX_ACK_STATUS ); -ieee80211_hw_set (hw,NEEDS_UNIQUE_STA_ADDR ); -ieee80211_hw_set (hw,SUPPORTS_REORDERING_BUFFER ); - - wiphy->flags |=WIPHY_FLAG_IBSS_RSN ; - wiphy->interface_modes = - BIT(NL80211_IFTYPE_STATION) | - BIT(NL80211_IFTYPE_AP) | -#ifdef CONFIG_MAC80211_MESH -BIT (NL80211_IFTYPE_MESH_POINT ) | -#endif -BIT (NL80211_IFTYPE_ADHOC ); +mt76_phy_init (dev, hw);if (dev->cap.has_2ghz) { ret =mt76_init_sband_2g (dev, rates, n_rates);
@@ -369,9 +452,9 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,return ret; } -wiphy_read_of_freq_limits (dev->hw->wiphy); -mt76_check_sband (dev,NL80211_BAND_2GHZ ); -mt76_check_sband (dev,NL80211_BAND_5GHZ ); +wiphy_read_of_freq_limits (hw->wiphy); +mt76_check_sband (&dev->phy, &phy->sband_2g); +mt76_check_sband (&dev->phy, &phy->sband_5g);if (IS_ENABLED (CONFIG_MT76_LEDS )) { ret =mt76_led_init (dev);
drivers/net/wireless/mediatek/mt76/mt76.h +5 -0
@@ -651,6 +651,11 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, struct ieee80211_rate *rates, int n_rates);void mt76_unregister_device (struct mt76_dev *dev);void mt76_free_device (struct mt76_dev *dev); +void mt76_unregister_phy (struct mt76_phy *phy); + +struct mt76_phy *mt76_alloc_phy (struct mt76_dev *dev,unsigned int size, +const struct ieee80211_ops *ops); +int mt76_register_phy (struct mt76_phy *phy);struct dentry *mt76_register_debugfs (struct mt76_dev *dev);int mt76_queues_read (struct seq_file *s,void *data);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH v2 15/29 mt76: add function for allocating an extra wiphy
Unlike the core phy, this will have extra allocated memory for a driver private struct.
---
v2: fix crash, don't rely on sband->band being initialized
drivers/net/wireless/mediatek/mt76/mac80211.c | 179 +++++++++++++----- drivers/net/wireless/mediatek/mt76/mt76.h | 5 + 2 files changed, 135 insertions(+), 49 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +130 -49
@@ -187,8 +187,6 @@ mt76_init_sband(struct mt76_dev *dev, struct mt76_sband *msband, sband->n_channels = n_chan; sband->bitrates = rates; sband->n_bitrates = n_rates; - dev->phy.chandef.chan = &sband->channels[0 ]; - dev->phy.chan_state = &msband->chan[0 ]; ht_cap = &sband->ht_cap; ht_cap->ht_supported = true;
@@ -244,9 +242,10 @@ mt76_init_sband_5g(struct mt76_dev *dev, struct ieee80211_rate *rates, }static void -mt76_check_sband (struct mt76_dev *dev,int band) +mt76_check_sband (struct mt76_phy *phy,struct mt76_sband *msband, +enum nl80211_band band) { -struct ieee80211_supported_band *sband = dev->hw->wiphy->bands[band]; +struct ieee80211_supported_band *sband = &msband->sband;bool found = false;int i;
@@ -261,12 +260,132 @@ mt76_check_sband(struct mt76_dev *dev, int band)break ; } -if (found) +if (found) { + phy->chandef.chan = &sband->channels[0 ]; + phy->chan_state = &msband->chan[0 ];return ; + } sband->n_channels =0 ; - dev->hw->wiphy->bands[band] =NULL ; + phy->hw->wiphy->bands[band] =NULL ; +} + +static void +mt76_phy_init (struct mt76_dev *dev,struct ieee80211_hw *hw) +{ +struct wiphy *wiphy = hw->wiphy; + +SET_IEEE80211_DEV (hw, dev->dev); +SET_IEEE80211_PERM_ADDR (hw, dev->macaddr); + + wiphy->features |=NL80211_FEATURE_ACTIVE_MONITOR ; + +wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_CQM_RSSI_LIST ); +wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_AIRTIME_FAIRNESS ); + + wiphy->available_antennas_tx = dev->phy.antenna_mask; + wiphy->available_antennas_rx = dev->phy.antenna_mask; + + hw->txq_data_size =sizeof (struct mt76_txq ); + hw->max_tx_fragments =16 ; + +ieee80211_hw_set (hw,SIGNAL_DBM ); +ieee80211_hw_set (hw,PS_NULLFUNC_STACK ); +ieee80211_hw_set (hw,HOST_BROADCAST_PS_BUFFERING ); +ieee80211_hw_set (hw,AMPDU_AGGREGATION ); +ieee80211_hw_set (hw,SUPPORTS_RC_TABLE ); +ieee80211_hw_set (hw,SUPPORT_FAST_XMIT ); +ieee80211_hw_set (hw,SUPPORTS_CLONED_SKBS ); +ieee80211_hw_set (hw,SUPPORTS_AMSDU_IN_AMPDU ); +ieee80211_hw_set (hw,TX_AMSDU ); +ieee80211_hw_set (hw,TX_FRAG_LIST ); +ieee80211_hw_set (hw,MFP_CAPABLE ); +ieee80211_hw_set (hw,AP_LINK_PS ); +ieee80211_hw_set (hw,REPORTS_TX_ACK_STATUS ); +ieee80211_hw_set (hw,NEEDS_UNIQUE_STA_ADDR ); + + wiphy->flags |=WIPHY_FLAG_IBSS_RSN ; + wiphy->interface_modes = + BIT(NL80211_IFTYPE_STATION) | + BIT(NL80211_IFTYPE_AP) | +#ifdef CONFIG_MAC80211_MESH + BIT(NL80211_IFTYPE_MESH_POINT) | +#endif +BIT (NL80211_IFTYPE_ADHOC ); +} + +struct mt76_phy * +mt76_alloc_phy (struct mt76_dev *dev,unsigned int size, +const struct ieee80211_ops *ops) +{ +struct ieee80211_hw *hw; +struct mt76_phy *phy; +unsigned int phy_size, chan_size; +unsigned int size_2g, size_5g; +void *priv; + + phy_size =ALIGN (sizeof (*phy),8 ); + chan_size =sizeof (dev->phy.sband_2g.chan[0 ]); + size_2g =ALIGN (ARRAY_SIZE (mt76_channels_2ghz) * chan_size,8 ); + size_5g =ALIGN (ARRAY_SIZE (mt76_channels_5ghz) * chan_size,8 ); + + size += phy_size + size_2g + size_5g; + hw =ieee80211_alloc_hw (size, ops); +if (!hw) +return NULL ; + + phy = hw->priv; + phy->dev = dev; + phy->hw = hw; + +mt76_phy_init (dev, hw); + + priv = hw->priv + phy_size; + + phy->sband_2g = dev->phy.sband_2g; + phy->sband_2g.chan = priv; + priv += size_2g; + + phy->sband_5g = dev->phy.sband_5g; + phy->sband_5g.chan = priv; + priv += size_5g; + + phy->priv = priv; + + hw->wiphy->bands[NL80211_BAND_2GHZ ] = &phy->sband_2g.sband; + hw->wiphy->bands[NL80211_BAND_5GHZ ] = &phy->sband_5g.sband; + +mt76_check_sband (phy, &phy->sband_2g,NL80211_BAND_2GHZ ); +mt76_check_sband (phy, &phy->sband_5g,NL80211_BAND_5GHZ ); + +return phy; +} +EXPORT_SYMBOL_GPL (mt76_alloc_phy); + +int +mt76_register_phy (struct mt76_phy *phy) +{ +int ret; + + ret =ieee80211_register_hw (phy->hw); +if (ret) +return ret; + + phy->dev->phy2 = phy; +return 0 ; } +EXPORT_SYMBOL_GPL (mt76_register_phy); + +void +mt76_unregister_phy (struct mt76_phy *phy) +{ +struct mt76_dev *dev = phy->dev; + + dev->phy2 =NULL ; +mt76_tx_status_check (dev,NULL , true); +ieee80211_unregister_hw (phy->hw); +} +EXPORT_SYMBOL_GPL (mt76_unregister_phy);struct mt76_dev * mt76_alloc_device(struct device *pdev, unsigned int size,
@@ -313,49 +432,11 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, struct ieee80211_rate *rates, int n_rates) {struct ieee80211_hw *hw = dev->hw; -struct wiphy *wiphy = hw->wiphy; +struct mt76_phy *phy = &dev->phy;int ret;dev_set_drvdata (dev->dev, dev); - -SET_IEEE80211_DEV (hw, dev->dev); -SET_IEEE80211_PERM_ADDR (hw, dev->macaddr); - - wiphy->features |=NL80211_FEATURE_ACTIVE_MONITOR ; - -wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_CQM_RSSI_LIST ); -wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_AIRTIME_FAIRNESS ); - - wiphy->available_antennas_tx = dev->phy.antenna_mask; - wiphy->available_antennas_rx = dev->phy.antenna_mask; - - hw->txq_data_size =sizeof (struct mt76_txq ); - hw->max_tx_fragments =16 ; - -ieee80211_hw_set (hw,SIGNAL_DBM ); -ieee80211_hw_set (hw,PS_NULLFUNC_STACK ); -ieee80211_hw_set (hw,HOST_BROADCAST_PS_BUFFERING ); -ieee80211_hw_set (hw,AMPDU_AGGREGATION ); -ieee80211_hw_set (hw,SUPPORTS_RC_TABLE ); -ieee80211_hw_set (hw,SUPPORT_FAST_XMIT ); -ieee80211_hw_set (hw,SUPPORTS_CLONED_SKBS ); -ieee80211_hw_set (hw,SUPPORTS_AMSDU_IN_AMPDU ); -ieee80211_hw_set (hw,TX_AMSDU ); -ieee80211_hw_set (hw,TX_FRAG_LIST ); -ieee80211_hw_set (hw,MFP_CAPABLE ); -ieee80211_hw_set (hw,AP_LINK_PS ); -ieee80211_hw_set (hw,REPORTS_TX_ACK_STATUS ); -ieee80211_hw_set (hw,NEEDS_UNIQUE_STA_ADDR ); -ieee80211_hw_set (hw,SUPPORTS_REORDERING_BUFFER ); - - wiphy->flags |=WIPHY_FLAG_IBSS_RSN ; - wiphy->interface_modes = - BIT(NL80211_IFTYPE_STATION) | - BIT(NL80211_IFTYPE_AP) | -#ifdef CONFIG_MAC80211_MESH -BIT (NL80211_IFTYPE_MESH_POINT ) | -#endif -BIT (NL80211_IFTYPE_ADHOC ); +mt76_phy_init (dev, hw);if (dev->cap.has_2ghz) { ret =mt76_init_sband_2g (dev, rates, n_rates);
@@ -369,9 +450,9 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,return ret; } -wiphy_read_of_freq_limits (dev->hw->wiphy); -mt76_check_sband (dev,NL80211_BAND_2GHZ ); -mt76_check_sband (dev,NL80211_BAND_5GHZ ); +wiphy_read_of_freq_limits (hw->wiphy); +mt76_check_sband (&dev->phy, &phy->sband_2g,NL80211_BAND_2GHZ ); +mt76_check_sband (&dev->phy, &phy->sband_5g,NL80211_BAND_5GHZ );if (IS_ENABLED (CONFIG_MT76_LEDS )) { ret =mt76_led_init (dev);
drivers/net/wireless/mediatek/mt76/mt76.h +5 -0
@@ -651,6 +651,11 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, struct ieee80211_rate *rates, int n_rates);void mt76_unregister_device (struct mt76_dev *dev);void mt76_free_device (struct mt76_dev *dev); +void mt76_unregister_phy (struct mt76_phy *phy); + +struct mt76_phy *mt76_alloc_phy (struct mt76_dev *dev,unsigned int size, +const struct ieee80211_ops *ops); +int mt76_register_phy (struct mt76_phy *phy);struct dentry *mt76_register_debugfs (struct mt76_dev *dev);int mt76_queues_read (struct seq_file *s,void *data);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 16/29 mt76: add ext_phy field to struct mt76_wcid
In reply to Felix FietkauWill be used to determine the phy from within the driver
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 1 + drivers/net/wireless/mediatek/mt76/mt76.h | 1 + 2 files changed, 2 insertions(+)
drivers/net/wireless/mediatek/mt76/mac80211.c +1 -0
@@ -954,6 +954,7 @@ mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif,ewma_signal_init (&wcid->rssi);if (ext_phy)mt76_wcid_mask_set (dev->wcid_phy_mask, wcid->idx); + wcid->ext_phy = ext_phy;rcu_assign_pointer (dev->wcid[wcid->idx], wcid); out:
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -200,6 +200,7 @@ struct mt76_wcid {u8 hw_key_idx; u8 sta:1; + u8 ext_phy:1;u8 rx_check_pn;u8 rx_key_pn[IEEE80211_NUM_TIDS ][6 ];
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 17/29 mt76: move ampdu_ref from mt76_dev to driver struct
In reply to Felix FietkauIt is only used by the driver
--- drivers/net/wireless/mediatek/mt76/mt76.h | 1 - drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 1 + drivers/net/wireless/mediatek/mt76/mt7615/mac.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_mac.c | 6 +++--- 7 files changed, 12 insertions(+), 10 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +0 -1
@@ -502,7 +502,6 @@ struct mt76_dev {spinlock_t rx_lock;struct napi_struct napi[__MT_RXQ_MAX];struct sk_buff_head rx_skb[__MT_RXQ_MAX]; -u32 ampdu_ref;struct list_head txwi_cache;struct mt76_sw_queue q_tx[2 * __MT_TXQ_MAX];
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +3 -3
@@ -531,12 +531,12 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb)/* all subframes of an A-MPDU have the same timestamp */ if (dev->rx_ampdu_ts != rxd[12 ]) { -if (!++dev->mt76.ampdu_ref) - dev->mt76.ampdu_ref++; +if (!++dev->ampdu_ref) + dev->ampdu_ref++; } dev->rx_ampdu_ts = rxd[12 ]; - status->ampdu_ref = dev->mt76.ampdu_ref; + status->ampdu_ref = dev->ampdu_ref; } remove_pad = rxd1 &MT_RXD1_NORMAL_HDR_OFFSET ;
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h +1 -0
@@ -118,6 +118,7 @@ struct mt7603_dev {u32 false_cca_ofdm, false_cca_cck;unsigned long last_cca_adj; +u32 ampdu_ref;__le32 rx_ampdu_ts;u8 rssi_offset[3 ];
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +3 -3
@@ -118,12 +118,12 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)/* all subframes of an A-MPDU have the same timestamp */ if (dev->rx_ampdu_ts != rxd[12 ]) { -if (!++dev->mt76.ampdu_ref) - dev->mt76.ampdu_ref++; +if (!++dev->ampdu_ref) + dev->ampdu_ref++; } dev->rx_ampdu_ts = rxd[12 ]; - status->ampdu_ref = dev->mt76.ampdu_ref; + status->ampdu_ref = dev->ampdu_ref; } remove_pad = rxd1 &MT_RXD1_NORMAL_HDR_OFFSET ;
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -0
@@ -90,6 +90,7 @@ struct mt7615_dev {u32 omac_mask;__le32 rx_ampdu_ts; +u32 ampdu_ref;struct list_head sta_poll_list;spinlock_t sta_poll_lock;
drivers/net/wireless/mediatek/mt76/mt76x02.h +1 -0
@@ -86,6 +86,7 @@ struct mt76x02_dev { DECLARE_KFIFO_PTR(txstatus_fifo, struct mt76x02_tx_status);spinlock_t txstatus_fifo_lock;u32 tx_airtime; +u32 ampdu_ref;struct sk_buff *rx_head;
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +3 -3
@@ -824,7 +824,7 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,if (rxinfo &MT_RXINFO_AMPDU ) { status->flag |=RX_FLAG_AMPDU_DETAILS ; - status->ampdu_ref = dev->mt76.ampdu_ref; + status->ampdu_ref = dev->ampdu_ref;/* * When receiving an A-MPDU subframe and RSSI info is not valid,
@@ -832,8 +832,8 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,* are coming. The last one will have valid RSSI info */ if (rxinfo &MT_RXINFO_RSSI ) { -if (!++dev->mt76.ampdu_ref) - dev->mt76.ampdu_ref++; +if (!++dev->ampdu_ref) + dev->ampdu_ref++; } }
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 18/29 mt76: mt7615: add dual-phy support for mac80211 ops
In reply to Felix FietkauAllows them to be used by a separately registered wiphy later
--- .../net/wireless/mediatek/mt76/mt7615/init.c | 15 +- .../net/wireless/mediatek/mt76/mt7615/mac.c | 96 ++++++++---- .../net/wireless/mediatek/mt76/mt7615/main.c | 145 +++++++++++------- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 42 +++-- .../wireless/mediatek/mt76/mt7615/mt7615.h | 47 +++++- .../net/wireless/mediatek/mt76/mt7615/regs.h | 5 +- 6 files changed, 242 insertions(+), 108 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +8 -7
@@ -50,7 +50,7 @@ static void mt7615_mac_init(struct mt7615_dev *dev)MT_TMAC_CTCR0_INS_DDLMT_VHT_SMPDU_EN | MT_TMAC_CTCR0_INS_DDLMT_EN); -mt7615_mcu_set_rts_thresh (dev,0x92b ); +mt7615_mcu_set_rts_thresh (&dev->phy,0x92b );mt7615_mac_set_scs (dev, true); mt76_rmw(dev, MT_AGG_SCR, MT_AGG_SCR_NLNAV_MID_PTEC_DIS,
@@ -132,7 +132,7 @@ static int mt7615_init_hardware(struct mt7615_dev *dev)mt7615_mcu_set_eeprom (dev);mt7615_mac_init (dev);mt7615_phy_init (dev); -mt7615_mcu_ctrl_pm_state (dev,0 ); +mt7615_mcu_ctrl_pm_state (dev,0 ,0 );mt7615_mcu_del_wtbl_all (dev);/* Beacon and mgmt frames should occupy wcid 0 */
@@ -246,11 +246,9 @@ mt7615_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request) {struct ieee80211_hw *hw =wiphy_to_ieee80211_hw (wiphy); -struct mt7615_dev *dev = hw->priv; -struct cfg80211_chan_def *chandef = &dev->mphy.chandef; - -if (request->dfs_region == dev->mt76.region) -return ; +struct mt7615_dev *dev =mt7615_hw_dev (hw); +struct mt76_phy *mphy = hw->priv; +struct cfg80211_chan_def *chandef = &mphy->chandef; dev->mt76.region = request->dfs_region;
@@ -271,6 +269,9 @@ int mt7615_register_device(struct mt7615_dev *dev)struct wiphy *wiphy = hw->wiphy;int ret; + dev->phy.dev = dev; + dev->phy.mt76 = &dev->mt76.phy; + dev->mt76.phy.priv = &dev->phy;INIT_DELAYED_WORK (&dev->mt76.mac_work, mt7615_mac_work);INIT_LIST_HEAD (&dev->sta_poll_list);spin_lock_init (&dev->sta_poll_lock);
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +70 -26
231 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/main.c +92 -53
329 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +28 -14
125 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +41 -6
85 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +3 -2
@@ -170,7 +170,7 @@#define MT_WF_RMAC_BASE 0x21200#define MT_WF_RMAC (ofs) (MT_WF_RMAC_BASE + (ofs)) -#define MT_WF_RFCR MT_WF_RMAC(0x000) +#define MT_WF_RFCR (_band) MT_WF_RMAC((_band) ? 0x100 : 0x000)#define MT_WF_RFCR_DROP_STBC_MULTI BIT(0)#define MT_WF_RFCR_DROP_FCSFAIL BIT(1)#define MT_WF_RFCR_DROP_VERSION BIT(3)
@@ -193,7 +193,7 @@#define MT_WF_RFCR_DROP_NDPA BIT(20)#define MT_WF_RFCR_DROP_UNWANTED_CTL BIT(21) -#define MT_WF_RFCR1 MT_WF_RMAC(0x004) +#define MT_WF_RFCR1 (_band) MT_WF_RMAC((_band) ? 0x104 : 0x004)#define MT_WF_RFCR1_DROP_ACK BIT(4)#define MT_WF_RFCR1_DROP_BF_POLL BIT(5)#define MT_WF_RFCR1_DROP_BA BIT(6)
@@ -207,6 +207,7 @@#define MT_WF_RMAC_MIB_AIRTIME0 MT_WF_RMAC(0x0380)#define MT_WF_RMAC_MIB_TIME5 MT_WF_RMAC(0x03d8) +#define MT_WF_RMAC_MIB_TIME6 MT_WF_RMAC(0x03dc)#define MT_MIB_OBSSTIME_MASK GENMASK(23, 0)#define MT_WF_DMA_BASE 0x21800
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 19/29 mt76: mt7615: add multiple wiphy support for smart carrier sense
In reply to Felix FietkauUse per-phy radio stats and tuning registers
--- .../wireless/mediatek/mt76/mt7615/debugfs.c | 21 ++- .../net/wireless/mediatek/mt76/mt7615/mac.c | 134 +++++++++++------- .../net/wireless/mediatek/mt76/mt7615/main.c | 2 +- .../wireless/mediatek/mt76/mt7615/mt7615.h | 11 +- .../net/wireless/mediatek/mt76/mt7615/regs.h | 9 +- 5 files changed, 112 insertions(+), 65 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +17 -4
@@ -74,15 +74,28 @@ static const struct file_operations fops_ampdu_stat = { .release = single_release, }; +static void +mt7615_radio_read_phy (struct mt7615_phy *phy,struct seq_file *s) +{ +struct mt7615_dev *dev =dev_get_drvdata (s->private); +bool ext_phy = phy != &dev->phy; + +if (!phy) +return ; + +seq_printf (s,"Radio %d sensitivity: ofdm=%d cck=%d\n" , ext_phy, + phy->ofdm_sensitivity, phy->cck_sensitivity); +seq_printf (s,"Radio %d false CCA: ofdm=%d cck=%d\n" , ext_phy, + phy->false_cca_ofdm, phy->false_cca_cck); +} +static int mt7615_radio_read (struct seq_file *s,void *data) {struct mt7615_dev *dev =dev_get_drvdata (s->private); -seq_printf (s,"Sensitivity: ofdm=%d cck=%d\n" , - dev->ofdm_sensitivity, dev->cck_sensitivity); -seq_printf (s,"False CCA: ofdm=%d cck=%d\n" , - dev->false_cca_ofdm, dev->false_cca_cck); +mt7615_radio_read_phy (&dev->phy, s); +mt7615_radio_read_phy (mt7615_ext_phy (dev), s);return 0 ; }
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +83 -51
232 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/main.c +1 -1
@@ -194,7 +194,7 @@ static int mt7615_set_channel(struct mt7615_phy *phy) goto out; ret =mt7615_dfs_init_radar_detector (dev); -mt7615_mac_cca_stats_reset (dev); +mt7615_mac_cca_stats_reset (phy);mt7615_mac_reset_counters (dev);
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +6 -5
@@ -84,6 +84,11 @@ struct mt7615_phy {struct mt7615_dev *dev;u32 rxfilter; + +unsigned long last_cca_adj; +int false_cca_ofdm, false_cca_cck; +s8 ofdm_sensitivity; +s8 cck_sensitivity; };struct mt7615_dev {
@@ -112,11 +117,7 @@ struct mt7615_dev {u32 hw_pattern;int dfs_state; -int false_cca_ofdm, false_cca_cck; -unsigned long last_cca_adj;u8 mac_work_count; -s8 ofdm_sensitivity; -s8 cck_sensitivity;bool scs_en;spinlock_t token_lock;
@@ -280,7 +281,7 @@ static inline void mt7615_irq_disable(struct mt7615_dev *dev, u32 mask)void mt7615_update_channel (struct mt76_dev *mdev);bool mt7615_mac_wtbl_update (struct mt7615_dev *dev,int idx,u32 mask);void mt7615_mac_reset_counters (struct mt7615_dev *dev); -void mt7615_mac_cca_stats_reset (struct mt7615_dev *dev); +void mt7615_mac_cca_stats_reset (struct mt7615_phy *phy);void mt7615_mac_set_scs (struct mt7615_dev *dev,bool enable);void mt7615_mac_sta_poll (struct mt7615_dev *dev); int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +5 -4
@@ -84,13 +84,13 @@#define MT_WF_PHY_WF2_RFCTRL0 MT_WF_PHY(0x1900)#define MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN BIT(9) -#define MT_WF_PHY_R0_B0_PHYMUX_5 MT_WF_PHY(0x0614) +#define MT_WF_PHY_R0_PHYMUX_5 (_phy) MT_WF_PHY(0x0614 + ((_phy) << 9)) -#define MT_WF_PHY_R0_B0_PHYCTRL_STS0 MT_WF_PHY(0x020c) +#define MT_WF_PHY_R0_PHYCTRL_STS0 (_phy) MT_WF_PHY(0x020c + ((_phy) << 9))#define MT_WF_PHYCTRL_STAT_PD_OFDM GENMASK(31, 16)#define MT_WF_PHYCTRL_STAT_PD_CCK GENMASK(15, 0) -#define MT_WF_PHY_R0_B0_PHYCTRL_STS5 MT_WF_PHY(0x0220) +#define MT_WF_PHY_R0_PHYCTRL_STS5 (_phy) MT_WF_PHY(0x0220 + ((_phy) << 9))#define MT_WF_PHYCTRL_STAT_MDRDY_OFDM GENMASK(31, 16)#define MT_WF_PHYCTRL_STAT_MDRDY_CCK GENMASK(15, 0)
@@ -295,7 +295,8 @@#define MT_WF_MIB (ofs) (MT_WF_MIB_BASE + (ofs))#define MT_MIB_M0_MISC_CR MT_WF_MIB(0x00c) -#define MT_MIB_MB_SDR0 (n) MT_WF_MIB(0x100 + ((n) << 4)) +#define MT_MIB_MB_SDR (_band, n) MT_WF_MIB(0x100 + ((_band) << 9) + \ + ((n) << 4))#define MT_MIB_RTS_RETRIES_COUNT_MASK GENMASK(31, 16)#define MT_MIB_RTS_COUNT_MASK GENMASK(15, 0)
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 20/29 mt76: mt7615: add missing register init for dual-wiphy support
In reply to Felix FietkauInitialize low-power beacon mode setting
--- drivers/net/wireless/mediatek/mt76/mt7615/init.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +3 -3
@@ -13,9 +13,9 @@static void mt7615_phy_init (struct mt7615_dev *dev) { -/* disable band 0 rf low power beacon mode */ -mt76_rmw (dev,MT_WF_PHY_WF2_RFCTRL0 ,MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN , -MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN ); +/* disable rf low power beacon mode */ +mt76_set (dev,MT_WF_PHY_WF2_RFCTRL0 (0 ),MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN ); +mt76_set (dev,MT_WF_PHY_WF2_RFCTRL0 (1 ),MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN ); }static void mt7615_mac_init (struct mt7615_dev *dev)
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +1 -1
@@ -81,7 +81,7 @@#define MT_WF_PHY_BASE 0x10000#define MT_WF_PHY (ofs) (MT_WF_PHY_BASE + (ofs)) -#define MT_WF_PHY_WF2_RFCTRL0 MT_WF_PHY(0x1900) +#define MT_WF_PHY_WF2_RFCTRL0 (n) MT_WF_PHY(0x1900 + ((n) * 0x400))#define MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN BIT(9)#define MT_WF_PHY_R0_PHYMUX_5 (_phy) MT_WF_PHY(0x0614 + ((_phy) << 9))
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 21/29 mt76: mt7615: remove useless MT_HW_RDD0/1 enum
In reply to Felix FietkauWriting 0/1 is shorter and just as clear
--- .../net/wireless/mediatek/mt76/mt7615/init.c | 3 +- .../net/wireless/mediatek/mt76/mt7615/mac.c | 29 ++++++++----------- .../wireless/mediatek/mt76/mt7615/mt7615.h | 5 ---- 3 files changed, 13 insertions(+), 24 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +1 -2
@@ -257,8 +257,7 @@ mt7615_regd_notifier(struct wiphy *wiphy,mt7615_dfs_stop_radar_detector (dev);if (request->dfs_region ==NL80211_DFS_UNSET ) -mt7615_mcu_rdd_cmd (dev,RDD_CAC_END ,MT_HW_RDD0 , -MT_RX_SEL0 ,0 ); +mt7615_mcu_rdd_cmd (dev,RDD_CAC_END ,0 ,MT_RX_SEL0 ,0 );else mt7615_dfs_start_radar_detector (dev); }
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +12 -17
@@ -1502,15 +1502,13 @@ int mt7615_dfs_stop_radar_detector(struct mt7615_dev *dev)struct cfg80211_chan_def *chandef = &dev->mphy.chandef;int err; - err =mt7615_mcu_rdd_cmd (dev,RDD_STOP ,MT_HW_RDD0 , -MT_RX_SEL0 ,0 ); + err =mt7615_mcu_rdd_cmd (dev,RDD_STOP ,0 ,MT_RX_SEL0 ,0 );if (err <0 )return err;if (chandef->width ==NL80211_CHAN_WIDTH_160 || chandef->width ==NL80211_CHAN_WIDTH_80P80 ) - err =mt7615_mcu_rdd_cmd (dev,RDD_STOP ,MT_HW_RDD1 , -MT_RX_SEL0 ,0 ); + err =mt7615_mcu_rdd_cmd (dev,RDD_STOP ,1 ,MT_RX_SEL0 ,0 );return err; }
@@ -1532,20 +1530,19 @@ int mt7615_dfs_start_radar_detector(struct mt7615_dev *dev)int err;/* start CAC */ - err =mt7615_mcu_rdd_cmd (dev,RDD_CAC_START ,MT_HW_RDD0 , -MT_RX_SEL0 ,0 ); + err =mt7615_mcu_rdd_cmd (dev,RDD_CAC_START ,0 ,MT_RX_SEL0 ,0 );if (err <0 )return err;/* TODO: DBDC support */ - err =mt7615_dfs_start_rdd (dev,MT_HW_RDD0 ); + err =mt7615_dfs_start_rdd (dev,0 );if (err <0 )return err;if (chandef->width ==NL80211_CHAN_WIDTH_160 || chandef->width ==NL80211_CHAN_WIDTH_80P80 ) { - err =mt7615_dfs_start_rdd (dev,MT_HW_RDD1 ); + err =mt7615_dfs_start_rdd (dev,1 );if (err <0 )return err; }
@@ -1572,15 +1569,13 @@ int mt7615_dfs_init_radar_detector(struct mt7615_dev *dev)if (chandef->chan->flags &IEEE80211_CHAN_RADAR ) {if (chandef->chan->dfs_state !=NL80211_DFS_AVAILABLE )return mt7615_dfs_start_radar_detector (dev); -else -return mt7615_mcu_rdd_cmd (dev,RDD_CAC_END ,MT_HW_RDD0 , -MT_RX_SEL0 ,0 ); - }else { - err =mt7615_mcu_rdd_cmd (dev,RDD_NORMAL_START , -MT_HW_RDD0 ,MT_RX_SEL0 ,0 ); -if (err <0 ) -return err; -return mt7615_dfs_stop_radar_detector (dev); +return mt7615_mcu_rdd_cmd (dev,RDD_CAC_END ,0 ,MT_RX_SEL0 ,0 ); } + + err =mt7615_mcu_rdd_cmd (dev,RDD_NORMAL_START ,0 ,MT_RX_SEL0 ,0 ); +if (err <0 ) +return err; + +return mt7615_dfs_stop_radar_detector (dev); }
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +0 -5
@@ -149,11 +149,6 @@ enum {EXT_BSSID_END }; -enum { -MT_HW_RDD0 , -MT_HW_RDD1 , -}; -enum {MT_RX_SEL0 ,MT_RX_SEL1 ,
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 22/29 mt76: mt7615: add multiple wiphy support to the dfs support code
In reply to Felix FietkauThere are two DFS detectors on the chip. When using 160 MHz channel bandwidth (not supported in dual-wiphy mode), both are used. Otherwise, one detector is used per wiphy.
Rework the code to start/stop them separately per phy and to indicate the radar event on the right phy based on the detector index
--- .../net/wireless/mediatek/mt76/mt7615/init.c | 9 +-- .../net/wireless/mediatek/mt76/mt7615/mac.c | 63 +++++++++++-------- .../net/wireless/mediatek/mt76/mt7615/main.c | 5 +- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 18 +++++- .../net/wireless/mediatek/mt76/mt7615/mcu.h | 46 ++++++++++++++ .../wireless/mediatek/mt76/mt7615/mt7615.h | 19 ++---- 6 files changed, 107 insertions(+), 53 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +3 -6
@@ -248,6 +248,7 @@ mt7615_regd_notifier(struct wiphy *wiphy,struct ieee80211_hw *hw =wiphy_to_ieee80211_hw (wiphy);struct mt7615_dev *dev =mt7615_hw_dev (hw);struct mt76_phy *mphy = hw->priv; +struct mt7615_phy *phy = mphy->priv;struct cfg80211_chan_def *chandef = &mphy->chandef; dev->mt76.region = request->dfs_region;
@@ -255,11 +256,7 @@ mt7615_regd_notifier(struct wiphy *wiphy,if (!(chandef->chan->flags &IEEE80211_CHAN_RADAR ))return ; -mt7615_dfs_stop_radar_detector (dev); -if (request->dfs_region ==NL80211_DFS_UNSET ) -mt7615_mcu_rdd_cmd (dev,RDD_CAC_END ,0 ,MT_RX_SEL0 ,0 ); -else -mt7615_dfs_start_radar_detector (dev); +mt7615_dfs_init_radar_detector (phy); }int mt7615_register_device (struct mt7615_dev *dev)
@@ -303,7 +300,7 @@ int mt7615_register_device(struct mt7615_dev *dev)IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ ; - dev->dfs_state =-1 ; + dev->phy.dfs_state =-1 ; ret =mt76_register_device (&dev->mt76, true, mt7615_rates,ARRAY_SIZE (mt7615_rates));
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +36 -27
113 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/main.c +2 -3
@@ -185,15 +185,14 @@ static int mt7615_set_channel(struct mt7615_phy *phy)mutex_lock (&dev->mt76.mutex);set_bit (MT76_RESET , &phy->mt76->state); -mt7615_dfs_check_channel (dev); - + phy->dfs_state =-1 ;mt76_set_channel (phy->mt76); ret =mt7615_mcu_set_channel (phy);if (ret) goto out; - ret =mt7615_dfs_init_radar_detector (dev); + ret =mt7615_dfs_init_radar_detector (phy);mt7615_mac_cca_stats_reset (phy);mt7615_mac_reset_counters (dev);
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +16 -2
@@ -185,6 +185,21 @@ mt7615_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)ieee80211_csa_finish (vif); } +static void +mt7615_mcu_rx_radar_detected (struct mt7615_dev *dev,struct sk_buff *skb) +{ +struct mt76_phy *mphy = &dev->mt76.phy; +struct mt7615_mcu_rdd_report *r; + + r = (struct mt7615_mcu_rdd_report *)skb->data; + +if (r->idx && dev->mt76.phy2) + mphy = dev->mt76.phy2; + +ieee80211_radar_detected (mphy->hw); + dev->hw_pattern++; +} +static void mt7615_mcu_rx_ext_event (struct mt7615_dev *dev,struct sk_buff *skb) {
@@ -192,8 +207,7 @@ mt7615_mcu_rx_ext_event(struct mt7615_dev *dev, struct sk_buff *skb)switch (rxd->ext_eid) {case MCU_EXT_EVENT_RDD_REPORT : -ieee80211_radar_detected (dev->mt76.hw); - dev->hw_pattern++; +mt7615_mcu_rx_radar_detected (dev, skb);break ;case MCU_EXT_EVENT_CSA_NOTIFY : ieee80211_iterate_active_interfaces_atomic(dev->mt76.hw,
drivers/net/wireless/mediatek/mt76/mt7615/mcu.h +46 -0
52 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +4 -15
@@ -89,6 +89,9 @@ struct mt7615_phy {int false_cca_ofdm, false_cca_cck;s8 ofdm_sensitivity;s8 cck_sensitivity; + +u8 rdd_state; +int dfs_state; };struct mt7615_dev {
@@ -115,7 +118,6 @@ struct mt7615_dev {s16 power; } radar_pattern;u32 hw_pattern; -int dfs_state;u8 mac_work_count;bool scs_en;
@@ -243,8 +245,6 @@ void mt7615_mcu_rx_event(struct mt7615_dev *dev, struct sk_buff *skb);int mt7615_mcu_rdd_cmd (struct mt7615_dev *dev,enum mt7615_rdd_cmd cmd,u8 index,u8 rx_sel,u8 val); -int mt7615_dfs_start_radar_detector (struct mt7615_dev *dev); -int mt7615_dfs_stop_radar_detector (struct mt7615_dev *dev);int mt7615_mcu_rdd_send_pattern (struct mt7615_dev *dev);static inline bool is_mt7622 (struct mt76_dev *dev)
@@ -252,17 +252,6 @@ static inline bool is_mt7622(struct mt76_dev *dev)return mt76_chip (dev) ==0x7622 ; } -static inline void mt7615_dfs_check_channel (struct mt7615_dev *dev) -{ -enum nl80211_chan_width width = dev->mphy.chandef.width; -u32 freq = dev->mphy.chandef.chan->center_freq; -struct ieee80211_hw *hw =mt76_hw (dev); - -if (hw->conf.chandef.chan->center_freq != freq || - hw->conf.chandef.width != width) - dev->dfs_state =-1 ; -} -static inline void mt7615_irq_enable (struct mt7615_dev *dev,u32 mask) {mt76_set_irq_mask (&dev->mt76,MT_INT_MASK_CSR ,0 , mask);
@@ -319,7 +308,7 @@ void mt7615_mac_work(struct work_struct *work);void mt7615_txp_skb_unmap (struct mt76_dev *dev,struct mt76_txwi_cache *txwi);int mt76_dfs_start_rdd (struct mt7615_dev *dev,bool force); -int mt7615_dfs_init_radar_detector (struct mt7615_dev *dev); +int mt7615_dfs_init_radar_detector (struct mt7615_phy *phy);int mt7615_init_debugfs (struct mt7615_dev *dev);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 23/29 mt76: mt7615: rework chainmask handling
In reply to Felix FietkauMove chainmask to struct mt7615_phy and instead of needlessly making the format similar to values for older chips, make it refer to the actual chain bits used for the rx/tx path.
This is important for multiple wiphy support, where for a secondary phy, antenna_mask will start at 0, and chainmask will start at the chain offset (bit 2)
--- drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 7 +++++-- drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +1 -1
@@ -124,8 +124,8 @@ static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev)if (!tx_mask || tx_mask > max_nss) tx_mask = max_nss; - dev->chainmask = tx_mask <<8 | rx_mask; dev->mphy.antenna_mask =BIT (tx_mask) -1 ; + dev->phy.chainmask = dev->mphy.antenna_mask; } int mt7615_eeprom_get_power_index(struct mt7615_dev *dev,
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +5 -2
@@ -1304,6 +1304,7 @@ int mt7615_mcu_set_channel(struct mt7615_phy *phy)struct mt7615_dev *dev = phy->dev;struct cfg80211_chan_def *chandef = &phy->mt76->chandef;int freq1 = chandef->center_freq1, freq2 = chandef->center_freq2; +u8 n_chains =hweight8 (phy->mt76->antenna_mask);struct {u8 control_chan;u8 center_chan;
@@ -1325,8 +1326,8 @@ int mt7615_mcu_set_channel(struct mt7615_phy *phy) } req = { .control_chan = chandef->chan->hw_value, .center_chan = ieee80211_frequency_to_channel(freq1), - .tx_streams = (dev->chainmask >> 8) & 0xf, - .rx_streams_mask = dev->mphy.antenna_mask, + .tx_streams = n_chains, + .rx_streams_mask = n_chains, .center_chan2 = ieee80211_frequency_to_channel(freq2), };int ret;
@@ -1373,6 +1374,8 @@ int mt7615_mcu_set_channel(struct mt7615_phy *phy)if (ret)return ret; + req.rx_streams_mask = phy->chainmask; +return __mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_SET_RX_PATH , &req,sizeof (req), true); }
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +2 -1
@@ -90,6 +90,8 @@ struct mt7615_phy {s8 ofdm_sensitivity;s8 cck_sensitivity; +u16 chainmask; +u8 rdd_state;int dfs_state; };
@@ -101,7 +103,6 @@ struct mt7615_dev { };struct mt7615_phy phy; -u16 chainmask;u32 vif_mask;u32 omac_mask;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 24/29 mt76: mt7615: add multiple wiphy support to the rx path
In reply to Felix FietkauProgram the RMAC CHFREQ registers to properly indicate the band that the frames are received on.
Add some sanity checks to the programmed values, because the firmware programs these registers differently
--- .../net/wireless/mediatek/mt76/mt7615/mac.c | 42 +++++++++++++------ .../net/wireless/mediatek/mt76/mt7615/main.c | 7 ++++ .../wireless/mediatek/mt76/mt7615/mt7615.h | 11 +++-- .../net/wireless/mediatek/mt76/mt7615/regs.h | 2 + 4 files changed, 47 insertions(+), 15 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +30 -12
@@ -70,6 +70,8 @@ void mt7615_mac_reset_counters(struct mt7615_dev *dev)int mt7615_mac_fill_rx (struct mt7615_dev *dev,struct sk_buff *skb) {struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb; +struct mt76_phy *mphy = &dev->mt76.phy; +struct mt7615_phy *phy = &dev->phy;struct ieee80211_supported_band *sband;struct ieee80211_hdr *hdr;__le32 *rxd = (__le32 *)skb->data;
@@ -78,11 +80,28 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)u32 rxd2 =le32_to_cpu (rxd[2 ]);bool unicast, remove_pad, insert_ccmp_hdr = false;int i, idx; +u8 chfreq; + +memset (status,0 ,sizeof (*status)); -if (!test_bit (MT76_STATE_RUNNING , &dev->mphy.state)) + chfreq =FIELD_GET (MT_RXD1_NORMAL_CH_FREQ , rxd1); +if (!(chfreq &MT_CHFREQ_VALID ))return -EINVAL ; -memset (status,0 ,sizeof (*status)); +if (chfreq &MT_CHFREQ_DBDC_IDX ) { + mphy = dev->mt76.phy2; +if (!mphy) +return -EINVAL ; + + phy = mphy->priv; + status->ext_phy = true; + } + +if ((chfreq &MT_CHFREQ_SEQ ) != phy->chfreq_seq) +return -EINVAL ; + +if (!test_bit (MT76_STATE_RUNNING , &mphy->state)) +return -EINVAL ; unicast = (rxd1 &MT_RXD1_NORMAL_ADDR_TYPE ) ==MT_RXD1_NORMAL_U2M ; idx =FIELD_GET (MT_RXD2_NORMAL_WLAN_IDX , rxd2);
@@ -98,13 +117,12 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)spin_unlock_bh (&dev->sta_poll_lock); } -/* TODO: properly support DBDC */ - status->freq = dev->mphy.chandef.chan->center_freq; - status->band = dev->mphy.chandef.chan->band; + status->freq = mphy->chandef.chan->center_freq; + status->band = mphy->chandef.chan->band;if (status->band ==NL80211_BAND_5GHZ ) - sband = &dev->mphy.sband_5g.sband; + sband = &mphy->sband_5g.sband;else - sband = &dev->mphy.sband_2g.sband; + sband = &mphy->sband_2g.sband;if (rxd2 &MT_RXD2_NORMAL_FCS_ERR ) status->flag |=RX_FLAG_FAILED_FCS_CRC ;
@@ -124,13 +142,13 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb) status->flag |=RX_FLAG_AMPDU_DETAILS ;/* all subframes of an A-MPDU have the same timestamp */ -if (dev->rx_ampdu_ts != rxd[12 ]) { -if (!++dev->ampdu_ref) - dev->ampdu_ref++; +if (phy->rx_ampdu_ts != rxd[12 ]) { +if (!++phy->ampdu_ref) + phy->ampdu_ref++; } - dev->rx_ampdu_ts = rxd[12 ]; + phy->rx_ampdu_ts = rxd[12 ]; - status->ampdu_ref = dev->ampdu_ref; + status->ampdu_ref = phy->ampdu_ref; } remove_pad = rxd1 &MT_RXD1_NORMAL_HDR_OFFSET ;
drivers/net/wireless/mediatek/mt76/mt7615/main.c +7 -0
@@ -178,6 +178,7 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,static int mt7615_set_channel (struct mt7615_phy *phy) {struct mt7615_dev *dev = phy->dev; +bool ext_phy = phy != &dev->phy;int ret;cancel_delayed_work_sync (&dev->mt76.mac_work);
@@ -185,6 +186,7 @@ static int mt7615_set_channel(struct mt7615_phy *phy)mutex_lock (&dev->mt76.mutex);set_bit (MT76_RESET , &phy->mt76->state); + phy->chfreq_seq = (phy->chfreq_seq +1 ) &MT_CHFREQ_SEQ ; phy->dfs_state =-1 ;mt76_set_channel (phy->mt76);
@@ -192,6 +194,11 @@ static int mt7615_set_channel(struct mt7615_phy *phy)if (ret) goto out; +mt76_wr (dev,MT_CHFREQ (ext_phy), +MT_CHFREQ_VALID | + (ext_phy *MT_CHFREQ_DBDC_IDX ) | + phy->chfreq_seq); + ret =mt7615_dfs_init_radar_detector (phy);mt7615_mac_cca_stats_reset (phy);
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +8 -3
@@ -36,6 +36,10 @@#define MT_FRAC_SCALE 12#define MT_FRAC (val, div) (((val) << MT_FRAC_SCALE) / (div)) +#define MT_CHFREQ_VALID BIT(7) +#define MT_CHFREQ_DBDC_IDX BIT(6) +#define MT_CHFREQ_SEQ GENMASK(5, 0) +struct mt7615_vif ;struct mt7615_sta ;
@@ -92,8 +96,12 @@ struct mt7615_phy {u16 chainmask; +u8 chfreq_seq;u8 rdd_state;int dfs_state; + +__le32 rx_ampdu_ts; +u32 ampdu_ref; };struct mt7615_dev {
@@ -106,9 +114,6 @@ struct mt7615_dev {u32 vif_mask;u32 omac_mask; -__le32 rx_ampdu_ts; -u32 ampdu_ref; -struct list_head sta_poll_list;spinlock_t sta_poll_lock;
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +2 -0
@@ -200,6 +200,8 @@#define MT_WF_RFCR1_DROP_CFEND BIT(7)#define MT_WF_RFCR1_DROP_CFACK BIT(8) +#define MT_CHFREQ (_band) MT_WF_RMAC((_band) ? 0x130 : 0x030) +#define MT_WF_RMAC_MIB_TIME0 MT_WF_RMAC(0x03c4)#define MT_WF_RMAC_MIB_RXTIME_CLR BIT(31)#define MT_WF_RMAC_MIB_RXTIME_EN BIT(30)
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 25/29 mt76: mt7615: initialize dbdc settings on interface add
In reply to Felix FietkauUse the first two WMM slots for the primary phy and the second two for the secondary phy.
--- .../net/wireless/mediatek/mt76/mt7615/main.c | 12 +++- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 59 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7615/mcu.h | 13 ++++ .../wireless/mediatek/mt76/mt7615/mt7615.h | 2 + .../net/wireless/mediatek/mt76/mt7615/regs.h | 9 +++ 5 files changed, 94 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/main.c +11 -1
@@ -121,7 +121,11 @@ static int mt7615_add_interface(struct ieee80211_hw *hw, mvif->omac_idx = idx; mvif->band_idx = ext_phy; - mvif->wmm_idx = mvif->idx %MT7615_MAX_WMM_SETS ; +if (mt7615_ext_phy (dev)) + mvif->wmm_idx = ext_phy * (MT7615_MAX_WMM_SETS /2 ) + + mvif->idx % (MT7615_MAX_WMM_SETS /2 ); +else + mvif->wmm_idx = mvif->idx %MT7615_MAX_WMM_SETS ; ret =mt7615_mcu_set_dev_info (dev, vif,1 );if (ret)
@@ -129,6 +133,10 @@ static int mt7615_add_interface(struct ieee80211_hw *hw, dev->vif_mask |=BIT (mvif->idx); dev->omac_mask |=BIT (mvif->omac_idx); + phy->omac_mask |=BIT (mvif->omac_idx); + +mt7615_mcu_set_dbdc (dev); + idx =MT7615_WTBL_RESERVED - mvif->idx;INIT_LIST_HEAD (&mvif->sta.poll_list);
@@ -155,6 +163,7 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;struct mt7615_sta *msta = &mvif->sta;struct mt7615_dev *dev =mt7615_hw_dev (hw); +struct mt7615_phy *phy =mt7615_hw_phy (hw);int idx = msta->wcid.idx;/* TODO: disable beacon for the bss */
@@ -167,6 +176,7 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,mutex_lock (&dev->mt76.mutex); dev->vif_mask &= ~BIT (mvif->idx); dev->omac_mask &= ~BIT (mvif->omac_idx); + phy->omac_mask &= ~BIT (mvif->omac_idx);mutex_unlock (&dev->mt76.mutex);spin_lock_bh (&dev->sta_poll_lock);
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +59 -0
65 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mcu.h +13 -0
@@ -148,6 +148,7 @@ enum {MCU_EXT_CMD_WTBL_UPDATE =0x32 ,MCU_EXT_CMD_SET_RDD_CTRL =0x3a ,MCU_EXT_CMD_PROTECT_CTRL =0x3e , +MCU_EXT_CMD_DBDC_CTRL =0x45 ,MCU_EXT_CMD_MAC_INIT_CTRL =0x46 ,MCU_EXT_CMD_BCN_OFFLOAD =0x49 , MCU_EXT_CMD_SET_RX_PATH = 0x4e,
@@ -202,6 +203,18 @@ enum {DEV_INFO_MAX_NUM }; +enum { +DBDC_TYPE_WMM , +DBDC_TYPE_MGMT , +DBDC_TYPE_BSS , +DBDC_TYPE_MBSS , +DBDC_TYPE_REPEATER , +DBDC_TYPE_MU , +DBDC_TYPE_BF , +DBDC_TYPE_PTA , + __DBDC_TYPE_MAX, +}; +struct bss_info_omac {__le16 tag;__le16 len;
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +2 -0
@@ -88,6 +88,7 @@ struct mt7615_phy {struct mt7615_dev *dev;u32 rxfilter; +u32 omac_mask;unsigned long last_cca_adj;int false_cca_ofdm, false_cca_cck;
@@ -285,6 +286,7 @@ int mt7615_mac_wtbl_set_key(struct mt7615_dev *dev, struct mt76_wcid *wcid,struct ieee80211_key_conf *key, enum set_key_cmd cmd); +int mt7615_mcu_set_dbdc (struct mt7615_dev *dev);int mt7615_mcu_set_eeprom (struct mt7615_dev *dev);int mt7615_mcu_init_mac (struct mt7615_dev *dev);int mt7615_mcu_set_rts_thresh (struct mt7615_phy *phy,u32 val);
drivers/net/wireless/mediatek/mt76/mt7615/regs.h +9 -0
@@ -121,6 +121,15 @@#define MT_CFG_CCR_MAC_D1_2X_GC_EN BIT(30)#define MT_CFG_CCR_MAC_D0_2X_GC_EN BIT(31) +#define MT_DBDC_CTRL0 MT_WF_CFG(0x050) +#define MT_DBDC_CTRL0_OMAC_00_04 GENMASK(4, 0) +#define MT_DBDC_CTRL0_OMAC_11_1F GENMASK(19, 5) +#define MT_DBDC_CTRL0_MGMT GENMASK(21, 20) +#define MT_DBDC_CTRL0_WMM GENMASK(25, 22) +#define MT_DBDC_CTRL0_DBDC_EN BIT(31) + +#define MT_DBDC_CTRL1 MT_WF_CFG(0x054) +#define MT_WF_AGG_BASE 0x20a00#define MT_WF_AGG (ofs) (MT_WF_AGG_BASE + (ofs))
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 26/29 mt76: mt7615: move radio/mac initialization to .start/stop callbacks
In reply to Felix FietkauRun initialization per phy
--- .../net/wireless/mediatek/mt76/mt7615/init.c | 3 --- .../net/wireless/mediatek/mt76/mt7615/main.c | 23 ++++++++++++++++++- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 6 ++--- .../wireless/mediatek/mt76/mt7615/mt7615.h | 2 +- 4 files changed, 26 insertions(+), 8 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +0 -3
@@ -56,8 +56,6 @@ static void mt7615_mac_init(struct mt7615_dev *dev)mt76_rmw (dev,MT_AGG_SCR ,MT_AGG_SCR_NLNAV_MID_PTEC_DIS ,MT_AGG_SCR_NLNAV_MID_PTEC_DIS ); -mt7615_mcu_init_mac (dev); -mt76_wr (dev,MT_DMA_DCR0 ,MT_DMA_DCR0_RX_VEC_DROP |FIELD_PREP (MT_DMA_DCR0_MAX_RX_LEN ,3072 ));
@@ -132,7 +130,6 @@ static int mt7615_init_hardware(struct mt7615_dev *dev)mt7615_mcu_set_eeprom (dev);mt7615_mac_init (dev);mt7615_phy_init (dev); -mt7615_mcu_ctrl_pm_state (dev,0 ,0 );mt7615_mcu_del_wtbl_all (dev);/* Beacon and mgmt frames should occupy wcid 0 */
drivers/net/wireless/mediatek/mt76/mt7615/main.c +22 -1
@@ -33,6 +33,17 @@ static int mt7615_start(struct ieee80211_hw *hw)mutex_lock (&dev->mt76.mutex); running =mt7615_dev_running (dev); + +if (!running) { +mt7615_mcu_ctrl_pm_state (dev,0 ,0 ); +mt7615_mcu_set_mac_enable (dev,0 , true); + } + +if (phy != &dev->phy) { +mt7615_mcu_ctrl_pm_state (dev,1 ,0 ); +mt7615_mcu_set_mac_enable (dev,1 , true); + } +set_bit (MT76_STATE_RUNNING , &phy->mt76->state);if (running)
@@ -57,9 +68,19 @@ static void mt7615_stop(struct ieee80211_hw *hw)mutex_lock (&dev->mt76.mutex);clear_bit (MT76_STATE_RUNNING , &phy->mt76->state); -if (!mt7615_dev_running (dev)) + +if (phy != &dev->phy) { +mt7615_mcu_ctrl_pm_state (dev,1 ,1 ); +mt7615_mcu_set_mac_enable (dev,1 , false); + } + +if (!mt7615_dev_running (dev)) {cancel_delayed_work_sync (&dev->mt76.mac_work); +mt7615_mcu_ctrl_pm_state (dev,0 ,1 ); +mt7615_mcu_set_mac_enable (dev,0 , false); + } +mutex_unlock (&dev->mt76.mutex); }
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +3 -3
@@ -615,15 +615,15 @@ int mt7615_mcu_set_eeprom(struct mt7615_dev *dev)return ret; } -int mt7615_mcu_init_mac (struct mt7615_dev *dev) +int mt7615_mcu_set_mac_enable (struct mt7615_dev *dev,int band,bool enable) {struct {u8 enable;u8 band;u8 rsv[2 ]; } __packed req = { - .enable =1 , - .band =0 , + .enable = enable, + .band = band, }; return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_MAC_INIT_CTRL,
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -1
@@ -288,7 +288,7 @@ int mt7615_mac_wtbl_set_key(struct mt7615_dev *dev, struct mt76_wcid *wcid,int mt7615_mcu_set_dbdc (struct mt7615_dev *dev);int mt7615_mcu_set_eeprom (struct mt7615_dev *dev); -int mt7615_mcu_init_mac (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_ctrl_pm_state (struct mt7615_dev *dev,int band,int enter);int mt7615_mcu_get_temperature (struct mt7615_dev *dev,int index);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 27/29 mt76: mt7615: select the correct tx queue for frames sent to the second phy
In reply to Felix FietkauBeacons and management frames need to explicitly select the alternate tx queues in order to be sent out on the right phy
--- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 13 ++++++++++--- drivers/net/wireless/mediatek/mt76/mt7615/mac.h | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +10 -3
@@ -382,6 +382,7 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,bool multicast =is_multicast_ether_addr (hdr->addr1);struct ieee80211_vif *vif = info->control.vif;struct mt76_phy *mphy = &dev->mphy; +bool ext_phy = info->hw_queue &MT_TX_HW_QUEUE_EXT_PHY ;int tx_count =8 ;u8 fc_type, fc_stype, p_fmt, q_idx, omac_idx =0 , wmm_idx =0 ;__le16 fc = hdr->frame_control;
@@ -401,7 +402,7 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi, tx_count = msta->rate_count; } -if ((info->hw_queue &MT_TX_HW_QUEUE_EXT_PHY ) && dev->mt76.phy2) +if (ext_phy && dev->mt76.phy2) mphy = dev->mt76.phy2; fc_type = (le16_to_cpu (fc) &IEEE80211_FCTL_FTYPE ) >>2 ;
@@ -412,10 +413,16 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,skb_get_queue_mapping (skb); p_fmt =MT_TX_TYPE_CT ; }else if (ieee80211_is_beacon (fc)) { - q_idx =MT_LMAC_BCN0 ; +if (ext_phy) + q_idx =MT_LMAC_BCN1 ; +else + q_idx =MT_LMAC_BCN0 ; p_fmt =MT_TX_TYPE_FW ; }else { - q_idx =MT_LMAC_ALTX0 ; +if (ext_phy) + q_idx =MT_LMAC_ALTX1 ; +else + q_idx =MT_LMAC_ALTX0 ; p_fmt =MT_TX_TYPE_CT ; }
drivers/net/wireless/mediatek/mt76/mt7615/mac.h +4 -0
@@ -126,6 +126,10 @@ enum tx_pkt_queue_idx {MT_LMAC_BMC0 ,MT_LMAC_BCN0 ,MT_LMAC_PSMP0 , +MT_LMAC_ALTX1 , +MT_LMAC_BMC1 , +MT_LMAC_BCN1 , + MT_LMAC_PSMP1, }; enum tx_port_idx {
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 28/29 mt76: mt7615: add support for registering a second wiphy via debugfs
In reply to Felix FietkauThis is only used for testing for now. In the future it will be possible to enable the second PHY through an proper API via device tree
--- .../wireless/mediatek/mt76/mt7615/debugfs.c | 27 ++++ .../wireless/mediatek/mt76/mt7615/eeprom.c | 5 +- .../net/wireless/mediatek/mt76/mt7615/init.c | 118 +++++++++++++++--- .../wireless/mediatek/mt76/mt7615/mt7615.h | 4 + 4 files changed, 133 insertions(+), 21 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +27 -0
@@ -36,6 +36,32 @@ mt7615_scs_get(void *data, u64 *val)DEFINE_DEBUGFS_ATTRIBUTE (fops_scs, mt7615_scs_get, mt7615_scs_set,"%lld\n" ); +static int +mt7615_dbdc_set (void *data,u64 val) +{ +struct mt7615_dev *dev = data; + +if (val) +mt7615_register_ext_phy (dev); +else +mt7615_unregister_ext_phy (dev); + +return 0 ; +} + +static int +mt7615_dbdc_get (void *data,u64 *val) +{ +struct mt7615_dev *dev = data; + + *val = !!mt7615_ext_phy (dev); + +return 0 ; +} + +DEFINE_DEBUGFS_ATTRIBUTE (fops_dbdc, mt7615_dbdc_get, + mt7615_dbdc_set,"%lld\n" ); +static int mt7615_ampdu_stat_read (struct seq_file *file,void *data) {
@@ -183,6 +209,7 @@ int mt7615_init_debugfs(struct mt7615_dev *dev) mt7615_queues_acq);debugfs_create_file ("ampdu_stat" ,0400 , dir, dev, &fops_ampdu_stat);debugfs_create_file ("scs" ,0600 , dir, dev, &fops_scs); +debugfs_create_file ("dbdc" ,0600 , dir, dev, &fops_dbdc);debugfs_create_devm_seqfile (dev->mt76.dev,"radio" , dir, mt7615_radio_read);debugfs_create_u32 ("dfs_hw_pattern" ,0400 , dir, &dev->hw_pattern);
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +3 -2
@@ -124,8 +124,9 @@ static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev)if (!tx_mask || tx_mask > max_nss) tx_mask = max_nss; - dev->mphy.antenna_mask =BIT (tx_mask) -1 ; - dev->phy.chainmask = dev->mphy.antenna_mask; + dev->chainmask =BIT (tx_mask) -1 ; + dev->mphy.antenna_mask = dev->chainmask; + dev->phy.chainmask = dev->chainmask; } int mt7615_eeprom_get_power_index(struct mt7615_dev *dev,
drivers/net/wireless/mediatek/mt76/mt7615/init.c +99 -19
148 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +4 -0
@@ -115,6 +115,8 @@ struct mt7615_dev {u32 vif_mask;u32 omac_mask; +u16 chainmask; +struct list_head sta_poll_list;spinlock_t sta_poll_lock;
@@ -211,6 +213,8 @@ u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr);int mt7615_register_device (struct mt7615_dev *dev);void mt7615_unregister_device (struct mt7615_dev *dev); +int mt7615_register_ext_phy (struct mt7615_dev *dev); +void mt7615_unregister_ext_phy (struct mt7615_dev *dev);int mt7615_eeprom_init (struct mt7615_dev *dev); int mt7615_eeprom_get_power_index(struct mt7615_dev *dev, struct ieee80211_channel *chan,
Signature · 1 line
2.24.0
Re: [PATCH 28/29] mt76: mt7615: add support for registering a second wiphy via debugfs
Quoted 4 lines · Felix Fietkau
This is only used for testing for now. In the future it will be possible to enable the second PHY through an proper API via device tree
Signed-off-by Felix Fietkau <[email protected]>
An example how to use the debugfs file would be nice.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Felix Fietkau
maintainerPATCH v2 28/29 mt76: mt7615: add support for registering a second wiphy via debugfs
In reply to Felix FietkauThis is only used for testing for now. In the future it will be possible to enable the second PHY through an proper API via device tree
Running:
echo 1 > /sys/kernel/debug/ieee80211/phyX/mt76/dbdc
will register a second wiphy (and limit the primary one to 2 spatial streams). The second wiphy will only be able to run on 5 GHz, while the primary one can operate in both bands (if supported by the device).
---
v2:
- extend commit message
- fix MAC address of second wiphy
.../wireless/mediatek/mt76/mt7615/debugfs.c | 27 ++++ .../wireless/mediatek/mt76/mt7615/eeprom.c | 5 +- .../net/wireless/mediatek/mt76/mt7615/init.c | 125 +++++++++++++++--- .../wireless/mediatek/mt76/mt7615/mt7615.h | 4 + 4 files changed, 140 insertions(+), 21 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +27 -0
@@ -36,6 +36,32 @@ mt7615_scs_get(void *data, u64 *val)DEFINE_DEBUGFS_ATTRIBUTE (fops_scs, mt7615_scs_get, mt7615_scs_set,"%lld\n" ); +static int +mt7615_dbdc_set (void *data,u64 val) +{ +struct mt7615_dev *dev = data; + +if (val) +mt7615_register_ext_phy (dev); +else +mt7615_unregister_ext_phy (dev); + +return 0 ; +} + +static int +mt7615_dbdc_get (void *data,u64 *val) +{ +struct mt7615_dev *dev = data; + + *val = !!mt7615_ext_phy (dev); + +return 0 ; +} + +DEFINE_DEBUGFS_ATTRIBUTE (fops_dbdc, mt7615_dbdc_get, + mt7615_dbdc_set,"%lld\n" ); +static int mt7615_ampdu_stat_read (struct seq_file *file,void *data) {
@@ -183,6 +209,7 @@ int mt7615_init_debugfs(struct mt7615_dev *dev) mt7615_queues_acq);debugfs_create_file ("ampdu_stat" ,0400 , dir, dev, &fops_ampdu_stat);debugfs_create_file ("scs" ,0600 , dir, dev, &fops_scs); +debugfs_create_file ("dbdc" ,0600 , dir, dev, &fops_dbdc);debugfs_create_devm_seqfile (dev->mt76.dev,"radio" , dir, mt7615_radio_read);debugfs_create_u32 ("dfs_hw_pattern" ,0400 , dir, &dev->hw_pattern);
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +3 -2
@@ -124,8 +124,9 @@ static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev)if (!tx_mask || tx_mask > max_nss) tx_mask = max_nss; - dev->mphy.antenna_mask =BIT (tx_mask) -1 ; - dev->phy.chainmask = dev->mphy.antenna_mask; + dev->chainmask =BIT (tx_mask) -1 ; + dev->mphy.antenna_mask = dev->chainmask; + dev->phy.chainmask = dev->chainmask; } int mt7615_eeprom_get_power_index(struct mt7615_dev *dev,
drivers/net/wireless/mediatek/mt76/mt7615/init.c +106 -19
155 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +4 -0
@@ -115,6 +115,8 @@ struct mt7615_dev {u32 vif_mask;u32 omac_mask; +u16 chainmask; +struct list_head sta_poll_list;spinlock_t sta_poll_lock;
@@ -211,6 +213,8 @@ u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr);int mt7615_register_device (struct mt7615_dev *dev);void mt7615_unregister_device (struct mt7615_dev *dev); +int mt7615_register_ext_phy (struct mt7615_dev *dev); +void mt7615_unregister_ext_phy (struct mt7615_dev *dev);int mt7615_eeprom_init (struct mt7615_dev *dev); int mt7615_eeprom_get_power_index(struct mt7615_dev *dev, struct ieee80211_channel *chan,
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 29/29 mt76: mt7615: update beacon contents on BSS_CHANGED_BEACON
In reply to Felix FietkauBeacon changes need to be sent to the firmware, otherwise it will keep sending stale data
--- drivers/net/wireless/mediatek/mt76/mt7615/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/main.c +4 -5
@@ -406,17 +406,16 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw,if (changed &BSS_CHANGED_ASSOC )mt7615_mcu_set_bss_info (dev, vif, info->assoc); -/* TODO: update beacon content -* BSS_CHANGED_BEACON -*/ -if (changed &BSS_CHANGED_BEACON_ENABLED ) {mt7615_mcu_set_bss_info (dev, vif, info->enable_beacon);mt7615_mcu_wtbl_bmc (dev, vif, info->enable_beacon);mt7615_mcu_set_sta_rec_bmc (dev, vif, info->enable_beacon); -mt7615_mcu_set_bcn (hw, vif, info->enable_beacon); } +if (changed & (BSS_CHANGED_BEACON | +BSS_CHANGED_BEACON_ENABLED )) +mt7615_mcu_set_bcn (hw, vif, info->enable_beacon); +mutex_unlock (&dev->mt76.mutex); }
Signature · 1 line
2.24.0