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

Merge tag 'iwlwifi-next-for-kalle-2019-02-14' of... 

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

Fourth batch of iwlwifi patches intended for v5.1

* Work on the new debugging infrastructure continues;
* FTM (Fine Timing Measurement) initiator and responder implementation;
* Support for a new device family started;
* Bump supported FW API to 46;
* General bugfixes;
* Other cleanups;
parents 34025a10 99944b73

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

+73 −20
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 * Copyright (C) 2018-2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -20,7 +20,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 * Copyright (C) 2018-2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@ 
#include "iwl-config.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	44

#define IWL_22000_UCODE_API_MAX	46



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -79,11 +79,15 @@ 
#define IWL_22000_HR_B_F0_FW_PRE	"iwlwifi-Qu-b0-hr-b0-"

#define IWL_22000_QU_B_HR_B_FW_PRE	"iwlwifi-Qu-b0-hr-b0-"

#define IWL_22000_HR_B_FW_PRE		"iwlwifi-QuQnj-b0-hr-b0-"

#define IWL_22000_JF_B0_FW_PRE		"iwlwifi-QuQnj-a0-jf-b0-"

#define IWL_22000_HR_A0_FW_PRE		"iwlwifi-QuQnj-a0-hr-a0-"

#define IWL_22000_SU_Z0_FW_PRE		"iwlwifi-su-z0-"

#define IWL_QU_B_JF_B_FW_PRE		"iwlwifi-Qu-b0-jf-b0-"

#define IWL_QNJ_B_JF_B_FW_PRE		"iwlwifi-QuQnj-b0-jf-b0-"

#define IWL_CC_A_FW_PRE			"iwlwifi-cc-a0-"

#define IWL_22000_SO_A_JF_B_FW_PRE	"iwlwifi-so-a0-jf-b0-"

#define IWL_22000_SO_A_HR_B_FW_PRE      "iwlwifi-so-a0-hr-b0-"

#define IWL_22000_SO_A_GF_A_FW_PRE      "iwlwifi-so-a0-gf-a0-"

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



#define IWL_22000_HR_MODULE_FIRMWARE(api) \

	IWL_22000_HR_FW_PRE __stringify(api) ".ucode"
@@ -97,16 +101,26 @@ 
	IWL_22000_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(api)	\

	IWL_22000_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_JF_B0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_JF_B0_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(api) \

	IWL_22000_HR_A0_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_SU_Z0_MODULE_FIRMWARE(api) \

	IWL_22000_SU_Z0_FW_PRE __stringify(api) ".ucode"

#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_QNJ_B_JF_B_MODULE_FIRMWARE(api)		\

	IWL_QNJ_B_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_CC_A_MODULE_FIRMWARE(api)			\

	IWL_CC_A_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(api) \

	IWL_22000_SO_A_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_SO_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_22000_SO_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_SO_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_22000_SO_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_TY_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_22000_TY_A_GF_A_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -167,6 +181,10 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.d3_debug_data_base_addr = 0x401000,				\

	.d3_debug_data_length = 60 * 1024



#define IWL_DEVICE_AX200_COMMON						\

	IWL_DEVICE_22000_COMMON,					\

	.umac_prph_offset = 0x300000



#define IWL_DEVICE_22500						\

	IWL_DEVICE_22000_COMMON,					\

	.device_family = IWL_DEVICE_FAMILY_22000,			\
@@ -179,6 +197,13 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.base_params = &iwl_22560_base_params,				\

	.csr = &iwl_csr_v2



#define IWL_DEVICE_AX210						\

	IWL_DEVICE_AX200_COMMON,					\

	.device_family = IWL_DEVICE_FAMILY_AX210,			\

	.base_params = &iwl_22000_base_params,				\

	.csr = &iwl_csr_v1,						\

	.min_txq_size = 128



const struct iwl_cfg iwl22000_2ac_cfg_hr = {

	.name = "Intel(R) Dual Band Wireless AC 22000",

	.fw_name_pre = IWL_22000_HR_FW_PRE,
@@ -278,6 +303,18 @@ const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0 = { 
	IWL_DEVICE_22500,

};



const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_QNJ_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,
@@ -350,18 +387,6 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



const struct iwl_cfg iwl22000_2ax_cfg_qnj_jf_b0 = {

	.name = "Intel(R) Dual Band Wireless AX 22000",

	.fw_name_pre = IWL_22000_JF_B0_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap

	 * so we need to restrict the size of transmitted aggregation to the

	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0 = {

	.name = "Intel(R) Dual Band Wireless AX 22000",

	.fw_name_pre = IWL_22000_HR_A0_FW_PRE,
@@ -387,13 +412,41 @@ const struct iwl_cfg iwl22560_2ax_cfg_su_cdb = { 
	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_22000_SO_A_JF_B_FW_PRE,

	IWL_DEVICE_AX210,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {

	.name = "Intel(R) Wi-Fi 6 AX201 160MHz",

	.fw_name_pre = IWL_22000_SO_A_HR_B_FW_PRE,

	IWL_DEVICE_AX210,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_gf_a0 = {

	.name = "Intel(R) Wi-Fi 7 AX211 160MHz",

	.fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,

	IWL_DEVICE_AX210,

};



const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {

	.name = "Intel(R) Wi-Fi 7 AX210 160MHz",

	.fw_name_pre = IWL_22000_TY_A_GF_A_FW_PRE,

	IWL_DEVICE_AX210,

};



MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_JF_B0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SU_Z0_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QNJ_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SO_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_SO_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_22000_TY_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#include "fw/file.h"



/* Highest firmware API version supported */

#define IWL9000_UCODE_API_MAX	44

#define IWL9000_UCODE_API_MAX	46



/* Lowest firmware API version supported */

#define IWL9000_UCODE_API_MIN	30

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

+7 −7
Original line number Diff line number Diff line
@@ -1881,7 +1881,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log, 
		return pos;

	}



	if (!(iwl_have_debug_level(IWL_DL_FW_ERRORS)) && !full_log)

	if (!(iwl_have_debug_level(IWL_DL_FW)) && !full_log)

		size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES)

			? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size;

	IWL_ERR(priv, "Start IWL Event Log Dump: display last %u entries\n",
@@ -1897,7 +1897,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log, 
		if (!*buf)

			return -ENOMEM;

	}

	if (iwl_have_debug_level(IWL_DL_FW_ERRORS) || full_log) {

	if (iwl_have_debug_level(IWL_DL_FW) || full_log) {

		/*

		 * if uCode has wrapped back to top of log,

		 * start at the oldest entry,
@@ -1927,7 +1927,7 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand) 
	unsigned int reload_msec;

	unsigned long reload_jiffies;



	if (iwl_have_debug_level(IWL_DL_FW_ERRORS))

	if (iwl_have_debug_level(IWL_DL_FW))

		iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS);



	/* uCode is no longer loaded. */
@@ -1965,11 +1965,11 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand) 


	if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) {

		if (iwlwifi_mod_params.fw_restart) {

			IWL_DEBUG_FW_ERRORS(priv,

			IWL_DEBUG_FW(priv,

				     "Restarting adapter due to uCode error.\n");

			queue_work(priv->workqueue, &priv->restart);

		} else

			IWL_DEBUG_FW_ERRORS(priv,

			IWL_DEBUG_FW(priv,

				     "Detected FW error, but not restarting\n");

	}

}

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

+32 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright (C) 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -26,6 +27,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright (C) 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -205,3 +207,33 @@ out: 
	return dflt_pwr_limit;

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_pwr_limit);



int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)

{

	union acpi_object *wifi_pkg, *data;

	int ret;



	data = iwl_acpi_get_object(dev, ACPI_ECKV_METHOD);

	if (IS_ERR(data))

		return PTR_ERR(data);



	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE);

	if (IS_ERR(wifi_pkg)) {

		ret = PTR_ERR(wifi_pkg);

		goto out_free;

	}



	if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER) {

		ret = -EINVAL;

		goto out_free;

	}



	*extl_clk = wifi_pkg->package.elements[1].integer.value;



	ret = 0;



out_free:

	kfree(data);

	return ret;

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_eckv);

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

+20 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * Copyright(c) 2018 - 2019        Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -27,7 +27,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * Copyright(c) 2018 - 2019       Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,7 @@ 
#define ACPI_WGDS_METHOD	"WGDS"

#define ACPI_WRDD_METHOD	"WRDD"

#define ACPI_SPLC_METHOD	"SPLC"

#define ACPI_ECKV_METHOD	"ECKV"



#define ACPI_WIFI_DOMAIN	(0x07)
@@ -86,6 +87,7 @@ 
#define ACPI_WGDS_WIFI_DATA_SIZE	19

#define ACPI_WRDD_WIFI_DATA_SIZE	2

#define ACPI_SPLC_WIFI_DATA_SIZE	2

#define ACPI_ECKV_WIFI_DATA_SIZE	2



#define ACPI_WGDS_NUM_BANDS		2

#define ACPI_WGDS_TABLE_SIZE		3
@@ -109,6 +111,17 @@ int iwl_acpi_get_mcc(struct device *dev, char *mcc); 


u64 iwl_acpi_get_pwr_limit(struct device *dev);



/*

 * iwl_acpi_get_eckv - read external clock validation from ACPI, if available

 *

 * @dev: the struct device

 * @extl_clk: output var (2 bytes) that will get the clk indication.

 *

 * This function tries to read the external clock indication

 * from ACPI if available.

 */

int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk);



#else /* CONFIG_ACPI */



static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)
@@ -133,5 +146,10 @@ static inline u64 iwl_acpi_get_pwr_limit(struct device *dev) 
	return 0;

}



static inline int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)

{

	return -ENOENT;

}



#endif /* CONFIG_ACPI */

#endif /* __iwl_fw_acpi__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE