Commit 6bffeb61 authored by Mike Tipton's avatar Mike Tipton Committed by sanglipeng
Browse files

interconnect: qcom: Add support for mask-based BCMs 

stable inclusion
from stable-v5.10.202
commit 610057f4f6e01dd7289f6144059ca6fd87ea3488
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9DZOS

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=610057f4f6e01dd7289f6144059ca6fd87ea3488

--------------------------------

commit d8630f05 upstream.

Some BCMs aren't directly associated with the data path (i.e. ACV) and
therefore don't communicate using BW. Instead, they are simply
enabled/disabled with a simple bit mask. Add support for these.

Origin commit retrieved from:
https://git.codelinaro.org/clo/la/kernel/msm-5.15/-/commit/2d1573e0206998151b342e6b52a4c0f7234d7e36



Signed-off-by: default avatarMike Tipton <mdtipton@codeaurora.org>
[narmstrong: removed copyright change from original commit]
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230619-topic-sm8550-upstream-interconnect-mask-vote-v2-1-709474b151cc@linaro.org


Fixes: fafc114a ("interconnect: qcom: Add SM8450 interconnect provider driver")
Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 16a65f88

drivers/interconnect/qcom/bcm-voter.c

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ static void bcm_aggregate(struct qcom_icc_bcm *bcm) 


		temp = agg_peak[bucket] * bcm->vote_scale;

		bcm->vote_y[bucket] = bcm_div(temp, bcm->aux_data.unit);



		if (bcm->enable_mask && (bcm->vote_x[bucket] || bcm->vote_y[bucket])) {

			bcm->vote_x[bucket] = 0;

			bcm->vote_y[bucket] = bcm->enable_mask;

		}

	}



	if (bcm->keepalive && bcm->vote_x[QCOM_ICC_BUCKET_AMC] == 0 &&

drivers/interconnect/qcom/icc-rpmh.h

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ struct qcom_icc_node { 
 * @vote_x: aggregated threshold values, represents sum_bw when @type is bw bcm

 * @vote_y: aggregated threshold values, represents peak_bw when @type is bw bcm

 * @vote_scale: scaling factor for vote_x and vote_y

 * @enable_mask: optional mask to send as vote instead of vote_x/vote_y

 * @dirty: flag used to indicate whether the bcm needs to be committed

 * @keepalive: flag used to indicate whether a keepalive is required

 * @aux_data: auxiliary data used when calculating threshold values and
@@ -97,6 +98,7 @@ struct qcom_icc_bcm { 
	u64 vote_x[QCOM_ICC_NUM_BUCKETS];

	u64 vote_y[QCOM_ICC_NUM_BUCKETS];

	u64 vote_scale;

	u32 enable_mask;

	bool dirty;

	bool keepalive;

	struct bcm_db aux_data;