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

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

iwlwifi: dbg_ini: make memory dump get_size handler include headers 



Make the get size handler of iwl_dump_ini_mem_ops include the total
size of the region. It is needed for fifos dumping.

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

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

+49 −49
Original line number Diff line number Diff line
@@ -1187,69 +1187,81 @@ static struct iwl_fw_ini_error_dump_range 
	return mon_dump->ranges;

}



static u32 iwl_dump_ini_mem_get_size(struct iwl_fw_runtime *fwrt,

static u32 iwl_dump_ini_mem_ranges(struct iwl_fw_runtime *fwrt,

				   struct iwl_fw_ini_region_cfg *reg)

{

	return le32_to_cpu(reg->internal.num_of_ranges) *

		le32_to_cpu(reg->internal.range_data_size);

	return le32_to_cpu(reg->internal.num_of_ranges);

}



static u32 iwl_dump_ini_paging_gen2_get_size(struct iwl_fw_runtime *fwrt,

static u32 iwl_dump_ini_paging_gen2_ranges(struct iwl_fw_runtime *fwrt,

					   struct iwl_fw_ini_region_cfg *reg)

{

	int i;

	u32 size = 0;



	for (i = 0; i < fwrt->trans->init_dram.paging_cnt; i++)

		size += fwrt->trans->init_dram.paging[i].size;

	return size;

	return fwrt->trans->init_dram.paging_cnt;

}



static u32 iwl_dump_ini_paging_get_size(struct iwl_fw_runtime *fwrt,

static u32 iwl_dump_ini_paging_ranges(struct iwl_fw_runtime *fwrt,

				      struct iwl_fw_ini_region_cfg *reg)

{

	int i;

	u32 size = 0;



	for (i = 1; i <= fwrt->num_of_paging_blk; i++)

		size += fwrt->fw_paging_db[i].fw_paging_size;

	return size;

	return fwrt->num_of_paging_blk;

}



static u32 iwl_dump_ini_mon_dram_get_size(struct iwl_fw_runtime *fwrt,

static u32 iwl_dump_ini_mon_dram_ranges(struct iwl_fw_runtime *fwrt,

					struct iwl_fw_ini_region_cfg *reg)

{

	return fwrt->trans->num_blocks ? fwrt->trans->fw_mon[0].size : 0;

	return 1;

}



static u32 iwl_dump_ini_mem_ranges(struct iwl_fw_runtime *fwrt,

static u32 iwl_dump_ini_mem_get_size(struct iwl_fw_runtime *fwrt,

				     struct iwl_fw_ini_region_cfg *reg)

{

	return le32_to_cpu(reg->internal.num_of_ranges);

	return sizeof(struct iwl_fw_ini_error_dump) +

		iwl_dump_ini_mem_ranges(fwrt, reg) *

		(sizeof(struct iwl_fw_ini_error_dump_range) +

		 le32_to_cpu(reg->internal.range_data_size));

}



static u32 iwl_dump_ini_paging_gen2_ranges(struct iwl_fw_runtime *fwrt,

static u32 iwl_dump_ini_paging_gen2_get_size(struct iwl_fw_runtime *fwrt,

					     struct iwl_fw_ini_region_cfg *reg)

{

	return fwrt->trans->init_dram.paging_cnt;

	int i;

	u32 range_header_len = sizeof(struct iwl_fw_ini_error_dump_range);

	u32 size = sizeof(struct iwl_fw_ini_error_dump);



	for (i = 0; i < iwl_dump_ini_paging_gen2_ranges(fwrt, reg); i++)

		size += range_header_len +

			fwrt->trans->init_dram.paging[i].size;



	return size;

}



static u32 iwl_dump_ini_paging_ranges(struct iwl_fw_runtime *fwrt,

static u32 iwl_dump_ini_paging_get_size(struct iwl_fw_runtime *fwrt,

					struct iwl_fw_ini_region_cfg *reg)

{

	return fwrt->num_of_paging_blk;

	int i;

	u32 range_header_len = sizeof(struct iwl_fw_ini_error_dump_range);

	u32 size = sizeof(struct iwl_fw_ini_error_dump);



	for (i = 1; i <= iwl_dump_ini_paging_ranges(fwrt, reg); i++)

		size += range_header_len + fwrt->fw_paging_db[i].fw_paging_size;



	return size;

}



static u32 iwl_dump_ini_mon_dram_ranges(struct iwl_fw_runtime *fwrt,

static u32 iwl_dump_ini_mon_dram_get_size(struct iwl_fw_runtime *fwrt,

					  struct iwl_fw_ini_region_cfg *reg)

{

	return 1;

	u32 size = sizeof(struct iwl_fw_ini_monitor_dram_dump);



	if (fwrt->trans->num_blocks)

		size += fwrt->trans->fw_mon[0].size;



	return size;

}



/**

 * struct iwl_dump_ini_mem_ops - ini memory dump operations

 * @get_num_of_ranges: returns the number of memory ranges in the region.

 * @get_size: returns the size of the region data without headers.

 * @get_size: returns the total size of the region.

 * @fill_mem_hdr: fills region type specific headers and returns the first

 *	range or NULL if failed to fill headers.

 * @fill_range: copies a given memory range into the dump.
@@ -1291,8 +1303,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)->len = cpu_to_le32(sizeof(*header) + num_of_ranges *

				   sizeof(*range) + ops->get_size(fwrt, reg));

	(*data)->len = cpu_to_le32(ops->get_size(fwrt, reg));



	header->num_of_ranges = cpu_to_le32(num_of_ranges);

	header->name_len = cpu_to_le32(min_t(int, IWL_FW_INI_MAX_NAME,
@@ -1323,8 +1334,6 @@ static int iwl_fw_ini_get_trigger_len(struct iwl_fw_runtime *fwrt, 
				      struct iwl_fw_ini_trigger *trigger)

{

	int i, size = 0, hdr_len = sizeof(struct iwl_fw_error_dump_data);

	u32 dump_header_len = sizeof(struct iwl_fw_ini_error_dump);

	u32 range_header_len = sizeof(struct iwl_fw_ini_error_dump_range);



	if (!trigger || !trigger->num_regions)

		return 0;
@@ -1349,9 +1358,7 @@ static int iwl_fw_ini_get_trigger_len(struct iwl_fw_runtime *fwrt, 
		case IWL_FW_INI_REGION_PERIPHERY_AUX:

		case IWL_FW_INI_REGION_INTERNAL_BUFFER:

		case IWL_FW_INI_REGION_CSR:

			size += hdr_len + dump_header_len + range_header_len *

				iwl_dump_ini_mem_ranges(fwrt, reg) +

				iwl_dump_ini_mem_get_size(fwrt, reg);

			size += hdr_len + iwl_dump_ini_mem_get_size(fwrt, reg);

			break;

		case IWL_FW_INI_REGION_TXF:

			size += iwl_fw_txf_len(fwrt, &fwrt->smem_cfg);
@@ -1360,16 +1367,11 @@ static int iwl_fw_ini_get_trigger_len(struct iwl_fw_runtime *fwrt, 
			size += iwl_fw_rxf_len(fwrt, &fwrt->smem_cfg);

			break;

		case IWL_FW_INI_REGION_PAGING: {

			size += hdr_len + dump_header_len;

			size += hdr_len;

			if (iwl_fw_dbg_is_paging_enabled(fwrt)) {

				size += range_header_len *

					iwl_dump_ini_paging_ranges(fwrt, reg) +

					iwl_dump_ini_paging_get_size(fwrt, reg);

				size += iwl_dump_ini_paging_get_size(fwrt, reg);

			} else {

				size += range_header_len *

					iwl_dump_ini_paging_gen2_ranges(fwrt,

									reg) +

					iwl_dump_ini_paging_gen2_get_size(fwrt,

				size += iwl_dump_ini_paging_gen2_get_size(fwrt,

									  reg);

			}

			break;
@@ -1378,8 +1380,6 @@ static int iwl_fw_ini_get_trigger_len(struct iwl_fw_runtime *fwrt, 
			if (!fwrt->trans->num_blocks)

				break;

			size += hdr_len +

				sizeof(struct iwl_fw_ini_monitor_dram_dump) *

				iwl_dump_ini_mon_dram_ranges(fwrt, reg) +

				iwl_dump_ini_mon_dram_get_size(fwrt, reg);

			break;

		case IWL_FW_INI_REGION_DRAM_IMR: