commit: efe9c99426cd527b5e9262717be118d2abfaf0dd Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sun Feb 12 15:56:31 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Feb 14 21:38:46 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe9c994
sys-power/powertop: remove unused patches/file Closes: https://github.com/gentoo/gentoo/pull/3936 sys-power/powertop/files/csstoh | 18 --- .../powertop/files/powertop-1.98-build-cc.patch | 28 ---- .../files/powertop-1.98-build-libnl-3.patch | 27 ---- sys-power/powertop/files/powertop-1.98-build.patch | 80 ----------- .../powertop/files/powertop-1.98-gcc-4.7.patch | 151 --------------------- .../powertop-2.2-cpu-add-new-Intel-cpuid.patch | 41 ------ .../files/powertop-2.2-use-package_version.patch | 26 ---- .../powertop/files/powertop-2.7-baytrail-msr.patch | 33 ----- .../powertop/files/powertop-2.7-braswell.patch | 81 ----------- .../powertop/files/powertop-2.7-broadwell.patch | 28 ---- .../powertop/files/powertop-2.7-skylake-2.patch | 37 ----- .../powertop/files/powertop-2.7-skylake.patch | 58 -------- 12 files changed, 608 deletions(-) diff --git a/sys-power/powertop/files/csstoh b/sys-power/powertop/files/csstoh deleted file mode 100644 index 51d1ec1372..0000000000 --- a/sys-power/powertop/files/csstoh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -in=$1 -out=$2 - -( -cat <<EOF -#ifndef __INCLUDE_GUARD_CCS_H -#define __INCLUDE_GUARD_CCS_H - -const char css[] = -EOF -sed -e 's:^:\t":' -e 's:$:\\n":' "${in}" -cat <<EOF -; -#endif -EOF -) > "${out}" diff --git a/sys-power/powertop/files/powertop-1.98-build-cc.patch b/sys-power/powertop/files/powertop-1.98-build-cc.patch deleted file mode 100644 index 70beb81db3..0000000000 --- a/sys-power/powertop/files/powertop-1.98-build-cc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e2a8efc2d349880833215ccbe9ac6cb80cdfe5d0 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vap...@gentoo.org> -Date: Tue, 23 Aug 2011 18:03:38 -0400 -Subject: [PATCH] allow control over the build compiler - -Signed-off-by: Mike Frysinger <vap...@gentoo.org> ---- - Makefile | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index f637bfe..75e6e63 100644 ---- a/Makefile -+++ b/Makefile -@@ -80,8 +80,9 @@ install: powertop - @(cd po/ && env LOCALESDIR=$(LOCALESDIR) DESTDIR=$(DESTDIR) $(MAKE) $@) - - -+BUILD_CC ?= gcc - csstoh: csstoh.c -- gcc -o csstoh csstoh.c -+ $(BUILD_CC) -o csstoh csstoh.c - - css.h: csstoh powertop.css - ./csstoh powertop.css css.h --- -1.7.6 - diff --git a/sys-power/powertop/files/powertop-1.98-build-libnl-3.patch b/sys-power/powertop/files/powertop-1.98-build-libnl-3.patch deleted file mode 100644 index bbe2b1c857..0000000000 --- a/sys-power/powertop/files/powertop-1.98-build-libnl-3.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 21dcbd03507632c987e8c68b3efcf7b4a5d51147 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vap...@gentoo.org> -Date: Wed, 18 Apr 2012 21:11:22 -0400 -Subject: [PATCH] use right libnl pkg-config name - -Signed-off-by: Mike Frysinger <vap...@gentoo.org> ---- - Makefile | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 94ed2be..8a90b85 100644 ---- a/Makefile -+++ b/Makefile -@@ -39,8 +39,7 @@ endif - - ifeq ($(NL3FOUND),Y) - CPPFLAGS += -DCONFIG_LIBNL20 --LIBS += -lnl-genl --NLLIBNAME = libnl-3.0 -+NLLIBNAME = libnl-genl-3.0 - endif - - ifeq ($(NLLIBNAME),) --- -1.7.8.5 - diff --git a/sys-power/powertop/files/powertop-1.98-build.patch b/sys-power/powertop/files/powertop-1.98-build.patch deleted file mode 100644 index 8f130fdace..0000000000 --- a/sys-power/powertop/files/powertop-1.98-build.patch +++ /dev/null @@ -1,80 +0,0 @@ -From cafa47147fdc503103cda1e67e736ab95051e44a Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vap...@gentoo.org> -Date: Tue, 23 Aug 2011 18:01:36 -0400 -Subject: [PATCH] use right flag names - -CFLAGS for the C compiler, CXXFLAGS for the C++ compiler, and -CPPFLAGS for preprocessor flags. - -Signed-off-by: Mike Frysinger <vap...@gentoo.org> ---- - Makefile | 20 ++++++++++++-------- - 1 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index b0b6cb7..bf9b79a 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,9 +2,13 @@ all: powertop po/powertop.pot - - VERSION := 1.98 - --CFLAGS += -Wall -O2 -g -fno-omit-frame-pointer -fstack-protector -Wshadow -Wformat -D_FORTIFY_SOURCE=2 --CPPFLAGS += -Wall -O2 -g -fno-omit-frame-pointer --CXXFLAGS += -Wall -O2 -g -fno-omit-frame-pointer -fstack-protector -Wshadow -Wformat -D_FORTIFY_SOURCE=2 -+WFLAGS = -Wall -Wshadow -Wformat -+COMMON_FLAGS = -O2 -g -fno-omit-frame-pointer -fstack-protector -+CFLAGS ?= $(COMMON_FLAGS) -+CFLAGS += $(WFLAGS) -+CXXFLAGS ?= $(COMMON_FLAGS) -+CXXFLAGS += $(WFLAGS) -+CPPFLAGS += -D_FORTIFY_SOURCE=2 - PKG_CONFIG ?= pkg-config - - OBJS := lib.o main.o display.o html.o devlist.o -@@ -31,13 +35,13 @@ NLLIBNAME = libnl-1 - endif - - ifeq ($(NL2FOUND),Y) --CFLAGS += -DCONFIG_LIBNL20 -+CPPFLAGS += -DCONFIG_LIBNL20 - LIBS += -lnl-genl - NLLIBNAME = libnl-2.0 - endif - - ifeq ($(NL3FOUND),Y) --CFLAGS += -DCONFIG_LIBNL20 -+CPPFLAGS += -DCONFIG_LIBNL20 - LIBS += -lnl-genl - NLLIBNAME = libnl-3.0 - endif -@@ -47,7 +51,7 @@ $(error Cannot find development files for any supported version of libnl) - endif - - LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME)) --CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME)) -+CPPFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME)) - - - -@@ -70,7 +74,7 @@ clean: - rm -f *.o *~ powertop DEADJOE core.* */*.o */*~ csstoh css.h - - powertop: $(OBJS) $(HEADERS) -- $(CXX) $(OBJS) $(LIBS) -o powertop -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o powertop - @(cd po/ && $(MAKE)) - - install: powertop -@@ -90,7 +94,7 @@ css.h: csstoh powertop.css - %.o: %.cpp lib.h css.h Makefile - @echo " CC $<" - @[ -x /usr/bin/cppcheck ] && /usr/bin/cppcheck -q $< || : -- @$(CC) $(CFLAGS) -c -o $@ $< -+ @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< - - - uptrans: --- -1.7.8.5 - diff --git a/sys-power/powertop/files/powertop-1.98-gcc-4.7.patch b/sys-power/powertop/files/powertop-1.98-gcc-4.7.patch deleted file mode 100644 index 78d2d70e5e..0000000000 --- a/sys-power/powertop/files/powertop-1.98-gcc-4.7.patch +++ /dev/null @@ -1,151 +0,0 @@ -From b86877fb2f24563d74cd3faf7eceffcc8fa59299 Mon Sep 17 00:00:00 2001 -From: Han Shen <shen...@chromium.org> -Date: Thu, 19 Apr 2012 12:14:08 -0400 -Subject: [PATCH] include unistd.h when necessary - -Older versions of gcc (pre-4.7) would implicitly include unistd.h in some -of its internal headers. With newer versions though, that is no longer -the case, so building powertop breaks with files that use things from the -unistd.h header but don't include it explicitly. - -Signed-off-by: Han Shen <shen...@chromium.org> -Signed-off-by: Mike Frysinger <vap...@gentoo.org> ---- - cpu/intel_cpus.cpp | 1 + - devices/alsa.cpp | 2 +- - devices/device.cpp | 1 + - devices/i915-gpu.cpp | 2 +- - devices/network.cpp | 1 + - devices/rfkill.cpp | 2 +- - devices/thinkpad-fan.cpp | 1 + - devices/thinkpad-light.cpp | 1 + - html.cpp | 1 + - main.cpp | 1 + - 10 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/cpu/intel_cpus.cpp b/cpu/intel_cpus.cpp -index f42f3b4..bbbd460 100644 ---- a/cpu/intel_cpus.cpp -+++ b/cpu/intel_cpus.cpp -@@ -34,6 +34,7 @@ - #include <sys/time.h> - #include <string.h> - #include <errno.h> -+#include <unistd.h> - - #include "../lib.h" - #include "../parameters/parameters.h" -diff --git a/devices/alsa.cpp b/devices/alsa.cpp -index b0bcd3f..5100c36 100644 ---- a/devices/alsa.cpp -+++ b/devices/alsa.cpp -@@ -39,7 +39,7 @@ using namespace std; - #include "../devlist.h" - - #include <string.h> -- -+#include <unistd.h> - - alsa::alsa(char *_name, char *path): device() - { -diff --git a/devices/device.cpp b/devices/device.cpp -index c38b96c..9ce4509 100644 ---- a/devices/device.cpp -+++ b/devices/device.cpp -@@ -29,6 +29,7 @@ - #include <stdio.h> - #include <limits.h> - #include <stdlib.h> -+#include <unistd.h> - - using namespace std; - -diff --git a/devices/i915-gpu.cpp b/devices/i915-gpu.cpp -index a9dc899..ca2dad1 100644 ---- a/devices/i915-gpu.cpp -+++ b/devices/i915-gpu.cpp -@@ -28,7 +28,7 @@ - #include <stdio.h> - #include <sys/types.h> - #include <dirent.h> -- -+#include <unistd.h> - - using namespace std; - -diff --git a/devices/network.cpp b/devices/network.cpp -index 5f3ddf2..72c766d 100644 ---- a/devices/network.cpp -+++ b/devices/network.cpp -@@ -33,6 +33,7 @@ - #include <dirent.h> - #include <libgen.h> - #include <stdlib.h> -+#include <unistd.h> - - #include <linux/ethtool.h> - -diff --git a/devices/rfkill.cpp b/devices/rfkill.cpp -index 5bf40c4..33a8fcd 100644 ---- a/devices/rfkill.cpp -+++ b/devices/rfkill.cpp -@@ -29,7 +29,7 @@ - #include <sys/types.h> - #include <dirent.h> - #include <libgen.h> -- -+#include <unistd.h> - - using namespace std; - -diff --git a/devices/thinkpad-fan.cpp b/devices/thinkpad-fan.cpp -index 4ac3d11..8750c6e 100644 ---- a/devices/thinkpad-fan.cpp -+++ b/devices/thinkpad-fan.cpp -@@ -29,6 +29,7 @@ - #include <sys/types.h> - #include <dirent.h> - #include <math.h> -+#include <unistd.h> - - #include "../lib.h" - -diff --git a/devices/thinkpad-light.cpp b/devices/thinkpad-light.cpp -index ba4c553..7e91637 100644 ---- a/devices/thinkpad-light.cpp -+++ b/devices/thinkpad-light.cpp -@@ -29,6 +29,7 @@ - #include <sys/types.h> - #include <dirent.h> - #include <math.h> -+#include <unistd.h> - - #include "../lib.h" - -diff --git a/html.cpp b/html.cpp -index 0a4db2e..8260ed5 100644 ---- a/html.cpp -+++ b/html.cpp -@@ -29,6 +29,7 @@ - #include <utility> - #include <iostream> - #include <fstream> -+#include <unistd.h> - - #include "css.h" - #include "lib.h" -diff --git a/main.cpp b/main.cpp -index 45a126e..0bbb4aa 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -33,6 +33,7 @@ - #include <time.h> - #include <sys/stat.h> - #include <getopt.h> -+#include <unistd.h> - - #include "cpu/cpu.h" - #include "process/process.h" --- -1.7.8.5 - diff --git a/sys-power/powertop/files/powertop-2.2-cpu-add-new-Intel-cpuid.patch b/sys-power/powertop/files/powertop-2.2-cpu-add-new-Intel-cpuid.patch deleted file mode 100644 index 04f17a3b5e..0000000000 --- a/sys-power/powertop/files/powertop-2.2-cpu-add-new-Intel-cpuid.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6626761dec9b3d1e3053d214913f329ed27c468c Mon Sep 17 00:00:00 2001 -From: Kristen Carlson Accardi <kris...@linux.intel.com> -Date: Tue, 19 Mar 2013 16:45:47 -0700 -Subject: [PATCH] cpu: add new Intel cpuid - -update cpu to support next generation Intel core processor ---- - src/cpu/cpu.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp -index 1eb340c..afe6a8c 100644 ---- a/src/cpu/cpu.cpp -+++ b/src/cpu/cpu.cpp -@@ -78,6 +78,7 @@ static class abstract_cpu * new_package(int package, int cpu, char * vendor, int - case 0x3A: /* IVB */ - case 0x3C: - case 0x3D: /* IVB Xeon */ -+ case 0x45: /* Next Gen Intel Core Processor */ - has_c2c7_res = 1; - ret = new class nhm_package; - break; -@@ -116,6 +117,7 @@ static class abstract_cpu * new_core(int core, int cpu, char * vendor, int famil - case 0x3A: /* IVB */ - case 0x3C: - case 0x3D: /* IVB Xeon */ -+ case 0x45: /* Next Gen Intel Core Processor */ - ret = new class nhm_core; - } - } -@@ -159,6 +161,7 @@ static class abstract_cpu * new_cpu(int number, char * vendor, int family, int m - case 0x3A: /* IVB */ - case 0x3C: - case 0x3D: /* IVB Xeon */ -+ case 0x45: /* Next Gen Intel Core Processor */ - ret = new class nhm_cpu; - } - } --- -1.8.1.2 - diff --git a/sys-power/powertop/files/powertop-2.2-use-package_version.patch b/sys-power/powertop/files/powertop-2.2-use-package_version.patch deleted file mode 100644 index f4ec6c3ed0..0000000000 --- a/sys-power/powertop/files/powertop-2.2-use-package_version.patch +++ /dev/null @@ -1,26 +0,0 @@ -It was missed to update POWERTOP_VERSION macro so that the -new v2.2 release still shows v2.1 string on the header of -ncurses window. Convert to use PACKAGE_VERSION macro which -set by autotools to the AC_INIT version so that it cannot -be missed anymore. - -Signed-off-by: Namhyung Kim <namhyung at gmail.com> ---- - src/lib.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib.h b/src/lib.h -index 8cf4632..209421a 100644 ---- a/src/lib.h -+++ b/src/lib.h -@@ -35,8 +35,8 @@ - - #define _(STRING) gettext(STRING) - --#define POWERTOP_VERSION "v2.1" --#define POWERTOP_SHORT_VERSION "2.1" -+#define POWERTOP_VERSION "v"PACKAGE_VERSION -+#define POWERTOP_SHORT_VERSION PACKAGE_VERSION - - - extern int get_max_cpu(void); diff --git a/sys-power/powertop/files/powertop-2.7-baytrail-msr.patch b/sys-power/powertop/files/powertop-2.7-baytrail-msr.patch deleted file mode 100644 index 9c4c17b3f8..0000000000 --- a/sys-power/powertop/files/powertop-2.7-baytrail-msr.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 037906c55374cbf045f197b43c22314617dbfc21 Mon Sep 17 00:00:00 2001 -From: Daniel Leung <daniel.le...@linux.intel.com> -Date: Wed, 25 Feb 2015 16:36:45 -0800 -Subject: [PATCH] Baytrail does not have core C7 MSR to read - -So do not acquire core C7 from MSR, or else it fails -and stops the program. - -Reported-by: Eoff, Ullysses A <ullysses.a.e...@intel.com> -Signed-off-by: Daniel Leung <daniel.le...@linux.intel.com> ---- - src/cpu/intel_cpus.cpp | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp -index 04275e5..72ecd50 100644 ---- a/src/cpu/intel_cpus.cpp -+++ b/src/cpu/intel_cpus.cpp -@@ -135,11 +135,6 @@ nhm_core::nhm_core(int model) - if (model == 0x37) { - has_c3_res = 0; - has_c1_res = 1; -- this->byt_has_ahci(); -- if ((this->get_byt_ahci_support()) == 0) -- has_c7_res = 1;/*BYT-T PC7 <- S0iX*/ -- else -- has_c7_res = 0; - } else { - has_c3_res = 1; - has_c1_res = 0; --- -2.3.1 - diff --git a/sys-power/powertop/files/powertop-2.7-braswell.patch b/sys-power/powertop/files/powertop-2.7-braswell.patch deleted file mode 100644 index cabbed44ed..0000000000 --- a/sys-power/powertop/files/powertop-2.7-braswell.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 1c60f2342b752149f3d6543c63fee11a167dc998 Mon Sep 17 00:00:00 2001 -From: "David E. Box" <david.e....@linux.intel.com> -Date: Thu, 2 Apr 2015 21:24:29 -0700 -Subject: [PATCH] Fix Powertop support for Intel Braswell SOC - -Correct Braswell MSR used to determine PC6 residency. - -Signed-off-by: David E. Box <david.e....@linux.intel.com> ---- - src/cpu/intel_cpus.cpp | 21 +++++++++++++++++++-- - src/cpu/intel_cpus.h | 1 + - 2 files changed, 20 insertions(+), 2 deletions(-) - -diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp -index d96cb49..1f3647a 100644 ---- a/src/cpu/intel_cpus.cpp -+++ b/src/cpu/intel_cpus.cpp -@@ -289,6 +289,7 @@ nhm_package::nhm_package(int model) - has_c8c9c10_res = 0; - has_c2c6_res = 0; - has_c7_res = 0; -+ has_c6c_res = 0; - - switch(model) { - case 0x2A: /* SNB */ -@@ -314,6 +315,9 @@ nhm_package::nhm_package(int model) - else - has_c7_res = 0; - } -+ /* BSW only exposes package C6 */ -+ else if (model == 0x4C) -+ has_c6c_res = 1; - else - has_c3_res = 1; - -@@ -360,7 +364,15 @@ void nhm_package::measurement_start(void) - - if (this->has_c3_res) - c3_before = get_msr(number, MSR_PKG_C3_RESIDENCY); -- c6_before = get_msr(number, MSR_PKG_C6_RESIDENCY); -+ -+ /* -+ * Hack for Braswell where C7 MSR is actually BSW C6 -+ */ -+ if (this->has_c6c_res) -+ c6_before = get_msr(number, MSR_PKG_C7_RESIDENCY); -+ else -+ c6_before = get_msr(number, MSR_PKG_C6_RESIDENCY); -+ - if (this->has_c7_res) - c7_before = get_msr(number, MSR_PKG_C7_RESIDENCY); - if (this->has_c8c9c10_res) { -@@ -401,7 +413,12 @@ void nhm_package::measurement_end(void) - - if (this->has_c3_res) - c3_after = get_msr(number, MSR_PKG_C3_RESIDENCY); -- c6_after = get_msr(number, MSR_PKG_C6_RESIDENCY); -+ -+ if (this->has_c6c_res) -+ c6_after = get_msr(number, MSR_PKG_C7_RESIDENCY); -+ else -+ c6_after = get_msr(number, MSR_PKG_C6_RESIDENCY); -+ - if (this->has_c7_res) - c7_after = get_msr(number, MSR_PKG_C7_RESIDENCY); - if (has_c8c9c10_res) { -diff --git a/src/cpu/intel_cpus.h b/src/cpu/intel_cpus.h -index 810a243..0331069 100644 ---- a/src/cpu/intel_cpus.h -+++ b/src/cpu/intel_cpus.h -@@ -77,6 +77,7 @@ public: - int has_c7_res; - int has_c2c6_res; - int has_c3_res; -+ int has_c6c_res; /* BSW */ - int has_c8c9c10_res; - nhm_package(int model); - virtual void measurement_start(void); --- -2.4.4 - diff --git a/sys-power/powertop/files/powertop-2.7-broadwell.patch b/sys-power/powertop/files/powertop-2.7-broadwell.patch deleted file mode 100644 index 7a1ed6f1ff..0000000000 --- a/sys-power/powertop/files/powertop-2.7-broadwell.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 60258e6149a420b45521201e02f39cf41839e081 Mon Sep 17 00:00:00 2001 -From: Alexandra Yates <alexandra.ya...@linux.intel.com> -Date: Wed, 22 Oct 2014 06:57:10 -0700 -Subject: [PATCH] Enable PowerTOP support for: BSW, BDW-H - -Added PowerTOP support for BSW and BDW-H platforms. - -Signed-off-by: Alexandra Yates <alexandra.ya...@linux.intel.com> ---- - src/cpu/intel_cpus.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp -index 167f1a7..d307aa1 100644 ---- a/src/cpu/intel_cpus.cpp -+++ b/src/cpu/intel_cpus.cpp -@@ -59,6 +59,8 @@ static int intel_cpu_models[] = { - 0x3D, /* Intel Next Generation */ - 0x3F, /* HSX */ - 0x46, /* HSW */ -+ 0x47, /* BDW-H */ -+ 0x4C, /* BSW */ - 0x4D, /* AVN */ - 0x4F, /* BDX */ - 0x56, /* BDX-DE */ --- -2.4.4 - diff --git a/sys-power/powertop/files/powertop-2.7-skylake-2.patch b/sys-power/powertop/files/powertop-2.7-skylake-2.patch deleted file mode 100644 index be5f0a3789..0000000000 --- a/sys-power/powertop/files/powertop-2.7-skylake-2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a7ddbd00f84253da38acc393e38f1c4db4263864 Mon Sep 17 00:00:00 2001 -From: Alexandra Yates <alexandra.ya...@linux.intel.com> -Date: Thu, 16 Apr 2015 14:36:29 -0700 -Subject: [PATCH] Add C7- C10 support for Intel SKY - -Add C7 to C10 support for Intel SKY for CPU idle. - -Signed-off-by: Alexandra Yates <alexandra.ya...@linux.intel.com> ---- - src/cpu/intel_cpus.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp -index 72ecd50..d96cb49 100644 ---- a/src/cpu/intel_cpus.cpp -+++ b/src/cpu/intel_cpus.cpp -@@ -63,7 +63,7 @@ static int intel_cpu_models[] = { - 0x4C, /* BSW */ - 0x4D, /* AVN */ - 0x4F, /* BDX */ -- 0x4E, /* Intel Next Generation */ -+ 0x4E, /* SKY */ - 0x56, /* BDX-DE */ - 0 /* last entry must be zero */ - }; -@@ -318,7 +318,7 @@ nhm_package::nhm_package(int model) - has_c3_res = 1; - - /* Haswell-ULT has C8/9/10*/ -- if (model == 0x45 || model ==0x3D) -+ if (model == 0x45 || model == 0x3D || model == 0x4E) - has_c8c9c10_res = 1; - } - --- -2.4.4 - diff --git a/sys-power/powertop/files/powertop-2.7-skylake.patch b/sys-power/powertop/files/powertop-2.7-skylake.patch deleted file mode 100644 index 50781dd246..0000000000 --- a/sys-power/powertop/files/powertop-2.7-skylake.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 761e87f1ccd3b5364b5518d7e29f4b7b8a6b8490 Mon Sep 17 00:00:00 2001 -From: Alexandra Yates <alexandra.ya...@linux.intel.com> -Date: Wed, 21 Jan 2015 16:55:59 -0800 -Subject: [PATCH] Adding support to SKY platforms. - -Adding Intel SKY platform support to PowerTOP - -Signed-off-by: Alexandra Yates <alexandra.ya...@linux.intel.com> ---- - src/cpu/intel_cpus.cpp | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp -index d307aa1..04275e5 100644 ---- a/src/cpu/intel_cpus.cpp -+++ b/src/cpu/intel_cpus.cpp -@@ -51,18 +51,19 @@ static int intel_cpu_models[] = { - 0x2C, /* Westmere */ - 0x2A, /* SNB */ - 0x2D, /* SNB Xeon */ -+ 0x37, /* BYT-M */ - 0x3A, /* IVB */ - 0x3C, -+ 0x3D, /* Broadwell */ - 0x3E, /* IVB Xeon */ -- 0x37, /* BYT-M */ -- 0x45, /* HSW-ULT */ -- 0x3D, /* Intel Next Generation */ - 0x3F, /* HSX */ -+ 0x45, /* HSW-ULT */ - 0x46, /* HSW */ - 0x47, /* BDW-H */ - 0x4C, /* BSW */ - 0x4D, /* AVN */ - 0x4F, /* BDX */ -+ 0x4E, /* Intel Next Generation */ - 0x56, /* BDX-DE */ - 0 /* last entry must be zero */ - }; -@@ -125,6 +126,7 @@ nhm_core::nhm_core(int model) - case 0x3C: - case 0x3E: /* IVB Xeon */ - case 0x45: /* HSW-ULT */ -+ case 0x4E: /* SKY */ - case 0x3D: /* Intel Next Generation */ - has_c7_res = 1; - } -@@ -300,6 +302,7 @@ nhm_package::nhm_package(int model) - case 0x3C: - case 0x3E: /* IVB Xeon */ - case 0x45: /* HSW-ULT */ -+ case 0x4E: /* SKY */ - case 0x3D: /* Intel Next Generation */ - has_c2c6_res=1; - has_c7_res = 1; --- -2.4.4 -
