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

Merge tag 'wireless-drivers-2021-12-01' of... 

Merge tag 'wireless-drivers-2021-12-01' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

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

First set of fixes for v5.16. Mostly crash and driver initialisation
fixes, the fix for rtw89 being most important.

iwlwifi

* compiler, lockdep and smatch warning fixes

* fix for a rare driver initialisation failure

* fix a memory leak

rtw89

* fix const buffer modification causing a kernel crash

mt76

* fix null pointer access

* fix idr leak

rt2x00

* fix driver initialisation errors, a regression since v5.2-rc1
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4326d04f 191587cd

drivers/net/wireless/intel/iwlwifi/fw/uefi.c

+6 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static void *iwl_uefi_reduce_power_section(struct iwl_trans *trans, 
		if (len < tlv_len) {

			IWL_ERR(trans, "invalid TLV len: %zd/%u\n",

				len, tlv_len);

			kfree(reduce_power_data);

			reduce_power_data = ERR_PTR(-EINVAL);

			goto out;

		}
@@ -105,6 +106,7 @@ static void *iwl_uefi_reduce_power_section(struct iwl_trans *trans, 
				IWL_DEBUG_FW(trans,

					     "Couldn't allocate (more) reduce_power_data\n");



				kfree(reduce_power_data);

				reduce_power_data = ERR_PTR(-ENOMEM);

				goto out;

			}
@@ -134,6 +136,10 @@ static void *iwl_uefi_reduce_power_section(struct iwl_trans *trans, 
done:

	if (!size) {

		IWL_DEBUG_FW(trans, "Empty REDUCE_POWER, skipping.\n");

		/* Better safe than sorry, but 'reduce_power_data' should

		 * always be NULL if !size.

		 */

		kfree(reduce_power_data);

		reduce_power_data = ERR_PTR(-ENOENT);

		goto out;

	}

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+15 −7
Original line number Diff line number Diff line
@@ -1313,6 +1313,9 @@ _iwl_op_mode_start(struct iwl_drv *drv, struct iwlwifi_opmode_table *op) 
	const struct iwl_op_mode_ops *ops = op->ops;

	struct dentry *dbgfs_dir = NULL;

	struct iwl_op_mode *op_mode = NULL;

	int retry, max_retry = !!iwlwifi_mod_params.fw_restart * IWL_MAX_INIT_RETRY;



	for (retry = 0; retry <= max_retry; retry++) {



#ifdef CONFIG_IWLWIFI_DEBUGFS

		drv->dbgfs_op_mode = debugfs_create_dir(op->name,
@@ -1320,16 +1323,21 @@ _iwl_op_mode_start(struct iwl_drv *drv, struct iwlwifi_opmode_table *op) 
		dbgfs_dir = drv->dbgfs_op_mode;

#endif



	op_mode = ops->start(drv->trans, drv->trans->cfg, &drv->fw, dbgfs_dir);

		op_mode = ops->start(drv->trans, drv->trans->cfg,

				     &drv->fw, dbgfs_dir);



		if (op_mode)

			return op_mode;



		IWL_ERR(drv, "retry init count %d\n", retry);



#ifdef CONFIG_IWLWIFI_DEBUGFS

	if (!op_mode) {

		debugfs_remove_recursive(drv->dbgfs_op_mode);

		drv->dbgfs_op_mode = NULL;

	}

#endif

	}



	return op_mode;

	return NULL;

}



static void _iwl_op_mode_stop(struct iwl_drv *drv)

drivers/net/wireless/intel/iwlwifi/iwl-drv.h

+3 −0
Original line number Diff line number Diff line
@@ -89,4 +89,7 @@ void iwl_drv_stop(struct iwl_drv *drv); 
#define IWL_EXPORT_SYMBOL(sym)

#endif



/* max retry for init flow */

#define IWL_MAX_INIT_RETRY 2



#endif /* __iwl_drv_h__ */

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

+23 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <net/ieee80211_radiotap.h>

#include <net/tcp.h>



#include "iwl-drv.h"

#include "iwl-op-mode.h"

#include "iwl-io.h"

#include "mvm.h"
@@ -1117,9 +1118,30 @@ static int iwl_mvm_mac_start(struct ieee80211_hw *hw) 
{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	int ret;

	int retry, max_retry = 0;



	mutex_lock(&mvm->mutex);



	/* we are starting the mac not in error flow, and restart is enabled */

	if (!test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status) &&

	    iwlwifi_mod_params.fw_restart) {

		max_retry = IWL_MAX_INIT_RETRY;

		/*

		 * This will prevent mac80211 recovery flows to trigger during

		 * init failures

		 */

		set_bit(IWL_MVM_STATUS_STARTING, &mvm->status);

	}



	for (retry = 0; retry <= max_retry; retry++) {

		ret = __iwl_mvm_mac_start(mvm);

		if (!ret)

			break;



		IWL_ERR(mvm, "mac start retry %d\n", retry);

	}

	clear_bit(IWL_MVM_STATUS_STARTING, &mvm->status);



	mutex_unlock(&mvm->mutex);



	return ret;

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+3 −0
Original line number Diff line number Diff line
@@ -1123,6 +1123,8 @@ struct iwl_mvm { 
 * @IWL_MVM_STATUS_FIRMWARE_RUNNING: firmware is running

 * @IWL_MVM_STATUS_NEED_FLUSH_P2P: need to flush P2P bcast STA

 * @IWL_MVM_STATUS_IN_D3: in D3 (or at least about to go into it)

 * @IWL_MVM_STATUS_STARTING: starting mac,

 *	used to disable restart flow while in STARTING state

 */

enum iwl_mvm_status {

	IWL_MVM_STATUS_HW_RFKILL,
@@ -1134,6 +1136,7 @@ enum iwl_mvm_status { 
	IWL_MVM_STATUS_FIRMWARE_RUNNING,

	IWL_MVM_STATUS_NEED_FLUSH_P2P,

	IWL_MVM_STATUS_IN_D3,

	IWL_MVM_STATUS_STARTING,

};



/* Keep track of completed init configuration */