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

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

Merge "msm: ipa3: Fix IPA aggregation force close call"

parents 051ae299 98305e66

drivers/platform/msm/ipa/ipa_v3/ipa_utils.c

+1 −1
Original line number Diff line number Diff line
@@ -5435,7 +5435,7 @@ static int ipa3_tag_generate_force_close_desc(struct ipa3_desc desc[], 
			IPAHAL_FULL_PIPELINE_CLEAR;

		reg_write_agg_close.offset =

			ipahal_get_reg_ofst(IPA_AGGR_FORCE_CLOSE);

		ipahal_get_aggr_force_close_valmask(1<<i, &valmask);

		ipahal_get_aggr_force_close_valmask(i, &valmask);

		reg_write_agg_close.value = valmask.val;

		reg_write_agg_close.value_mask = valmask.mask;

		cmd_pyld = ipahal_construct_imm_cmd(IPA_IMM_CMD_REGISTER_WRITE,

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c

+5 −0
Original line number Diff line number Diff line
@@ -1569,6 +1569,11 @@ void ipahal_get_aggr_force_close_valmask(int ep_idx, 
		IPA_AGGR_FORCE_CLOSE_AGGR_FORCE_CLOSE_PIPE_BITMAP_BMSK_V3_5;

	}



	if (ep_idx > (sizeof(valmask->val) * 8 - 1)) {

		IPAHAL_ERR("too big ep_idx %d\n", ep_idx);

		ipa_assert();

		return;

	}

	IPA_SETFIELD_IN_REG(valmask->val, 1 << ep_idx, shft, bmsk);

	valmask->mask = bmsk << shft;

}