Commit 3630f043 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge tag 'iwlwifi-next-2025-07-23' of... 

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



Miri Korenblit says:
====================
iwlwifi feature, notably

- disable features in fips
- remove RX OMI feature code
- A few fixes and cleanups
====================

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 26b1d003 da75f183

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

+0 −4
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#define IWL_SC_A_WH_A_FW_PRE		"iwlwifi-sc-a0-wh-a0"

#define IWL_SC2_A_FM_C_FW_PRE		"iwlwifi-sc2-a0-fm-c0"

#define IWL_SC2_A_WH_A_FW_PRE		"iwlwifi-sc2-a0-wh-a0"

#define IWL_SC2F_A_FM_C_FW_PRE		"iwlwifi-sc2f-a0-fm-c0"

#define IWL_SC2F_A_WH_A_FW_PRE		"iwlwifi-sc2f-a0-wh-a0"



static const struct iwl_family_base_params iwl_sc_base = {

	.num_of_queues = 512,
@@ -101,5 +99,3 @@ IWL_FW_AND_PNVM(IWL_SC_A_FM_C_FW_PRE, IWL_SC_UCODE_API_MAX); 
IWL_FW_AND_PNVM(IWL_SC_A_WH_A_FW_PRE, IWL_SC_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_SC2_A_FM_C_FW_PRE, IWL_SC_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_SC2_A_WH_A_FW_PRE, IWL_SC_UCODE_API_MAX);
 
IWL_FW_AND_PNVM(IWL_SC2F_A_FM_C_FW_PRE, IWL_SC_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_SC2F_A_WH_A_FW_PRE, IWL_SC_UCODE_API_MAX);

drivers/net/wireless/intel/iwlwifi/dvm/agn.h

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static inline void iwl_dvm_set_pmi(struct iwl_priv *priv, bool state) 
/**

 * iwl_parse_eeprom_data - parse EEPROM data and return values

 *

 * @trans: ransport we're parsing for, for debug only

 * @trans: transport we're parsing for, for debug only

 * @cfg: device configuration for parsing and overrides

 * @eeprom: the EEPROM data

 * @eeprom_size: length of the EEPROM data

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

+0 −26
Original line number Diff line number Diff line
@@ -90,12 +90,6 @@ enum iwl_data_path_subcmd_ids { 
	 */

	SEC_KEY_CMD = 0x18,



	/**

	 * @OMI_SEND_STATUS_NOTIF: notification after OMI was sent

	 *	uses &struct iwl_omi_send_status_notif

	 */

	OMI_SEND_STATUS_NOTIF = 0xF2,



	/**

	 * @ESR_MODE_NOTIF: notification to recommend/force a wanted esr mode,

	 *	uses &struct iwl_esr_mode_notif or &struct iwl_esr_mode_notif_v1
@@ -699,24 +693,4 @@ struct iwl_sec_key_cmd { 
	} __packed u; /* SEC_KEY_OPERATION_API_U_VER_1 */

} __packed; /* SEC_KEY_CMD_API_S_VER_1 */



/**

 * struct iwl_omi_send_status_notif_v1 - OMI status notification

 * @success: indicates that the OMI was sent successfully

 *	(currently always set)

 */

struct iwl_omi_send_status_notif_v1 {

	__le32 success;

} __packed; /* OMI_SEND_STATUS_NTFY_API_S_VER_1 */



/**

 * struct iwl_omi_send_status_notif - OMI status notification

 * @success: indicates that the OMI was sent successfully

 *	(currently always set)

 * @sta_id: sta_id to which the OMI was sent

 */

struct iwl_omi_send_status_notif {

	__le32 success;

	__le32 sta_id;

} __packed; /* OMI_SEND_STATUS_NTFY_API_S_VER_2 */



#endif /* __iwl_fw_api_datapath_h__ */

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

+16 −4
Original line number Diff line number Diff line
@@ -571,7 +571,8 @@ enum iwl_ppag_flags { 
/**

 * union iwl_ppag_table_cmd - union for all versions of PPAG command

 * @v1: command version 1 structure.

 * @v2: command version 5 structure.

 * @v2: command version from 2 to 6 are same structure as v2.

 *	but has a different format of the flags bitmap

 * @v3: command version 7 structure.

 * @v1.flags: values from &enum iwl_ppag_flags

 * @v1.gain: table of antenna gain values per chain and sub-band
@@ -592,7 +593,9 @@ union iwl_ppag_table_cmd { 
		__le32 flags;

		s8 gain[IWL_NUM_CHAIN_LIMITS][IWL_NUM_SUB_BANDS_V2];

		s8 reserved[2];

	} __packed v2; /* PER_PLAT_ANTENNA_GAIN_CMD_API_S_VER_5 */

	} __packed v2; /* PER_PLAT_ANTENNA_GAIN_CMD_API_S_VER_2, VER3, VER4,

			* VER5, VER6

			*/

	struct {

		struct bios_value_u32 ppag_config_info;

		s8 gain[IWL_NUM_CHAIN_LIMITS][IWL_NUM_SUB_BANDS_V2];
@@ -600,11 +603,20 @@ union iwl_ppag_table_cmd { 
	} __packed v3; /* PER_PLAT_ANTENNA_GAIN_CMD_API_S_VER_7 */

} __packed;



#define IWL_PPAG_CMD_V1_MASK (IWL_PPAG_ETSI_MASK | IWL_PPAG_CHINA_MASK)

#define IWL_PPAG_CMD_V5_MASK (IWL_PPAG_CMD_V1_MASK | \

#define IWL_PPAG_CMD_V4_MASK (IWL_PPAG_ETSI_MASK | IWL_PPAG_CHINA_MASK)

#define IWL_PPAG_CMD_V5_MASK (IWL_PPAG_CMD_V4_MASK | \

			      IWL_PPAG_ETSI_LPI_UHB_MASK | \

			      IWL_PPAG_USA_LPI_UHB_MASK)



#define IWL_PPAG_CMD_V6_MASK (IWL_PPAG_CMD_V5_MASK |		\

			      IWL_PPAG_ETSI_VLP_UHB_MASK |	\

			      IWL_PPAG_ETSI_SP_UHB_MASK |	\

			      IWL_PPAG_USA_VLP_UHB_MASK |	\

			      IWL_PPAG_USA_SP_UHB_MASK |	\

			      IWL_PPAG_CANADA_LPI_UHB_MASK |	\

			      IWL_PPAG_CANADA_VLP_UHB_MASK |	\

			      IWL_PPAG_CANADA_SP_UHB_MASK)



#define MCC_TO_SAR_OFFSET_TABLE_ROW_SIZE	26

#define MCC_TO_SAR_OFFSET_TABLE_COL_SIZE	13

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

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ struct iwl_tdls_channel_switch_timing { 
 */

struct iwl_tdls_channel_switch_frame {

	__le32 switch_time_offset;

	struct iwl_tx_cmd_v6 tx_cmd;

	struct iwl_tx_cmd_v6_params tx_cmd;

	u8 data[IWL_TDLS_CH_SW_FRAME_MAX_SIZE];

} __packed; /* TDLS_STA_CHANNEL_SWITCH_FRAME_API_S_VER_1 */
@@ -131,7 +131,7 @@ struct iwl_tdls_config_cmd { 
	struct iwl_tdls_sta_info sta_info[IWL_TDLS_STA_COUNT];



	__le32 pti_req_data_offset;

	struct iwl_tx_cmd_v6 pti_req_tx_cmd;

	struct iwl_tx_cmd_v6_params pti_req_tx_cmd;

	u8 pti_req_template[];

} __packed; /* TDLS_CONFIG_CMD_API_S_VER_1 */