Merge tag 'icc-5.18-rc6' of git:https://git.kernel.org/pub/scm/linux/kernel…

…/git/djakov/icc into char-misc-linus Pull interconnect fixes from Georgi: "interconnect fixes for v5.18-rc This contains an additional fix for sc7180 and sdx55 platforms that helps them to enter suspend even on devices that don't have the most recent DT changes. - interconnect: Restore sync state by ignoring ipa-virt in provider count Signed-off-by: Georgi Djakov <[email protected]>" * tag 'icc-5.18-rc6' of git:https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc: interconnect: Restore sync state by ignoring ipa-virt in provider count
torvalds · May 13, 2022 · d83ea02 · d83ea02
2 parents fe50388 + 20ce30f
commit d83ea02
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
@@ -1087,9 +1087,15 @@ static int of_count_icc_providers(struct device_node *np)
 {
  struct device_node *child;
  int count = 0;
+ const struct of_device_id __maybe_unused ignore_list[] = {
+ { .compatible = "qcom,sc7180-ipa-virt" },
+ { .compatible = "qcom,sdx55-ipa-virt" },
+ {}
+ };
 
  for_each_available_child_of_node(np, child) {
- if (of_property_read_bool(child, "#interconnect-cells"))
+ if (of_property_read_bool(child, "#interconnect-cells") &&
+ likely(!of_match_node(ignore_list, child)))
  count++;
  count += of_count_icc_providers(child);
  }