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

Merge tag 'iwlwifi-next-for-kalle-2020-04-24-2' of... 

Merge tag 'iwlwifi-next-for-kalle-2020-04-24-2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

First set of iwlwifi patches intended for v5.8

* TX queue debugfs improvements;
* Support for a few new FW API versions;
* Remove deprecated scan FW API version;
* New hw configs and other related changes;
* Support for NPK buffers in debugging;
* More debugging fetures;
* Some other small fixes and clean-ups;

# gpg: Signature made Fri 24 Apr 2020 04:39:43 PM EEST using RSA key ID 1A3CC5FA
# gpg: Good signature from "Luciano Roth Coelho (Luca) <luca@coelho.fi>"
# gpg:                 aka "Luciano Roth Coelho (Intel) <luciano.coelho@intel.com>"
parents 86501437 cbc63655

drivers/net/wireless/intel/iwlwifi/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o 
iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o

iwlwifi-objs		+= iwl-dbg-tlv.o

iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= fw/notif-wait.o



iwlwifi-objs		+= fw/img.o fw/notif-wait.o

iwlwifi-objs		+= fw/dbg.o

iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o

iwlwifi-$(CONFIG_ACPI) += fw/acpi.o

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

+60 −11
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ 
#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_SO_A_GF4_A_FW_PRE     "iwlwifi-so-a0-gf4-a0-"

#define IWL_22000_SOSNJ_A_GF4_A_FW_PRE  "iwlwifi-SoSnj-a0-gf4-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_22000_HR_MODULE_FIRMWARE(api) \

	IWL_22000_HR_FW_PRE __stringify(api) ".ucode"
@@ -120,6 +121,10 @@ 
	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"

#define IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(api) \

	IWL_SNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_SNJ_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_SNJ_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,
@@ -229,6 +234,15 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
		},							\

	}



const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

};



const struct iwl_cfg_trans_params iwl_qu_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,
@@ -238,9 +252,10 @@ const struct iwl_cfg_trans_params iwl_qu_trans_cfg = { 
	.base_params = &iwl_22000_base_params,

	.integrated = true,

	.xtal_latency = 5000,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_200US,

};



const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = {

const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,
@@ -248,17 +263,21 @@ const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = { 
	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

	.integrated = true,

	.xtal_latency = 12000,

	.low_latency_xtal = true,

	.xtal_latency = 1820,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_1820US,

};



const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = {

const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = {

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

	.integrated = true,

	.xtal_latency = 12000,

	.low_latency_xtal = true,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};



/*
@@ -522,22 +541,32 @@ const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = { 
};



const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {

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

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

	.fw_name_pre = IWL_22000_SO_A_HR_B_FW_PRE,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = {

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

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

	.fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long = {

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

	.fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

	.trans.xtal_latency = 12000,

	.trans.low_latency_xtal = true,

};



const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {

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

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

	.fw_name_pre = IWL_22000_TY_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,
@@ -545,16 +574,34 @@ const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = { 
};



const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = {

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

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

	.fw_name_pre = IWL_22000_SO_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long = {

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

	.fw_name_pre = IWL_22000_SO_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

	.trans.xtal_latency = 12000,

	.trans.low_latency_xtal = true,

};



const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0 = {

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

	.fw_name_pre = IWL_22000_SOSNJ_A_GF4_A_FW_PRE,

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

	.fw_name_pre = IWL_SNJ_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwlax211_cfg_snj_gf_a0 = {

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

	.fw_name_pre = IWL_SNJ_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,
@@ -573,3 +620,5 @@ 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));

MODULE_FIRMWARE(IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+76 −0
Original line number Diff line number Diff line
@@ -151,6 +151,82 @@ found: 
}

IWL_EXPORT_SYMBOL(iwl_acpi_get_wifi_pkg);



int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,

		     __le32 *black_list_array,

		     int *black_list_size)

{

	union acpi_object *wifi_pkg, *data;

	int ret, tbl_rev, i;

	bool enabled;



	data = iwl_acpi_get_object(fwrt->dev, ACPI_WTAS_METHOD);

	if (IS_ERR(data))

		return PTR_ERR(data);



	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt->dev, data,

					 ACPI_WTAS_WIFI_DATA_SIZE,

					 &tbl_rev);

	if (IS_ERR(wifi_pkg)) {

		ret = PTR_ERR(wifi_pkg);

		goto out_free;

	}



	if (wifi_pkg->package.elements[0].type != ACPI_TYPE_INTEGER ||

	    tbl_rev != 0) {

		ret = -EINVAL;

		goto out_free;

	}



	enabled = !!wifi_pkg->package.elements[0].integer.value;



	if (!enabled) {

		*black_list_size = -1;

		IWL_DEBUG_RADIO(fwrt, "TAS not enabled\n");

		ret = 0;

		goto out_free;

	}



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

	    wifi_pkg->package.elements[1].integer.value >

	    APCI_WTAS_BLACK_LIST_MAX) {

		IWL_DEBUG_RADIO(fwrt, "TAS invalid array size %llu\n",

				wifi_pkg->package.elements[1].integer.value);

		ret = -EINVAL;

		goto out_free;

	}

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



	IWL_DEBUG_RADIO(fwrt, "TAS array size %d\n", *black_list_size);

	if (*black_list_size > APCI_WTAS_BLACK_LIST_MAX) {

		IWL_DEBUG_RADIO(fwrt, "TAS invalid array size value %u\n",

				*black_list_size);

		ret = -EINVAL;

		goto out_free;

	}



	for (i = 0; i < *black_list_size; i++) {

		u32 country;



		if (wifi_pkg->package.elements[2 + i].type !=

		    ACPI_TYPE_INTEGER) {

			IWL_DEBUG_RADIO(fwrt,

					"TAS invalid array elem %d\n", 2 + i);

			ret = -EINVAL;

			goto out_free;

		}



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

		black_list_array[i] = cpu_to_le32(country);

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

	}



	ret = 0;

out_free:

	kfree(data);

	return ret;

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_tas);



int iwl_acpi_get_mcc(struct device *dev, char *mcc)

{

	union acpi_object *wifi_pkg, *data;

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

+17 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#include "fw/api/commands.h"

#include "fw/api/power.h"

#include "fw/api/phy.h"

#include "fw/api/nvm-reg.h"

#include "fw/img.h"

#include "iwl-trans.h"
@@ -75,6 +76,7 @@ 
#define ACPI_SPLC_METHOD	"SPLC"

#define ACPI_ECKV_METHOD	"ECKV"

#define ACPI_PPAG_METHOD	"PPAG"

#define ACPI_WTAS_METHOD	"WTAS"



#define ACPI_WIFI_DOMAIN	(0x07)
@@ -96,6 +98,12 @@ 
#define ACPI_SPLC_WIFI_DATA_SIZE	2

#define ACPI_ECKV_WIFI_DATA_SIZE	2



/*

 * 1 type, 1 enabled, 1 black list size, 16 black list array

 */

#define APCI_WTAS_BLACK_LIST_MAX	16

#define ACPI_WTAS_WIFI_DATA_SIZE	(3 + APCI_WTAS_BLACK_LIST_MAX)



#define ACPI_WGDS_NUM_BANDS		2

#define ACPI_WGDS_TABLE_SIZE		3
@@ -174,6 +182,9 @@ int iwl_validate_sar_geo_profile(struct iwl_fw_runtime *fwrt, 
int iwl_sar_geo_init(struct iwl_fw_runtime *fwrt,

		     struct iwl_per_chain_offset_group *table);



int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt, __le32 *black_list_array,

		     int *black_list_size);



#else /* CONFIG_ACPI */



static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)
@@ -250,5 +261,11 @@ static inline int iwl_sar_geo_init(struct iwl_fw_runtime *fwrt, 
	return -ENOENT;

}



static inline int iwl_acpi_get_tas(struct iwl_fw_runtime *fwrt,

				   __le32 *black_list_array,

				   int *black_list_size)

{

	return -ENOENT;

}

#endif /* CONFIG_ACPI */

#endif /* __iwl_fw_acpi__ */

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

+36 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 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
@@ -31,7 +31,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 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
@@ -119,16 +119,49 @@ enum iwl_calib_cfg { 
	IWL_CALIB_CFG_AGC_IDX			= BIT(18),

};



/**

 * struct iwl_phy_specific_cfg - specific PHY filter configuration

 *

 * Sent as part of the phy configuration command (v3) to configure specific FW

 * defined PHY filters that can be applied to each antenna.

 *

 * @filter_cfg_chain_a: filter config id for LMAC1 chain A

 * @filter_cfg_chain_b: filter config id for LMAC1 chain B

 * @filter_cfg_chain_c: filter config id for LMAC2 chain A

 * @filter_cfg_chain_d: filter config id for LMAC2 chain B

 * values: 0 - no filter; 0xffffffff - reserved; otherwise - filter id

 */

struct iwl_phy_specific_cfg {

	__le32 filter_cfg_chain_a;

	__le32 filter_cfg_chain_b;

	__le32 filter_cfg_chain_c;

	__le32 filter_cfg_chain_d;

} __packed; /* PHY_SPECIFIC_CONFIGURATION_API_VER_1*/



/**

 * struct iwl_phy_cfg_cmd - Phy configuration command

 *

 * @phy_cfg: PHY configuration value, uses &enum iwl_fw_phy_cfg

 * @calib_control: calibration control data

 */

struct iwl_phy_cfg_cmd {

struct iwl_phy_cfg_cmd_v1 {

	__le32	phy_cfg;

	struct iwl_calib_ctrl calib_control;

} __packed;



/**

 * struct iwl_phy_cfg_cmd_v3 - Phy configuration command (v3)

 *

 * @phy_cfg: PHY configuration value, uses &enum iwl_fw_phy_cfg

 * @calib_control: calibration control data

 * @phy_specific_cfg: configure predefined PHY filters

 */

struct iwl_phy_cfg_cmd_v3 {

	__le32	phy_cfg;

	struct iwl_calib_ctrl calib_control;

	struct iwl_phy_specific_cfg phy_specific_cfg;

} __packed; /* PHY_CONFIGURATION_CMD_API_S_VER_3 */



/*

 * enum iwl_dc2dc_config_id - flag ids

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE