interconnect: qcom: rpm: Add support for specifying channel num

Some nodes, like EBI0 (DDR) or L3/LLCC, may be connected over more than
one channel. This should be taken into account in bandwidth calcualtion,
as we're supposed to feed msmbus with the per-channel bandwidth. Add
support for specifying that and use it during bandwidth aggregation.

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230228-topic-qos-v7-2-815606092fff@linaro.org
Signed-off-by: Georgi Djakov <djakov@kernel.org>

diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c
index 56f29e0..5341fa1 100644 (file)
--- a/drivers/interconnect/qcom/icc-rpm.c
+++ b/drivers/interconnect/qcom/icc-rpm.c
@@ -316,6 +316,7 @@ 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];
        int i;
 
        /* Initialise aggregate values */
@@ -333,7 +334,11 @@ 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++) {
-                       agg_avg[i] += qn->sum_avg[i];
+                       if (qn->channels)
+                               sum_avg[i] = div_u64(qn->sum_avg[i], qn->channels);
+                       else
+                               sum_avg[i] = qn->sum_avg[i];
+                       agg_avg[i] += sum_avg[i];
                        agg_peak[i] = max_t(u64, agg_peak[i], qn->max_peak[i]);
                }
        }

diff --git a/drivers/interconnect/qcom/icc-rpm.h b/drivers/interconnect/qcom/icc-rpm.h
index d54f76d..1256601 100644 (file)
--- a/drivers/interconnect/qcom/icc-rpm.h
+++ b/drivers/interconnect/qcom/icc-rpm.h
@@ -66,6 +66,7 @@ struct qcom_icc_qos {
  * @id: a unique node identifier
  * @links: an array of nodes where we can go next while traversing
  * @num_links: the total number of @links
+ * @channels: number of channels at this node (e.g. DDR channels)
  * @buswidth: width of the interconnect between a node and the bus (bytes)
  * @sum_avg: current sum aggregate value of all avg bw requests
  * @max_peak: current max aggregate value of all peak bw requests
@@ -78,6 +79,7 @@ struct qcom_icc_node {
        u16 id;
        const u16 *links;
        u16 num_links;
+       u16 channels;
        u16 buswidth;
        u64 sum_avg[QCOM_ICC_NUM_BUCKETS];
        u64 max_peak[QCOM_ICC_NUM_BUCKETS];