Commit 12996160 authored by Kalle Valo's avatar Kalle Valo
Browse files

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

mt76 patches for 5.12

* add new mt7921e driver
* factor out common code shared between 7615/7663 and 7921
* performance optimizations
* 7915 dbdc fixes
* 802.11 encap offload support
* support for multiple pcie gen1 host interfaces on 7915
* 7915 testmode support
* bugfixes
* testmode support enhancements
* endian fixes
* 7915 txbf support
parents b7e6725d d2bf7959

drivers/net/wireless/mediatek/mt76/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -24,8 +24,13 @@ config MT76x02_USB 
	tristate

	select MT76_USB



config MT76_CONNAC_LIB

	tristate

	select MT76_CORE



source "drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig"

source "drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig"

source "drivers/net/wireless/mediatek/mt76/mt7603/Kconfig"

source "drivers/net/wireless/mediatek/mt76/mt7615/Kconfig"

source "drivers/net/wireless/mediatek/mt76/mt7915/Kconfig"

source "drivers/net/wireless/mediatek/mt76/mt7921/Kconfig"

drivers/net/wireless/mediatek/mt76/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 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

obj-$(CONFIG_MT76_CONNAC_LIB) += mt76-connac-lib.o



mt76-y := \

	mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o \
@@ -26,8 +27,11 @@ mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \ 


mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o



mt76-connac-lib-y := mt76_connac_mcu.o mt76_connac_mac.o



obj-$(CONFIG_MT76x0_COMMON) += mt76x0/

obj-$(CONFIG_MT76x2_COMMON) += mt76x2/

obj-$(CONFIG_MT7603E) += mt7603/

obj-$(CONFIG_MT7615_COMMON) += mt7615/

obj-$(CONFIG_MT7915E) += mt7915/

obj-$(CONFIG_MT7921E) += mt7921/

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

+6 −2
Original line number Diff line number Diff line
@@ -411,8 +411,12 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, 
free:

#ifdef CONFIG_NL80211_TESTMODE

	/* fix tx_done accounting on queue overflow */

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

		dev->test.tx_done--;

	if (mt76_is_testmode_skb(dev, skb, &hw)) {

		struct mt76_phy *phy = hw->priv;



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

			phy->test.tx_done--;

	}

#endif



	e.skb = tx_info.skb;

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

+2 −2
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len) 
	}



#ifdef CONFIG_NL80211_TESTMODE

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

	dev->test.mtd_offset = offset;

	dev->test_mtd.name = devm_kstrdup(dev->dev, part, GFP_KERNEL);

	dev->test_mtd.offset = offset;

#endif



out_put_node:

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

+4 −4
Original line number Diff line number Diff line
@@ -387,9 +387,9 @@ 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);

	dev->phy2 = NULL;

}

EXPORT_SYMBOL_GPL(mt76_unregister_phy);
@@ -519,10 +519,10 @@ void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb) 
	}



#ifdef CONFIG_NL80211_TESTMODE

	if (dev->test.state == MT76_TM_STATE_RX_FRAMES) {

		dev->test.rx_stats.packets[q]++;

	if (phy->test.state == MT76_TM_STATE_RX_FRAMES) {

		phy->test.rx_stats.packets[q]++;

		if (status->flag & RX_FLAG_FAILED_FCS_CRC)

			dev->test.rx_stats.fcs_error[q]++;

			phy->test.rx_stats.fcs_error[q]++;

	}

#endif

	__skb_queue_tail(&dev->rx_skb[q], skb);