Commit 5cf2740f authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2020-05-28' of https://github.com/nbd168/wireless 

mt76 patches for 5.8

* fixes for sparse warnings
* DBDC fixes
* mt7663 remain-on-channel support
* mt7915 spatial reuse support
* mt7915 radiotap fix
* station wcid allocation fix
* mt7663 powersave fix
* mt7663 scan fix
* mt7611n support
* cleanup

# gpg: Signature made Thu 28 May 2020 07:02:21 PM EEST using DSA key ID 02A76EF5
# gpg: Good signature from "Felix Fietkau <nbd@nbd.name>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 75D1 1A7D 91A7 710F 4900  42EF D77D 141D 02A7 6EF5
parents 982d7287 d9045b18

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int mt76_rx_queues_read(struct seq_file *s, void *data) 
	struct mt76_dev *dev = dev_get_drvdata(s->private);

	int i, queued;



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

	mt76_for_each_q_rx(dev, i) {

		struct mt76_queue *q = &dev->q_rx[i];



		if (!q->ndesc)

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

+2 −2
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ mt76_dma_init(struct mt76_dev *dev) 


	init_dummy_netdev(&dev->napi_dev);



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

	mt76_for_each_q_rx(dev, i) {

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

			       64);

		mt76_dma_rx_fill(dev, &dev->q_rx[i]);
@@ -610,7 +610,7 @@ void mt76_dma_cleanup(struct mt76_dev *dev) 
	for (i = 0; i < ARRAY_SIZE(dev->q_tx); i++)

		mt76_dma_tx_cleanup(dev, i, true);



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

	mt76_for_each_q_rx(dev, i) {

		netif_napi_del(&dev->napi[i]);

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

	}

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

+7 −3
Original line number Diff line number Diff line
@@ -288,8 +288,8 @@ enum { 
	MT76_REMOVED,

	MT76_READING_STATS,

	MT76_STATE_POWER_OFF,

	MT76_STATE_PS,

	MT76_STATE_SUSPEND,

	MT76_STATE_ROC,

};



struct mt76_hw_cap {
@@ -537,8 +537,8 @@ struct mt76_dev { 
	wait_queue_head_t tx_wait;

	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];

	u32 wcid_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];

	u32 wcid_phy_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];



	struct mt76_wcid global_wcid;

	struct mt76_wcid __rcu *wcid[MT76_N_WCIDS];
@@ -671,6 +671,10 @@ static inline u16 mt76_rev(struct mt76_dev *dev) 
#define mt76_queue_tx_cleanup(dev, ...)	(dev)->mt76.queue_ops->tx_cleanup(&((dev)->mt76), __VA_ARGS__)

#define mt76_queue_kick(dev, ...)	(dev)->mt76.queue_ops->kick(&((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++)



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

				   const struct ieee80211_ops *ops,

				   const struct mt76_driver_ops *drv_ops);

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

+4 −3
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ mt7603_rx_get_wcid(struct mt7603_dev *dev, u8 idx, bool unicast) 
	struct mt7603_sta *sta;

	struct mt76_wcid *wcid;



	if (idx >= ARRAY_SIZE(dev->mt76.wcid))

	if (idx >= MT7603_WTBL_SIZE)

		return NULL;



	wcid = rcu_dereference(dev->mt76.wcid[idx]);
@@ -1238,7 +1238,7 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data) 
	if (pid == MT_PACKET_ID_NO_ACK)

		return;



	if (wcidx >= ARRAY_SIZE(dev->mt76.wcid))

	if (wcidx >= MT7603_WTBL_SIZE)

		return;



	rcu_read_lock();
@@ -1438,8 +1438,9 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev) 
	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++)

	mt76_for_each_q_rx(&dev->mt76, i) {

		mt76_queue_rx_reset(dev, i);

	}



	mt7603_dma_sched_reset(dev);

drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c

+7 −0
Original line number Diff line number Diff line
@@ -111,6 +111,12 @@ mt7615_eeprom_parse_hw_band_cap(struct mt7615_dev *dev) 
		return;

	}



	if (is_mt7611(&dev->mt76)) {

		/* 5GHz only */

		dev->mt76.cap.has_5ghz = true;

		return;

	}



	val = FIELD_GET(MT_EE_NIC_WIFI_CONF_BAND_SEL,

			eeprom[MT_EE_WIFI_CONF]);

	switch (val) {
@@ -310,6 +316,7 @@ static void mt7615_cal_free_data(struct mt7615_dev *dev) 
		mt7622_apply_cal_free_data(dev);

		break;

	case 0x7615:

	case 0x7611:

		mt7615_apply_cal_free_data(dev);

		break;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE