Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc14b800 authored by Shahar S Matityahu's avatar Shahar S Matityahu Committed by Luca Coelho
Browse files

iwlwifi: dbg_ini: use different barker for ini dump 



Use a different barker for ini dump to allow differentiation from legacy
dump. Also it allows to remove INI_BIT from dump TLVs.

Signed-off-by: default avatarShahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent c7ab138e

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

+2 −2
Original line number Diff line number Diff line
@@ -1690,7 +1690,7 @@ iwl_dump_ini_mem(struct iwl_fw_runtime *fwrt, 


	num_of_ranges = ops->get_num_of_ranges(fwrt, reg);



	(*data)->type = cpu_to_le32(type | INI_DUMP_BIT);

	(*data)->type = cpu_to_le32(type);

	(*data)->len = cpu_to_le32(size);



	header->region_id = reg->region_id;
@@ -1935,7 +1935,7 @@ iwl_fw_error_ini_dump_file(struct iwl_fw_runtime *fwrt, 
	if (!dump_file)

		return NULL;



	dump_file->barker = cpu_to_le32(IWL_FW_ERROR_DUMP_BARKER);

	dump_file->barker = cpu_to_le32(IWL_FW_INI_ERROR_DUMP_BARKER);

	dump_data = (void *)dump_file->data;

	dump_file->file_len = cpu_to_le32(size);

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

+1 −3
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include <linux/types.h>



#define IWL_FW_ERROR_DUMP_BARKER	0x14789632

#define IWL_FW_INI_ERROR_DUMP_BARKER	0x14789633



/**

 * enum iwl_fw_error_dump_type - types of data in the dump file
@@ -283,9 +284,6 @@ struct iwl_fw_error_dump_mem { 
 */

#define IWL_INI_DUMP_VER 1



/* This bit is used to differentiate the legacy dump from the ini dump */

#define INI_DUMP_BIT BIT(31)



/**

 * struct iwl_fw_ini_fifo_hdr - fifo range header

 * @fifo_num: the fifo number. In case of umac rx fifo, set BIT(31) to