Commit d30836a9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'icc-5.14-rc6' of... 

Merge tag 'icc-5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc

 into char-misc-linus

Georgi writes:

interconnect fix for v5.14

This contains a revert for a patch that has been causing issues:
- Revert: qcom: rpmh: Add BCMs to commit list in pre_aggregate

Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>

* tag 'icc-5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  Revert "interconnect: qcom: icc-rpmh: Add BCMs to commit list in pre_aggregate"
parents 50f05bd1 f7530674

drivers/interconnect/qcom/icc-rpmh.c

+5 −5
Original line number Diff line number Diff line
@@ -20,18 +20,13 @@ void qcom_icc_pre_aggregate(struct icc_node *node) 
{

	size_t i;

	struct qcom_icc_node *qn;

	struct qcom_icc_provider *qp;



	qn = node->data;

	qp = to_qcom_provider(node->provider);



	for (i = 0; i < QCOM_ICC_NUM_BUCKETS; i++) {

		qn->sum_avg[i] = 0;

		qn->max_peak[i] = 0;

	}



	for (i = 0; i < qn->num_bcms; i++)

		qcom_icc_bcm_voter_add(qp->voter, qn->bcms[i]);

}

EXPORT_SYMBOL_GPL(qcom_icc_pre_aggregate);
@@ -49,8 +44,10 @@ int qcom_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw, 
{

	size_t i;

	struct qcom_icc_node *qn;

	struct qcom_icc_provider *qp;



	qn = node->data;

	qp = to_qcom_provider(node->provider);



	if (!tag)

		tag = QCOM_ICC_TAG_ALWAYS;
@@ -70,6 +67,9 @@ int qcom_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw, 
	*agg_avg += avg_bw;

	*agg_peak = max_t(u32, *agg_peak, peak_bw);



	for (i = 0; i < qn->num_bcms; i++)

		qcom_icc_bcm_voter_add(qp->voter, qn->bcms[i]);



	return 0;

}

EXPORT_SYMBOL_GPL(qcom_icc_aggregate);