Add urgent powernow-k8 patch which fixes turbo clock behavior for the new Phenom II x6 processors

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 158 insertions, 2 deletions

diff --git a/sys-kernel/zen-sources/ChangeLog b/sys-kernel/zen-sources/ChangeLog
index d58a4fd3a9f3..d63830311f95 100644
--- a/sys-kernel/zen-sources/ChangeLog
+++ b/sys-kernel/zen-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/zen-sources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.34 2010/05/18 15:32:26 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/ChangeLog,v 1.35 2010/05/25 23:15:11 hwoarang Exp $
+
+*zen-sources-2.6.33_p2-r1 (25 May 2010)
+*zen-sources-2.6.32_p7-r1 (25 May 2010)
+
+  25 May 2010; Markos Chandras <hwoarang@gentoo.org>
+  +files/powernow-k8-family10-model10_fix.patch,
+  +zen-sources-2.6.32_p7-r1.ebuild, +zen-sources-2.6.33_p2-r1.ebuild:
+  Add urgent powernow-k8 patch which fixes turbo clock behavior for the new
+  Phenom II x6 processors. Please visit
+  http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.33.y.git;a=comm
+  it;h=1ff21ff30e324d2e994a54baf9dc3df003985b60 for details
 
   18 May 2010; Alex Alexander <wired@gentoo.org>
   -zen-sources-2.6.31_p8.ebuild, -zen-sources-2.6.31_p9.ebuild,
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index da82042c2397..cc54048eeb56 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,3 +1,4 @@
+AUX powernow-k8-family10-model10_fix.patch 1365 RMD160 68c4ac1eb9d10aaa60d957bfa7a535bc242b2b90 SHA1 7363a0975573ae25609e45be87bdb0913963e195 SHA256 a9050bbc110a22d9412ca194100aaf0f19e5b5424bf75ae0e8e31dcb496f6fc3
 AUX zen-sources-2.6.31_p5-config_fb_fix.patch 416 RMD160 30c076002b76ee99bffca08a4a0f1346b52045c4 SHA1 7b36c837fc71c8929efcb335b9a7b13051730392 SHA256 cebc41750c46446d2edcfb506dc60a5bcc6f200bb7ecf499dc4db9b1fc45da74
 AUX zen-sources-2.6.33_rc2_p1-kernel-sysctl.c.patch 711 RMD160 76699719dc16cc697063b1f965d6e570283c5d20 SHA1 1ee4d7d9e8b60ea103727e056e84061e4ed827d1 SHA256 ac0b48dc3d1ea730bb4591bafb721802520608b8a77c95d59578ded7d574e8ae
 DIST 2.6.30-zen11.patch.lzma 1844571 RMD160 2dd6c496bd425c34399a631ffa84c5af273b894a SHA1 6fe33e05c1f608711bd9d1d9e92b6b861dd9ced1 SHA256 d7894256b08c9766252b0575fc1ac298791194a8f298bcc929643aa92cd31949
@@ -17,9 +18,11 @@ DIST linux-2.6.33.tar.bz2 66266488 RMD160 7f0897db8113bc17249d82d61ca41e3b91eb46
 EBUILD zen-sources-2.6.30_p11.ebuild 1497 RMD160 8c1c74a08219210e9b4cea318fe6360a95085dad SHA1 1745440ab7cd1b7c6462039e635e2b5fd41acd8d SHA256 7166c8e2d125878a54648e00e3837eadc2e41878f54f57813b5878948fa3d1e5
 EBUILD zen-sources-2.6.31_p12.ebuild 1707 RMD160 7d52e6b169b20a2456697d2d7fceb6146ba33ee8 SHA1 f0be365d68cbfb1d0a8310c18825015565cbae22 SHA256 1451edfe71734c1c1f73c0dcf9202cd688f80e735a74ec85f8a07dec650f9b19
 EBUILD zen-sources-2.6.32_p6.ebuild 1496 RMD160 8f553796b23603b4777f634d1f7def7dbcbb98ee SHA1 a4e810f7f16112be9bd15229a1a0b37d4f13a21c SHA256 a6d74330d64e5e38c534052792086c2b1240aef8be0ce4f7de05dd11061c1c28
+EBUILD zen-sources-2.6.32_p7-r1.ebuild 1609 RMD160 bddc74edb03ebb4e7bdac2aa02e916851d7c7e5a SHA1 6171c1ce40c500baf760c817e65125aa24b523ce SHA256 47a06f77d9227f7a73bdc5f9302c1cdd5615d3d2a675208d1907736efbd92d74
 EBUILD zen-sources-2.6.32_p7.ebuild 1496 RMD160 53c8d44b03f34c20fc621b6e852b30cd8b89e59f SHA1 6f543687fb997b4cbd0db1b8f1c66572fb9bc926 SHA256 9d30950c9b07a21f23d1230d83886381e6aad3dd58195df81d75983fc4bcc665
 EBUILD zen-sources-2.6.33_p1.ebuild 1496 RMD160 82631bfda101b012711e2f908f16e3622e3156b7 SHA1 119d87f10fd7adff5b7c040f3921d774922d4568 SHA256 8d112cbcc7afcd206797a504a1f2c27efe4b7048a564d1adc39d1a0250a8227b
+EBUILD zen-sources-2.6.33_p2-r1.ebuild 1609 RMD160 744a37da9c72e8180397fc93dbf7120566178756 SHA1 f6d227aa94ca9f70a7dae0dce5dd648d2b080642 SHA256 63fbf71179b8b8ff930419c1298769a1df5b08ea2e7565a525803a03cd18edc1
 EBUILD zen-sources-2.6.33_p2.ebuild 1494 RMD160 45cce0b45a51e82c6680dc4d2f82ec09139a50c0 SHA1 feddd300d07138e6c21550bba909d8edee4e1e4a SHA256 2b68d0759ba19213ad5212e9db987e48b16badbe924afc314c4a609184302579
 EBUILD zen-sources-9999.ebuild 1500 RMD160 df7214a80912508665dae186eaa16e1a8208f614 SHA1 8be3a20a092e471efcbd38a54e65d6fcd627d765 SHA256 06319ca9f5485495bf0a66bc188aad54d9a722ca1aadaac050020795271900f8
-MISC ChangeLog 8881 RMD160 607aabae851bfffe030c32873cf3b1c9c71cf8d1 SHA1 3d354383a6ffa5d4465ee688ef5de240ca4dbafb SHA256 5404ce3cbc8304bca336440be683c9884501b162811330784fb33bf5ab3f5e0e
+MISC ChangeLog 9391 RMD160 28a96b48cdb1a3aad7ae048e6a536aba9617abe2 SHA1 bc4d2fb50873bb3246fc8547dc125f9abed157b9 SHA256 89a2d4ed3785a918ceb05e5c0d3ac7f3523cacf53f5c44daf48de664d74b12dc
 MISC metadata.xml 511 RMD160 53c16cae3eb78b74c5e806589c5dbe5330ce27f7 SHA1 1929871223eb271dc366bd149be6e5ccdc0a326a SHA256 08dc24a26fe1498ff2fb805aebecc1f14c8a4c5c33b1aebf99de20366b16fc48
diff --git a/sys-kernel/zen-sources/files/powernow-k8-family10-model10_fix.patch b/sys-kernel/zen-sources/files/powernow-k8-family10-model10_fix.patch
new file mode 100644
index 000000000000..10ad496ce57f
--- /dev/null
+++ b/sys-kernel/zen-sources/files/powernow-k8-family10-model10_fix.patch
@@ -0,0 +1,34 @@
+From 679370641e3675633cad222449262abbe93a4a2a Mon Sep 17 00:00:00 2001
+From: Mark Langsdorf <mark.langsdorf@amd.com>
+Date: Wed, 31 Mar 2010 21:56:45 +0200
+Subject: [PATCH] powernow-k8: Fix frequency reporting
+
+With F10, model 10, all valid frequencies are in the ACPI _PST table.
+
+Cc: <stable@kernel.org> # 33.x 32.x
+Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com>
+LKML-Reference: <1270065406-1814-6-git-send-email-bp@amd64.org>
+Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
+Reviewed-by: Thomas Renninger <trenn@suse.de>
+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+---
+ arch/x86/kernel/cpu/cpufreq/powernow-k8.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+index 52fce63..6f3dc8f 100644
+--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
++++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+@@ -935,7 +935,8 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data,
+ 		powernow_table[i].index = index;
+ 
+ 		/* Frequency may be rounded for these */
+-		if (boot_cpu_data.x86 == 0x10 || boot_cpu_data.x86 == 0x11) {
++		if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10)
++				 || boot_cpu_data.x86 == 0x11) {
+ 			powernow_table[i].frequency =
+ 				freq_from_fid_did(lo & 0x3f, (lo >> 6) & 7);
+ 		} else
+-- 
+1.7.1
+
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.32_p7-r1.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.32_p7-r1.ebuild
new file mode 100644
index 000000000000..72eab5bdc591
--- /dev/null
+++ b/sys-kernel/zen-sources/zen-sources-2.6.32_p7-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.32_p7-r1.ebuild,v 1.1 2010/05/25 23:15:11 hwoarang Exp $
+
+COMPRESSTYPE=".lzma"
+K_USEPV="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+
+CKV="${PV/_p[0-9]*}"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+
+DESCRIPTION="The Zen Kernel Sources v2.6"
+HOMEPAGE="http://zen-kernel.org"
+
+ZEN_PATCHSET="${PV/*_p}"
+ZEN_KERNEL="${PV/_p[0-9]*}"
+ZEN_KERNEL="${ZEN_KERNEL/_/-}"
+ZEN_FILE="${ZEN_KERNEL}-zen${ZEN_PATCHSET}.patch${COMPRESSTYPE}"
+ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${ZEN_FILE}"
+SRC_URI="${KERNEL_URI} ${ZEN_URI}"
+
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )"
+
+KV_FULL="${PVR/_p/-zen}"
+S="${WORKDIR}"/linux-"${KV_FULL}"
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the Zen developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	ebeep 8
+	kernel-2_pkg_setup
+}
+
+src_unpack(){
+	kernel-2_src_unpack
+	#powernow-k8 fix for AMD family10/model10 CPUs
+	epatch "${FILESDIR}"/powernow-k8-family10-model10_fix.patch
+	cd "${S}"
+	epatch "${DISTDIR}"/"${ZEN_FILE}"
+}
+
+K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \
+${HOMEPAGE}. You may also visit #zen-sources on irc.rizon.net"
diff --git a/sys-kernel/zen-sources/zen-sources-2.6.33_p2-r1.ebuild b/sys-kernel/zen-sources/zen-sources-2.6.33_p2-r1.ebuild
new file mode 100644
index 000000000000..369dac183d65
--- /dev/null
+++ b/sys-kernel/zen-sources/zen-sources-2.6.33_p2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-2.6.33_p2-r1.ebuild,v 1.1 2010/05/25 23:15:11 hwoarang Exp $
+
+COMPRESSTYPE=".lzma"
+K_USEPV="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+
+CKV="${PV/_p[0-9]*}"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+
+DESCRIPTION="The Zen Kernel Sources v2.6"
+HOMEPAGE="http://zen-kernel.org"
+
+ZEN_PATCHSET="${PV/*_p}"
+ZEN_KERNEL="${PV/_p[0-9]*}"
+ZEN_KERNEL="${ZEN_KERNEL/_/-}"
+ZEN_FILE="${ZEN_KERNEL}-zen${ZEN_PATCHSET}.patch${COMPRESSTYPE}"
+ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range 1-3)/${ZEN_FILE}"
+SRC_URI="${KERNEL_URI} ${ZEN_URI}"
+
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )"
+
+KV_FULL="${PVR/_p/-zen}"
+S="${WORKDIR}"/linux-"${KV_FULL}"
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the Zen developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	ebeep 8
+	kernel-2_pkg_setup
+}
+
+src_unpack(){
+	kernel-2_src_unpack
+	#powernow-k8 fix for AMD family10/model10 CPUs
+	epatch "${FILESDIR}"/powernow-k8-family10-model10_fix.patch
+	cd "${S}"
+	epatch "${DISTDIR}"/"${ZEN_FILE}"
+}
+
+K_EXTRAEINFO="For more info on zen-sources and details on how to report problems, see: \
+${HOMEPAGE}. You may also visit #zen-sources on irc.rizon.net"