Commit 04f1ee24 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: fw: correctly detect HW-SMEM region subtype 



This is part of the "device memory" type, but with the
subtypes we can now detect it properly, rather than
having to make assumptions on the ID.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211204174546.91d33aa9dd3d.Ifb48e21fbb92ea25360856b5cc2afbb9b485d6b3@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 23a392a4

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

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


#include <linux/bitops.h>



#define IWL_FW_INI_HW_SMEM_REGION_ID		15

#define IWL_FW_INI_MAX_REGION_ID		64

#define IWL_FW_INI_MAX_NAME			32

#define IWL_FW_INI_MAX_CFG_NAME			64
@@ -387,6 +386,8 @@ enum iwl_fw_ini_region_type { 
	IWL_FW_INI_REGION_NUM

}; /* FW_TLV_DEBUG_REGION_TYPE_API_E */



#define IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_HW_SMEM	1



/**

 * enum iwl_fw_ini_time_point

 *

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

+1 −2
Original line number Diff line number Diff line
@@ -1165,8 +1165,7 @@ static int iwl_dump_ini_dev_mem_iter(struct iwl_fw_runtime *fwrt, 
	iwl_trans_read_mem_bytes(fwrt->trans, addr, range->data,

				 le32_to_cpu(reg->dev_addr.size));



	if ((le32_to_cpu(reg->id) & IWL_FW_INI_REGION_V2_MASK) ==

		IWL_FW_INI_HW_SMEM_REGION_ID &&

	if (reg->sub_type == IWL_FW_INI_REGION_DEVICE_MEMORY_SUBTYPE_HW_SMEM &&

	    fwrt->sanitize_ops && fwrt->sanitize_ops->frob_txf)

		fwrt->sanitize_ops->frob_txf(fwrt->sanitize_ctx,

					     range->data,