Commit 4960ada8 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2022-02-04' of https://github.com/nbd168/wireless into main 

mt76 patches for 5.18

- mt7915 mcu code cleanup
- mt7916 support
- fixes for SDIO support
- fixes for DFS
- power management fixes
- stability improvements
- background radar detection support
parents 2fd6d2ef b3ad9d6a

Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml

+9 −0
Original line number Diff line number Diff line
@@ -69,6 +69,15 @@ properties: 
      calibration data is generic and specific calibration data should be

      pulled from the OTP ROM



  mediatek,disable-radar-background:

    type: boolean

    description:

      Disable/enable radar/CAC detection running on a dedicated offchannel

      chain available on some hw.

      Background radar/CAC detection allows to avoid the CAC downtime

      switching on a different channel during CAC detection on the selected

      radar channel.



  led:

    type: object

    $ref: /schemas/leds/common.yaml#

drivers/net/wireless/mediatek/mt76/dma.c

+12 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q) 
{

	int i;



	if (!q)

	if (!q || !q->ndesc)

		return;



	/* clear descriptors */
@@ -233,7 +233,7 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush) 
	struct mt76_queue_entry entry;

	int last;



	if (!q)

	if (!q || !q->ndesc)

		return;



	spin_lock_bh(&q->cleanup_lock);
@@ -448,6 +448,9 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q) 
	int len = SKB_WITH_OVERHEAD(q->buf_size);

	int offset = q->buf_offset;



	if (!q->ndesc)

		return 0;



	spin_lock_bh(&q->lock);



	while (q->queued < q->ndesc - 1) {
@@ -465,6 +468,7 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q) 


		qbuf.addr = addr + offset;

		qbuf.len = len - offset;

		qbuf.skip_unmap = false;

		mt76_dma_add_buf(dev, q, &qbuf, 1, 0, buf, NULL);

		frames++;

	}
@@ -484,6 +488,9 @@ mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q) 
	void *buf;

	bool more;



	if (!q->ndesc)

		return;



	spin_lock_bh(&q->lock);

	do {

		buf = mt76_dma_dequeue(dev, q, true, NULL, NULL, &more);
@@ -508,6 +515,9 @@ mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid) 
	struct mt76_queue *q = &dev->q_rx[qid];

	int i;



	if (!q->ndesc)

		return;



	for (i = 0; i < q->ndesc; i++)

		q->desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE);

drivers/net/wireless/mediatek/mt76/mac80211.c

+29 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static const struct cfg80211_sar_freq_ranges mt76_sar_freq_ranges[] = { 
	{ .start_freq = 5725, .end_freq = 5950, },

};



const struct cfg80211_sar_capa mt76_sar_capa = {

static const struct cfg80211_sar_capa mt76_sar_capa = {

	.type = NL80211_SAR_TYPE_POWER,

	.num_freq_ranges = ARRAY_SIZE(mt76_sar_freq_ranges),

	.freq_ranges = &mt76_sar_freq_ranges[0],
@@ -823,6 +823,10 @@ void mt76_set_channel(struct mt76_phy *phy) 
	wait_event_timeout(dev->tx_wait, !mt76_has_tx_pending(phy), timeout);

	mt76_update_survey(phy);



	if (phy->chandef.chan->center_freq != chandef->chan->center_freq ||

	    phy->chandef.width != chandef->width)

		phy->dfs_state = MT_DFS_STATE_UNKNOWN;



	phy->chandef = *chandef;

	phy->chan_state = mt76_channel_state(phy, chandef->chan);
@@ -1604,3 +1608,27 @@ void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi, 
	wi->worker_stat_count = ei - wi->initial_stat_idx;

}

EXPORT_SYMBOL_GPL(mt76_ethtool_worker);



enum mt76_dfs_state mt76_phy_dfs_state(struct mt76_phy *phy)

{

	struct ieee80211_hw *hw = phy->hw;

	struct mt76_dev *dev = phy->dev;



	if (dev->region == NL80211_DFS_UNSET ||

	    test_bit(MT76_SCANNING, &phy->state))

		return MT_DFS_STATE_DISABLED;



	if (!hw->conf.radar_enabled) {

		if ((hw->conf.flags & IEEE80211_CONF_MONITOR) &&

		    (phy->chandef.chan->flags & IEEE80211_CHAN_RADAR))

			return MT_DFS_STATE_ACTIVE;



		return MT_DFS_STATE_DISABLED;

	}



	if (phy->chandef.chan->dfs_state != NL80211_DFS_AVAILABLE)

		return MT_DFS_STATE_CAC;



	return MT_DFS_STATE_ACTIVE;

}

EXPORT_SYMBOL_GPL(mt76_phy_dfs_state);

drivers/net/wireless/mediatek/mt76/mt76.h

+17 −5
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ enum mt76_rxq_id { 
	MT_RXQ_MCU_WA,

	MT_RXQ_EXT,

	MT_RXQ_EXT_WA,

	MT_RXQ_MAIN_WA,

	__MT_RXQ_MAX

};
@@ -104,6 +105,13 @@ enum mt76_cipher_type { 
	MT_CIPHER_GCMP_256,

};



enum mt76_dfs_state {

	MT_DFS_STATE_UNKNOWN,

	MT_DFS_STATE_DISABLED,

	MT_DFS_STATE_CAC,

	MT_DFS_STATE_ACTIVE,

};



struct mt76_queue_buf {

	dma_addr_t addr;

	u16 len;
@@ -224,7 +232,7 @@ enum mt76_wcid_flags { 
	MT_WCID_FLAG_HDR_TRANS,

};



#define MT76_N_WCIDS 288

#define MT76_N_WCIDS 544



/* stored in ieee80211_tx_info::hw_queue */

#define MT_TX_HW_QUEUE_EXT_PHY		BIT(3)
@@ -496,7 +504,7 @@ struct mt76_usb { 
	} mcu;

};



#define MT76S_XMIT_BUF_SZ	(16 * PAGE_SIZE)

#define MT76S_XMIT_BUF_SZ	0x3fe00

#define MT76S_NUM_TX_ENTRIES	256

#define MT76S_NUM_RX_ENTRIES	512

struct mt76_sdio {
@@ -506,7 +514,8 @@ struct mt76_sdio { 


	struct work_struct stat_work;



	u8 *xmit_buf[IEEE80211_NUM_ACS + 2];

	u8 *xmit_buf;

	u32 xmit_buf_sz;



	struct sdio_func *func;

	void *intr_data;
@@ -621,6 +630,7 @@ struct mt76_vif { 
	u8 band_idx;

	u8 wmm_idx;

	u8 scan_seq_num;

	u8 cipher;

};



struct mt76_phy {
@@ -636,6 +646,7 @@ struct mt76_phy { 
	struct ieee80211_channel *main_chan;



	struct mt76_channel_state *chan_state;

	enum mt76_dfs_state dfs_state;

	ktime_t survey_time;



	struct mt76_hw_cap cap;
@@ -897,8 +908,8 @@ static inline u16 mt76_rev(struct mt76_dev *dev) 
#define mt76_queue_reset(dev, ...)	(dev)->mt76.queue_ops->reset_q(&((dev)->mt76), __VA_ARGS__)



#define mt76_for_each_q_rx(dev, i)	\

	for (i = 0; i < ARRAY_SIZE((dev)->q_rx) && \

		    (dev)->q_rx[i].ndesc; i++)

	for (i = 0; i < ARRAY_SIZE((dev)->q_rx); i++)	\

		if ((dev)->q_rx[i].ndesc)



struct mt76_dev *mt76_alloc_device(struct device *pdev, unsigned int size,

				   const struct ieee80211_ops *ops,
@@ -1181,6 +1192,7 @@ void mt76_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		  const u8 *mac);

void mt76_sw_scan_complete(struct ieee80211_hw *hw,

			   struct ieee80211_vif *vif);

enum mt76_dfs_state mt76_phy_dfs_state(struct mt76_phy *phy);

int mt76_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		      void *data, int len);

int mt76_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,

drivers/net/wireless/mediatek/mt76/mt7603/main.c

+3 −0
Original line number Diff line number Diff line
@@ -641,6 +641,9 @@ mt7603_sta_rate_tbl_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	struct ieee80211_sta_rates *sta_rates = rcu_dereference(sta->rates);

	int i;



	if (!sta_rates)

		return;



	spin_lock_bh(&dev->mt76.lock);

	for (i = 0; i < ARRAY_SIZE(msta->rates); i++) {

		msta->rates[i].idx = sta_rates->rate[i].idx;