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

Merge tag 'iwlwifi-next-for-kalle-2020-05-08' of... 

Merge tag 'iwlwifi-next-for-kalle-2020-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Second set of iwlwifi patches intended for v5.8

* Support new FW APIs;
* Remove some old and unused features;
* HW configuration rework continues;
* Some queues rework by Johannes;
* Enable A-AMSDU in low  latency;
* Some debugging fixes;
* Some other small fixes and clean-ups;

# gpg: Signature made Fri 08 May 2020 10:08:58 AM 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 b6ba5761 d3d2674c

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

+47 −57
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-2019 Intel Corporation

 * Copyright (C) 2018-2020 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-2019 Intel Corporation

 * Copyright (C) 2018-2020 Intel Corporation

 * All rights reserved.

 *

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



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	53

#define IWL_22000_UCODE_API_MAX	55



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -73,11 +73,8 @@ 
#define IWL_22000_SMEM_OFFSET		0x400000

#define IWL_22000_SMEM_LEN		0xD0000



#define IWL_22000_JF_FW_PRE		"iwlwifi-Qu-a0-jf-b0-"

#define IWL_22000_HR_FW_PRE		"iwlwifi-Qu-a0-hr-a0-"

#define IWL_22000_HR_CDB_FW_PRE		"iwlwifi-QuIcp-z0-hrcdb-a0-"

#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_QU_B_HR_B_FW_PRE		"iwlwifi-Qu-b0-hr-b0-"

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

#define IWL_QU_C_HR_B_FW_PRE		"iwlwifi-Qu-c0-hr-b0-"

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

#define IWL_QU_C_JF_B_FW_PRE		"iwlwifi-Qu-c0-jf-b0-"
@@ -85,22 +82,18 @@ 
#define IWL_QUZ_A_JF_B_FW_PRE		"iwlwifi-QuZ-a0-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_SO_A_GF4_A_FW_PRE     "iwlwifi-so-a0-gf4-a0-"

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

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

#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_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"

#define IWL_22000_JF_MODULE_FIRMWARE(api) \

	IWL_22000_JF_FW_PRE __stringify(api) ".ucode"

#define IWL_22000_QU_B_HR_B_MODULE_FIRMWARE(api) \

	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_QU_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_QNJ_B_HR_B_MODULE_FIRMWARE(api)	\

	IWL_QNJ_B_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \
@@ -113,14 +106,14 @@ 
	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"

#define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \

	IWL_SO_A_JF_B_FW_PRE __stringify(api) ".ucode"

#define IWL_SO_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_SO_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_SO_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_SO_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_TY_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_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) \
@@ -218,7 +211,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 = 512,					\

	.min_256_ba_txq_size = 1024,					\

	.mon_dram_regs = {						\

		.write_ptr = {						\

			.addr = DBGC_CUR_DBGBUF_STATUS,			\
@@ -343,15 +336,16 @@ const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = { 
};



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_ax101_name[] = "Intel(R) Wi-Fi 6 AX101";



const char iwl_ax200_killer_1650w_name[] =

	"Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)";

const char iwl_ax200_killer_1650x_name[] =

	"Killer(R) Wi-Fi 6 AX1650x 160MHz Wireless Network Adapter (200NGW)";



const struct iwl_cfg iwl_ax101_cfg_qu_hr = {

	.name = "Intel(R) Wi-Fi 6 AX101",

	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,

const struct iwl_cfg iwl_qu_b0_hr1_b0 = {

	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -365,7 +359,7 @@ const struct iwl_cfg iwl_ax101_cfg_qu_hr = { 


const struct iwl_cfg iwl_ax201_cfg_qu_hr = {

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

	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,

	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -376,8 +370,7 @@ const struct iwl_cfg iwl_ax201_cfg_qu_hr = { 
	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0 = {

	.name = "Intel(R) Wi-Fi 6 AX101",

const struct iwl_cfg iwl_qu_c0_hr1_b0 = {

	.fw_name_pre = IWL_QU_C_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*
@@ -403,8 +396,7 @@ const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0 = { 
	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl_ax101_cfg_quz_hr = {

	.name = "Intel(R) Wi-Fi 6 AX101",

const struct iwl_cfg iwl_quz_a0_hr1_b0 = {

	.fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*
@@ -470,7 +462,7 @@ const struct iwl_cfg iwl_ax200_cfg_cc = { 


const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {

	.name = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)",

	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,

	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -483,7 +475,7 @@ const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = { 


const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = {

	.name = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)",

	.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,

	.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -520,9 +512,8 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = { 
	.num_rbds = IWL_NUM_RBDS_22000_HE,

};



const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = {

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

	.fw_name_pre = IWL_22000_HR_B_FW_PRE,

const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg = {

	.fw_name_pre = IWL_QNJ_B_HR_B_FW_PRE,

	IWL_DEVICE_22500,

	/*

	 * This device doesn't support receiving BlockAck with a large bitmap
@@ -535,21 +526,21 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = { 


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,

	.fw_name_pre = IWL_SO_A_JF_B_FW_PRE,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_NON_HE,

};



const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {

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

	.fw_name_pre = IWL_22000_SO_A_HR_B_FW_PRE,

	.fw_name_pre = IWL_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 6 AX211 160MHz",

	.fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,

	.fw_name_pre = IWL_SO_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,
@@ -557,7 +548,7 @@ const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = { 


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,

	.fw_name_pre = IWL_SO_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,
@@ -567,7 +558,7 @@ const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long = { 


const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {

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

	.fw_name_pre = IWL_22000_TY_A_GF_A_FW_PRE,

	.fw_name_pre = IWL_TY_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,
@@ -575,7 +566,7 @@ 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 6 AX411 160MHz",

	.fw_name_pre = IWL_22000_SO_A_GF4_A_FW_PRE,

	.fw_name_pre = IWL_SO_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,
@@ -583,7 +574,7 @@ const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = { 


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,

	.fw_name_pre = IWL_SO_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,
@@ -607,18 +598,17 @@ const struct iwl_cfg iwlax211_cfg_snj_gf_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



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_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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));

MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QUZ_A_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));

MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SO_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_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/dvm/dev.h

+1 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/******************************************************************************

 *

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

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

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -810,7 +810,6 @@ struct iwl_priv { 
	u8 bt_traffic_load, last_bt_traffic_load;

	bool bt_ch_announce;

	bool bt_full_concurrent;

	bool bt_ant_couple_ok;

	__le32 kill_ack_mask;

	__le32 kill_cts_mask;

	__le16 bt_valid;

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

+2 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/******************************************************************************

 *

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

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

 * Copyright(c) 2015 Intel Deutschland GmbH

 * Copyright (C) 2018 - 2019 Intel Corporation

 *

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

 * as portions of the ieee80211 subsystem header files.
@@ -53,7 +52,7 @@ 


#define DRV_DESCRIPTION	"Intel(R) Wireless WiFi Link AGN driver for Linux"

MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);

MODULE_AUTHOR(DRV_AUTHOR);

MODULE_LICENSE("GPL");



/* Please keep this array *SORTED* by hex value.
@@ -1370,12 +1369,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 


	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");



	/* is antenna coupling more than 35dB ? */

	priv->bt_ant_couple_ok =

		(iwlwifi_mod_params.antenna_coupling >

			IWL_BT_ANTENNA_COUPLING_THRESHOLD) ?

			true : false;



	/* bt channel inhibition enabled*/

	priv->bt_ch_announce = true;

	IWL_DEBUG_INFO(priv, "BT channel inhibition is %s\n",

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

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

 *

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

 * Copyright (C) 2019 - 2020 Intel Corporation

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -846,16 +847,6 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx, 
	struct iwl_scale_tbl_info *tbl;

	bool full_concurrent = priv->bt_full_concurrent;



	if (priv->bt_ant_couple_ok) {

		/*

		 * Is there a need to switch between

		 * full concurrency and 3-wire?

		 */

		if (priv->bt_ci_compliance)

			full_concurrent = true;

		else

			full_concurrent = false;

	}

	if ((priv->bt_traffic_load != priv->last_bt_traffic_load) ||

	    (priv->bt_full_concurrent != full_concurrent)) {

		priv->bt_full_concurrent = full_concurrent;

drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h

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

 * GPL LICENSE SUMMARY

 *

 * Copyright (C) 2018 - 2019 Intel Corporation

 * Copyright (C) 2018 - 2020 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
@@ -25,7 +25,7 @@ 
 *

 * BSD LICENSE

 *

 * Copyright (C) 2018 - 2019 Intel Corporation

 * Copyright (C) 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -304,6 +304,7 @@ enum iwl_fw_ini_buffer_location { 
	IWL_FW_INI_LOCATION_SRAM_PATH,

	IWL_FW_INI_LOCATION_DRAM_PATH,

	IWL_FW_INI_LOCATION_NPK_PATH,

	IWL_FW_INI_LOCATION_NUM,

}; /* FW_DEBUG_TLV_BUFFER_LOCATION_E_VER_1 */



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE