This is a note to let you know that I've just added the patch titled
interconnect: Always call pre_aggregate before aggregate
to the 5.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
interconnect-always-call-pre_aggregate-before-aggregate.patch
and it can be found in the queue-5.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 73606ba9242f8e32023699b500b7922b4cf2993c Mon Sep 17 00:00:00 2001
From: Mike Tipton <mdtipton@xxxxxxxxxxxxxx>
Date: Wed, 21 Jul 2021 10:54:30 -0700
Subject: interconnect: Always call pre_aggregate before aggregate
From: Mike Tipton <mdtipton@xxxxxxxxxxxxxx>
commit 73606ba9242f8e32023699b500b7922b4cf2993c upstream.
The pre_aggregate callback isn't called in all cases before calling
aggregate. Add the missing calls so providers can rely on consistent
framework behavior.
Fixes: d3703b3e255f ("interconnect: Aggregate before setting initial bandwidth")
Signed-off-by: Mike Tipton <mdtipton@xxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20210721175432.2119-3-mdtipton@xxxxxxxxxxxxxx
Signed-off-by: Georgi Djakov <djakov@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/interconnect/core.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -973,9 +973,14 @@ void icc_node_add(struct icc_node *node,
}
node->avg_bw = node->init_avg;
node->peak_bw = node->init_peak;
+
+ if (provider->pre_aggregate)
+ provider->pre_aggregate(node);
+
if (provider->aggregate)
provider->aggregate(node, 0, node->init_avg, node->init_peak,
&node->avg_bw, &node->peak_bw);
+
provider->set(node, node);
node->avg_bw = 0;
node->peak_bw = 0;
Patches currently in stable-queue which might be from mdtipton@xxxxxxxxxxxxxx are
queue-5.13/interconnect-qcom-icc-rpmh-ensure-floor-bw-is-enforced-for-all-nodes.patch
queue-5.13/interconnect-always-call-pre_aggregate-before-aggregate.patch
queue-5.13/interconnect-qcom-icc-rpmh-add-bcms-to-commit-list-in-pre_aggregate.patch
queue-5.13/interconnect-zero-initial-bw-after-sync-state.patch
