Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9434dca9 authored by Kalle Valo's avatar Kalle Valo
Browse files

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

mt76 patches for 4.20

* unify code between mt76x0, mt76x2
* mt76x0 fixes
* tx power configuration fix for 76x2
* more progress on mt76x0e support
* support for getting firmware version via ethtool
* fix for rx buffer allocation regression on usb
* fix for handling powersave responses
* fix for mt76x2 beacon transmission
parents 09afaba1 5289976a

drivers/net/wireless/mediatek/mt76/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ mt76-usb-y := usb.o usb_trace.o usb_mcu.o 
CFLAGS_trace.o := -I$(src)

CFLAGS_usb_trace.o := -I$(src)



mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o

mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \

		 mt76x02_eeprom.o mt76x02_phy.o mt76x02_mmio.o



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

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

+31 −0
Original line number Diff line number Diff line
@@ -56,6 +56,35 @@ mt76_queues_read(struct seq_file *s, void *data) 
	return 0;

}



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

			 s8 *val, int len)

{

	int i;



	seq_printf(file, "%10s:", str);

	for (i = 0; i < len; i++)

		seq_printf(file, " %2d", val[i]);

	seq_puts(file, "\n");

}

EXPORT_SYMBOL_GPL(mt76_seq_puts_array);



static int mt76_read_rate_txpower(struct seq_file *s, void *data)

{

	struct mt76_dev *dev = dev_get_drvdata(s->private);



	mt76_seq_puts_array(s, "CCK", dev->rate_power.cck,

			    ARRAY_SIZE(dev->rate_power.cck));

	mt76_seq_puts_array(s, "OFDM", dev->rate_power.ofdm,

			    ARRAY_SIZE(dev->rate_power.ofdm));

	mt76_seq_puts_array(s, "STBC", dev->rate_power.stbc,

			    ARRAY_SIZE(dev->rate_power.stbc));

	mt76_seq_puts_array(s, "HT", dev->rate_power.ht,

			    ARRAY_SIZE(dev->rate_power.ht));

	mt76_seq_puts_array(s, "VHT", dev->rate_power.vht,

			    ARRAY_SIZE(dev->rate_power.vht));

	return 0;

}



struct dentry *mt76_register_debugfs(struct mt76_dev *dev)

{

	struct dentry *dir;
@@ -72,6 +101,8 @@ struct dentry *mt76_register_debugfs(struct mt76_dev *dev) 
	if (dev->otp.data)

		debugfs_create_blob("otp", 0400, dir, &dev->otp);

	debugfs_create_devm_seqfile(dev->dev, "queues", dir, mt76_queues_read);

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

				    mt76_read_rate_txpower);



	return dir;

}

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

+6 −0
Original line number Diff line number Diff line
@@ -550,6 +550,12 @@ mt76_check_ps(struct mt76_dev *dev, struct sk_buff *skb) 
	struct mt76_wcid *wcid = status->wcid;

	bool ps;



	if (ieee80211_is_pspoll(hdr->frame_control) && !wcid) {

		sta = ieee80211_find_sta_by_ifaddr(dev->hw, hdr->addr2, NULL);

		if (sta)

			wcid = status->wcid = (struct mt76_wcid *) sta->drv_priv;

	}



	if (!wcid || !wcid->sta)

		return;

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

+27 −0
Original line number Diff line number Diff line
@@ -46,6 +46,30 @@ static void mt76_mmio_copy(struct mt76_dev *dev, u32 offset, const void *data, 
	__iowrite32_copy(dev->mmio.regs + offset, data, len >> 2);

}



static int mt76_mmio_wr_rp(struct mt76_dev *dev, u32 base,

			   const struct mt76_reg_pair *data, int len)

{

	while (len > 0) {

		mt76_mmio_wr(dev, data->reg, data->value);

		data++;

		len--;

	}



	return 0;

}



static int mt76_mmio_rd_rp(struct mt76_dev *dev, u32 base,

			   struct mt76_reg_pair *data, int len)

{

	while (len > 0) {

		data->value = mt76_mmio_rr(dev, data->reg);

		data++;

		len--;

	}



	return 0;

}



void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs)

{

	static const struct mt76_bus_ops mt76_mmio_ops = {
@@ -53,6 +77,8 @@ void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs) 
		.rmw = mt76_mmio_rmw,

		.wr = mt76_mmio_wr,

		.copy = mt76_mmio_copy,

		.wr_rp = mt76_mmio_wr_rp,

		.rd_rp = mt76_mmio_rd_rp,

	};



	dev->bus = &mt76_mmio_ops;
@@ -60,6 +86,7 @@ void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs) 


	skb_queue_head_init(&dev->mmio.mcu.res_q);

	init_waitqueue_head(&dev->mmio.mcu.wait);

	spin_lock_init(&dev->mmio.irq_lock);

	mutex_init(&dev->mmio.mcu.mutex);

}

EXPORT_SYMBOL_GPL(mt76_mmio_init);

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

+25 −14
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ struct mt76_queue { 
	dma_addr_t desc_dma;

	struct sk_buff *rx_head;

	struct page_frag_cache rx_page;

	spinlock_t rx_page_lock;

};



struct mt76_mcu_ops {
@@ -275,6 +276,19 @@ struct mt76_sband { 
	struct mt76_channel_state *chan;

};



struct mt76_rate_power {

	union {

		struct {

			s8 cck[4];

			s8 ofdm[8];

			s8 stbc[10];

			s8 ht[16];

			s8 vht[10];

		};

		s8 all[48];

	};

};



/* addr req mask */

#define MT_VEND_TYPE_EEPROM	BIT(31)

#define MT_VEND_TYPE_CFG	BIT(30)
@@ -349,6 +363,8 @@ struct mt76_mmio { 
		u32 msg_seq;

	} mcu;

	void __iomem *regs;

	spinlock_t irq_lock;

	u32 irqmask;

};



struct mt76_dev {
@@ -388,6 +404,7 @@ struct mt76_dev { 
	unsigned long state;



	u8 antenna_mask;

	u16 chainmask;



	struct mt76_sband sband_2g;

	struct mt76_sband sband_5g;
@@ -395,6 +412,10 @@ struct mt76_dev { 
	struct debugfs_blob_wrapper otp;

	struct mt76_hw_cap cap;



	struct mt76_rate_power rate_power;

	int txpower_conf;

	int txpower_cur;



	u32 debugfs_reg;



	struct led_classdev led_cdev;
@@ -418,18 +439,6 @@ enum mt76_phy_type { 
	MT_PHY_TYPE_VHT,

};



struct mt76_rate_power {

	union {

		struct {

			s8 cck[4];

			s8 ofdm[8];

			s8 ht[16];

			s8 vht[10];

		};

		s8 all[38];

	};

};



struct mt76_rx_status {

	struct mt76_wcid *wcid;
@@ -510,8 +519,8 @@ static inline u16 mt76_rev(struct mt76_dev *dev) 
#define mt76xx_chip(dev) mt76_chip(&((dev)->mt76))

#define mt76xx_rev(dev) mt76_rev(&((dev)->mt76))



#define mt76_init_queues(dev)		(dev)->mt76.queue_ops->init(&((dev)->mt76))

#define mt76_queue_alloc(dev, ...)	(dev)->mt76.queue_ops->alloc(&((dev)->mt76), __VA_ARGS__)

#define __mt76_init_queues(dev)		(dev)->queue_ops->init((dev))

#define __mt76_queue_alloc(dev, ...)	(dev)->queue_ops->alloc((dev), __VA_ARGS__)

#define mt76_queue_add_buf(dev, ...)	(dev)->mt76.queue_ops->add_buf(&((dev)->mt76), __VA_ARGS__)

#define mt76_queue_rx_reset(dev, ...)	(dev)->mt76.queue_ops->rx_reset(&((dev)->mt76), __VA_ARGS__)

#define mt76_queue_tx_cleanup(dev, ...)	(dev)->mt76.queue_ops->tx_cleanup(&((dev)->mt76), __VA_ARGS__)
@@ -539,6 +548,8 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, 
void mt76_unregister_device(struct mt76_dev *dev);



struct dentry *mt76_register_debugfs(struct mt76_dev *dev);

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

			 s8 *val, int len);



int mt76_eeprom_init(struct mt76_dev *dev, int len);

void mt76_eeprom_override(struct mt76_dev *dev);