Commit 1899405c authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2019-01-22' of https://github.com/nbd168/wireless 

first batch of mt76 patches for 5.1

* fixes for mt76x0/mt76x2
* energy detect regulatory compliance fixes
* tx status handling fixes
* preparation for MT7603 support
* channel switch announcement support
parents 64e23305 d225581d

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

+19 −12
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ int mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, 
	if (q->queued + (n + 1) / 2 >= q->ndesc - 1)

		goto unmap;



	return dev->queue_ops->add_buf(dev, q, buf, n, tx_info, skb, t);

	return mt76_dma_add_buf(dev, q, buf, n, tx_info, skb, t);



unmap:

	ret = -ENOMEM;
@@ -318,7 +318,7 @@ int mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, 
EXPORT_SYMBOL_GPL(mt76_dma_tx_queue_skb);



static int

mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q, bool napi)

mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q)

{

	dma_addr_t addr;

	void *buf;
@@ -392,7 +392,7 @@ mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid) 


	mt76_dma_rx_cleanup(dev, q);

	mt76_dma_sync_idx(dev, q);

	mt76_dma_rx_fill(dev, q, false);

	mt76_dma_rx_fill(dev, q);

}



static void
@@ -417,10 +417,9 @@ mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data, 
static int

mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget)

{

	int len, data_len, done = 0;

	struct sk_buff *skb;

	unsigned char *data;

	int len;

	int done = 0;

	bool more;



	while (done < budget) {
@@ -430,6 +429,19 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) 
		if (!data)

			break;



		if (q->rx_head)

			data_len = q->buf_size;

		else

			data_len = SKB_WITH_OVERHEAD(q->buf_size);



		if (data_len < len + q->buf_offset) {

			dev_kfree_skb(q->rx_head);

			q->rx_head = NULL;



			skb_free_frag(data);

			continue;

		}



		if (q->rx_head) {

			mt76_add_fragment(dev, q, data, len, more);

			continue;
@@ -440,12 +452,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) 
			skb_free_frag(data);

			continue;

		}



		skb_reserve(skb, q->buf_offset);

		if (skb->tail + len > skb->end) {

			dev_kfree_skb(skb);

			continue;

		}



		if (q == &dev->q_rx[MT_RXQ_MCU]) {

			u32 *rxfce = (u32 *) skb->cb;
@@ -463,7 +470,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) 
		dev->drv->rx_skb(dev, q - dev->q_rx, skb);

	}



	mt76_dma_rx_fill(dev, q, true);

	mt76_dma_rx_fill(dev, q);

	return done;

}
@@ -504,7 +511,7 @@ mt76_dma_init(struct mt76_dev *dev) 
	for (i = 0; i < ARRAY_SIZE(dev->q_rx); i++) {

		netif_napi_add(&dev->napi_dev, &dev->napi[i], mt76_dma_rx_poll,

			       64);

		mt76_dma_rx_fill(dev, &dev->q_rx[i], false);

		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

+66 −2
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, 
	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;
@@ -547,7 +548,7 @@ mt76_check_ccmp_pn(struct sk_buff *skb) 
}



static void

mt76_check_ps(struct mt76_dev *dev, struct sk_buff *skb)

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;
@@ -566,6 +567,11 @@ mt76_check_ps(struct mt76_dev *dev, struct sk_buff *skb) 


	sta = container_of((void *) wcid, struct ieee80211_sta, drv_priv);



	if (status->signal <= 0)

		ewma_signal_add(&wcid->rssi, -status->signal);



	wcid->inactive_count = 0;



	if (!test_bit(MT_WCID_FLAG_CHECK_PS, &wcid->flags))

		return;
@@ -625,7 +631,7 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q, 
	__skb_queue_head_init(&frames);



	while ((skb = __skb_dequeue(&dev->rx_skb[q])) != NULL) {

		mt76_check_ps(dev, skb);

		mt76_check_sta(dev, skb);

		mt76_rx_aggr_reorder(skb, &frames);

	}
@@ -659,6 +665,7 @@ mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif, 
		mt76_txq_init(dev, sta->txq[i]);

	}



	ewma_signal_init(&wcid->rssi);

	rcu_assign_pointer(dev->wcid[wcid->idx], wcid);



out:
@@ -709,3 +716,60 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	return 0;

}

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 = __sw_hweight8(dev->antenna_mask);



	*dbm = dev->txpower_cur / 2;



	/* convert from per-chain power to combined

	 * output on 2x2 devices

	 */

	if (n_chains > 1)

		*dbm += 3;



	return 0;

}

EXPORT_SYMBOL_GPL(mt76_get_txpower);



static void

__mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)

{

	if (vif->csa_active && ieee80211_csa_is_complete(vif))

	    ieee80211_csa_finish(vif);

}



void mt76_csa_finish(struct mt76_dev *dev)

{

	if (!dev->csa_complete)

		return;



	ieee80211_iterate_active_interfaces_atomic(dev->hw,

		IEEE80211_IFACE_ITER_RESUME_ALL,

		__mt76_csa_finish, dev);



	dev->csa_complete = 0;

}

EXPORT_SYMBOL_GPL(mt76_csa_finish);



static void

__mt76_csa_check(void *priv, u8 *mac, struct ieee80211_vif *vif)

{

	struct mt76_dev *dev = priv;



	if (!vif->csa_active)

		return;



	dev->csa_complete |= ieee80211_csa_is_complete(vif);

}



void mt76_csa_check(struct mt76_dev *dev)

{

	ieee80211_iterate_active_interfaces_atomic(dev->hw,

		IEEE80211_IFACE_ITER_RESUME_ALL,

		__mt76_csa_check, dev);

}

EXPORT_SYMBOL_GPL(mt76_csa_check);

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

+21 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/skbuff.h>

#include <linux/leds.h>

#include <linux/usb.h>

#include <linux/average.h>

#include <net/mac80211.h>

#include "util.h"
@@ -174,6 +175,8 @@ enum mt76_wcid_flags { 


#define MT76_N_WCIDS 128



DECLARE_EWMA(signal, 10, 8);



struct mt76_wcid {

	struct mt76_rx_tid __rcu *aggr[IEEE80211_NUM_TIDS];
@@ -181,6 +184,9 @@ struct mt76_wcid { 


	unsigned long flags;



	struct ewma_signal rssi;

	int inactive_count;



	u8 idx;

	u8 hw_key_idx;
@@ -239,7 +245,9 @@ struct mt76_rx_tid { 
#define MT_TX_CB_TXS_FAILED		BIT(2)



#define MT_PACKET_ID_MASK		GENMASK(7, 0)

#define MT_PACKET_ID_NO_ACK		MT_PACKET_ID_MASK

#define MT_PACKET_ID_NO_ACK		0

#define MT_PACKET_ID_NO_SKB		1

#define MT_PACKET_ID_FIRST		2



#define MT_TX_STATUS_SKB_TIMEOUT	HZ
@@ -421,6 +429,7 @@ struct mt76_dev { 
	struct mt76_queue q_tx[__MT_TXQ_MAX];

	struct mt76_queue q_rx[__MT_RXQ_MAX];

	const struct mt76_queue_ops *queue_ops;

	int tx_dma_idx[4];



	wait_queue_head_t tx_wait;

	struct sk_buff_head status_list;
@@ -454,6 +463,8 @@ struct mt76_dev { 
	bool led_al;

	u8 led_pin;



	u8 csa_complete;



	u32 rxfilter;



	union {
@@ -488,7 +499,7 @@ struct mt76_rx_status { 
	u8 rate_idx;

	u8 nss;

	u8 band;

	u8 signal;

	s8 signal;

	u8 chains;

	s8 chain_signal[IEEE80211_MAX_CHAINS];

};
@@ -677,6 +688,14 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb);



int mt76_get_min_avg_rssi(struct mt76_dev *dev);



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

		     int *dbm);



void mt76_csa_check(struct mt76_dev *dev);

void mt76_csa_finish(struct mt76_dev *dev);



/* internal */

void mt76_tx_free(struct mt76_dev *dev);

struct mt76_txwi_cache *mt76_get_txwi(struct mt76_dev *dev);

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

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static const struct mt76_reg_pair mt76x0_mac_reg_table[] = { 
	{ MT_TX_PROT_CFG6,		0xe3f42004 },

	{ MT_TX_PROT_CFG7,		0xe3f42084 },

	{ MT_TX_PROT_CFG8,		0xe3f42104 },

	{ MT_VHT_HT_FBK_CFG1,		0xedcba980 },

};



static const struct mt76_reg_pair mt76x0_bbp_init_tab[] = {

drivers/net/wireless/mediatek/mt76/mt76x0/pci.c

+10 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static const struct ieee80211_ops mt76x0e_ops = { 
	.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,

	.wake_tx_queue = mt76_wake_tx_queue,

	.get_survey = mt76_get_survey,

	.get_txpower = mt76x02_get_txpower,

	.get_txpower = mt76_get_txpower,

	.flush = mt76x0e_flush,

	.set_tim = mt76x0e_set_tim,

	.release_buffered_frames = mt76_release_buffered_frames,
@@ -141,6 +141,15 @@ static int mt76x0e_register_device(struct mt76x02_dev *dev) 
	mt76_clear(dev, 0x110, BIT(9));

	mt76_set(dev, MT_MAX_LEN_CFG, BIT(13));



	mt76_wr(dev, MT_CH_TIME_CFG,

		MT_CH_TIME_CFG_TIMER_EN |

		MT_CH_TIME_CFG_TX_AS_BUSY |

		MT_CH_TIME_CFG_RX_AS_BUSY |

		MT_CH_TIME_CFG_NAV_AS_BUSY |

		MT_CH_TIME_CFG_EIFS_AS_BUSY |

		MT_CH_CCA_RC_EN |

		FIELD_PREP(MT_CH_TIME_CFG_CH_TIMER_CLR, 1));



	err = mt76x0_register_device(dev);

	if (err < 0)

		return err;