Commit b95b668e authored by Mike Tipton's avatar Mike Tipton Committed by Georgi Djakov
Browse files

interconnect: qcom: icc-rpmh: Add BCMs to commit list in pre_aggregate 



We're only adding BCMs to the commit list in aggregate(), but there are
cases where pre_aggregate() is called without subsequently calling
aggregate(). In particular, in icc_sync_state() when a node with initial
BW has zero requests. Since BCMs aren't added to the commit list in
these cases, we don't actually send the zero BW request to HW. So the
resources remain on unnecessarily.

Add BCMs to the commit list in pre_aggregate() instead, which is always
called even when there are no requests.

Signed-off-by: default avatarMike Tipton <mdtipton@codeaurora.org>
[georgi: remove icc_sync_state for platforms with incomplete support]
Link: https://lore.kernel.org/r/20211125174751.25317-1-djakov@kernel.org


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

drivers/interconnect/qcom/icc-rpmh.c

+5 −5
Original line number Diff line number Diff line
@@ -21,13 +21,18 @@ 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);
@@ -45,10 +50,8 @@ 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;
@@ -68,9 +71,6 @@ 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);

drivers/interconnect/qcom/sm8150.c

+0 −1
Original line number Diff line number Diff line
@@ -535,7 +535,6 @@ static struct platform_driver qnoc_driver = { 
	.driver = {

		.name = "qnoc-sm8150",

		.of_match_table = qnoc_of_match,

		.sync_state = icc_sync_state,

	},

};

module_platform_driver(qnoc_driver);

drivers/interconnect/qcom/sm8250.c

+0 −1
Original line number Diff line number Diff line
@@ -551,7 +551,6 @@ static struct platform_driver qnoc_driver = { 
	.driver = {

		.name = "qnoc-sm8250",

		.of_match_table = qnoc_of_match,

		.sync_state = icc_sync_state,

	},

};

module_platform_driver(qnoc_driver);

drivers/interconnect/qcom/sm8350.c

+0 −1
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ static struct platform_driver qnoc_driver = { 
	.driver = {

		.name = "qnoc-sm8350",

		.of_match_table = qnoc_of_match,

		.sync_state = icc_sync_state,

	},

};

module_platform_driver(qnoc_driver);