ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-24 05:01:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'pm-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Browse Source 
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()
This commit is contained in:
Linus Torvalds
2023-03-17 11:02:26 -07:00
parent abb02a8245 1fa9d47baa
commit 02ef7d39fd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/cpuidle/cpuidle-psci-domain.c
View File

@@ -106,7 +106,8 @@ static void psci_pd_remove(void)
struct psci_pd_provider *pd_provider, *it; struct psci_pd_provider *pd_provider, *it;
struct generic_pm_domain *genpd; struct generic_pm_domain *genpd;
list_for_each_entry_safe(pd_provider, it, &psci_pd_providers, link) { list_for_each_entry_safe_reverse(pd_provider, it,
&psci_pd_providers, link) {
of_genpd_del_provider(pd_provider->node); of_genpd_del_provider(pd_provider->node);
genpd = of_genpd_remove_last(pd_provider->node); genpd = of_genpd_remove_last(pd_provider->node);

5
tools/power/pm-graph/sleepgraph.py
View File

@@ -5556,9 +5556,8 @@ def executeSuspend(quiet=False):
if not quiet: if not quiet:
pprint('CAPTURING TRACE') pprint('CAPTURING TRACE')
op = sv.writeDatafileHeader(sv.ftracefile, testdata) op = sv.writeDatafileHeader(sv.ftracefile, testdata)
fp = open(tp+'trace', 'r') fp = open(tp+'trace', 'rb')
for line in fp: op.write(ascii(fp.read()))
op.write(line)
op.close() op.close()
sv.fsetVal('', 'trace') sv.fsetVal('', 'trace')
sv.platforminfo(cmdafter) sv.platforminfo(cmdafter)