Add fix from upstream for running on newer Baytrail systems.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 153 insertions, 15 deletions

diff --git a/sys-power/powertop/ChangeLog b/sys-power/powertop/ChangeLog
index 0999525e0802..1e35e78fc9bc 100644
--- a/sys-power/powertop/ChangeLog
+++ b/sys-power/powertop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/powertop
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.108 2015/03/02 09:33:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/ChangeLog,v 1.109 2015/03/02 21:40:10 vapier Exp $
+
+*powertop-2.7-r1 (02 Mar 2015)
+
+  02 Mar 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/powertop-2.7-baytrail-msr.patch, +powertop-2.7-r1.ebuild:
+  Add fix from upstream for running on newer Baytrail systems.
 
   02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> powertop-2.6.ebuild:
   Stable for ppc, wrt bug #520616
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 601cd21db475..89781dcb215a 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -9,6 +9,7 @@ AUX powertop-1.98-gcc-4.7.patch 3720 SHA256 44335480e32fbd591e5fe45cc8f47c45ad45
 AUX powertop-2.2-cpu-add-new-Intel-cpuid.patch 1308 SHA256 ac53965cebf261cea753e73a17f95478d39294847d92581fd10260a5cdcaae67 SHA512 5c36318d0ea7ebf166162957fb72e8b38e4e010e8029128a3f5e9bc789ee6efbf4b87b1a5a96fba2c675397e90c8c37333542c5cab4ea5077a3d26f8e6df0eaa WHIRLPOOL 8d76929edd03ceabff268e7d39584b1e68c6338e3f1452d4bfff0ee80d66df7e4f81084392a635077569c372e747827ae74f39dfc4cc4904b904a80d20b221aa
 AUX powertop-2.2-use-package_version.patch 740 SHA256 40258728ae75fb0ba425bd1295ce88784ca03bde59ef52aa114a2269020f1cd8 SHA512 196a866d13999103a6c0d7b5e1b03ce0a11ce1c3a7550346b45bcbb5597b1080b0b9fbd7b18b5d66e2b9d140d5e7ec460cd8be4749bc52c7b904287a0e621999 WHIRLPOOL 715823eb0e936764ebfc5ad6c4bbc7b818f54c310081dd3112da2640923046582b4eaec8b8c0f85891adcf147b04fb25150d1322099664b75a091f39b3c729b5
 AUX powertop-2.4-tinfo.patch 580 SHA256 fc1c7238d5c386c0f28ff003e998b6657826f8b354d051caa45ff52168d162cb SHA512 51a075ec585a8bc33a8e91f5b808e6f7f8fb63f1b77f879dee75811b61e78ee105887e3a02edcb2ff7cd624216b7139572c81cbe2b54d8e4b06946a730b53a5d WHIRLPOOL 4fbc00dc642376c237746194b5ad46540a12aa2831d342b4c76f030ad6042ffd48b14ccc30009765de4ca733fce3ba8b5bf1dfc3f3922827aeebb7934099422a
+AUX powertop-2.7-baytrail-msr.patch 1014 SHA256 9a3b666dd79ec3fbcf3b3713fcef2572faa73fe3fb1d6d9a3f2f3ec0e5c2c74f SHA512 8d79966522d88d19f8b9a07a7637e4e30aea24a2ac5fc909735bf63a97508379ed60de2b90f769e904c0da21b0daf467553d2c7935a73126cae027501e93cac9 WHIRLPOOL efb02222865013b1456a51390e5cfcfa1512d83ff53cca7a8c60800b0b84b205cb0f16bd98d63b1717343b47f7b376cd81f97639384d5667bef37b8b76b24b87
 DIST powertop-1.13.tar.gz 104675 SHA256 2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98 SHA512 0c22a903da64798d987492336d57260372e03eab067ad94cf30b7640e9ee05e759a2fe9fa48fbdc35404cd2782b6b29d705e11e68452653b08f7f9df1a52be44 WHIRLPOOL 5ba44b84f49609f67c32563f75e20f6576c21a93fcb1ca99ebfe064475397602aa0f0fb9575e05b5a0290983791e7cf6ebae0139b39158b962e4b51027a6f5aa
 DIST powertop-2.5.tar.gz 635979 SHA256 8b2c08a555d79e1c428863470c41cb023971d74ba4801d80a05e35adeec23c0b SHA512 696629fb6f5d0164da3ec2b259780dc635abc661de859e5e908debd3872c9a82024c0cc2dd8210c4cd1cf5586bf4238e31c3af29266f6a8ed8d90b1d876f04d8 WHIRLPOOL 5940b15ea4c5f09809e9a8febc11b1abe680df04469d75889c3a0cc0935a8c9d578d1f7c4ecaf2507cda74d574696a61b3bef21c6e30e9c768c09abf03436bcf
 DIST powertop-2.6.tar.gz 3024009 SHA256 3024c2b13c8f32cdac0b0ea9359eb5668dc9bd11776cf063481daa878533d1ee SHA512 7c44b9c49f74d0f415d0332b60629940e05cf1c9170a9a7b98427da630c25c0cc9c8ece49e059ec8c665847ff03fa8a341e0cf8f7ca792d889f2c52a39ddbb62 WHIRLPOOL eaa6e05d2fdb3050eb3a37f39fb5d760a8d3d91461b8c6f0ae825138080a0dd8a532e490a71246d62d2e340e3820b402d761a1331a6e7b6bc23db116c98cf0d9
@@ -16,24 +17,25 @@ DIST powertop-2.7.tar.gz 654329 SHA256 8d4b1490e2baad4467c0ded3c423db4472dcbf7b2
 EBUILD powertop-1.13.ebuild 1158 SHA256 b996887bff17065a57aac201aac438a2c6310f5423109e4cb62de10c3e3dfdfd SHA512 c1ed8ee2fd7416138b9ab84072766071047e557ffc35fc57d32d8e4dc86f8986fa3a642f1875e2cf929eeabeb8a0b20025babc27808602b1123c970869c51146 WHIRLPOOL 570c6c80e97351859f9758b581a103a1a98d6c5ee58a63b4277431f21bcef9bed94ee35e3ed0193259a44978aa7aac717c597db4cba2aaa2d201ffe13998610f
 EBUILD powertop-2.5.ebuild 3378 SHA256 7e59cf6687b3b6d6ae7c5045c508d2a5d4b37819783e9af419ba0826df167e40 SHA512 2cff8cfe282f475bcf32356073f0b34418e14b376d08c7353b8426bfb83198dfc411f6d2945b8bbe0ed4e4f228f62d6504d84c460c5cfba064e0afe47453b1f8 WHIRLPOOL 2a22cb3a1307a667dae0fe93f96f583cd20ce1b9b9fa8691d9f31d765cc1331022dc556b6599a11d4fde8e0ae95f2c2452d86284daf33a0bb822abda441c2d44
 EBUILD powertop-2.6.ebuild 3340 SHA256 a1b366fd6c6c0968d063e99daba70b8f829f39017d900d24bb53406597fa25eb SHA512 a7d4dacc75e0b6b9f2c08e8e9ded30f43e5c6d32ae7362cc3e738183b606ed7d0b23e9e173133b4cc1f5666dfdffc33556f5d379c36dec819c6b89372bc1adfe WHIRLPOOL 7669891cb85c23cc8c6cfbf965c1e3235aa70d7d745ac1587499a1ebe837e5e82f984d79734338fc228885864fabbb7576b92b2cc9f202ccf85fdec76004f15e
+EBUILD powertop-2.7-r1.ebuild 3305 SHA256 e746fc84ecef3375c67cecff5bf6b46486acedbbf97e27d230b72d2996d2378e SHA512 400ea9ea562c3a906b8043c51e348ba9665097584ec777b9736e2529400c20d851cb1b02770cc99c6c05c18e26ce8123ab35c9087c9485e2b87bce609d87f856 WHIRLPOOL 17b6d08462eaa59fb23869f903b0be15a90d01694347985e2708b51206e50fd702dd51eed6c75e10f3248b9af2b0f8f29065c9486f38e6730db2f4f2a14eb631
 EBUILD powertop-2.7.ebuild 3282 SHA256 b7db1bd6ae18f3ed8c2f9405f5587471fabd85fd08f6563ea6cc5a2c5fe32f57 SHA512 15aff0bc07130cbe7aa78d3858dd8a82b4502111964fd6a8d165036b3c94f06a3b797091ef57f06b3429b7bf0930f3f638210cbec2a37e6e9d748520edb65936 WHIRLPOOL 71d091a7d58c2ed8c14c874f09fd144c21f60dfde0fce46272ef2215ebc3ff6a235347a2251794c331b88be5b99c1127da640075f1dd7b4bd4ee313efc182536
 EBUILD powertop-9999.ebuild 3284 SHA256 a9499b4db51632fcadb6e3840c456137b2d6ab1b659c92e932fe771c52ab9091 SHA512 27b4e7e00934a75502eb888a81aede48dcac32be7a8af203ed715d3d1312d191cda0d57d0d41f180b25a7ec7a0446fa49778812162194873d20ccf8695e33e65 WHIRLPOOL afac2120c3634f1e035c5b073a22ca9d5c0807f560986a4270f95d887a00b7ad19c71e47f0511991d9769400cf17cd22e6335e7e11b559add2787c86f6948966
-MISC ChangeLog 15539 SHA256 ab9ddb4df2e32cc9dda1e786297306d6a570e2073384fa3b8b862f12166aa900 SHA512 3e72345c8292d49be8c6fb02ac7ec4ce319219c72c47c13c40f8bca9270a68dabda17bc7e8f161238f8c2cef8f2b24bcdfc086a6016a51e0b648b63196659de3 WHIRLPOOL ed46af34d39f214fee861f10fd6c0ece1b57b0c22188c5bfe7430dab7690f6723fa4c257b7c3f73e7e692deb3069c605f793c2f3ed375713f059b5ee138768e2
+MISC ChangeLog 15755 SHA256 87d46b7e7496c0c80e539c5efcbecbc9a602587148d73761e37597f3c649e2a8 SHA512 571abb46d13776ace9b3b567dca0e49c73874565be341a5fe97951a0e2edbc19f4863d2bbbc86bae89dd4ba1ec032731257ff2d9761d9867a7ce270e520c2a4d WHIRLPOOL 281c391293eeb24d9dac009ce96d722451212823c8f2777801a2d4ee839b759ee7875b777a8b329feab0182a5c6da501c935ee65c5390496c7af1aef400d452b
 MISC metadata.xml 239 SHA256 24d3268dbe675a5446456b139438c1bd59bd6190077399a4a715805ef28da3cc SHA512 2fa025f3394a125b4a92ee5fdb579bcfe74755f4e4306d90979bbb04c5239adfd2fdf9242ee7623642909597100ca88a6f6b7578a24512d976930fad186e10f9 WHIRLPOOL ab1b126e1a8170eba68412f8704d38ac7a479cb80a461cb2466ad87966ab8f78ddc04ce66341e5056df8c3aa21e3cf2c530a1f3236461bb502b91842089b49bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU9C5yAAoJELp701BxlEWfduIP/3GksF6h7HfGa+E8+x2hfcJi
-1BvBKmyWAfmniDIhx/yKWc2QWbUWmtpSClsS0SoczvMKClLOwA3HFgaIj46REGG/
-TTM1ALKucw/c8AKMkgdzevXf8F7G1xTS1IAM/tzy1glEQY+bgEeOHVmVcePhZrbC
-7q8YTnB3LuZnknO+YnJvrqWzMoFPLaqtVyMqk5B5Lkg6/P4d3R3GnkWV1IHJ0zVt
-lJLuRF01W2CSLM6VZxDJUui+wP7f2RfjJIV7n58/Ia1TXF4gInc1kv/Dmqe/ymMO
-wRb3jTpgocIrF9LKRXP4lF7GaXoUcLuVDmFEclUhOE/vW0egiHESXMB9txtj2Vkt
-L1Lv+smJdxfg+q3XwyY66pnw3Y+8hn3MV08STkL7DlHzXMHyySrxY8q8G5tBM9Ma
-BZwafBp4ftWKNX5CDHgdddbrfTMB7O9fsbbnGTYynUzYvygYQmNuiJk+gL2g0zdj
-V23/PH3R4mVVer98Qs8/DmAY7q3y4HzaldmgqUNzFMJs7jI6jYdFlDH0ZWMyexQL
-yfxnXRfSoAE3jJF2dw9ryc8/Q/1/EcR+dyNySGYS1lQ7RbPrzTdfKY2fBSoaLt28
-0hL4ZxZdR6nXZshVLoibGmtTFh6iJ0CSepRjarSXagnQarf16spG7cRg3SYRl3vH
-zC0VP4NXN9W7ebh3X50G
-=Ey0d
+iQIcBAEBCAAGBQJU9Ni7AAoJEPGu1DbS6WIAoZAP/jIJR2iAAVFBjKYtQLJgV0eS
+vl830j4e2op3lxQOzkcrFP1vvnqEzHReJapYAyphH0UPvw8TYyoLCFt0ACRpzeuP
+qE14irIgLXeBaBKT3tpq7e8Jl+Wj9DyH7O+4HtBPj2PmSlXGXX5tLNc1WxsWsK6u
+1ojum9MXkzVVXjZHeIMEwYnxhpsGBBb0qomk/MgNYJabu2m/gvgO9+uGJc0mgAkj
+kCNXAFGmjfiMaIpl8jlnPBDc5hPlN7yTXcNYPMttSNj+fK6lyHNjO9mG+Ueyua2Z
+ZEE6ljbK1u5slBPLtAhU1CjntgYZLkDHxj+Sw9+VwtHY5jUTtDhCAfZFkxBK/hnh
+pydEc6D0pDxlHNJWqJS0GE4qMuiM+GoXSm33g888wlWcGMPgnHmkENdgOYmBHbwJ
+BZVjfjguMU6jB0A+KRq8G35qEMraeY3t2hUqtL+iJeoucCwuu1IB4GQ9gBAAVIv8
+odIa1VhSAHhvxvQs8sz5Lq6Kx0c7KMriW07Ka0qFbgOTsFlDwdF4jwxtuxtOEAFR
+Sh6LArlDHq2rQQNyykudRGD2+k18axGt1Hh04A1RfX2wQct4OIxoFQshKFHCCYgm
+Xw4DTVqkiwKdHsfEbb9EEZ97q8XZ0kzxemv/bJHToVKWvutS6iCkFs+d65u6SByl
++hpbPvzHXq8uN91nPLN9
+=BwY/
 -----END PGP SIGNATURE-----
diff --git a/sys-power/powertop/files/powertop-2.7-baytrail-msr.patch b/sys-power/powertop/files/powertop-2.7-baytrail-msr.patch
new file mode 100644
index 000000000000..9c4c17b3f8c1
--- /dev/null
+++ b/sys-power/powertop/files/powertop-2.7-baytrail-msr.patch
@@ -0,0 +1,33 @@
+From 037906c55374cbf045f197b43c22314617dbfc21 Mon Sep 17 00:00:00 2001
+From: Daniel Leung <daniel.leung@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.eoff@intel.com>
+Signed-off-by: Daniel Leung <daniel.leung@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/powertop-2.7-r1.ebuild b/sys-power/powertop/powertop-2.7-r1.ebuild
new file mode 100644
index 000000000000..08eef72e67b4
--- /dev/null
+++ b/sys-power/powertop/powertop-2.7-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.7-r1.ebuild,v 1.1 2015/03/02 21:40:10 vapier Exp $
+
+EAPI="5"
+
+inherit eutils linux-info
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/fenrus75/powertop.git"
+	inherit git-2 autotools
+	SRC_URI=""
+else
+	SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="tool that helps you find what software is using the most power"
+HOMEPAGE="https://01.org/powertop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="unicode X"
+
+COMMON_DEPEND="
+	dev-libs/libnl:3
+	sys-apps/pciutils
+	sys-libs/ncurses[unicode?]
+"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? ( x11-apps/xset )
+	virtual/libintl
+"
+
+DOCS=( TODO README )
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~X86_MSR
+		~DEBUG_FS
+		~PERF_EVENTS
+		~TRACEPOINTS
+		~NO_HZ
+		~HIGH_RES_TIMERS
+		~HPET_TIMER
+		~CPU_FREQ_STAT
+		~CPU_FREQ_GOV_ONDEMAND
+		~PM_RUNTIME
+		~FTRACE
+		~BLK_DEV_IO_TRACE
+		~TIMER_STATS
+		~TRACING
+	"
+	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
+	ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
+	ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_NO_HZ="NO_HZ should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
+	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable TIMER_STATS, TRACING and EVENT_POWER_TRACING_DEPRECATED"
+	ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
+	linux-info_pkg_setup
+	if linux_config_exists; then
+		if kernel_is -lt 3 7 0; then
+			if linux_chkconfig_present SND_HDA_INTEL; then
+				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
+				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
+				check_extra_config
+			fi
+		fi
+		if kernel_is -lt 3 9 0; then
+			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
+			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-baytrail-msr.patch
+}
+
+src_configure() {
+	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
+	default
+}