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

Commit 0b8e7590 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: fix scratch register capture"

parents b55717f2 8b872513

drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.c

+9 −5
Original line number Diff line number Diff line
@@ -879,16 +879,18 @@ void ipa_save_registers(void) 
		if (!ipa_reg_save.gsi.ch_cntxt.a7[

				i].gsi_map_ee_n_ch_k_vp_table.valid)

			continue;



		ipa_reg_save.gsi.ch_cntxt.a7[

			i].mcs_channel_scratch.scratch4.shram =

			IPA_READ_1xVECTOR_REG(

				GSI_SHRAM_n,

				n + IPA_REG_SAVE_BYTES_PER_CHNL_SHRAM - 2);

				n + IPA_GSI_OFFSET_WORDS_SCRATCH4);



		ipa_reg_save.gsi.ch_cntxt.a7[

			i].mcs_channel_scratch.scratch5.shram =

			IPA_READ_1xVECTOR_REG(

				GSI_SHRAM_n,

				n + IPA_REG_SAVE_BYTES_PER_CHNL_SHRAM - 1);

				n + IPA_GSI_OFFSET_WORDS_SCRATCH5);

	}



	for (i = 0; i < IPA_HW_REG_SAVE_GSI_NUM_CH_CNTXT_UC; i++) {
@@ -899,16 +901,18 @@ void ipa_save_registers(void) 
		if (!ipa_reg_save.gsi.ch_cntxt.uc[

				i].gsi_map_ee_n_ch_k_vp_table.valid)

			continue;



		ipa_reg_save.gsi.ch_cntxt.uc[

			i].mcs_channel_scratch.scratch4.shram =

			IPA_READ_1xVECTOR_REG(

				GSI_SHRAM_n,

				n + IPA_REG_SAVE_BYTES_PER_CHNL_SHRAM - 2);

				n + IPA_GSI_OFFSET_WORDS_SCRATCH4);



		ipa_reg_save.gsi.ch_cntxt.uc[

			i].mcs_channel_scratch.scratch5.shram =

			IPA_READ_1xVECTOR_REG(

				GSI_SHRAM_n,

				n + IPA_REG_SAVE_BYTES_PER_CHNL_SHRAM - 1);

				n + IPA_GSI_OFFSET_WORDS_SCRATCH5);

	}



	/*

drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.h

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ 


#define IPA_REG_SAVE_NUM_EXTRA_ENDP_REGS         22



#define IPA_GSI_OFFSET_WORDS_SCRATCH4            6

#define IPA_GSI_OFFSET_WORDS_SCRATCH5            7



#define IPA_DEBUG_TESTBUS_RSRC_TYPE_CNT_BIT_MASK 0x7E000

#define IPA_DEBUG_TESTBUS_RSRC_TYPE_CNT_SHIFT    13