Commit cc598782 authored by Rotem Saado's avatar Rotem Saado Committed by Luca Coelho
Browse files

iwlwifi: yoyo: align the write pointer to DWs 



from AX210 generation the write pointer is in Bytes.
to be align with all previous HWs convert it DWs.

Signed-off-by: default avatarRotem Saado <rotem.saado@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201209231351.c9a9cbef4a09.Ic7df63c617f79b7e6a95a510c51b3516bba5599f@changeid


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

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

+5 −0
Original line number Diff line number Diff line
@@ -1662,6 +1662,11 @@ iwl_dump_ini_mon_fill_header(struct iwl_fw_runtime *fwrt, 


	data->write_ptr = iwl_get_mon_reg(fwrt, alloc_id,

					  &addrs->write_ptr);

	if (fwrt->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_AX210) {

		u32 wrt_ptr = le32_to_cpu(data->write_ptr);



		data->write_ptr = cpu_to_le32(wrt_ptr >> 2);

	}

	data->cycle_cnt = iwl_get_mon_reg(fwrt, alloc_id,

					  &addrs->cycle_cnt);

	data->cur_frag = iwl_get_mon_reg(fwrt, alloc_id,

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+2 −0
Original line number Diff line number Diff line
@@ -3133,6 +3133,8 @@ iwl_trans_pcie_dump_pointers(struct iwl_trans *trans, 
		fw_mon_data->fw_mon_base_high_ptr =

			cpu_to_le32(iwl_read_prph(trans, base_high));

		write_ptr_val &= DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK;

		/* convert wrtPtr to DWs, to align with all HWs */

		write_ptr_val >>= 2;

	}

	fw_mon_data->fw_mon_wr_ptr = cpu_to_le32(write_ptr_val);

}