Commit 12a89f01 authored by Johannes Berg's avatar Johannes Berg Committed by Jakub Kicinski
Browse files

wifi: iwlwifi: remove 'use_tfh' config to fix crash 



This is equivalent to 'gen2', and it was always confusing to have
two identical config entries. The split config patch actually had
been originally developed after removing 'use_tfh" and didn't add
the use_tfh in the new configs as they'd later been copied to the
new files. Thus the easiest way to fix the init crash here now is
to just remove use_tfh (which is erroneously unset in most of the
configs now) and use 'gen2' in the code instead.

There's possibly still an unwind error in iwl_txq_gen2_init() as
it crashes if TXQ 0 fails to initialize, but we can deal with it
later since the original failure is due to the use_tfh confusion.

Tested-by: default avatarXi Ruoyao <xry111@xry111.site>
Reported-and-tested-by: default avatarNiklāvs Koļesņikovs <pinkflames.linux@gmail.com>
Reported-and-tested-by: default avatarJeff Chua <jeff.chua.linux@gmail.com>
Reported-and-tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217622
Link: https://lore.kernel.org/all/9274d9bd3d080a457649ff5addcc1726f08ef5b2.camel@xry111.site/
Link: https://lore.kernel.org/all/CAAJw_Zug6VCS5ZqTWaFSr9sd85k%3DtyPm9DEE%2BmV%3DAKoECZM%2BsQ@mail.gmail.com/


Fixes: 19898ce9 ("wifi: iwlwifi: split 22000.c into multiple files")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20230710145038.84186-2-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9373771a

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+0 −5
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ const struct iwl_ht_params iwl_22000_ht_params = { 
	.mac_addr_from_csr = 0x380,					\

	.ht_params = &iwl_22000_ht_params,				\

	.nvm_ver = IWL_22000_NVM_VERSION,				\

	.trans.use_tfh = true,						\

	.trans.rf_id = true,						\

	.trans.gen2 = true,						\

	.nvm_type = IWL_NVM_EXT,					\
@@ -122,7 +121,6 @@ const struct iwl_ht_params iwl_22000_ht_params = { 


const struct iwl_cfg_trans_params iwl_qu_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_22000,
@@ -134,7 +132,6 @@ const struct iwl_cfg_trans_params iwl_qu_trans_cfg = { 


const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_22000,
@@ -146,7 +143,6 @@ const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg = { 


const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_22000,
@@ -200,7 +196,6 @@ const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = { 
	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.bisr_workaround = 1,

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

+0 −2
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ enum iwl_cfg_trans_ltr_delay { 
 * @xtal_latency: power up latency to get the xtal stabilized

 * @extra_phy_cfg_flags: extra configuration flags to pass to the PHY

 * @rf_id: need to read rf_id to determine the firmware image

 * @use_tfh: use TFH

 * @gen2: 22000 and on transport operation

 * @mq_rx_supported: multi-queue rx support

 * @integrated: discrete or integrated
@@ -271,7 +270,6 @@ struct iwl_cfg_trans_params { 
	u32 xtal_latency;

	u32 extra_phy_cfg_flags;

	u32 rf_id:1,

	    use_tfh:1,

	    gen2:1,

	    mq_rx_supported:1,

	    integrated:1,

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

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

/*

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

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

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 */

#ifndef __iwl_fh_h__
@@ -71,7 +71,7 @@ 
static inline unsigned int FH_MEM_CBBC_QUEUE(struct iwl_trans *trans,

					     unsigned int chnl)

{

	if (trans->trans_cfg->use_tfh) {

	if (trans->trans_cfg->gen2) {

		WARN_ON_ONCE(chnl >= 64);

		return TFH_TFDQ_CBB_TABLE + 8 * chnl;

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * Copyright (C) 2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 * Copyright (C) 2019-2021 Intel Corporation

 * Copyright (C) 2019-2021, 2023 Intel Corporation

 */

#include <linux/kernel.h>

#include <linux/bsearch.h>
@@ -42,7 +42,7 @@ struct iwl_trans *iwl_trans_alloc(unsigned int priv_size, 


	WARN_ON(!ops->wait_txq_empty && !ops->wait_tx_queues_empty);



	if (trans->trans_cfg->use_tfh) {

	if (trans->trans_cfg->gen2) {

		trans->txqs.tfd.addr_size = 64;

		trans->txqs.tfd.max_tbs = IWL_TFH_NUM_TBS;

		trans->txqs.tfd.size = sizeof(struct iwl_tfh_tfd);
@@ -101,7 +101,7 @@ int iwl_trans_init(struct iwl_trans *trans) 


	/* Some things must not change even if the config does */

	WARN_ON(trans->txqs.tfd.addr_size !=

		(trans->trans_cfg->use_tfh ? 64 : 36));

		(trans->trans_cfg->gen2 ? 64 : 36));



	snprintf(trans->dev_cmd_pool_name, sizeof(trans->dev_cmd_pool_name),

		 "iwl_cmd_pool:%s", dev_name(trans->dev));

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

+1 −1
Original line number Diff line number Diff line
@@ -1450,7 +1450,7 @@ static inline bool iwl_mvm_has_new_station_api(const struct iwl_fw *fw) 
static inline bool iwl_mvm_has_new_tx_api(struct iwl_mvm *mvm)

{

	/* TODO - replace with TLV once defined */

	return mvm->trans->trans_cfg->use_tfh;

	return mvm->trans->trans_cfg->gen2;

}



static inline bool iwl_mvm_has_unified_ucode(struct iwl_mvm *mvm)