Commit 47c2be0c authored by Kalle Valo's avatar Kalle Valo
Browse files

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

mt76 patches for 5.1

* fix hardware restart for mt76x2
* fix writing txwi on USB devices
* fix (and disable by default) ED/CCA support on 76x2
* fix powersave issues on 7603
* fix return value check for ioremap on 7603
* fix duplicate USB device IDs
parents 4177c5d9 411e05f4

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

+6 −1
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx, 
static void

mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q)

{

	iowrite32(q->desc_dma, &q->regs->desc_base);

	iowrite32(q->ndesc, &q->regs->ring_size);

	q->head = ioread32(&q->regs->dma_idx);

	q->tail = q->head;

	iowrite32(q->head, &q->regs->cpu_idx);
@@ -180,7 +182,10 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush) 
	else

		mt76_dma_sync_idx(dev, q);



	wake = wake && qid < IEEE80211_NUM_ACS && q->queued < q->ndesc - 8;

	wake = wake && q->stopped &&

	       qid < IEEE80211_NUM_ACS && q->queued < q->ndesc - 8;

	if (wake)

		q->stopped = false;



	if (!q->queued)

		wake_up(&dev->tx_wait);

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

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ struct mt76_queue { 
	int ndesc;

	int queued;

	int buf_size;

	bool stopped;



	u8 buf_offset;

	u8 hw_idx;
@@ -143,6 +144,7 @@ struct mt76_mcu_ops { 
			 const struct mt76_reg_pair *rp, int len);

	int (*mcu_rd_rp)(struct mt76_dev *dev, u32 base,

			 struct mt76_reg_pair *rp, int len);

	int (*mcu_restart)(struct mt76_dev *dev);

};



struct mt76_queue_ops {

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

+15 −2
Original line number Diff line number Diff line
@@ -27,12 +27,16 @@ static void 
mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)

{

	__le32 *txd = (__le32 *)skb->data;

	struct ieee80211_hdr *hdr;

	struct ieee80211_sta *sta;

	struct mt7603_sta *msta;

	struct mt76_wcid *wcid;

	void *priv;

	int idx;

	u32 val;

	u8 tid;



	if (skb->len < sizeof(MT_TXD_SIZE) + sizeof(struct ieee80211_hdr))

	if (skb->len < MT_TXD_SIZE + sizeof(struct ieee80211_hdr))

		goto free;



	val = le32_to_cpu(txd[1]);
@@ -46,10 +50,19 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) 
	if (!wcid)

		goto free;



	msta = container_of(wcid, struct mt7603_sta, wcid);

	priv = msta = container_of(wcid, struct mt7603_sta, wcid);

	val = le32_to_cpu(txd[0]);

	skb_set_queue_mapping(skb, FIELD_GET(MT_TXD0_Q_IDX, val));



	val &= ~(MT_TXD0_P_IDX | MT_TXD0_Q_IDX);

	val |= FIELD_PREP(MT_TXD0_Q_IDX, MT_TX_HW_QUEUE_MGMT);

	txd[0] = cpu_to_le32(val);



	sta = container_of(priv, struct ieee80211_sta, drv_priv);

	hdr = (struct ieee80211_hdr *) &skb->data[MT_TXD_SIZE];

	tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;

	ieee80211_sta_set_buffered(sta, tid, true);



	spin_lock_bh(&dev->ps_lock);

	__skb_queue_tail(&msta->psq, skb);

	if (skb_queue_len(&msta->psq) >= 64) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1072,7 +1072,7 @@ out: 
	case MT_PHY_TYPE_HT:

		final_rate_flags |= IEEE80211_TX_RC_MCS;

		final_rate &= GENMASK(5, 0);

		if (i > 15)

		if (final_rate > 15)

			return false;

		break;

	default:

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

+16 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/pci.h>

#include <linux/module.h>

#include "mt7603.h"

#include "mac.h"

#include "eeprom.h"



static int
@@ -385,6 +386,15 @@ mt7603_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps) 
	mt7603_ps_tx_list(dev, &list);

}



static void

mt7603_ps_set_more_data(struct sk_buff *skb)

{

	struct ieee80211_hdr *hdr;



	hdr = (struct ieee80211_hdr *) &skb->data[MT_TXD_SIZE];

	hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);

}



static void

mt7603_release_buffered_frames(struct ieee80211_hw *hw,

			       struct ieee80211_sta *sta,
@@ -399,6 +409,8 @@ mt7603_release_buffered_frames(struct ieee80211_hw *hw, 


	__skb_queue_head_init(&list);



	mt7603_wtbl_set_ps(dev, msta, false);



	spin_lock_bh(&dev->ps_lock);

	skb_queue_walk_safe(&msta->psq, skb, tmp) {

		if (!nframes)
@@ -409,11 +421,15 @@ mt7603_release_buffered_frames(struct ieee80211_hw *hw, 


		skb_set_queue_mapping(skb, MT_TXQ_PSD);

		__skb_unlink(skb, &msta->psq);

		mt7603_ps_set_more_data(skb);

		__skb_queue_tail(&list, skb);

		nframes--;

	}

	spin_unlock_bh(&dev->ps_lock);



	if (!skb_queue_empty(&list))

		ieee80211_sta_eosp(sta);



	mt7603_ps_tx_list(dev, &list);



	if (nframes)

CRA Git | Maintained and supported by SUSTech CRA and CCSE