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

Commit 9829a0bd authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2019-06-27' of https://github.com/nbd168/wireless 

mt76 patches for 5.3

* use NAPI polling for tx cleanup on mt7603/mt7615
* various fixes for mt7615
* unify some code between mt7603 and mt7615
* fix locking issues on mt76x02
* add support for toggling edcca on mt7603
* fix reading target tx power with ext PA on mt7603/mt7615
* fix initalizing channel maximum power
* fix rate control / tx status reporting issues on mt76x02/mt7603
* add support for eeprom calibration data from mtd on mt7615
* support configuring tx power on mt7615
* fix external PA support on mt76x0
* per-chain signal reporting on mt7615
* rx/tx buffer fixes for USB devices
parents b7414222 676fabd1

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

+1 −0
Original line number Diff line number Diff line
@@ -588,6 +588,7 @@ void mt76_dma_cleanup(struct mt76_dev *dev) 
{

	int i;



	netif_napi_del(&dev->tx_napi);

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

		mt76_dma_tx_cleanup(dev, i, true);

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

+60 −2
Original line number Diff line number Diff line
@@ -766,10 +766,21 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	*dbm = DIV_ROUND_UP(dev->txpower_cur, 2);



	/* convert from per-chain power to combined

	 * output on 2x2 devices

	 * output power

	 */

	if (n_chains > 1)

	switch (n_chains) {

	case 4:

		*dbm += 6;

		break;

	case 3:

		*dbm += 4;

		break;

	case 2:

		*dbm += 3;

		break;

	default:

		break;

	}



	return 0;

}
@@ -820,3 +831,50 @@ mt76_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set) 
	return 0;

}

EXPORT_SYMBOL_GPL(mt76_set_tim);



void mt76_insert_ccmp_hdr(struct sk_buff *skb, u8 key_id)

{

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

	int hdr_len = ieee80211_get_hdrlen_from_skb(skb);

	u8 *hdr, *pn = status->iv;



	__skb_push(skb, 8);

	memmove(skb->data, skb->data + 8, hdr_len);

	hdr = skb->data + hdr_len;



	hdr[0] = pn[5];

	hdr[1] = pn[4];

	hdr[2] = 0;

	hdr[3] = 0x20 | (key_id << 6);

	hdr[4] = pn[3];

	hdr[5] = pn[2];

	hdr[6] = pn[1];

	hdr[7] = pn[0];



	status->flag &= ~RX_FLAG_IV_STRIPPED;

}

EXPORT_SYMBOL_GPL(mt76_insert_ccmp_hdr);



int mt76_get_rate(struct mt76_dev *dev,

		  struct ieee80211_supported_band *sband,

		  int idx, bool cck)

{

	int i, offset = 0, len = sband->n_bitrates;



	if (cck) {

		if (sband == &dev->sband_5g.sband)

			return 0;



		idx &= ~BIT(2); /* short preamble */

	} else if (sband == &dev->sband_2g.sband) {

		offset = 4;

	}



	for (i = offset; i < len; i++) {

		if ((sband->bitrates[i].hw_value & GENMASK(7, 0)) == idx)

			return i;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(mt76_get_rate);

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

+19 −4
Original line number Diff line number Diff line
@@ -258,10 +258,11 @@ struct mt76_rx_tid { 
#define MT_TX_CB_TXS_DONE		BIT(1)

#define MT_TX_CB_TXS_FAILED		BIT(2)



#define MT_PACKET_ID_MASK		GENMASK(7, 0)

#define MT_PACKET_ID_MASK		GENMASK(6, 0)

#define MT_PACKET_ID_NO_ACK		0

#define MT_PACKET_ID_NO_SKB		1

#define MT_PACKET_ID_FIRST		2

#define MT_PACKET_ID_HAS_RATE		BIT(7)



#define MT_TX_STATUS_SKB_TIMEOUT	HZ
@@ -381,7 +382,8 @@ enum mt76u_out_ep { 
	__MT_EP_OUT_MAX,

};



#define MT_SG_MAX_SIZE		8

#define MT_TX_SG_MAX_SIZE	8

#define MT_RX_SG_MAX_SIZE	1

#define MT_NUM_TX_ENTRIES	256

#define MT_NUM_RX_ENTRIES	128

#define MCU_RESP_URB_SIZE	1024
@@ -393,9 +395,7 @@ struct mt76_usb { 
	struct delayed_work stat_work;



	u8 out_ep[__MT_EP_OUT_MAX];

	u16 out_max_packet;

	u8 in_ep[__MT_EP_IN_MAX];

	u16 in_max_packet;

	bool sg_en;



	struct mt76u_mcu {
@@ -452,6 +452,7 @@ struct mt76_dev { 
	int tx_dma_idx[4];



	struct tasklet_struct tx_tasklet;

	struct napi_struct tx_napi;

	struct delayed_work mac_work;



	wait_queue_head_t tx_wait;
@@ -483,6 +484,8 @@ struct mt76_dev { 
	int txpower_conf;

	int txpower_cur;



	enum nl80211_dfs_regions region;



	u32 debugfs_reg;



	struct led_classdev led_cdev;
@@ -688,6 +691,14 @@ static inline void mt76_insert_hdr_pad(struct sk_buff *skb) 
	skb->data[len + 1] = 0;

}



static inline bool mt76_is_skb_pktid(u8 pktid)

{

	if (pktid & MT_PACKET_ID_HAS_RATE)

		return false;



	return pktid >= MT_PACKET_ID_FIRST;

}



void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb);

void mt76_tx(struct mt76_dev *dev, struct ieee80211_sta *sta,

	     struct mt76_wcid *wcid, struct sk_buff *skb);
@@ -749,6 +760,10 @@ void mt76_csa_check(struct mt76_dev *dev); 
void mt76_csa_finish(struct mt76_dev *dev);



int mt76_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set);

void mt76_insert_ccmp_hdr(struct sk_buff *skb, u8 key_id);

int mt76_get_rate(struct mt76_dev *dev,

		  struct ieee80211_supported_band *sband,

		  int idx, bool cck);



/* internal */

void mt76_tx_free(struct mt76_dev *dev);

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ irqreturn_t mt7603_irq_handler(int irq, void *dev_instance) 


	if (intr & MT_INT_TX_DONE_ALL) {

		mt7603_irq_disable(dev, MT_INT_TX_DONE_ALL);

		tasklet_schedule(&dev->mt76.tx_tasklet);

		napi_schedule(&dev->mt76.tx_napi);

	}



	if (intr & MT_INT_RX_DONE(0)) {

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

+30 −0
Original line number Diff line number Diff line
@@ -40,6 +40,35 @@ mt7603_radio_read(struct seq_file *s, void *data) 
	return 0;

}



static int

mt7603_edcca_set(void *data, u64 val)

{

	struct mt7603_dev *dev = data;



	mutex_lock(&dev->mt76.mutex);



	dev->ed_monitor_enabled = !!val;

	dev->ed_monitor = dev->ed_monitor_enabled &&

			  dev->mt76.region == NL80211_DFS_ETSI;

	mt7603_init_edcca(dev);



	mutex_unlock(&dev->mt76.mutex);



	return 0;

}



static int

mt7603_edcca_get(void *data, u64 *val)

{

	struct mt7603_dev *dev = data;



	*val = dev->ed_monitor_enabled;

	return 0;

}



DEFINE_DEBUGFS_ATTRIBUTE(fops_edcca, mt7603_edcca_get,

			 mt7603_edcca_set, "%lld\n");



void mt7603_init_debugfs(struct mt7603_dev *dev)

{

	struct dentry *dir;
@@ -48,6 +77,7 @@ void mt7603_init_debugfs(struct mt7603_dev *dev) 
	if (!dir)

		return;



	debugfs_create_file("edcca", 0600, dir, dev, &fops_edcca);

	debugfs_create_u32("reset_test", 0600, dir, &dev->reset_test);

	debugfs_create_devm_seqfile(dev->mt76.dev, "reset", dir,

				    mt7603_reset_read);