summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch105
-rw-r--r--meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch42
-rw-r--r--meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch51
-rw-r--r--meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch39
-rw-r--r--meta-oe/recipes-kernel/pm-graph/pm-graph_5.13.bb (renamed from meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb)13
5 files changed, 47 insertions, 203 deletions
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
index 56981d96fa..e28903d6ba 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
@@ -1,4 +1,4 @@
1From 50cea8fd3c07ab27da6edce865a49339f16f3b57 Mon Sep 17 00:00:00 2001 1From 468850b5d39435025633df14dda3d48651d9ec29 Mon Sep 17 00:00:00 2001
2From: Naveen Saini <naveen.kumar.saini@intel.com> 2From: Naveen Saini <naveen.kumar.saini@intel.com>
3Date: Tue, 18 Jun 2019 17:10:15 +0800 3Date: Tue, 18 Jun 2019 17:10:15 +0800
4Subject: [PATCH] Makefile: fix multilib build failure 4Subject: [PATCH] Makefile: fix multilib build failure
@@ -6,20 +6,26 @@ Subject: [PATCH] Makefile: fix multilib build failure
6Upstream-Status: Inappropriate [oe specific] 6Upstream-Status: Inappropriate [oe specific]
7 7
8Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> 8Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
9
10Refresh to 5.13
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
9--- 12---
10 Makefile | 50 +++++++++++++++++++++++++++----------------------- 13 Makefile | 16 ++++++++++------
11 1 file changed, 27 insertions(+), 23 deletions(-) 14 1 file changed, 10 insertions(+), 6 deletions(-)
12 15
13diff --git a/Makefile b/Makefile 16diff --git a/Makefile b/Makefile
14index 8455415..4aa0786 100644 17index 337c53e..58e3779 100644
15--- a/Makefile 18--- a/Makefile
16+++ b/Makefile 19+++ b/Makefile
17@@ -1,30 +1,34 @@ 20@@ -25,6 +25,7 @@ BINDIR ?= /usr/bin
18 # SPDX-License-Identifier: GPL-2.0 21 MANDIR ?= /usr/share/man
19 PREFIX ?= /usr 22 SHRDIR ?= /usr/share/pm-graph
20 DESTDIR ?= 23 LIBDIR ?= /usr/lib
21+BASELIB ?= 24+BASELIB ?=
22 25
26 # Toolchain: what tools do we use, and what options do they need:
27 INSTALL = /usr/bin/install
28@@ -33,6 +34,9 @@ INSTALL_DATA = ${INSTALL} -m 644
23 all: 29 all:
24 @echo "Nothing to build" 30 @echo "Nothing to build"
25 31
@@ -27,63 +33,34 @@ index 8455415..4aa0786 100644
27+ @echo "Nothing to clean" 33+ @echo "Nothing to clean"
28+ 34+
29 install : uninstall 35 install : uninstall
30- install -d $(DESTDIR)$(PREFIX)/lib/pm-graph 36 $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pm-graph
31- install sleepgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph 37 $(INSTALL) sleepgraph.py $(DESTDIR)$(LIBDIR)/pm-graph
32- install bootgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph 38@@ -54,10 +58,10 @@ install : uninstall
33- install -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config 39 $(INSTALL) -d $(DESTDIR)$(SHRDIR)
34- install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/lib/pm-graph/config
35- install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
36- install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
37- install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
38- install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
39- install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
40- install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
41- install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
42- install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
43- install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
44- install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
45+ install -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
46+ install sleepgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
47+ install bootgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
48+ install -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
49+ install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
50+ install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
51+ install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
52+ install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
53+ install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
54+ install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
55+ install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
56+ install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
57+ install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
58+ install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
59+ install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
60 40
61 install -d $(DESTDIR)$(PREFIX)/bin 41 $(INSTALL) -d $(DESTDIR)$(BINDIR)
62- ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph 42- ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(BINDIR)/bootgraph
63- ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph 43- ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(BINDIR)/sleepgraph
64+ ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph 44- ln -s ../lib/pm-graph/netfix.py $(DESTDIR)$(BINDIR)/netfix
65+ ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph 45- $(DESTDIR)$(BINDIR)/netfix defconfig > $(DESTDIR)$(SHRDIR)/netfix.cfg
46+ ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(BINDIR)/bootgraph
47+ ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(BINDIR)/sleepgraph
48+ ln -s ../$(BASELIB)/pm-graph/netfix.py $(DESTDIR)$(BINDIR)/netfix
49+ #$(DESTDIR)$(BINDIR)/netfix defconfig > $(DESTDIR)$(SHRDIR)/netfix.cfg
66 50
67 install -d $(DESTDIR)$(PREFIX)/share/man/man8 51 $(INSTALL) -d $(DESTDIR)$(MANDIR)/man8
68 install bootgraph.8 $(DESTDIR)$(PREFIX)/share/man/man8 52 $(INSTALL) bootgraph.8 $(DESTDIR)$(MANDIR)/man8
69@@ -37,11 +41,11 @@ uninstall : 53@@ -90,8 +94,8 @@ hwcheck-install :
70 rm -f $(DESTDIR)$(PREFIX)/bin/bootgraph 54 rm -f $(DESTDIR)$(LIBDIR)/pm-graph/hwcheck.py
71 rm -f $(DESTDIR)$(PREFIX)/bin/sleepgraph 55 $(INSTALL) tools/hwcheck.py $(DESTDIR)$(LIBDIR)/pm-graph
56 $(INSTALL) -d $(DESTDIR)$(BINDIR)
57- ln -s ../lib/pm-graph/hwcheck.py $(DESTDIR)$(BINDIR)/hwcheck
58- $(DESTDIR)$(BINDIR)/hwcheck cronon
59+ ln -s ../$(BASELIB)/pm-graph/hwcheck.py $(DESTDIR)$(BINDIR)/hwcheck
60+ #$(DESTDIR)$(BINDIR)/hwcheck cronon
72 61
73- rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/config/* 62 hwcheck-uninstall :
74- if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config ] ; then \ 63 if [ -e $(DESTDIR)$(BINDIR)/hwcheck ] ; then \
75- rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph/config; \
76+ rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config/*
77+ if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ] ; then \
78+ rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config; \
79 fi;
80- rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/*
81- if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph ] ; then \
82- rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph; \
83+ rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/*
84+ if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ] ; then \
85+ rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph; \
86 fi;
87-- 64--
882.17.1 652.25.1
89 66
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch
deleted file mode 100644
index f7f8bc0687..0000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 47a1db21f6c5d17c94c58c3fe0dcce35c623dbf4 Mon Sep 17 00:00:00 2001
2From: Liwei Song <liwei.song@windriver.com>
3Date: Tue, 23 Jun 2020 04:47:20 +0000
4Subject: [PATCH] sleepgraph: add support for RT kernel ftrace flags
5
6with PREEMPT_RT enabled in kernel, ftrace have a different
7flags format:
8
9 _-----=> irqs-off
10 / _----=> need-resched
11 | / _----=> need-resched
12 || / _---=> hardirq/softirq
13 ||| / _--=> preempt-depth
14 ||||/ delay
15TASK-PID CPU# ||||| TIMESTAMP FUNCTION
16 | | | ||||| | |
17
18add support for this.
19
20Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/18]
21
22Signed-off-by: Liwei Song <liwei.song@windriver.com>
23---
24 sleepgraph.py | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/sleepgraph.py b/sleepgraph.py
28index cfed8e09e0e6..561f165cf9be 100755
29--- a/sleepgraph.py
30+++ b/sleepgraph.py
31@@ -2689,7 +2689,7 @@ class TestProps:
32 '[ +!#\*@$]*(?P<dur>[0-9\.]*) .*\| (?P<msg>.*)'
33 ftrace_line_fmt_nop = \
34 ' *(?P<proc>.*)-(?P<pid>[0-9]*) *\[(?P<cpu>[0-9]*)\] *'+\
35- '(?P<flags>.{4}) *(?P<time>[0-9\.]*): *'+\
36+ '(?P<flags>.{4,7}) *(?P<time>[0-9\.]*): *'+\
37 '(?P<msg>.*)'
38 def __init__(self):
39 self.stamp = ''
40--
412.24.1
42
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch
deleted file mode 100644
index fc5991d464..0000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 9bbc991a927722439cad38c892fc9f57207089d3 Mon Sep 17 00:00:00 2001
2From: Liwei Song <liwei.song@windriver.com>
3Date: Mon, 24 May 2021 08:27:28 +0000
4Subject: [PATCH] sleepgraph.py: parse unfished cpu exec line
5
6exist the below case in ftrace file:
7sleepgraph-6508 [003] .... 18197.824037: tracing_mark_write: ps - xxx..., lock_torture_wr-94 169,lock_torture_wr-95 143,lock_tort
8sleepgraph-6508 [003] .... 18197.824043: tracing_mark_write: ure_wr-96 189,lock_torture_wr-97 174,lock_torture_wr-98 160,lock_torture_st-99 1
9
10lock_torture_wr-96 was split to different line due to limited buffer
11size(1k) set in kernel, check this case and re-parse the unfinished
12line.
13
14Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/20]
15
16Signed-off-by: Liwei Song <liwei.song@windriver.com>
17---
18 sleepgraph.py | 17 +++++++++++++++--
19 1 file changed, 15 insertions(+), 2 deletions(-)
20
21diff --git a/sleepgraph.py b/sleepgraph.py
22index e340d5b3f03b..38b4439db8eb 100755
23--- a/sleepgraph.py
24+++ b/sleepgraph.py
25@@ -3365,8 +3365,21 @@ def parseTraceLog(live=False):
26 val = ps.split()
27 if not val:
28 continue
29- name = val[0].replace('--', '-')
30- proclist[name] = int(val[1])
31+ if not len(val) < 2:
32+ name = val[0].replace('--', '-')
33+ proclist[name] = int(val[1])
34+ else:
35+ proclist = dict()
36+ nextline = next(tf)
37+ mcont = re.match(tp.ftrace_line_fmt, nextline)
38+ n = m.group('ps') + mcont.group('msg').split(': ')[1]
39+ for pscont in n.split(','):
40+ val = pscont.split()
41+ if not val:
42+ continue
43+ if not len(val) < 2:
44+ name = val[0].replace('--', '-')
45+ proclist[name] = int(val[1])
46 data.pstl[t.time] = proclist
47 continue
48 # find the end of resume
49--
502.29.2
51
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch
deleted file mode 100644
index 25c87093f6..0000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 22ce65d997f99606a3bb9d2a660ead42eecc234a Mon Sep 17 00:00:00 2001
2From: Naveen Saini <naveen.kumar.saini@intel.com>
3Date: Wed, 11 Sep 2019 11:31:07 +0800
4Subject: [PATCH] sleepgraph.py: use python3
5
6Already compatible with Python 3.
7Same goes for bootgraph.py
8
9Upstream-Status: Inappropriate [oe specific]
10
11Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
12---
13 bootgraph.py | 2 +-
14 sleepgraph.py | 2 +-
15 2 files changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/bootgraph.py b/bootgraph.py
18index d3b99a1..efb5714 100755
19--- a/bootgraph.py
20+++ b/bootgraph.py
21@@ -1,4 +1,4 @@
22-#!/usr/bin/python
23+#!/usr/bin/python3
24 # SPDX-License-Identifier: GPL-2.0-only
25 #
26 # Tool for analyzing boot timing
27diff --git a/sleepgraph.py b/sleepgraph.py
28index 1794c79..cfed8e0 100755
29--- a/sleepgraph.py
30+++ b/sleepgraph.py
31@@ -1,4 +1,4 @@
32-#!/usr/bin/python
33+#!/usr/bin/python3
34 # SPDX-License-Identifier: GPL-2.0-only
35 #
36 # Tool for analyzing suspend/resume timing
37--
382.17.1
39
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.13.bb
index 6e52a58de5..88c70ae82a 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.13.bb
@@ -5,12 +5,9 @@ HOMEPAGE = "https://01.org/pm-graph"
5LICENSE = "GPL-2.0-only" 5LICENSE = "GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" 6LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
7 7
8SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" 8SRCREV = "0987732b013936ad771334f51cba31c453c8a9c9"
9SRC_URI = "git://github.com/intel/pm-graph.git;branch=master;protocol=https \ 9SRC_URI = "git://github.com/intel/pm-graph.git;branch=master;protocol=https \
10 file://0001-Makefile-fix-multilib-build-failure.patch \ 10 file://0001-Makefile-fix-multilib-build-failure.patch \
11 file://0001-sleepgraph.py-use-python3.patch \
12 file://0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch \
13 file://0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch \
14" 11"
15S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
16 13
@@ -23,11 +20,13 @@ S = "${WORKDIR}/git"
23# - CONFIG_FUNCTION_GRAPH_TRACER=y 20# - CONFIG_FUNCTION_GRAPH_TRACER=y
24 21
25COMPATIBLE_HOST='(i.86|x86_64).*' 22COMPATIBLE_HOST='(i.86|x86_64).*'
26EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}" 23EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} LIBDIR=${libdir} BASELIB=${baselib}"
27 24
28do_install() { 25do_install() {
29 oe_runmake install 26 oe_runmake install
30 install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py 27 install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py
28
29 rm -rf ${D}${libdir}/pm-graph/__pycache__
31} 30}
32 31
33RDEPENDS:${PN} += "python3-core python3-threading python3-datetime python3-compression" 32RDEPENDS:${PN} += "python3-core python3-threading python3-datetime python3-compression"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-04 13:57:13 +0000