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

Commit 22781f07 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2019-03-19' of... 

Merge tag 'wireless-drivers-for-davem-2019-03-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 5.1

First set of fixes for 5.1. Lots of fixes for mt76 this time.

iwlwifi

* fix warning with do_div()

mt7601u

* avoid using hardware which is supported by mt76

mt76

* more fixes for hweight8() usage

* 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
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e8629d29 7dfc45e6

drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c

+1 −3
Original line number Diff line number Diff line
@@ -460,9 +460,7 @@ static int iwl_mvm_ftm_range_resp_valid(struct iwl_mvm *mvm, u8 request_id, 
static void iwl_mvm_debug_range_resp(struct iwl_mvm *mvm, u8 index,

				     struct cfg80211_pmsr_result *res)

{

	s64 rtt_avg = res->ftm.rtt_avg * 100;



	do_div(rtt_avg, 6666);

	s64 rtt_avg = div_s64(res->ftm.rtt_avg * 100, 6666);



	IWL_DEBUG_INFO(mvm, "entry %d\n", index);

	IWL_DEBUG_INFO(mvm, "\tstatus: %d\n", res->status);

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/mac80211.c

+11 −7
Original line number Diff line number Diff line
@@ -679,19 +679,15 @@ mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif, 
	return ret;

}



static void

mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,

void __mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta)

{

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

	int idx = wcid->idx;

	int i;

	int i, idx = wcid->idx;



	rcu_assign_pointer(dev->wcid[idx], NULL);

	synchronize_rcu();



	mutex_lock(&dev->mutex);



	if (dev->drv->sta_remove)

		dev->drv->sta_remove(dev, vif, sta);
@@ -699,7 +695,15 @@ mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif, 
	for (i = 0; i < ARRAY_SIZE(sta->txq); i++)

		mt76_txq_remove(dev, sta->txq[i]);

	mt76_wcid_free(dev->wcid_mask, idx);

}

EXPORT_SYMBOL_GPL(__mt76_sta_remove);



static void

mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,

		struct ieee80211_sta *sta)

{

	mutex_lock(&dev->mutex);

	__mt76_sta_remove(dev, vif, sta);

	mutex_unlock(&dev->mutex);

}

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

+4 −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 {
@@ -693,6 +695,8 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		   struct ieee80211_sta *sta,

		   enum ieee80211_sta_state old_state,

		   enum ieee80211_sta_state new_state);

void __mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta);



struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb);

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

+1 −2
Original line number Diff line number Diff line
@@ -135,8 +135,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg) 


out:

	mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false);

	if (dev->mt76.q_tx[MT_TXQ_BEACON].queued >

	    __sw_hweight8(dev->beacon_mask))

	if (dev->mt76.q_tx[MT_TXQ_BEACON].queued > hweight8(dev->beacon_mask))

		dev->beacon_check++;

}