Commit a54844d4 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: make iwl_mvm_reconfig_scd() static 



There's no need to have this in a different place, it's
only used in a single C file (sta.c).

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220205112029.699b4b9c2232.I0d7970d800a51fee5135946ee03a7d9e8a811893@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 091296d3

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

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

/*

 * Copyright (C) 2012-2014, 2018-2020 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2022 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -1946,10 +1946,6 @@ static inline u32 iwl_mvm_flushable_queues(struct iwl_mvm *mvm) 


void iwl_mvm_stop_device(struct iwl_mvm *mvm);



/* Re-configure the SCD for a queue that has already been configured */

int iwl_mvm_reconfig_scd(struct iwl_mvm *mvm, int queue, int fifo, int sta_id,

			 int tid, int frame_limit, u16 ssn);



/* Thermal management and CT-kill */

void iwl_mvm_tt_tx_backoff(struct iwl_mvm *mvm, u32 backoff);

void iwl_mvm_temp_notif(struct iwl_mvm *mvm,

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

+33 −0
Original line number Diff line number Diff line
@@ -597,6 +597,39 @@ static int iwl_mvm_get_shared_queue(struct iwl_mvm *mvm, 
	return queue;

}



/* Re-configure the SCD for a queue that has already been configured */

static int iwl_mvm_reconfig_scd(struct iwl_mvm *mvm, int queue, int fifo,

				int sta_id, int tid, int frame_limit, u16 ssn)

{

	struct iwl_scd_txq_cfg_cmd cmd = {

		.scd_queue = queue,

		.action = SCD_CFG_ENABLE_QUEUE,

		.window = frame_limit,

		.sta_id = sta_id,

		.ssn = cpu_to_le16(ssn),

		.tx_fifo = fifo,

		.aggregate = (queue >= IWL_MVM_DQA_MIN_DATA_QUEUE ||

			      queue == IWL_MVM_DQA_BSS_CLIENT_QUEUE),

		.tid = tid,

	};

	int ret;



	if (WARN_ON(iwl_mvm_has_new_tx_api(mvm)))

		return -EINVAL;



	if (WARN(mvm->queue_info[queue].tid_bitmap == 0,

		 "Trying to reconfig unallocated queue %d\n", queue))

		return -ENXIO;



	IWL_DEBUG_TX_QUEUES(mvm, "Reconfig SCD for TXQ #%d\n", queue);



	ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0, sizeof(cmd), &cmd);

	WARN_ONCE(ret, "Failed to re-configure queue %d on FIFO %d, ret=%d\n",

		  queue, fifo, ret);



	return ret;

}



/*

 * If a given queue has a higher AC than the TID stream that is being compared

 * to, the queue needs to be redirected to the lower AC. This function does that

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

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

/*

 * Copyright (C) 2012-2014, 2018-2021 Intel Corporation

 * Copyright (C) 2012-2014, 2018-2022 Intel Corporation

 * Copyright (C) 2013-2014 Intel Mobile Communications GmbH

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 */
@@ -240,38 +240,6 @@ u8 iwl_mvm_next_antenna(struct iwl_mvm *mvm, u8 valid, u8 last_idx) 
	return last_idx;

}



int iwl_mvm_reconfig_scd(struct iwl_mvm *mvm, int queue, int fifo, int sta_id,

			 int tid, int frame_limit, u16 ssn)

{

	struct iwl_scd_txq_cfg_cmd cmd = {

		.scd_queue = queue,

		.action = SCD_CFG_ENABLE_QUEUE,

		.window = frame_limit,

		.sta_id = sta_id,

		.ssn = cpu_to_le16(ssn),

		.tx_fifo = fifo,

		.aggregate = (queue >= IWL_MVM_DQA_MIN_DATA_QUEUE ||

			      queue == IWL_MVM_DQA_BSS_CLIENT_QUEUE),

		.tid = tid,

	};

	int ret;



	if (WARN_ON(iwl_mvm_has_new_tx_api(mvm)))

		return -EINVAL;



	if (WARN(mvm->queue_info[queue].tid_bitmap == 0,

		 "Trying to reconfig unallocated queue %d\n", queue))

		return -ENXIO;



	IWL_DEBUG_TX_QUEUES(mvm, "Reconfig SCD for TXQ #%d\n", queue);



	ret = iwl_mvm_send_cmd_pdu(mvm, SCD_QUEUE_CFG, 0, sizeof(cmd), &cmd);

	WARN_ONCE(ret, "Failed to re-configure queue %d on FIFO %d, ret=%d\n",

		  queue, fifo, ret);



	return ret;

}



/**

 * iwl_mvm_send_lq_cmd() - Send link quality command

 * @mvm: Driver data.