Merge "ipa3: mpm: remove WARN_ON for security concern" (685b2b00) · Commits · e / devices / android_kernel_fairphone_FP4

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

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -716,7 +716,6 @@ static void ipa_mpm_smmu_unmap(dma_addr_t carved_iova, int sz, int dir,

	if (carved_iova <= 0) {		if (carved_iova <= 0) {
	IPA_MPM_ERR("carved_iova is zero/negative\n");		IPA_MPM_ERR("carved_iova is zero/negative\n");
	WARN_ON(1);
	return;		return;
	}		}

	@@ -1554,9 +1553,8 @@ static int ipa_mpm_vote_unvote_pcie_clk(enum ipa_mpm_clk_vote_type vote,
	if ((atomic_read(		if ((atomic_read(
	&ipa_mpm_ctx->md[probe_id].clk_cnt.pcie_clk_cnt)		&ipa_mpm_ctx->md[probe_id].clk_cnt.pcie_clk_cnt)
	== 0)) {		== 0)) {
	IPA_MPM_DBG("probe_id %d PCIE clock already devoted\n",		IPA_MPM_ERR("probe_id %d PCIE clock already devoted\n",
	probe_id);		probe_id);
	WARN_ON(1);
	*is_acted = true;		*is_acted = true;
	return 0;		return 0;
	}		}
	@@ -1592,9 +1590,8 @@ static void ipa_mpm_vote_unvote_ipa_clk(enum ipa_mpm_clk_vote_type vote,
	if ((atomic_read		if ((atomic_read
	(&ipa_mpm_ctx->md[probe_id].clk_cnt.ipa_clk_cnt)		(&ipa_mpm_ctx->md[probe_id].clk_cnt.ipa_clk_cnt)
	== 0)) {		== 0)) {
	IPA_MPM_DBG("probe_id %d IPA clock count < 0\n",		IPA_MPM_ERR("probe_id %d IPA clock count < 0\n",
	probe_id);		probe_id);
	WARN_ON(1);
	return;		return;
	}		}
	IPA_ACTIVE_CLIENTS_DEC_SPECIAL(ipa_mpm_mhip_chan_str[probe_id]);		IPA_ACTIVE_CLIENTS_DEC_SPECIAL(ipa_mpm_mhip_chan_str[probe_id]);
	@@ -2347,7 +2344,6 @@ static int ipa_mpm_mhi_probe_cb(struct mhi_device *mhi_dev,
	ret = mhi_prepare_for_transfer(ipa_mpm_ctx->md[probe_id].mhi_dev);		ret = mhi_prepare_for_transfer(ipa_mpm_ctx->md[probe_id].mhi_dev);
	if (ret) {		if (ret) {
	IPA_MPM_ERR("mhi_prepare_for_transfer failed %d\n", ret);		IPA_MPM_ERR("mhi_prepare_for_transfer failed %d\n", ret);
	WARN_ON(1);
	/*		/*
	* WA to handle prepare_for_tx failures.		* WA to handle prepare_for_tx failures.
	* Though prepare for transfer fails, indicate success		* Though prepare for transfer fails, indicate success