rpm/cpupower
SHA256
1
0
Fork 0
forked from pool/cpupower
Code Pull Requests Activity

Accepting request 907146 from home:trenn:branches:hardware

Browse Source 
- Update (jsc#SLE-18392, jsc#SLE-18906, jsc#SLE-18393, jsc#SLE-18410):
 * turbostat          to    21.05.04
 * intel speed select to    1.10
 * cpupower           to    5.14-rcX (kernel sources state)

OBS-URL: https://build.opensuse.org/request/show/907146
OBS-URL: https://build.opensuse.org/package/show/hardware/cpupower?expand=0&rev=117
This commit is contained in:
Thomas Renninger 2021-07-19 13:43:20 +00:00 committed by Git OBS Bridge
parent 19ec2c7e82
commit 34ffab8694
13 changed files with 94 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amd_do_not_show_amount_of_boost_states_if_zero.patch
View File

@ -4,7 +4,7 @@
--- a/utils/cpufreq-info.c --- a/utils/cpufreq-info.c
+++ b/utils/cpufreq-info.c +++ b/utils/cpufreq-info.c
@@ -191,7 +191,9 @@ @@ -190,7 +190,9 @@
if (ret) if (ret)
return ret; return ret;

3
cpupower-5.10.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d46499057528206fc86f494c84e5677d5d6a76e01e070f92fbbf7b43b54f3b71
size 74850

3
cpupower-5.14.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a797d2584b25181147bb8a36e9538179066f8cb88c277cd8bbf485b8790f0fd1
size 75224

8
cpupower.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jul 19 12:17:54 UTC 2021 - Thomas Renninger <trenn@suse.de>
- Update (jsc#SLE-18392, jsc#SLE-18906, jsc#SLE-18393, jsc#SLE-18410):
* turbostat to 21.05.04
* intel speed select to 1.10
* cpupower to 5.14-rcX (kernel sources state)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 12 22:01:00 UTC 2020 - Thomas Renninger <trenn@suse.de> Thu Nov 12 22:01:00 UTC 2020 - Thomas Renninger <trenn@suse.de>

15
cpupower.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package cpupower # spec file for package cpupower
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# Author: Thomas Renninger <trenn@suse.de> # Author: Thomas Renninger <trenn@suse.de>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -20,14 +20,14 @@
# Use this as version when things are in mainline kernel # Use this as version when things are in mainline kernel
%define version %(rpm -q --qf '%{VERSION}' kernel-source) %define version %(rpm -q --qf '%{VERSION}' kernel-source)
%define tsversion 20.09.30 %define tsversion 21.05.04
%define pbversion 17.05.11 %define pbversion 17.05.11
%define ssversion 1.6 %define ssversion 1.10
Name: cpupower Name: cpupower
# Use this as version when things are in mainline kernel # Use this as version when things are in mainline kernel
%define version %(rpm -q --qf '%VERSION' kernel-source) %define version %(rpm -q --qf '%VERSION' kernel-source)
Version: 5.10 Version: 5.14
Release: 0 Release: 0
Summary: Tools to determine and set CPU Power related Settings Summary: Tools to determine and set CPU Power related Settings
License: GPL-2.0-only License: GPL-2.0-only
@ -52,9 +52,6 @@ Patch23: remove_bits_h.patch
# Fixes bsc#1048546: # Fixes bsc#1048546:
Patch30: x86_perf_makefile_fix_asm_header.patch Patch30: x86_perf_makefile_fix_asm_header.patch
# intel-speed-select patches
Patch50: intel-speed-select_remove_DATE_TIME.patch
BuildRequires: gettext-tools BuildRequires: gettext-tools
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: pciutils BuildRequires: pciutils
@ -104,11 +101,11 @@ cd ../turbostat-%{tsversion}
%patch23 -p1 %patch23 -p1
cd ../x86_energy_perf_policy-%{pbversion} cd ../x86_energy_perf_policy-%{pbversion}
%patch23 -p1
%patch30 -p1 %patch30 -p1
cd ../intel-speed-select-%{ssversion} cd ../intel-speed-select-%{ssversion}
cp %{SOURCE5} Makefile cp %{SOURCE5} Makefile
%patch50 -p1
%build %build
CONF="PACKAGE_BUGREPORT=https://bugs.opensuse.org mandir=%{_mandir} libdir=%{_libdir} CPUFRQ_BENCH=true VERSION=%{version}" CONF="PACKAGE_BUGREPORT=https://bugs.opensuse.org mandir=%{_mandir} libdir=%{_libdir} CPUFRQ_BENCH=true VERSION=%{version}"
@ -117,7 +114,7 @@ make $CONF %{?_smp_mflags}
%ifarch ix86 x86_64 %ifarch ix86 x86_64
cd ../turbostat-%{tsversion} cd ../turbostat-%{tsversion}
export CFLAGS="%{optflags} -fcommon -I ." export CFLAGS="%{optflags} -fcommon -I ../turbostat-%{tsversion}/include"
make %{?_smp_mflags} make %{?_smp_mflags}
cd ../x86_energy_perf_policy-%{pbversion} cd ../x86_energy_perf_policy-%{pbversion}
make %{?_smp_mflags} make %{?_smp_mflags}

122
cpupower_rapl.patch
View File

@ -25,11 +25,19 @@ more detailed info later. Like that other args can be added easily later as well
Signed-off-by: Thomas Renninger <trenn@suse.com> Signed-off-by: Thomas Renninger <trenn@suse.com>
Index: cpupower-5.5/Makefile ---
=================================================================== Makefile | 11 +
--- cpupower-5.5.orig/Makefile 2019-11-28 02:45:48.000000000 +0100 lib/powercap.c | 290 +++++++++++++++++++++++++++++++++++++++++++
+++ cpupower-5.5/Makefile 2019-11-28 14:27:56.753759105 +0100 lib/powercap.h | 54 ++++++++
@@ -133,7 +133,7 @@ UTIL_OBJS = utils/helpers/amd.o utils/h man/cpupower-powercap-info.1 | 25 +++
utils/builtin.h | 2
utils/cpupower.c | 1
utils/powercap-info.c | 113 ++++++++++++++++
7 files changed, 492 insertions(+), 4 deletions(-)
--- a/Makefile
+++ b/Makefile
@@ -133,7 +133,7 @@
utils/idle_monitor/mperf_monitor.o utils/idle_monitor/cpupower-monitor.o \ utils/idle_monitor/mperf_monitor.o utils/idle_monitor/cpupower-monitor.o \
utils/cpupower.o utils/cpufreq-info.o utils/cpufreq-set.o \ utils/cpupower.o utils/cpufreq-info.o utils/cpufreq-set.o \
utils/cpupower-set.o utils/cpupower-info.o utils/cpuidle-info.o \ utils/cpupower-set.o utils/cpupower-info.o utils/cpuidle-info.o \
@ -38,7 +46,7 @@ Index: cpupower-5.5/Makefile
UTIL_SRC := $(UTIL_OBJS:.o=.c) UTIL_SRC := $(UTIL_OBJS:.o=.c)
@@ -143,9 +143,9 @@ UTIL_HEADERS = utils/helpers/helpers.h u @@ -143,9 +143,9 @@
utils/helpers/bitmask.h \ utils/helpers/bitmask.h \
utils/idle_monitor/idle_monitors.h utils/idle_monitor/idle_monitors.def utils/idle_monitor/idle_monitors.h utils/idle_monitor/idle_monitors.def
@ -51,23 +59,23 @@ Index: cpupower-5.5/Makefile
LIB_OBJS := $(addprefix $(OUTPUT),$(LIB_OBJS)) LIB_OBJS := $(addprefix $(OUTPUT),$(LIB_OBJS))
override CFLAGS += -pipe override CFLAGS += -pipe
@@ -276,6 +276,7 @@ install-lib: @@ -276,6 +276,7 @@
$(INSTALL) -d $(DESTDIR)${includedir} $(INSTALL) -d $(DESTDIR)${includedir}
$(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h $(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h
$(INSTALL_DATA) lib/cpuidle.h $(DESTDIR)${includedir}/cpuidle.h $(INSTALL_DATA) lib/cpuidle.h $(DESTDIR)${includedir}/cpuidle.h
+ $(INSTALL_DATA) lib/powercap.h $(DESTDIR)${includedir}/powercap.h + $(INSTALL_DATA) lib/powercap.h $(DESTDIR)${includedir}/powercap.h
install-tools: install-tools: $(OUTPUT)cpupower
$(INSTALL) -d $(DESTDIR)${bindir} $(INSTALL) -d $(DESTDIR)${bindir}
@@ -292,6 +293,7 @@ install-man: @@ -292,6 +293,7 @@
$(INSTALL_DATA) -D man/cpupower-set.1 $(DESTDIR)${mandir}/man1/cpupower-set.1 $(INSTALL_DATA) -D man/cpupower-set.1 $(DESTDIR)${mandir}/man1/cpupower-set.1
$(INSTALL_DATA) -D man/cpupower-info.1 $(DESTDIR)${mandir}/man1/cpupower-info.1 $(INSTALL_DATA) -D man/cpupower-info.1 $(DESTDIR)${mandir}/man1/cpupower-info.1
$(INSTALL_DATA) -D man/cpupower-monitor.1 $(DESTDIR)${mandir}/man1/cpupower-monitor.1 $(INSTALL_DATA) -D man/cpupower-monitor.1 $(DESTDIR)${mandir}/man1/cpupower-monitor.1
+ $(INSTALL_DATA) -D man/cpupower-powercap-info.1 $(DESTDIR)${mandir}/man1/cpupower-powercap-info.1 + $(INSTALL_DATA) -D man/cpupower-powercap-info.1 $(DESTDIR)${mandir}/man1/cpupower-powercap-info.1
install-gmo: install-gmo: create-gmo
$(INSTALL) -d $(DESTDIR)${localedir} $(INSTALL) -d $(DESTDIR)${localedir}
@@ -321,6 +323,7 @@ uninstall: @@ -321,6 +323,7 @@
- rm -f $(DESTDIR)${mandir}/man1/cpupower-set.1 - rm -f $(DESTDIR)${mandir}/man1/cpupower-set.1
- rm -f $(DESTDIR)${mandir}/man1/cpupower-info.1 - rm -f $(DESTDIR)${mandir}/man1/cpupower-info.1
- rm -f $(DESTDIR)${mandir}/man1/cpupower-monitor.1 - rm -f $(DESTDIR)${mandir}/man1/cpupower-monitor.1
@ -75,10 +83,8 @@ Index: cpupower-5.5/Makefile
- for HLANG in $(LANGUAGES); do \ - for HLANG in $(LANGUAGES); do \
rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo; \ rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo; \
done; done;
Index: cpupower-5.5/lib/powercap.c --- /dev/null
=================================================================== +++ b/lib/powercap.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ cpupower-5.5/lib/powercap.c 2019-11-28 14:27:56.753759105 +0100
@@ -0,0 +1,290 @@ @@ -0,0 +1,290 @@
+/* +/*
+ * (C) 2016 Thomas Renninger <trenn@suse.com> + * (C) 2016 Thomas Renninger <trenn@suse.com>
@ -370,10 +376,8 @@ Index: cpupower-5.5/lib/powercap.c
+ } + }
+ return 0; + return 0;
+} +}
Index: cpupower-5.5/lib/powercap.h --- /dev/null
=================================================================== +++ b/lib/powercap.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ cpupower-5.5/lib/powercap.h 2019-11-28 14:27:56.753759105 +0100
@@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@
+/* +/*
+ * (C) 2016 Thomas Renninger <trenn@suse.com> + * (C) 2016 Thomas Renninger <trenn@suse.com>
@ -429,11 +433,37 @@ Index: cpupower-5.5/lib/powercap.h
+ +
+ +
+#endif /* __CPUPOWER_RAPL_H__ */ +#endif /* __CPUPOWER_RAPL_H__ */
Index: cpupower-5.5/utils/builtin.h --- /dev/null
=================================================================== +++ b/man/cpupower-powercap-info.1
--- cpupower-5.5.orig/utils/builtin.h 2019-11-28 02:45:48.000000000 +0100 @@ -0,0 +1,25 @@
+++ cpupower-5.5/utils/builtin.h 2019-11-28 14:27:56.753759105 +0100 +.TH CPUPOWER\-POWERCAP\-INFO "1" "05/08/2016" "" "cpupower Manual"
@@ -8,6 +8,8 @@ extern int cmd_freq_set(int argc, const +.SH NAME
+cpupower\-powercap\-info \- Shows powercapping related kernel and hardware configurations
+.SH SYNOPSIS
+.ft B
+.B cpupower powercap-info
+
+.SH DESCRIPTION
+\fBcpupower powercap-info \fP shows kernel powercapping subsystem information.
+This needs hardware support and a loaded powercapping driver (at this time only
+intel_rapl driver exits) exporting hardware values userspace via sysfs.
+
+Some options are platform wide, some affect single cores. By default values
+of core zero are displayed only. cpupower --cpu all cpuinfo will show the
+settings of all cores, see cpupower(1) how to choose specific cores.
+
+.SH "DOCUMENTATION"
+
+kernel sources:
+Documentation/power/powercap/powercap.txt
+
+
+.SH "SEE ALSO"
+
+cpupower(1)
--- a/utils/builtin.h
+++ b/utils/builtin.h
@@ -8,6 +8,8 @@
extern int cmd_freq_info(int argc, const char **argv); extern int cmd_freq_info(int argc, const char **argv);
extern int cmd_idle_set(int argc, const char **argv); extern int cmd_idle_set(int argc, const char **argv);
extern int cmd_idle_info(int argc, const char **argv); extern int cmd_idle_info(int argc, const char **argv);
@ -442,11 +472,9 @@ Index: cpupower-5.5/utils/builtin.h
extern int cmd_monitor(int argc, const char **argv); extern int cmd_monitor(int argc, const char **argv);
#endif #endif
Index: cpupower-5.5/utils/cpupower.c --- a/utils/cpupower.c
=================================================================== +++ b/utils/cpupower.c
--- cpupower-5.5.orig/utils/cpupower.c 2019-11-28 02:45:48.000000000 +0100 @@ -54,6 +54,7 @@
+++ cpupower-5.5/utils/cpupower.c 2019-11-28 14:27:56.753759105 +0100
@@ -52,6 +52,7 @@ static struct cmd_struct commands[] = {
{ "frequency-set", cmd_freq_set, 1 }, { "frequency-set", cmd_freq_set, 1 },
{ "idle-info", cmd_idle_info, 0 }, { "idle-info", cmd_idle_info, 0 },
{ "idle-set", cmd_idle_set, 1 }, { "idle-set", cmd_idle_set, 1 },
@ -454,10 +482,8 @@ Index: cpupower-5.5/utils/cpupower.c
{ "set", cmd_set, 1 }, { "set", cmd_set, 1 },
{ "info", cmd_info, 0 }, { "info", cmd_info, 0 },
{ "monitor", cmd_monitor, 0 }, { "monitor", cmd_monitor, 0 },
Index: cpupower-5.5/utils/powercap-info.c --- /dev/null
=================================================================== +++ b/utils/powercap-info.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ cpupower-5.5/utils/powercap-info.c 2019-11-28 14:27:56.753759105 +0100
@@ -0,0 +1,113 @@ @@ -0,0 +1,113 @@
+#include <unistd.h> +#include <unistd.h>
+#include <stdio.h> +#include <stdio.h>
@ -572,33 +598,3 @@ Index: cpupower-5.5/utils/powercap-info.c
+ powercap_show(); + powercap_show();
+ return 0; + return 0;
+} +}
Index: cpupower-5.5/man/cpupower-powercap-info.1
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ cpupower-5.5/man/cpupower-powercap-info.1 2019-11-28 14:27:56.753759105 +0100
@@ -0,0 +1,25 @@
+.TH CPUPOWER\-POWERCAP\-INFO "1" "05/08/2016" "" "cpupower Manual"
+.SH NAME
+cpupower\-powercap\-info \- Shows powercapping related kernel and hardware configurations
+.SH SYNOPSIS
+.ft B
+.B cpupower powercap-info
+
+.SH DESCRIPTION
+\fBcpupower powercap-info \fP shows kernel powercapping subsystem information.
+This needs hardware support and a loaded powercapping driver (at this time only
+intel_rapl driver exits) exporting hardware values userspace via sysfs.
+
+Some options are platform wide, some affect single cores. By default values
+of core zero are displayed only. cpupower --cpu all cpuinfo will show the
+settings of all cores, see cpupower(1) how to choose specific cores.
+
+.SH "DOCUMENTATION"
+
+kernel sources:
+Documentation/power/powercap/powercap.txt
+
+
+.SH "SEE ALSO"
+
+cpupower(1)

3
intel-speed-select-1.10.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92178c4cfc6b7fa52e167b79cc82cf0548dfa6531f02eca36d3519aa14ffee32
size 23381

3
intel-speed-select-1.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dbc0766c94c61d16010059aa2440bda0e448e0c99cec268624b9ba940f92e0a6
size 22679

12
intel-speed-select_remove_DATE_TIME.patch
View File

@ -1,12 +0,0 @@
Index: intel-speed-select-1.0/isst-config.c
===================================================================
--- intel-speed-select-1.0.orig/isst-config.c 2019-11-28 02:45:48.000000000 +0100
+++ intel-speed-select-1.0/isst-config.c 2019-11-28 14:31:29.745770581 +0100
@@ -1618,7 +1618,6 @@ static void usage(void)
static void print_version(void)
{
fprintf(outf, "Version %s\n", version_str);
- fprintf(outf, "Build date %s time %s\n", __DATE__, __TIME__);
exit(0);
}

3
turbostat-20.09.30.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13f265b786c431f0498b0c02ce5de678bbc77010c6aea6a33dc84ffbedb1cbfa
size 46775

3
turbostat-21.05.04.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed6c7716b7718ffc8c7037108b1fa2a923aea306e2aa01b99abc7b2157eb7da9
size 48713

4
x86_energy_perf_policy-17.05.11.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:102ce02c344a6eb9cd4b134dcbb25f14b09fd6d64363ad9dd74c096076fa0f23 oid sha256:5080ec1fa9597b9c5863119000c4cc87d767fd1f0a3f7250a5c1e7747ab4d714
size 18483 size 20254

16
x86_perf_makefile_fix_asm_header.patch
View File

@ -1,13 +1,15 @@
Index: x86_energy_perf_policy-17.05.11/Makefile ---
=================================================================== Makefile | 2 +-
--- x86_energy_perf_policy-17.05.11.orig/Makefile 2019-04-08 16:05:22.534455032 +0200 1 file changed, 1 insertion(+), 1 deletion(-)
+++ x86_energy_perf_policy-17.05.11/Makefile 2019-04-08 16:05:52.306456636 +0200
@@ -10,7 +10,7 @@ endif --- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
x86_energy_perf_policy : x86_energy_perf_policy.c x86_energy_perf_policy : x86_energy_perf_policy.c
override CFLAGS += -Wall override CFLAGS += -O2 -Wall -I../../../include
-override CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"' -override CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
+override CFLAGS += -DMSRHEADER='"msr-index.h"' +override CFLAGS += -DMSRHEADER='"msr-index.h"'
override CFLAGS += -D_FORTIFY_SOURCE=2
%: %.c %: %.c
@mkdir -p $(BUILD_OUTPUT)