Commit 98f80899 authored by Kalle Valo's avatar Kalle Valo
Browse files

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

mt76 patches for 5.9

* locking fixes
* tx queue mapping fixes for 7615/7915
* ARP filter offload for 7663
* runtime power management for 7663
* testmode support for mfg calibration
* memory leak fixes
* support for more channels

# gpg: Signature made Tue 21 Jul 2020 08:01:28 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 dfecd3e0 5648d1c9

drivers/net/wireless/mediatek/mt76/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ config MT76_USB 
	tristate

	depends on MT76_CORE



config MT76_SDIO

	tristate

	depends on MT76_CORE



config MT76x02_LIB

	tristate

	select MT76_CORE

drivers/net/wireless/mediatek/mt76/Makefile

+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_MT76_CORE) += mt76.o

obj-$(CONFIG_MT76_USB) += mt76-usb.o

obj-$(CONFIG_MT76_SDIO) += mt76-sdio.o

obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o

obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o
@@ -9,8 +10,10 @@ mt76-y := \ 
	tx.o agg-rx.o mcu.o



mt76-$(CONFIG_PCI) += pci.o

mt76-$(CONFIG_NL80211_TESTMODE) += testmode.o



mt76-usb-y := usb.o usb_trace.o

mt76-sdio-y := sdio.o



CFLAGS_trace.o := -I$(src)

CFLAGS_usb_trace.o := -I$(src)

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

+2 −5
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ mt76_reg_set(void *data, u64 val) 
{

	struct mt76_dev *dev = data;



	dev->bus->wr(dev, dev->debugfs_reg, val);

	__mt76_wr(dev, dev->debugfs_reg, val);

	return 0;

}
@@ -18,7 +18,7 @@ mt76_reg_get(void *data, u64 *val) 
{

	struct mt76_dev *dev = data;



	*val = dev->bus->rr(dev, dev->debugfs_reg);

	*val = __mt76_rr(dev, dev->debugfs_reg);

	return 0;

}
@@ -54,9 +54,6 @@ static int mt76_rx_queues_read(struct seq_file *s, void *data) 
	mt76_for_each_q_rx(dev, i) {

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



		if (!q->ndesc)

			continue;



		queued = mt76_is_usb(dev) ? q->ndesc - q->queued : q->queued;

		seq_printf(s, "%d:	queued=%d head=%d tail=%d\n",

			   i, queued, q->head, q->tail);

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

+6 −0
Original line number Diff line number Diff line
@@ -370,6 +370,12 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, 
				 tx_info.buf[n].len, DMA_TO_DEVICE);



free:

#ifdef CONFIG_NL80211_TESTMODE

	/* fix tx_done accounting on queue overflow */

	if (tx_info.skb == dev->test.tx_skb)

		dev->test.tx_done--;

#endif



	e.skb = tx_info.skb;

	e.txwi = t;

	dev->drv->tx_complete_skb(dev, qid, &e);

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

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len) 
					   &data[i]);

	}



#ifdef CONFIG_NL80211_TESTMODE

	dev->test.mtd_name = devm_kstrdup(dev->dev, part, GFP_KERNEL);

	dev->test.mtd_offset = offset;

#endif



out_put_node:

	of_node_put(np);

	return ret;