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

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

mt76 patches for 5.8

* new devices for mt76x0/mt76x2
* mt7615 fixes
* mt7663 fixes
* support for non-offload firmware on mt7663
* hw/sched scan support for mt7663
* mt7615/mt7663 MSI support
* TDLS support
* mt7603/mt7615 rate control fixes
* new driver for mt7915
* wowlan support for mt7663
* suspend/resume support for mt7663

# gpg: Signature made Thu 14 May 2020 01:10:07 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 c73fb4d3 12a87174

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

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ Optional properties: 
- mediatek,mtd-eeprom: Specify a MTD partition + offset containing EEPROM data

- big-endian: if the radio eeprom partition is written in big-endian, specify

  this property

- mediatek,eeprom-merge-otp: Merge EEPROM data with OTP data. Can be used on

  boards where the flash calibration data is generic and specific calibration

  data should be pulled from the OTP ROM



The MAC address can as well be set with corresponding optional properties

defined in net/ethernet.txt.

drivers/net/wireless/mediatek/mt76/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -24,3 +24,4 @@ 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"

drivers/net/wireless/mediatek/mt76/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o 
obj-$(CONFIG_MT76x0_COMMON) += mt76x0/

obj-$(CONFIG_MT76x2_COMMON) += mt76x2/

obj-$(CONFIG_MT7603E) += mt7603/

obj-$(CONFIG_MT7615E) += mt7615/
 
obj-$(CONFIG_MT7615_COMMON) += mt7615/

obj-$(CONFIG_MT7915E) += mt7915/

drivers/net/wireless/mediatek/mt76/agg-rx.c

+6 −6
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void 
mt76_rx_aggr_check_ctl(struct sk_buff *skb, struct sk_buff_head *frames)

{

	struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;

	struct ieee80211_bar *bar = (struct ieee80211_bar *)skb->data;

	struct ieee80211_bar *bar = mt76_skb_get_hdr(skb);

	struct mt76_wcid *wcid = status->wcid;

	struct mt76_rx_tid *tid;

	u16 seqno;
@@ -147,13 +147,13 @@ mt76_rx_aggr_check_ctl(struct sk_buff *skb, struct sk_buff_head *frames) 
void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames)

{

	struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ieee80211_hdr *hdr = mt76_skb_get_hdr(skb);

	struct mt76_wcid *wcid = status->wcid;

	struct ieee80211_sta *sta;

	struct mt76_rx_tid *tid;

	bool sn_less;

	u16 seqno, head, size;

	u8 ackp, idx;

	u16 seqno, head, size, idx;

	u8 ackp;



	__skb_queue_tail(frames, skb);
@@ -239,7 +239,7 @@ out: 
}



int mt76_rx_aggr_start(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tidno,

		       u16 ssn, u8 size)

		       u16 ssn, u16 size)

{

	struct mt76_rx_tid *tid;
@@ -264,7 +264,7 @@ EXPORT_SYMBOL_GPL(mt76_rx_aggr_start); 


static void mt76_rx_aggr_shutdown(struct mt76_dev *dev, struct mt76_rx_tid *tid)

{

	u8 size = tid->size;

	u16 size = tid->size;

	int i;



	spin_lock_bh(&tid->lock);

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

+21 −0
Original line number Diff line number Diff line
@@ -46,6 +46,25 @@ int mt76_queues_read(struct seq_file *s, void *data) 
}

EXPORT_SYMBOL_GPL(mt76_queues_read);



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++) {

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

	}



	return 0;

}



void mt76_seq_puts_array(struct seq_file *file, const char *str,

			 s8 *val, int len)

{
@@ -92,6 +111,8 @@ struct dentry *mt76_register_debugfs(struct mt76_dev *dev) 
		debugfs_create_blob("otp", 0400, dir, &dev->otp);

	debugfs_create_devm_seqfile(dev->dev, "rate_txpower", dir,

				    mt76_read_rate_txpower);

	debugfs_create_devm_seqfile(dev->dev, "rx-queues", dir,

				    mt76_rx_queues_read);



	return dir;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE