Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9caf727a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "interconnect: Do not skip aggregation for disabled paths" 



This reverts commit e8bf830e which is
commit 91b44981a2316e7b00574d32dec4fae356444dcf upstream.

It breaks the Android abi.  If it is required in the future, it can
come back in an abi-safe way.

Bug: 161946584
Change-Id: I79424d310d30b477a46796bd8059db192efff1aa
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 1abd0630

drivers/interconnect/core.c

+3 −9
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ static int aggregate_requests(struct icc_node *node) 
{

	struct icc_provider *p = node->provider;

	struct icc_req *r;

	u32 avg_bw, peak_bw;



	node->avg_bw = 0;

	node->peak_bw = 0;
@@ -188,14 +187,9 @@ static int aggregate_requests(struct icc_node *node) 
		p->pre_aggregate(node);



	hlist_for_each_entry(r, &node->req_list, req_node) {

		if (r->enabled) {

			avg_bw = r->avg_bw;

			peak_bw = r->peak_bw;

		} else {

			avg_bw = 0;

			peak_bw = 0;

		}

		p->aggregate(node, r->tag, avg_bw, peak_bw,

		if (!r->enabled)

			continue;

		p->aggregate(node, r->tag, r->avg_bw, r->peak_bw,

			     &node->avg_bw, &node->peak_bw);

	}