leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

interconnect fixes for v5.18-rc

Browse Source 
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 <djakov@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJidN7/AAoJEIDQzArG2BZjPa4QAMIv3SWHDwbSH9OvBVKuQ96+
 BGmb5sKBtVdJ8lSjZEpjhuJc6WH1jqt7pbYH7BG2CjqEWZ+mP4qHnSG+I8zO+JH+
 6gok/SHYhNYaeL230gVLuMTZVuW/KDduX/leSpGgE0hjWELX0YVZ7hMNtmcMjoc0
 vu1BstBucfEuAEErCy9DiTNZ5p28cDXE1/gGAPbjKUmHVWWYkO61qfTwyS0QVdxD
 hqlEPYovYD2APxZLv10f6/jQk7YJa99X5pjVJ4oAwOUgP3BwXJ29lm8cUgCnTQ37
 +kKIbBxdZXcSXTHCreGrpEA9xMQ2yHTD77kaOqDvcmtlIW9s0RpXufaL4/lN2lkh
 SKMWZr98q1aupaCS2Okr2tPoHyW/0pQ4PziD8Q1YVaFp9UlpqIoJskfzpTav97e4
 zgsZWdJuxrYKrFSK2EnS5AjzjyZA5VDtYitZFkRNNsqdlbtXfefVPBX0DanMc0Tt
 VRoovsbWmC9BNBY26HgChqq69cvQn8wTkfDaOqfHsYVF83Ome6wYtw/EXN565B2H
 fMqx3CPDTQWWNRt07nBA64Uqy50oUQl5xyDpinAFogqf97WgIc83F+/csYCrtS1I
 9bzy+3oXZaTOK9l2sZHi7S4RZbLwQXsW2ppPJ8B4T7EnWlW7tEThlrYaBSRYQJ4d
 HyvjYk1xvtsSYPwXzw+H
 =yR4u
 -----END PGP SIGNATURE-----

Merge tag 'icc-5.18-rc6' of git://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 <djakov@kernel.org>"

* tag 'icc-5.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  interconnect: Restore sync state by ignoring ipa-virt in provider count
This commit is contained in:
Greg Kroah-Hartman 2022-05-13 16:15:28 +02:00
commit d83ea02409
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/interconnect/core.c
View File

@ -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);
}