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

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

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

iwlwifi patches for v5.18

* Support UHB TAS enablement via BIOS;
* Remove a bunch of W=1 warnings;
* Add support for channel switch offload;
* Support a new FW API command version;
* Support 32 Rx AMPDU sessions in newer devices;
* Support a few new FW API command versions;
* Some debugging infra fixes;
* A few fixes in the HE functionality;
* Add a few new devices;
* A bunch of fixes for W=1 and W=3 warnings;
* Add support for a couple of new devices;
* Fix a potential buffer underflow;
* W=1 warnings clean up continues;
* Some improvements and fixes in scanning;
* More work on the Bz family of devices;
* Add support for band disablement via BIOS;
* Bump FW API version;
* Fix config structure for one device;
* Support a new FW API command version;
* Support new queue allocation command;
* Some more debugging improvements;
* Some other small fixes, clean-ups and improvements.
parents 2e2f63a1 cb0a1fb7

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

+33 −5
Original line number Diff line number Diff line
@@ -7,9 +7,10 @@ 
#include <linux/stringify.h>

#include "iwl-config.h"

#include "iwl-prph.h"

#include "fw/api/txq.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	69

#define IWL_22000_UCODE_API_MAX	70



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -39,6 +40,7 @@ 
#define IWL_SO_A_GF_A_FW_PRE		"iwlwifi-so-a0-gf-a0-"

#define IWL_TY_A_GF_A_FW_PRE		"iwlwifi-ty-a0-gf-a0-"

#define IWL_SO_A_GF4_A_FW_PRE		"iwlwifi-so-a0-gf4-a0-"

#define IWL_SO_A_MR_A_FW_PRE		"iwlwifi-so-a0-mr-a0-"

#define IWL_SNJ_A_GF4_A_FW_PRE		"iwlwifi-SoSnj-a0-gf4-a0-"

#define IWL_SNJ_A_GF_A_FW_PRE		"iwlwifi-SoSnj-a0-gf-a0-"

#define IWL_SNJ_A_HR_B_FW_PRE		"iwlwifi-SoSnj-a0-hr-b0-"
@@ -119,8 +121,6 @@ 
		IWL_BZ_A_FM_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_BZ_Z_GF_A_MODULE_FIRMWARE(api) \

	IWL_BZ_Z_GF_A_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) \
@@ -224,7 +224,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.trans.base_params = &iwl_ax210_base_params,			\

	.min_txq_size = 128,						\

	.gp2_reg_addr = 0xd02c68,					\

	.min_256_ba_txq_size = 1024,					\

	.min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_HE,		\

	.mon_dram_regs = {						\

		.write_ptr = {						\

			.addr = DBGC_CUR_DBGBUF_STATUS,			\
@@ -285,7 +285,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.trans.base_params = &iwl_ax210_base_params,			\

	.min_txq_size = 128,						\

	.gp2_reg_addr = 0xd02c68,					\

	.min_256_ba_txq_size = 1024,					\

	.min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_EHT,		\

	.mon_dram_regs = {						\

		.write_ptr = {						\

			.addr = DBGC_CUR_DBGBUF_STATUS,			\
@@ -299,6 +299,12 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
			.addr = DBGC_CUR_DBGBUF_STATUS,			\

			.mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK,		\

		},							\

	},								\

	.mon_dbgi_regs = {						\

		.write_ptr = {						\

			.addr = DBGI_SRAM_FIFO_POINTERS,		\

			.mask = DBGI_SRAM_FIFO_POINTERS_WR_PTR_MSK,	\

		},							\

	}



const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = {
@@ -476,6 +482,7 @@ const char iwl_ax101_name[] = "Intel(R) Wi-Fi 6 AX101"; 
const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz";

const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";

const char iwl_ax203_name[] = "Intel(R) Wi-Fi 6 AX203";

const char iwl_ax204_name[] = "Intel(R) Wi-Fi 6 AX204 160MHz";

const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz";

const char iwl_ax221_name[] = "Intel(R) Wi-Fi 6E AX221 160MHz";

const char iwl_ax231_name[] = "Intel(R) Wi-Fi 6E AX231 160MHz";
@@ -816,6 +823,20 @@ const struct iwl_cfg iwl_cfg_ma_a0_mr_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_a0_ms_a0 = {

	.fw_name_pre = IWL_MA_A_MR_A_FW_PRE,

	.uhb_supported = false,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_so_a0_ms_a0 = {

	.fw_name_pre = IWL_SO_A_MR_A_FW_PRE,

	.uhb_supported = false,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_a0_fm_a0 = {

	.fw_name_pre = IWL_MA_A_FM_A_FW_PRE,

	.uhb_supported = true,
@@ -830,6 +851,13 @@ const struct iwl_cfg iwl_cfg_snj_a0_mr_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_snj_a0_ms_a0 = {

	.fw_name_pre = IWL_SNJ_A_MR_A_FW_PRE,

	.uhb_supported = false,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_so_a0_hr_a0 = {

	.fw_name_pre = IWL_SO_A_HR_B_FW_PRE,

	IWL_DEVICE_AX210,

drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) 


	priv->is_open = 1;

	IWL_DEBUG_MAC80211(priv, "leave\n");

	return 0;

	return ret;

}



static void iwlagn_mac_stop(struct ieee80211_hw *hw)

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#define DRV_DESCRIPTION	"Intel(R) Wireless WiFi Link AGN driver for Linux"

MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_LICENSE("GPL");

MODULE_IMPORT_NS(IWLWIFI);



/* Please keep this array *SORTED* by hex value.

 * Access is done through binary search.

drivers/net/wireless/intel/iwlwifi/dvm/rx.c

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

 * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2015 Intel Deutschland GmbH

 * Copyright(c) 2018, 2020 Intel Corporation

 * Copyright(c) 2018, 2020-2021 Intel Corporation

 *

 * Portions of this file are derived from the ipw3945 project, as well

 * as portionhelp of the ieee80211 subsystem header files.
@@ -915,7 +915,7 @@ static void iwlagn_rx_noa_notification(struct iwl_priv *priv, 
		len += 1 + 2;

		copylen += 1 + 2;



		new_data = kmalloc(sizeof(*new_data) + len, GFP_ATOMIC);

		new_data = kmalloc(struct_size(new_data, data, len), GFP_ATOMIC);

		if (new_data) {

			new_data->length = len;

			new_data->data[0] = WLAN_EID_VENDOR_SPECIFIC;
@@ -1015,8 +1015,7 @@ void iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct napi_struct *napi, 
		/* No handling needed */

		IWL_DEBUG_RX(priv, "No handler needed for %s, 0x%02x\n",

			     iwl_get_cmd_string(priv->trans,

						iwl_cmd_id(pkt->hdr.cmd,

							   0, 0)),

						WIDE_ID(0, pkt->hdr.cmd)),

			     pkt->hdr.cmd);

	}

}

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

+13 −5
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ union acpi_object *iwl_acpi_get_wifi_pkg_range(struct device *dev, 
IWL_EXPORT_SYMBOL(iwl_acpi_get_wifi_pkg_range);



int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,

		     struct iwl_tas_config_cmd_v3 *cmd)

		     union iwl_tas_config_cmd *cmd, int fw_ver)

{

	union acpi_object *wifi_pkg, *data;

	int ret, tbl_rev, i, block_list_size, enabled;
@@ -268,10 +268,18 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, 
			(tas_selection & ACPI_WTAS_OVERRIDE_IEC_MSK) >> ACPI_WTAS_OVERRIDE_IEC_POS;

		u16 enabled_iec = (tas_selection & ACPI_WTAS_ENABLE_IEC_MSK) >>

			ACPI_WTAS_ENABLE_IEC_POS;

		u8 usa_tas_uhb = (tas_selection & ACPI_WTAS_USA_UHB_MSK) >> ACPI_WTAS_USA_UHB_POS;





		enabled = tas_selection & ACPI_WTAS_ENABLED_MSK;

		cmd->override_tas_iec = cpu_to_le16(override_iec);

		cmd->enable_tas_iec = cpu_to_le16(enabled_iec);

		if (fw_ver <= 3) {

			cmd->v3.override_tas_iec = cpu_to_le16(override_iec);

			cmd->v3.enable_tas_iec = cpu_to_le16(enabled_iec);

		} else {

			cmd->v4.usa_tas_uhb_allowed = usa_tas_uhb;

			cmd->v4.override_tas_iec = (u8)override_iec;

			cmd->v4.enable_tas_iec = (u8)enabled_iec;

		}



	} else if (tbl_rev == 0 &&

		wifi_pkg->package.elements[1].type == ACPI_TYPE_INTEGER) {
@@ -297,7 +305,7 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, 
		goto out_free;

	}

	block_list_size = wifi_pkg->package.elements[2].integer.value;

	cmd->block_list_size = cpu_to_le32(block_list_size);

	cmd->v4.block_list_size = cpu_to_le32(block_list_size);



	IWL_DEBUG_RADIO(fwrt, "TAS array size %u\n", block_list_size);

	if (block_list_size > APCI_WTAS_BLACK_LIST_MAX) {
@@ -319,7 +327,7 @@ int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, 
		}



		country = wifi_pkg->package.elements[3 + i].integer.value;

		cmd->block_list_array[i] = cpu_to_le32(country);

		cmd->v4.block_list_array[i] = cpu_to_le32(country);

		IWL_DEBUG_RADIO(fwrt, "TAS block list country %d\n", country);

	}