Commit bbc19fef authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge tag 'iwlwifi-fixes-2025-07-15' of... 

Merge tag 'iwlwifi-fixes-2025-07-15' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next



Miri Korenblit says:
====================
iwlwifi-fixes

- missing unlock in error path
- Avoid FW assert on bad command values
- fix kernel panic due to incorrect index calculation
====================

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 444020f4 46345ed3

drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h

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

/*

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

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

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

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -754,7 +754,7 @@ struct iwl_lari_config_change_cmd_v10 { 
 *	according to the BIOS definitions.

 *	For LARI cmd version 11 - bits 0:4 are supported.

 *	For LARI cmd version 12 - bits 0:6 are supported and bits 7:31 are

 *	reserved. No need to mask out the reserved bits.

 *	reserved.

 * @force_disable_channels_bitmap: Bitmap of disabled bands/channels.

 *	Each bit represents a set of channels in a specific band that should be

 *	disabled
@@ -787,6 +787,7 @@ struct iwl_lari_config_change_cmd { 
/* Activate UNII-1 (5.2GHz) for World Wide */

#define ACTIVATE_5G2_IN_WW_MASK			BIT(4)

#define CHAN_STATE_ACTIVE_BITMAP_CMD_V11	0x1F

#define CHAN_STATE_ACTIVE_BITMAP_CMD_V12	0x7F



/**

 * struct iwl_pnvm_init_complete_ntfy - PNVM initialization complete

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

+1 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ int iwl_fill_lari_config(struct iwl_fw_runtime *fwrt, 


	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ACTIVATE_CHANNEL, &value);

	if (!ret) {

		value &= CHAN_STATE_ACTIVE_BITMAP_CMD_V12;

		if (cmd_ver < 8)

			value &= ~ACTIVATE_5G2_IN_WW_MASK;

drivers/net/wireless/intel/iwlwifi/mld/regulatory.c

+3 −1
Original line number Diff line number Diff line
@@ -251,8 +251,10 @@ void iwl_mld_configure_lari(struct iwl_mld *mld) 
			cpu_to_le32(value &= DSM_UNII4_ALLOW_BITMAP);



	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ACTIVATE_CHANNEL, &value);

	if (!ret)

	if (!ret) {

		value &= CHAN_STATE_ACTIVE_BITMAP_CMD_V12;

		cmd.chan_state_active_bitmap = cpu_to_le32(value);

	}



	ret = iwl_bios_get_dsm(fwrt, DSM_FUNC_ENABLE_6E, &value);

	if (!ret)

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

+4 −2
Original line number Diff line number Diff line
@@ -546,8 +546,10 @@ int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans, 
	}



	if (WARN_ON(trans->do_top_reset &&

		    trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_SC))

		return -EINVAL;

		    trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_SC)) {

		ret = -EINVAL;

		goto out;

	}



	/* we need to wait later - set state */

	if (trans->do_top_reset)

drivers/net/wireless/intel/iwlwifi/pcie/tx.c

+4 −4
Original line number Diff line number Diff line
@@ -2101,10 +2101,10 @@ static void iwl_txq_gen1_update_byte_cnt_tbl(struct iwl_trans *trans, 


	bc_ent = cpu_to_le16(len | (sta_id << 12));



	scd_bc_tbl[txq_id * BC_TABLE_SIZE + write_ptr].tfd_offset = bc_ent;

	scd_bc_tbl[txq_id * TFD_QUEUE_BC_SIZE + write_ptr].tfd_offset = bc_ent;



	if (write_ptr < TFD_QUEUE_SIZE_BC_DUP)

		scd_bc_tbl[txq_id * BC_TABLE_SIZE + TFD_QUEUE_SIZE_MAX + write_ptr].tfd_offset =

		scd_bc_tbl[txq_id * TFD_QUEUE_BC_SIZE + TFD_QUEUE_SIZE_MAX + write_ptr].tfd_offset =

			bc_ent;

}
@@ -2328,10 +2328,10 @@ static void iwl_txq_gen1_inval_byte_cnt_tbl(struct iwl_trans *trans, 


	bc_ent = cpu_to_le16(1 | (sta_id << 12));



	scd_bc_tbl[txq_id * BC_TABLE_SIZE + read_ptr].tfd_offset = bc_ent;

	scd_bc_tbl[txq_id * TFD_QUEUE_BC_SIZE + read_ptr].tfd_offset = bc_ent;



	if (read_ptr < TFD_QUEUE_SIZE_BC_DUP)

		scd_bc_tbl[txq_id * BC_TABLE_SIZE + TFD_QUEUE_SIZE_MAX + read_ptr].tfd_offset =

		scd_bc_tbl[txq_id * TFD_QUEUE_BC_SIZE + TFD_QUEUE_SIZE_MAX + read_ptr].tfd_offset =

			bc_ent;

}