Commit aa7a5f94 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2022-09-18' of... 

Merge tag 'iwlwifi-next-for-kalle-2022-09-18' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

iwlwifi patches for v6.1
parents 5f606b3e 32fed470

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

+36 −6
Original line number Diff line number Diff line
@@ -56,13 +56,16 @@ 
#define IWL_BZ_A_GF4_A_FW_PRE		"iwlwifi-bz-a0-gf4-a0-"

#define IWL_BZ_A_MR_A_FW_PRE		"iwlwifi-bz-a0-mr-a0-"

#define IWL_BZ_A_FM_A_FW_PRE		"iwlwifi-bz-a0-fm-a0-"

#define IWL_BZ_A_FM4_A_FW_PRE		"iwlwifi-bz-a0-fm4-a0-"

#define IWL_GL_A_FM_A_FW_PRE		"iwlwifi-gl-a0-fm-a0-"

#define IWL_GL_B_FM_B_FW_PRE		"iwlwifi-gl-b0-fm-b0-"

#define IWL_BZ_Z_GF_A_FW_PRE		"iwlwifi-bz-z0-gf-a0-"

#define IWL_BNJ_A_FM_A_FW_PRE		"iwlwifi-BzBnj-a0-fm-a0-"

#define IWL_BNJ_A_FM4_A_FW_PRE		"iwlwifi-BzBnj-a0-fm4-a0-"

#define IWL_BNJ_A_GF_A_FW_PRE		"iwlwifi-BzBnj-a0-gf-a0-"

#define IWL_BNJ_A_GF4_A_FW_PRE		"iwlwifi-BzBnj-a0-gf4-a0-"

#define IWL_BNJ_A_HR_B_FW_PRE		"iwlwifi-BzBnj-a0-hr-b0-"

#define IWL_BNJ_B_FM_B_FW_PRE		"iwlwifi-BzBnj-b0-fm-b0-"





#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \
@@ -119,8 +122,12 @@ 
	IWL_BZ_A_MR_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_FM_A_MODULE_FIRMWARE(api) \

		IWL_BZ_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_FM4_A_MODULE_FIRMWARE(api) \

		IWL_BZ_A_FM4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_GL_A_FM_A_MODULE_FIRMWARE(api) \

		IWL_GL_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_GL_B_FM_B_MODULE_FIRMWARE(api) \

		IWL_GL_B_FM_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_FM_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(api) \
@@ -131,6 +138,8 @@ 
	IWL_BNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_B_FM_B_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_FM_B_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -240,7 +249,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
		},							\

	}



#define IWL_DEVICE_BZ_COMMON						\

#define IWL_DEVICE_BZ							\

	.ucode_api_max = IWL_22000_UCODE_API_MAX,			\

	.ucode_api_min = IWL_22000_UCODE_API_MIN,			\

	.led_mode = IWL_LED_RF_STATE,					\
@@ -276,10 +285,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
			.addr = LDBG_M2S_BUF_WRAP_CNT,			\

			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,		\

		},							\

	}



#define IWL_DEVICE_BZ							\

	IWL_DEVICE_BZ_COMMON,						\

	},								\

	.trans.umac_prph_offset = 0x300000,				\

	.trans.device_family = IWL_DEVICE_FAMILY_BZ,			\

	.trans.base_params = &iwl_ax210_base_params,			\
@@ -926,6 +932,13 @@ const struct iwl_cfg iwl_cfg_bz_a0_fm_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_fm4_a0 = {

	.fw_name_pre = IWL_BZ_A_FM4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_gl_a0_fm_a0 = {

	.fw_name_pre = IWL_GL_A_FM_A_FW_PRE,

	.uhb_supported = true,
@@ -933,6 +946,13 @@ const struct iwl_cfg iwl_cfg_gl_a0_fm_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_gl_b0_fm_b0 = {

	.fw_name_pre = IWL_GL_B_FM_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_z0_gf_a0 = {

	.fw_name_pre = IWL_BZ_Z_GF_A_FW_PRE,

	.uhb_supported = true,
@@ -974,6 +994,13 @@ const struct iwl_cfg iwl_cfg_bnj_a0_hr_b0 = { 
	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_b0_fm_b0 = {

	.fw_name_pre = IWL_BNJ_B_FM_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};

MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QNJ_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
@@ -1007,3 +1034,6 @@ MODULE_FIRMWARE(IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_BNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_B_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_B_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

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

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

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2020 Intel Corporation

 * Copyright (C) 2018-2022 Intel Corporation

 */

#ifndef __iwl_fw_api_commands_h__

#define __iwl_fw_api_commands_h__
@@ -20,6 +20,8 @@ 
 *	&enum iwl_phy_ops_subcmd_ids

 * @DATA_PATH_GROUP: data path group, uses command IDs from

 *	&enum iwl_data_path_subcmd_ids

 * @SCAN_GROUP: scan group, uses command IDs from

 *	&enum iwl_scan_subcmd_ids

 * @NAN_GROUP: NAN group, uses command IDs from &enum iwl_nan_subcmd_ids

 * @LOCATION_GROUP: location group, uses command IDs from

 *	&enum iwl_location_subcmd_ids
@@ -36,6 +38,7 @@ enum iwl_mvm_command_groups { 
	MAC_CONF_GROUP = 0x3,

	PHY_OPS_GROUP = 0x4,

	DATA_PATH_GROUP = 0x5,

	SCAN_GROUP = 0x6,

	NAN_GROUP = 0x7,

	LOCATION_GROUP = 0x8,

	PROT_OFFLOAD_GROUP = 0xb,

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

+60 −1
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

 */
@@ -766,6 +766,65 @@ struct iwl_wowlan_status_v12 { 
	u8 wake_packet[]; /* can be truncated from _length to _bufsize */

} __packed; /* WOWLAN_STATUSES_RSP_API_S_VER_12 */



/**

 * struct iwl_wowlan_info_notif - WoWLAN information notification

 * @gtk: GTK data

 * @igtk: IGTK data

 * @replay_ctr: GTK rekey replay counter

 * @pattern_number: number of the matched patterns

 * @reserved1: reserved

 * @qos_seq_ctr: QoS sequence counters to use next

 * @wakeup_reasons: wakeup reasons, see &enum iwl_wowlan_wakeup_reason

 * @num_of_gtk_rekeys: number of GTK rekeys

 * @transmitted_ndps: number of transmitted neighbor discovery packets

 * @received_beacons: number of received beacons

 * @wake_packet_length: wakeup packet length

 * @wake_packet_bufsize: wakeup packet buffer size

 * @tid_tear_down: bit mask of tids whose BA sessions were closed

 *	in suspend state

 * @station_id: station id

 * @reserved2: reserved

 */

struct iwl_wowlan_info_notif {

	struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM];

	struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM];

	__le64 replay_ctr;

	__le16 pattern_number;

	__le16 reserved1;

	__le16 qos_seq_ctr[8];

	__le32 wakeup_reasons;

	__le32 num_of_gtk_rekeys;

	__le32 transmitted_ndps;

	__le32 received_beacons;

	__le32 wake_packet_length;

	__le32 wake_packet_bufsize;

	u8 tid_tear_down;

	u8 station_id;

	u8 reserved2[2];

} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_1 */



/**

 * struct iwl_wowlan_wake_pkt_notif - WoWLAN wake packet notification

 * @wake_packet_length: wakeup packet length

 * @station_id: station id

 * @reserved: unused

 * @wake_packet: wakeup packet

 */

struct iwl_wowlan_wake_pkt_notif {

	__le32 wake_packet_length;

	u8 station_id;

	u8 reserved[3];

	u8 wake_packet[1];

} __packed; /* WOWLAN_WAKE_PKT_NTFY_API_S_VER_1 */



/**

 * struct iwl_mvm_d3_end_notif -  d3 end notification

 * @flags: See &enum iwl_d0i3_flags

 */

struct iwl_mvm_d3_end_notif {

	__le32 flags;

} __packed;



/* TODO: NetDetect API */



#endif /* __iwl_fw_api_d3_h__ */

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

+16 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright (C) 2012-2014 Intel Corporation

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

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 * Copyright (C) 2021 Intel Corporation

 * Copyright (C) 2021-2022 Intel Corporation

 */

#ifndef __iwl_fw_api_offload_h__

#define __iwl_fw_api_offload_h__
@@ -12,6 +12,21 @@ 
 * enum iwl_prot_offload_subcmd_ids - protocol offload commands

 */

enum iwl_prot_offload_subcmd_ids {

	/**

	 * @WOWLAN_WAKE_PKT_NOTIFICATION: Notification in &struct iwl_wowlan_wake_pkt_notif

	 */

	WOWLAN_WAKE_PKT_NOTIFICATION = 0xFC,



	/**

	 * @WOWLAN_INFO_NOTIFICATION: Notification in &struct iwl_wowlan_info_notif

	 */

	WOWLAN_INFO_NOTIFICATION = 0xFD,



	/**

	 * @D3_END_NOTIFICATION: End D3 state notification

	 */

	D3_END_NOTIFICATION = 0xFE,



	/**

	 * @STORED_BEACON_NTF: &struct iwl_stored_beacon_notif

	 */

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

+2 −2
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-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 */
@@ -668,7 +668,7 @@ struct iwl_rx_no_data { 
	__le32 phy_info[2];

	__le32 rx_vec[2];

} __packed; /* RX_NO_DATA_NTFY_API_S_VER_1,

	       TX_NO_DATA_NTFY_API_S_VER_2 */

	       RX_NO_DATA_NTFY_API_S_VER_2 */



struct iwl_frame_release {

	u8 baid;