On Tue, Jun 13, 2023 at 04:03:19PM +0200, Konrad Dybcio wrote:
> 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: dcbce7b0a79c ("interconnect: qcom: icc-rpm: Support multiple buckets")
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Reviewed-by: Stephan Gerhold <stephan@xxxxxxxxxxx>
> ---
> drivers/interconnect/qcom/icc-rpm.c | 16 ++++++++--------
> drivers/interconnect/qcom/icc-rpm.h | 6 +++---
> 2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c
> index f9d0ecba5631..01e14b8ced64 100644
> --- a/drivers/interconnect/qcom/icc-rpm.c
> +++ b/drivers/interconnect/qcom/icc-rpm.c
> @@ -249,7 +249,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;
> }
> @@ -273,9 +273,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);
> @@ -300,11 +300,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;
> }
> @@ -317,7 +317,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
> @@ -328,7 +328,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]);
> }
>
> @@ -339,7 +339,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;
>
> diff --git a/drivers/interconnect/qcom/icc-rpm.h b/drivers/interconnect/qcom/icc-rpm.h
> index a4588a3aebf3..fe928ab6b878 100644
> --- a/drivers/interconnect/qcom/icc-rpm.h
> +++ b/drivers/interconnect/qcom/icc-rpm.h
> @@ -10,7 +10,7 @@
> #include <linux/platform_device.h>
> #include <linux/soc/qcom/smd-rpm.h>
>
> -#include <dt-bindings/interconnect/qcom,icc.h>
> +#include <dt-bindings/interconnect/qcom,rpm-icc.h>
>
> #define RPM_BUS_MASTER_REQ 0x73616d62
> #define RPM_BUS_SLAVE_REQ 0x766c7362
> @@ -105,8 +105,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;
>
> --
> 2.41.0
>
