Commit 03029ed4 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2019-10-18-2' of... 

Merge tag 'iwlwifi-next-for-kalle-2019-10-18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Patches intended for v5.5

* Revamp the debugging infrastructure;
* Some udpdates to FW API commands;
* Fix max amsdu value calculation;
* Small updates in the debugging infra;
* Some new helper functions;
* A few clean-ups;
* Other small fixes and improvements;
parents 5c70e971 65b9425c

drivers/net/wireless/intel/iwlwifi/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 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-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o fw/dbg.o

iwlwifi-objs		+= fw/dbg.o

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

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

iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += fw/debugfs.o

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

+48 −7
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include <linux/module.h>

#include <linux/stringify.h>

#include "iwl-config.h"

#include "iwl-prph.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	50
@@ -183,23 +184,49 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.min_umac_error_event_table = 0x400000,				\

	.d3_debug_data_base_addr = 0x401000,				\

	.d3_debug_data_length = 60 * 1024,				\

	.fw_mon_smem_write_ptr_addr = 0xa0c16c,				\

	.fw_mon_smem_write_ptr_msk = 0xfffff,				\

	.fw_mon_smem_cycle_cnt_ptr_addr = 0xa0c174,			\

	.fw_mon_smem_cycle_cnt_ptr_msk = 0xfffff

	.mon_smem_regs = {						\

		.write_ptr = {						\

			.addr = LDBG_M2S_BUF_WPTR,			\

			.mask = LDBG_M2S_BUF_WPTR_VAL_MSK,		\

	},								\

		.cycle_cnt = {						\

			.addr = LDBG_M2S_BUF_WRAP_CNT,			\

			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,		\

		},							\

	}



#define IWL_DEVICE_22500						\

	IWL_DEVICE_22000_COMMON,					\

	.trans.device_family = IWL_DEVICE_FAMILY_22000,			\

	.trans.base_params = &iwl_22000_base_params,			\

	.trans.csr = &iwl_csr_v1,					\

	.gp2_reg_addr = 0xa02c68

	.gp2_reg_addr = 0xa02c68,					\

	.mon_dram_regs = {						\

		.write_ptr = {						\

			.addr = MON_BUFF_WRPTR_VER2,			\

			.mask = 0xffffffff,				\

		},							\

		.cycle_cnt = {						\

			.addr = MON_BUFF_CYCLE_CNT_VER2,		\

			.mask = 0xffffffff,				\

		},							\

	}



#define IWL_DEVICE_22560						\

	IWL_DEVICE_22000_COMMON,					\

	.trans.device_family = IWL_DEVICE_FAMILY_22560,			\

	.trans.base_params = &iwl_22560_base_params,			\

	.trans.csr = &iwl_csr_v2

	.trans.csr = &iwl_csr_v2,					\

	.mon_dram_regs = {						\

		.write_ptr = {						\

			.addr = MON_BUFF_WRPTR_VER2,			\

			.mask = 0xffffffff,				\

		},							\

		.cycle_cnt = {						\

			.addr = MON_BUFF_CYCLE_CNT_VER2,		\

			.mask = 0xffffffff,				\

		},							\

	}



#define IWL_DEVICE_AX210						\

	IWL_DEVICE_22000_COMMON,					\
@@ -209,7 +236,21 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.trans.csr = &iwl_csr_v1,					\

	.min_txq_size = 128,						\

	.gp2_reg_addr = 0xd02c68,					\

	.min_256_ba_txq_size = 512

	.min_256_ba_txq_size = 512,					\

	.mon_dram_regs = {						\

		.write_ptr = {						\

			.addr = DBGC_CUR_DBGBUF_STATUS,			\

			.mask = DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK,	\

		},							\

		.cycle_cnt = {						\

			.addr = DBGC_DBGBUF_WRAP_AROUND,		\

			.mask = 0xffffffff,				\

		},							\

		.cur_frag = {						\

			.addr = DBGC_CUR_DBGBUF_STATUS,			\

			.mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK,		\

		},							\

	}



const struct iwl_cfg iwl22000_2ac_cfg_hr = {

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

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

+21 −4
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include <linux/stringify.h>

#include "iwl-config.h"

#include "fw/file.h"

#include "iwl-prph.h"



/* Highest firmware API version supported */

#define IWL9000_UCODE_API_MAX	46
@@ -149,10 +150,26 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.ht_params = &iwl9000_ht_params,				\

	.nvm_ver = IWL9000_NVM_VERSION,					\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,		\

	.fw_mon_smem_write_ptr_addr = 0xa0476c,				\

	.fw_mon_smem_write_ptr_msk = 0xfffff,				\

	.fw_mon_smem_cycle_cnt_ptr_addr = 0xa04774,			\

	.fw_mon_smem_cycle_cnt_ptr_msk = 0xfffff

	.mon_smem_regs = {						\

		.write_ptr = {						\

			.addr = LDBG_M2S_BUF_WPTR,			\

			.mask = LDBG_M2S_BUF_WPTR_VAL_MSK,		\

		},							\

		.cycle_cnt = {						\

			.addr = LDBG_M2S_BUF_WRAP_CNT,			\

			.mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK,		\

		},							\

	},								\

	.mon_dram_regs = {						\

		.write_ptr = {						\

			.addr = MON_BUFF_WRPTR_VER2,			\

			.mask = 0xffffffff,				\

		},							\

		.cycle_cnt = {						\

			.addr = MON_BUFF_CYCLE_CNT_VER2,		\

			.mask = 0xffffffff,				\

		},							\

	}





const struct iwl_cfg iwl9160_2ac_cfg = {

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

+8 −0
Original line number Diff line number Diff line
@@ -64,6 +64,14 @@ 
#ifndef __iwl_fw_api_d3_h__

#define __iwl_fw_api_d3_h__



/**

 * enum iwl_d0i3_flags - d0i3 flags

 * @IWL_D0I3_RESET_REQUIRE: FW require reset upon resume

 */

enum iwl_d0i3_flags {

	IWL_D0I3_RESET_REQUIRE = BIT(0),

};



/**

 * enum iwl_d3_wakeup_flags - D3 manager wakeup flags

 * @IWL_WAKEUP_D3_CONFIG_FW_ERROR: wake up on firmware sysassert

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

+196 −318

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE