Merge "ipa3: mpm: remove WARN_ON for security concern"

This commit is contained in:
qctecmdr
2021-06-17 17:56:36 -07:00
committed by Gerrit - the friendly Code Review server

View File

@@ -737,7 +737,6 @@ static void ipa_mpm_smmu_unmap(dma_addr_t carved_iova, int sz, int dir,
if (carved_iova <= 0) {
IPA_MPM_ERR("carved_iova is zero/negative\n");
WARN_ON(1);
return;
}
@@ -1577,9 +1576,8 @@ static int ipa_mpm_vote_unvote_pcie_clk(enum ipa_mpm_clk_vote_type vote,
if ((atomic_read(
&ipa_mpm_ctx->md[probe_id].clk_cnt.pcie_clk_cnt)
== 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);
WARN_ON(1);
*is_acted = true;
return 0;
}
@@ -1619,9 +1617,8 @@ static void ipa_mpm_vote_unvote_ipa_clk(enum ipa_mpm_clk_vote_type vote,
if ((atomic_read
(&ipa_mpm_ctx->md[probe_id].clk_cnt.ipa_clk_cnt)
== 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);
WARN_ON(1);
return;
}
IPA_ACTIVE_CLIENTS_DEC_SPECIAL(ipa_mpm_mhip_chan_str[probe_id]);
@@ -2391,7 +2388,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);
if (ret) {
IPA_MPM_ERR("mhi_prepare_for_transfer failed %d\n", ret);
WARN_ON(1);
/*
* WA to handle prepare_for_tx failures.
* Though prepare for transfer fails, indicate success