Commit 718a8b23 authored by Shaul Triebitz's avatar Shaul Triebitz Committed by Luca Coelho
Browse files

iwlwifi: unite macros with same meaning 



TFD_*_SLOTS and IWL_*_QUEUE_SIZE both define the TX queue
size (number of TFDs).
Get rid of TFD_*_SLOTS and use only IWL_*_QUEUE_SIZE.

Signed-off-by: default avatarShaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 9a16ee0c

drivers/net/wireless/intel/iwlwifi/fw/api/txq.h

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -30,6 +31,7 @@ 
 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -133,6 +135,7 @@ enum iwl_tx_queue_cfg_actions { 


#define IWL_DEFAULT_QUEUE_SIZE 256

#define IWL_MGMT_QUEUE_SIZE 16

#define IWL_CMD_QUEUE_SIZE 32

/**

 * struct iwl_tx_queue_cfg_cmd - txq hw scheduler config command

 * @sta_id: station id

drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ int iwl_pcie_ctxt_info_gen3_init(struct iwl_trans *trans, 
	void *iml_img;

	u32 control_flags = 0;

	int ret;

	int cmdq_size = max_t(u32, TFD_CMD_SLOTS, trans->cfg->min_txq_size);

	int cmdq_size = max_t(u32, IWL_CMD_QUEUE_SIZE,

			      trans->cfg->min_txq_size);



	/* Allocate prph scratch */

	prph_scratch = dma_alloc_coherent(trans->dev, sizeof(*prph_scratch),

drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -20,7 +20,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -210,7 +210,7 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans, 
	ctxt_info->hcmd_cfg.cmd_queue_addr =

		cpu_to_le64(trans_pcie->txq[trans_pcie->cmd_queue]->dma_addr);

	ctxt_info->hcmd_cfg.cmd_queue_size =

		TFD_QUEUE_CB_SIZE(TFD_CMD_SLOTS);

		TFD_QUEUE_CB_SIZE(IWL_CMD_QUEUE_SIZE);



	/* allocate ucode sections in dram and set addresses */

	ret = iwl_pcie_init_fw_sec(trans, fw, &ctxt_info->dram);

drivers/net/wireless/intel/iwlwifi/pcie/internal.h

+0 −4
Original line number Diff line number Diff line
@@ -290,10 +290,6 @@ struct iwl_cmd_meta { 
	u32 tbs;

};





#define TFD_TX_CMD_SLOTS 256

#define TFD_CMD_SLOTS 32



/*

 * The FH will write back to the first TB only, so we need to copy some data

 * into the buffer regardless of whether it should be mapped or not.

drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c

+4 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -20,7 +20,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -234,7 +234,8 @@ void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power) 
static int iwl_pcie_gen2_nic_init(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	int queue_size = max_t(u32, TFD_CMD_SLOTS, trans->cfg->min_txq_size);

	int queue_size = max_t(u32, IWL_CMD_QUEUE_SIZE,

			       trans->cfg->min_txq_size);



	/* TODO: most of the logic can be removed in A0 - but not in Z0 */

	spin_lock(&trans_pcie->irq_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE