From 9caf727a6d54f5db0e84643530b6cc4ad6ce44cf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 31 Aug 2023 13:51:04 +0000 Subject: [PATCH] Revert "interconnect: Do not skip aggregation for disabled paths" This reverts commit e8bf830efa8a60324d53cfd3083277be8918f838 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: Greg Kroah-Hartman --- drivers/interconnect/core.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 824e6fb5e461..17062eff390f 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -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); }