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

Merge tag 'iwlwifi-next-for-kalle-2022-11-28' of... 

Merge tag 'iwlwifi-next-for-kalle-2022-11-28' of http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

This is the second pull request intended for v6.2

It contains two patch-sets sent before with the following content:
* iwlwifi EHT adjustments
* double-free fix in tx path
* iwlmei PLDR flow fixes
* iwlmei smatch fixes
* a logging data improvement
parents 2551a922 f31f7cd9

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

+3 −3
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) 2017 Intel Deutschland GmbH

 */

#ifndef __iwl_fw_api_mac_h__
@@ -398,7 +398,7 @@ struct iwl_he_backoff_conf { 
 * @IWL_HE_PKT_EXT_64QAM: 64-QAM

 * @IWL_HE_PKT_EXT_256QAM: 256-QAM

 * @IWL_HE_PKT_EXT_1024QAM: 1024-QAM

 * @IWL_HE_PKT_EXT_RESERVED: reserved value

 * @IWL_HE_PKT_EXT_4096QAM: 4096-QAM, for EHT only

 * @IWL_HE_PKT_EXT_NONE: not defined

 */

enum iwl_he_pkt_ext_constellations {
@@ -408,7 +408,7 @@ enum iwl_he_pkt_ext_constellations { 
	IWL_HE_PKT_EXT_64QAM,

	IWL_HE_PKT_EXT_256QAM,

	IWL_HE_PKT_EXT_1024QAM,

	IWL_HE_PKT_EXT_RESERVED,

	IWL_HE_PKT_EXT_4096QAM,

	IWL_HE_PKT_EXT_NONE,

};

drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h

+16 −17
Original line number Diff line number Diff line
@@ -13,10 +13,12 @@ 
#define PHY_BAND_6 (2)



/* Supported channel width, vary if there is VHT support */

#define PHY_VHT_CHANNEL_MODE20	(0x0)

#define PHY_VHT_CHANNEL_MODE40	(0x1)

#define PHY_VHT_CHANNEL_MODE80	(0x2)

#define PHY_VHT_CHANNEL_MODE160	(0x3)

#define IWL_PHY_CHANNEL_MODE20	0x0

#define IWL_PHY_CHANNEL_MODE40	0x1

#define IWL_PHY_CHANNEL_MODE80	0x2

#define IWL_PHY_CHANNEL_MODE160	0x3

/* and 320 MHz for EHT */

#define IWL_PHY_CHANNEL_MODE320	0x4



/*

 * Control channel position:
@@ -24,20 +26,17 @@ 
 * For VHT - bit-2 marks if the control is lower/upper relative to center-freq

 *   bits-1:0 mark the distance from the center freq. for 20Mhz, offset is 0.

 *                                   center_freq

 * For EHT - bit-3 is used for extended distance

 *                                                |

 * 40Mhz                          |_______|_______|

 * 80Mhz                  |_______|_______|_______|_______|

 * 160Mhz |_______|_______|_______|_______|_______|_______|_______|_______|

 * code      011     010     001     000  |  100     101     110    111

 * 40Mhz                                     |____|____|

 * 80Mhz                                |____|____|____|____|

 * 160Mhz                     |____|____|____|____|____|____|____|____|

 * 320MHz |____|____|____|____|____|____|____|____|____|____|____|____|____|____|____|____|

 * code    1011 1010 1001 1000 0011 0010 0001 0000 0100 0101 0110 0111 1100 1101 1110 1111

 */

#define PHY_VHT_CTRL_POS_1_BELOW  (0x0)

#define PHY_VHT_CTRL_POS_2_BELOW  (0x1)

#define PHY_VHT_CTRL_POS_3_BELOW  (0x2)

#define PHY_VHT_CTRL_POS_4_BELOW  (0x3)

#define PHY_VHT_CTRL_POS_1_ABOVE  (0x4)

#define PHY_VHT_CTRL_POS_2_ABOVE  (0x5)

#define PHY_VHT_CTRL_POS_3_ABOVE  (0x6)

#define PHY_VHT_CTRL_POS_4_ABOVE  (0x7)

#define IWL_PHY_CTRL_POS_ABOVE		0x4

#define IWL_PHY_CTRL_POS_OFFS_EXT	0x8

#define IWL_PHY_CTRL_POS_OFFS_MSK	0x3



/*

 * struct iwl_fw_channel_info_v1 - channel information

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

+4 −6
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ enum iwl_tlc_mng_cfg_flags { 
 * @IWL_TLC_MNG_CH_WIDTH_40MHZ: 40MHZ channel

 * @IWL_TLC_MNG_CH_WIDTH_80MHZ: 80MHZ channel

 * @IWL_TLC_MNG_CH_WIDTH_160MHZ: 160MHZ channel

 * @IWL_TLC_MNG_CH_WIDTH_LAST: maximum value

 * @IWL_TLC_MNG_CH_WIDTH_320MHZ: 320MHZ channel

 */

enum iwl_tlc_mng_cfg_cw {

	IWL_TLC_MNG_CH_WIDTH_20MHZ,

	IWL_TLC_MNG_CH_WIDTH_40MHZ,

	IWL_TLC_MNG_CH_WIDTH_80MHZ,

	IWL_TLC_MNG_CH_WIDTH_160MHZ,

	IWL_TLC_MNG_CH_WIDTH_LAST = IWL_TLC_MNG_CH_WIDTH_160MHZ,

	IWL_TLC_MNG_CH_WIDTH_320MHZ,

};



/**
@@ -64,8 +64,7 @@ enum iwl_tlc_mng_cfg_chains { 
 * @IWL_TLC_MNG_MODE_HT: enable HT

 * @IWL_TLC_MNG_MODE_VHT: enable VHT

 * @IWL_TLC_MNG_MODE_HE: enable HE

 * @IWL_TLC_MNG_MODE_INVALID: invalid value

 * @IWL_TLC_MNG_MODE_NUM: a count of possible modes

 * @IWL_TLC_MNG_MODE_EHT: enable EHT

 */

enum iwl_tlc_mng_cfg_mode {

	IWL_TLC_MNG_MODE_CCK = 0,
@@ -74,8 +73,7 @@ enum iwl_tlc_mng_cfg_mode { 
	IWL_TLC_MNG_MODE_HT,

	IWL_TLC_MNG_MODE_VHT,

	IWL_TLC_MNG_MODE_HE,

	IWL_TLC_MNG_MODE_INVALID,

	IWL_TLC_MNG_MODE_NUM = IWL_TLC_MNG_MODE_INVALID,

	IWL_TLC_MNG_MODE_EHT,

};



/**

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

+2 −0
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ int rs_pretty_print_rate(char *buf, int bufsz, const u32 rate) 
		type = "HT";

	else if (format == RATE_MCS_HE_MSK)

		type = "HE";

	else if (format == RATE_MCS_EHT_MSK)

		type = "EHT";

	else

		type = "Unknown"; /* shouldn't happen */

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

+3 −0
Original line number Diff line number Diff line
@@ -1971,3 +1971,6 @@ MODULE_PARM_DESC(remove_when_gone, 
module_param_named(disable_11ax, iwlwifi_mod_params.disable_11ax, bool,

		   S_IRUGO);

MODULE_PARM_DESC(disable_11ax, "Disable HE capabilities (default: false)");



module_param_named(disable_11be, iwlwifi_mod_params.disable_11be, bool, 0444);

MODULE_PARM_DESC(disable_11be, "Disable EHT capabilities (default: false)");