Commit 73606ba9 authored by Mike Tipton's avatar Mike Tipton Committed by Georgi Djakov
Browse files

interconnect: Always call pre_aggregate before aggregate 



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: d3703b3e ("interconnect: Aggregate before setting initial bandwidth")
Signed-off-by: default avatarMike Tipton <mdtipton@codeaurora.org>
Link: https://lore.kernel.org/r/20210721175432.2119-3-mdtipton@codeaurora.org


Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parent 456a9dac

drivers/interconnect/core.c

+5 −0
Original line number Diff line number Diff line
@@ -973,9 +973,14 @@ void icc_node_add(struct icc_node *node, struct icc_provider *provider) 
	}

	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;