Commit 39fb06f7 authored by Gregory Greenman's avatar Gregory Greenman Committed by Kalle Valo
Browse files

iwlwifi: mvm: rfi: don't lock mvm->mutex when sending config command 



The mutex is already locked in iwl_mvm_mac_start.

Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Fixes: 21254908 ("iwlwifi: mvm: add RFI-M support")
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20210326125611.703288ea058d.I82a0312389032d07c3b478bef3e938e06bfa7df6@changeid
parent 08f4b0b1

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

+5 −2
Original line number Diff line number Diff line
@@ -1786,10 +1786,13 @@ static ssize_t iwl_dbgfs_rfi_freq_table_write(struct iwl_mvm *mvm, char *buf, 
		return -EINVAL;



	/* value zero triggers re-sending the default table to the device */

	if (!op_id)

	if (!op_id) {

		mutex_lock(&mvm->mutex);

		ret = iwl_rfi_send_config_cmd(mvm, NULL);

	else

		mutex_unlock(&mvm->mutex);

	} else {

		ret = -EOPNOTSUPP; /* in the future a new table will be added */

	}



	return ret ?: count;

}

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

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2020 Intel Corporation

 * Copyright (C) 2020 - 2021 Intel Corporation

 */



#include "mvm.h"
@@ -66,6 +66,8 @@ int iwl_rfi_send_config_cmd(struct iwl_mvm *mvm, struct iwl_rfi_lut_entry *rfi_t 
	if (!fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_RFIM_SUPPORT))

		return -EOPNOTSUPP;



	lockdep_assert_held(&mvm->mutex);



	/* in case no table is passed, use the default one */

	if (!rfi_table) {

		memcpy(cmd.table, iwl_rfi_table, sizeof(cmd.table));
@@ -75,9 +77,7 @@ int iwl_rfi_send_config_cmd(struct iwl_mvm *mvm, struct iwl_rfi_lut_entry *rfi_t 
		cmd.oem = 1;

	}



	mutex_lock(&mvm->mutex);

	ret = iwl_mvm_send_cmd(mvm, &hcmd);

	mutex_unlock(&mvm->mutex);



	if (ret)

		IWL_ERR(mvm, "Failed to send RFI config cmd %d\n", ret);