Commit 6ed0e5e6 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Bjorn Andersson
Browse files

interconnect: qcom: icc-rpm: Fix bucket number 



SMD RPM only provides two buckets, one each for the active-only and
active-sleep RPM contexts. Use the correct constant to allocate and
operate on them.

This will make the qcom,icc.h header no longer work with this driver,
mostly because.. it was never meant to! The commit that introduced
bucket support to SMD RPM was trying to shove a square into a round
hole and it did not work out very well. That said, there are no
active users of SMD RPM ICC + qcom,icc.h, so that doesn't hurt.

Fixes: dcbce7b0 ("interconnect: qcom: icc-rpm: Support multiple buckets")
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarStephan Gerhold <stephan@gerhold.net>
Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Acked-by: default avatarGeorgi Djakov <djakov@kernel.org>
Link: https://lore.kernel.org/r/20230526-topic-smd_icc-v7-19-09c78c175546@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent d6edc31f

drivers/interconnect/qcom/icc-rpm.c

+8 −8
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static void qcom_icc_pre_bw_aggregate(struct icc_node *node) 
	size_t i;



	qn = node->data;

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

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

		qn->sum_avg[i] = 0;

		qn->max_peak[i] = 0;

	}
@@ -272,9 +272,9 @@ static int qcom_icc_bw_aggregate(struct icc_node *node, u32 tag, u32 avg_bw, 
	qn = node->data;



	if (!tag)

		tag = QCOM_ICC_TAG_ALWAYS;

		tag = RPM_ALWAYS_TAG;



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

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

		if (tag & BIT(i)) {

			qn->sum_avg[i] += avg_bw;

			qn->max_peak[i] = max_t(u32, qn->max_peak[i], peak_bw);
@@ -299,11 +299,11 @@ static void qcom_icc_bus_aggregate(struct icc_provider *provider, 
{

	struct icc_node *node;

	struct qcom_icc_node *qn;

	u64 sum_avg[QCOM_ICC_NUM_BUCKETS];

	u64 sum_avg[QCOM_SMD_RPM_STATE_NUM];

	int i;



	/* Initialise aggregate values */

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

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

		agg_avg[i] = 0;

		agg_peak[i] = 0;

	}
@@ -316,7 +316,7 @@ static void qcom_icc_bus_aggregate(struct icc_provider *provider, 
	 */

	list_for_each_entry(node, &provider->nodes, node_list) {

		qn = node->data;

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

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

			if (qn->channels)

				sum_avg[i] = div_u64(qn->sum_avg[i], qn->channels);

			else
@@ -327,7 +327,7 @@ static void qcom_icc_bus_aggregate(struct icc_provider *provider, 
	}



	/* Find maximum values across all buckets */

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

	for (i = 0; i < QCOM_SMD_RPM_STATE_NUM; i++)

		*max_agg_avg = max_t(u64, *max_agg_avg, agg_avg[i]);

}
@@ -338,7 +338,7 @@ static int qcom_icc_set(struct icc_node *src, struct icc_node *dst) 
	struct icc_provider *provider;

	u64 sum_bw;

	u64 active_rate, sleep_rate;

	u64 agg_avg[QCOM_ICC_NUM_BUCKETS], agg_peak[QCOM_ICC_NUM_BUCKETS];

	u64 agg_avg[QCOM_SMD_RPM_STATE_NUM], agg_peak[QCOM_SMD_RPM_STATE_NUM];

	u64 max_agg_avg;

	int ret;

drivers/interconnect/qcom/icc-rpm.h

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include <linux/soc/qcom/smd-rpm.h>



#include <dt-bindings/interconnect/qcom,icc.h>

#include <dt-bindings/interconnect/qcom,rpm-icc.h>

#include <linux/clk.h>

#include <linux/interconnect-provider.h>

#include <linux/platform_device.h>
@@ -106,8 +106,8 @@ struct qcom_icc_node { 
	u16 num_links;

	u16 channels;

	u16 buswidth;

	u64 sum_avg[QCOM_ICC_NUM_BUCKETS];

	u64 max_peak[QCOM_ICC_NUM_BUCKETS];

	u64 sum_avg[QCOM_SMD_RPM_STATE_NUM];

	u64 max_peak[QCOM_SMD_RPM_STATE_NUM];

	int mas_rpm_id;

	int slv_rpm_id;

	struct qcom_icc_qos qos;