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

Merge tag 'wireless-drivers-2020-07-13' of... 

Merge tag 'wireless-drivers-2020-07-13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for v5.8

First set of fixes for v5.8. Various important fixes for iwlwifi and
mt76.

iwlwifi

* fix sleeping under RCU

* fix a kernel crash when using compressed firmware images

mt76

* tx queueing fixes for mt7615/22/63

* locking fix

* fix a crash during watchdog reset

* fix memory leaks
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 46ef5b89 dc7bd30b

drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c

+14 −2
Original line number Diff line number Diff line
@@ -271,6 +271,8 @@ static int iwl_dbg_tlv_alloc_trigger(struct iwl_trans *trans, 
{

	struct iwl_fw_ini_trigger_tlv *trig = (void *)tlv->data;

	u32 tp = le32_to_cpu(trig->time_point);

	struct iwl_ucode_tlv *dup = NULL;

	int ret;



	if (le32_to_cpu(tlv->length) < sizeof(*trig))

		return -EINVAL;
@@ -283,10 +285,20 @@ static int iwl_dbg_tlv_alloc_trigger(struct iwl_trans *trans, 
		return -EINVAL;

	}



	if (!le32_to_cpu(trig->occurrences))

	if (!le32_to_cpu(trig->occurrences)) {

		dup = kmemdup(tlv, sizeof(*tlv) + le32_to_cpu(tlv->length),

				GFP_KERNEL);

		if (!dup)

			return -ENOMEM;

		trig = (void *)dup->data;

		trig->occurrences = cpu_to_le32(-1);

		tlv = dup;

	}



	return iwl_dbg_tlv_add(tlv, &trans->dbg.time_point[tp].trig_list);

	ret = iwl_dbg_tlv_add(tlv, &trans->dbg.time_point[tp].trig_list);

	kfree(dup);



	return ret;

}



static int (*dbg_tlv_alloc[])(struct iwl_trans *trans,

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+3 −5
Original line number Diff line number Diff line
@@ -1189,16 +1189,14 @@ static int iwl_mvm_inactivity_check(struct iwl_mvm *mvm, u8 alloc_for_sta) 
	for_each_set_bit(i, &changetid_queues, IWL_MAX_HW_QUEUES)

		iwl_mvm_change_queue_tid(mvm, i);



	rcu_read_unlock();



	if (free_queue >= 0 && alloc_for_sta != IWL_MVM_INVALID_STA) {

		ret = iwl_mvm_free_inactive_queue(mvm, free_queue, queue_owner,

						  alloc_for_sta);

		if (ret) {

			rcu_read_unlock();

		if (ret)

			return ret;

	}

	}



	rcu_read_unlock();



	return free_queue;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ struct mt76_hw_cap { 
#define MT_DRV_TX_ALIGNED4_SKBS		BIT(1)

#define MT_DRV_SW_RX_AIRTIME		BIT(2)

#define MT_DRV_RX_DMA_HDR		BIT(3)

#define MT_DRV_HW_MGMT_TXQ		BIT(4)



struct mt76_driver_ops {

	u32 drv_flags;

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

+2 −0
Original line number Diff line number Diff line
@@ -642,8 +642,10 @@ mt7603_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class) 
{

	struct mt7603_dev *dev = hw->priv;



	mutex_lock(&dev->mt76.mutex);

	dev->coverage_class = max_t(s16, coverage_class, 0);

	mt7603_mac_set_timing(dev);

	mutex_unlock(&dev->mt76.mutex);

}



static void mt7603_tx(struct ieee80211_hw *hw,

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

+5 −4
Original line number Diff line number Diff line
@@ -234,10 +234,11 @@ mt7615_queues_acq(struct seq_file *s, void *data) 
	int i;



	for (i = 0; i < 16; i++) {

		int j, acs = i / 4, index = i % 4;

		int j, wmm_idx = i % MT7615_MAX_WMM_SETS;

		int acs = i / MT7615_MAX_WMM_SETS;

		u32 ctrl, val, qlen = 0;



		val = mt76_rr(dev, MT_PLE_AC_QEMPTY(acs, index));

		val = mt76_rr(dev, MT_PLE_AC_QEMPTY(acs, wmm_idx));

		ctrl = BIT(31) | BIT(15) | (acs << 8);



		for (j = 0; j < 32; j++) {
@@ -245,11 +246,11 @@ mt7615_queues_acq(struct seq_file *s, void *data) 
				continue;



			mt76_wr(dev, MT_PLE_FL_Q0_CTRL,

				ctrl | (j + (index << 5)));

				ctrl | (j + (wmm_idx << 5)));

			qlen += mt76_get_field(dev, MT_PLE_FL_Q3_CTRL,

					       GENMASK(11, 0));

		}

		seq_printf(s, "AC%d%d: queued=%d\n", acs, index, qlen);

		seq_printf(s, "AC%d%d: queued=%d\n", wmm_idx, acs, qlen);

	}



	return 0;