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

Commit d87a8fcc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: disable HW error generation on zero trailing byte issue"

parents fad06545 2eb50d4a

drivers/platform/msm/ipa/ipa_reg.h

+2 −2
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ 
#define IPA_COUNTER_CFG_EOT_COAL_GRAN_SHFT 0x0

#define IPA_COUNTER_CFG_AGGR_GRAN_BMSK 0x1F0

#define IPA_COUNTER_CFG_AGGR_GRAN_SHFT 0x4

#define IPA_SPARE_REG_1_OFST 0x00003090

#define IPA_SPARE_REG_1_IGNORE_TRAILING_ZERO_ERR_SHFT 21

 /*

 * End of IPA 2.5 Registers

 */
@@ -239,8 +241,6 @@ Common Registers 
#define IPA_SINGLE_NDP_MODE_OFST 0x00000064

#define IPA_QCNCM_OFST 0x00000060



#define IPA_SPARE_REG_1_OFST 0x00002090



#define IPA_ENDP_INIT_CTRL_N_OFST(n) (0x00000070 + 0x4 * (n))

#define IPA_ENDP_INIT_CTRL_N_RMSK 0x1

#define IPA_ENDP_INIT_CTRL_N_MAX 19

drivers/platform/msm/ipa/ipa_utils.c

+8 −2
Original line number Diff line number Diff line
@@ -760,10 +760,16 @@ int ipa_init_hw(void) 
	if (ipa_version == 0)

		return -EFAULT;



	if (ipa_ctx->ipa_hw_type == IPA_HW_v2_5) {

		/* set ipa_bcr to 0xFFFFFFFF for using new IPA behavior */

	if (ipa_ctx->ipa_hw_type == IPA_HW_v2_5)

		ipa_write_reg(ipa_ctx->mmio, IPA_BCR_OFST, IPA_BCR_REG_VAL);



		/* Disable HW error generation on zero trailing byte issue */

		ipa_write_reg(ipa_ctx->mmio,

			IPA_SPARE_REG_1_OFST,

			BIT(IPA_SPARE_REG_1_IGNORE_TRAILING_ZERO_ERR_SHFT));

	}



	return 0;

}