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

Commit 5c509526 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: fix the ipa-hw rules not clean"

parents f53d63ef 88ae3d6e

drivers/platform/msm/ipa/ipa_v2/ipa_flt.c

+9 −1
Original line number Diff line number Diff line
@@ -1495,8 +1495,16 @@ int ipa2_reset_flt(enum ipa_ip_type ip, bool user_only) 
			}

		}

	}

	mutex_unlock(&ipa_ctx->lock);



	/* commit the change to IPA-HW */

	if (ipa_ctx->ctrl->ipa_commit_flt(IPA_IP_v4) ||

		ipa_ctx->ctrl->ipa_commit_flt(IPA_IP_v6)) {

		IPAERR_RL("fail to commit flt-rule\n");

		WARN_ON_RATELIMIT_IPA(1);

		mutex_unlock(&ipa_ctx->lock);

		return -EPERM;

	}

	mutex_unlock(&ipa_ctx->lock);

	return 0;

}

drivers/platform/msm/ipa/ipa_v2/ipa_hdr.c

+9 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,15 @@ int ipa2_reset_hdr(bool user_only) 
	}

	mutex_unlock(&ipa_ctx->lock);



	/* commit the change to IPA-HW */

	if (ipa_ctx->ctrl->ipa_commit_hdr()) {

		IPAERR_RL("fail to commit hdr\n");

		WARN_ON_RATELIMIT_IPA(1);

		mutex_unlock(&ipa_ctx->lock);

		return -EFAULT;

	}



	mutex_unlock(&ipa_ctx->lock);

	return 0;

}

drivers/platform/msm/ipa/ipa_v2/ipa_rt.c

+9 −0
Original line number Diff line number Diff line
@@ -1443,6 +1443,15 @@ int ipa2_reset_rt(enum ipa_ip_type ip, bool user_only) 
			}

		}

	}



	/* commit the change to IPA-HW */

	if (ipa_ctx->ctrl->ipa_commit_rt(IPA_IP_v4) ||

		ipa_ctx->ctrl->ipa_commit_rt(IPA_IP_v6)) {

		IPAERR("fail to commit rt-rule\n");

		WARN_ON_RATELIMIT_IPA(1);

		mutex_unlock(&ipa_ctx->lock);

		return -EPERM;

	}

	mutex_unlock(&ipa_ctx->lock);



	return 0;

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

+9 −1
Original line number Diff line number Diff line
@@ -1758,8 +1758,16 @@ int ipa3_reset_flt(enum ipa_ip_type ip, bool user_only) 
			}

		}

	}

	mutex_unlock(&ipa3_ctx->lock);



	/* commit the change to IPA-HW */

	if (ipa3_ctx->ctrl->ipa3_commit_flt(IPA_IP_v4) ||

		ipa3_ctx->ctrl->ipa3_commit_flt(IPA_IP_v6)) {

		IPAERR("fail to commit flt-rule\n");

		WARN_ON_RATELIMIT_IPA(1);

		mutex_unlock(&ipa3_ctx->lock);

		return -EPERM;

	}

	mutex_unlock(&ipa3_ctx->lock);

	return 0;

}

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

+9 −1
Original line number Diff line number Diff line
@@ -1180,8 +1180,16 @@ int ipa3_reset_hdr(bool user_only) 
		ipa3_ctx->hdr_proc_ctx_tbl.end = end;

		IPADBG("hdr_proc_tbl.end = %d\n", end);

	}



	/* commit the change to IPA-HW */

	if (ipa3_ctx->ctrl->ipa3_commit_hdr()) {

		IPAERR("fail to commit hdr\n");

		WARN_ON_RATELIMIT_IPA(1);

		mutex_unlock(&ipa3_ctx->lock);

		return -EFAULT;

	}



	mutex_unlock(&ipa3_ctx->lock);

	return 0;

}