iwlwifi: add d3 debug data support (2d8c2615) · Commits · e / devices / android_kernel_fairphone_FP5

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -155,7 +155,9 @@ static const struct iwl_ht_params iwl_22000_ht_params = {
	.gen2 = true, \		.gen2 = true, \
	.nvm_type = IWL_NVM_EXT, \		.nvm_type = IWL_NVM_EXT, \
	.dbgc_supported = true, \		.dbgc_supported = true, \
	.min_umac_error_event_table = 0x400000		.min_umac_error_event_table = 0x400000, \
			.d3_debug_data_base_addr = 0x401000, \
			.d3_debug_data_length = 60 * 1024

	#define IWL_DEVICE_22500 \		#define IWL_DEVICE_22500 \
	IWL_DEVICE_22000_COMMON, \		IWL_DEVICE_22000_COMMON, \

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -155,7 +155,9 @@ static const struct iwl_tt_params iwl9000_tt_params = {
	.nvm_type = IWL_NVM_EXT, \		.nvm_type = IWL_NVM_EXT, \
	.dbgc_supported = true, \		.dbgc_supported = true, \
	.min_umac_error_event_table = 0x800000, \		.min_umac_error_event_table = 0x800000, \
	.csr = &iwl_csr_v1		.csr = &iwl_csr_v1, \
			.d3_debug_data_base_addr = 0x401000, \
			.d3_debug_data_length = 92 * 1024

	const struct iwl_cfg iwl9160_2ac_cfg = {		const struct iwl_cfg iwl9160_2ac_cfg = {
	.name = "Intel(R) Dual Band Wireless AC 9160",		.name = "Intel(R) Dual Band Wireless AC 9160",

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

+48 −0

Original line number	Original line	Diff line number	Diff line
	@@ -746,6 +746,11 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
	sizeof(struct iwl_fw_error_dump_paging) +		sizeof(struct iwl_fw_error_dump_paging) +
	PAGING_BLOCK_SIZE);		PAGING_BLOCK_SIZE);

			if (iwl_fw_dbg_is_d3_debug_enabled(fwrt) && fwrt->dump.d3_debug_data) {
			file_len += sizeof(*dump_data) +
			fwrt->trans->cfg->d3_debug_data_length * 2;
			}

	/* If we only want a monitor dump, reset the file length */		/* If we only want a monitor dump, reset the file length */
	if (monitor_dump_only) {		if (monitor_dump_only) {
	file_len = sizeof(dump_file) + sizeof(dump_data) * 2 +		file_len = sizeof(dump_file) + sizeof(dump_data) * 2 +
	@@ -858,6 +863,26 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt)
	dump_data = iwl_fw_error_next_data(dump_data);		dump_data = iwl_fw_error_next_data(dump_data);
	}		}

			if (iwl_fw_dbg_is_d3_debug_enabled(fwrt) && fwrt->dump.d3_debug_data) {
			u32 addr = fwrt->trans->cfg->d3_debug_data_base_addr;
			size_t data_size = fwrt->trans->cfg->d3_debug_data_length;

			dump_data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_D3_DEBUG_DATA);
			dump_data->len = cpu_to_le32(data_size * 2);

			memcpy(dump_data->data, fwrt->dump.d3_debug_data,
			data_size);

			kfree(fwrt->dump.d3_debug_data);
			fwrt->dump.d3_debug_data = NULL;

			iwl_trans_read_mem_bytes(fwrt->trans, addr,
			dump_data->data + data_size,
			data_size);

			dump_data = iwl_fw_error_next_data(dump_data);
			}

	for (i = 0; i < fwrt->fw->n_dbg_mem_tlv; i++) {		for (i = 0; i < fwrt->fw->n_dbg_mem_tlv; i++) {
	u32 len = le32_to_cpu(fw_dbg_mem[i].len);		u32 len = le32_to_cpu(fw_dbg_mem[i].len);
	u32 ofs = le32_to_cpu(fw_dbg_mem[i].ofs);		u32 ofs = le32_to_cpu(fw_dbg_mem[i].ofs);
	@@ -1212,3 +1237,26 @@ void iwl_fw_error_dump_wk(struct work_struct *work)
	fwrt->ops->dump_end(fwrt->ops_ctx);		fwrt->ops->dump_end(fwrt->ops_ctx);
	}		}

			void iwl_fw_dbg_read_d3_debug_data(struct iwl_fw_runtime *fwrt)
			{
			const struct iwl_cfg *cfg = fwrt->trans->cfg;

			if (!iwl_fw_dbg_is_d3_debug_enabled(fwrt))
			return;

			if (!fwrt->dump.d3_debug_data) {
			fwrt->dump.d3_debug_data = kmalloc(cfg->d3_debug_data_length,
			GFP_KERNEL);
			if (!fwrt->dump.d3_debug_data) {
			IWL_ERR(fwrt,
			"failed to allocate memory for D3 debug data\n");
			return;
			}
			}

			/* if the buffer holds previous debug data it is overwritten */
			iwl_trans_read_mem_bytes(fwrt->trans, cfg->d3_debug_data_base_addr,
			fwrt->dump.d3_debug_data,
			cfg->d3_debug_data_length);
			}
			IWL_EXPORT_SYMBOL(iwl_fw_dbg_read_d3_debug_data);

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

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -217,6 +217,16 @@ static inline void iwl_fw_dump_conf_clear(struct iwl_fw_runtime *fwrt)

	void iwl_fw_error_dump_wk(struct work_struct *work);		void iwl_fw_error_dump_wk(struct work_struct *work);

			static inline bool iwl_fw_dbg_is_d3_debug_enabled(struct iwl_fw_runtime *fwrt)
			{
			return fw_has_capa(&fwrt->fw->ucode_capa,
			IWL_UCODE_TLV_CAPA_D3_DEBUG) &&
			fwrt->trans->cfg->d3_debug_data_length &&
			fwrt->fw->dbg_dump_mask & BIT(IWL_FW_ERROR_DUMP_D3_DEBUG_DATA);
			}

			void iwl_fw_dbg_read_d3_debug_data(struct iwl_fw_runtime *fwrt);

	static inline void iwl_fw_flush_dump(struct iwl_fw_runtime *fwrt)		static inline void iwl_fw_flush_dump(struct iwl_fw_runtime *fwrt)
	{		{
	flush_delayed_work(&fwrt->dump.wk);		flush_delayed_work(&fwrt->dump.wk);

drivers/net/wireless/intel/iwlwifi/fw/error-dump.h

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,7 @@
	* Copyright(c) 2014 Intel Corporation. All rights reserved.		* Copyright(c) 2014 Intel Corporation. All rights reserved.
	* Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH		* Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH
	* Copyright(c) 2016 - 2017 Intel Deutschland GmbH		* Copyright(c) 2016 - 2017 Intel Deutschland GmbH
			* Copyright (C) 2018 Intel Corporation
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of version 2 of the GNU General Public License as
	@@ -18,11 +19,6 @@
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* General Public License for more details.		* General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
	* USA
	*
	* The full GNU General Public License is included in this distribution		* The full GNU General Public License is included in this distribution
	* in the file called COPYING.		* in the file called COPYING.
	*		*
	@@ -35,6 +31,7 @@
	* Copyright(c) 2014 Intel Corporation. All rights reserved.		* Copyright(c) 2014 Intel Corporation. All rights reserved.
	* Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH		* Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH
	* Copyright(c) 2016 - 2017 Intel Deutschland GmbH		* Copyright(c) 2016 - 2017 Intel Deutschland GmbH
			* Copyright (C) 2018 Intel Corporation
	* All rights reserved.		* All rights reserved.
	*		*
	* Redistribution and use in source and binary forms, with or without		* Redistribution and use in source and binary forms, with or without
	@@ -116,6 +113,7 @@ enum iwl_fw_error_dump_type {
	IWL_FW_ERROR_DUMP_INTERNAL_TXF = 14,		IWL_FW_ERROR_DUMP_INTERNAL_TXF = 14,
	IWL_FW_ERROR_DUMP_EXTERNAL = 15, /* Do not move */		IWL_FW_ERROR_DUMP_EXTERNAL = 15, /* Do not move */
	IWL_FW_ERROR_DUMP_MEM_CFG = 16,		IWL_FW_ERROR_DUMP_MEM_CFG = 16,
			IWL_FW_ERROR_DUMP_D3_DEBUG_DATA = 17,

	IWL_FW_ERROR_DUMP_MAX,		IWL_FW_ERROR_DUMP_MAX,
	};		};