Pull power management fixes from Rafael Wysocki: "These fix an error code path issue in a cpuidle driver and make the sleepgraph utility more robust against unexpected input. Specifics: - Fix the psci_pd_init_topology() failure path in the PSCI cpuidle driver (Shawn Guo) - Modify the sleepgraph utility so it does not crash on binary data in device names (Todd Brandt)" * tag 'pm-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: pm-graph: sleepgraph: Avoid crashing on binary data in device names cpuidle: psci: Iterate backwards over list in psci_pd_remove()
Unified · Split
| @@ -106,7 +106,8 @@ static void psci_pd_remove(void) · 105 unmodified lines | |||
| 106 | struct psci_pd_provider *pd_provider, *it; | 106 | struct psci_pd_provider *pd_provider, *it; |
| 107 | struct generic_pm_domain *genpd; | 107 | struct generic_pm_domain *genpd; |
| 108 | 108 | ||
| 109 | list_for_each_entry_safe(pd_provider, it, &psci_pd_providers, link) { | 109 | list_for_each_entry_safe_reverse(pd_provider, it, |
| 110 | &psci_pd_providers, link) { | ||
| 110 | of_genpd_del_provider(pd_provider->node); | 111 | of_genpd_del_provider(pd_provider->node); |
| 111 | 112 | ||
| 112 | genpd = of_genpd_remove_last(pd_provider->node); | 113 | genpd = of_genpd_remove_last(pd_provider->node); |
| @@ -5556,9 +5556,8 @@ def executeSuspend(quiet=False): · 5555 unmodified lines | |||
| 5556 | if not quiet: | 5556 | if not quiet: |
| 5557 | pprint('CAPTURING TRACE') | 5557 | pprint('CAPTURING TRACE') |
| 5558 | op = sv.writeDatafileHeader(sv.ftracefile, testdata) | 5558 | op = sv.writeDatafileHeader(sv.ftracefile, testdata) |
| 5559 | fp = open(tp+'trace', 'r') | 5559 | fp = open(tp+'trace', 'rb') |
| 5560 | for line in fp: | 5560 | op.write(ascii(fp.read())) |
| 5561 | op.write(line) | ||
| 5562 | op.close() | 5561 | op.close() |
| 5563 | sv.fsetVal('', 'trace') | 5562 | sv.fsetVal('', 'trace') |
| 5564 | sv.platforminfo(cmdafter) | 5563 | sv.platforminfo(cmdafter) |