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

Commit e541fa75 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: fix the ipa-hw rules not clean"

parents 0ec8530c 8dbc5e0d

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

+9 −1
Original line number Diff line number Diff line
@@ -1451,8 +1451,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
@@ -1145,8 +1145,16 @@ int ipa3_reset_hdr(bool user_only) 
		ipa3_ctx->hdr_proc_ctx_tbl.end = 0;

		ipa3_ctx->hdr_proc_ctx_tbl.proc_ctx_cnt = 0;

	}



	/* 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;

}

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

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

		}

	}



	/* commit the change to IPA-HW */

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

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

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

		WARN_ON_RATELIMIT_IPA(1);

		mutex_unlock(&ipa3_ctx->lock);

		return -EPERM;

	}

	mutex_unlock(&ipa3_ctx->lock);



	return 0;