[kernel] r20063 - in dists/wheezy/linux/debian: . patches patches/features/all/cpu-devices

[Ben Hutchings]

Author: benh
Date: Thu May  9 01:25:13 2013
New Revision: 20063

Log:
[i386] cpufreq / Longhaul: Disable driver by default (Closes: #707047)

Added:
   dists/wheezy/linux/debian/patches/features/all/cpu-devices/cpufreq-Longhaul-Disable-driver-by-default.patch
Modified:
   dists/wheezy/linux/debian/changelog
   dists/wheezy/linux/debian/patches/series

Modified: dists/wheezy/linux/debian/changelog
==============================================================================
--- dists/wheezy/linux/debian/changelog	Thu May  9 00:41:03 2013	(r20062)
+++ dists/wheezy/linux/debian/changelog	Thu May  9 01:25:13 2013	(r20063)
@@ -98,6 +98,7 @@
     (Closes: #705655)
   * bug script: Remove broken sound functions (Closes: #705619)
   * [i386/486] udeb: Add lxfb to fb-modules (Closes: #705780)
+  * [i386] cpufreq / Longhaul: Disable driver by default (Closes: #707047)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 27 Mar 2013 14:10:40 +0000
 

Added: dists/wheezy/linux/debian/patches/features/all/cpu-devices/cpufreq-Longhaul-Disable-driver-by-default.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/features/all/cpu-devices/cpufreq-Longhaul-Disable-driver-by-default.patch	Thu May  9 01:25:13 2013	(r20063)
@@ -0,0 +1,55 @@
+From: =?UTF-8?q?Rafa=C5=82=20Bilski?= <rafalbilski at interia.pl>
+Date: Sat, 15 Dec 2012 00:45:02 +0100
+Subject: cpufreq / Longhaul: Disable driver by default
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit b5811bc469c0dbebb4f947800b9b234a9c0a68dc upstream.
+
+This is only solution I can think of. User decides if he wants this
+driver on his machine. I don't have enough knowledge and time to find
+the reason why same code works on some machines and doesn't on others
+which use the same, or very similar, chipset and processor.
+
+Signed-off-by: Rafał Bilski <rafalbilski at interia.pl>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki at intel.com>
+---
+ drivers/cpufreq/longhaul.c |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
+index f1fa500..1180d53 100644
+--- a/drivers/cpufreq/longhaul.c
++++ b/drivers/cpufreq/longhaul.c
+@@ -77,7 +77,7 @@ static unsigned int longhaul_index;
+ static int scale_voltage;
+ static int disable_acpi_c3;
+ static int revid_errata;
+-
++static int enable;
+ 
+ /* Clock ratios multiplied by 10 */
+ static int mults[32];
+@@ -965,6 +965,10 @@ static int __init longhaul_init(void)
+ 	if (!x86_match_cpu(longhaul_id))
+ 		return -ENODEV;
+ 
++	if (!enable) {
++		printk(KERN_ERR PFX "Option \"enable\" not set. Aborting.\n");
++		return -ENODEV;
++	}
+ #ifdef CONFIG_SMP
+ 	if (num_online_cpus() > 1) {
+ 		printk(KERN_ERR PFX "More than 1 CPU detected, "
+@@ -1021,6 +1025,10 @@ MODULE_PARM_DESC(scale_voltage, "Scale voltage of processor");
+  * such. */
+ module_param(revid_errata, int, 0644);
+ MODULE_PARM_DESC(revid_errata, "Ignore CPU Revision ID");
++/* By default driver is disabled to prevent incompatible
++ * system freeze. */
++module_param(enable, int, 0644);
++MODULE_PARM_DESC(enable, "Enable driver");
+ 
+ MODULE_AUTHOR("Dave Jones <davej at redhat.com>");
+ MODULE_DESCRIPTION("Longhaul driver for VIA Cyrix processors.");

Modified: dists/wheezy/linux/debian/patches/series
==============================================================================
--- dists/wheezy/linux/debian/patches/series	Thu May  9 00:41:03 2013	(r20062)
+++ dists/wheezy/linux/debian/patches/series	Thu May  9 01:25:13 2013	(r20063)
@@ -628,3 +628,4 @@
 debian/tracing-avoid-abi-change-in-3.2.42.patch
 debian/inet_frag-avoid-abi-change-in-3.2.42.patch
 debian/x86-mm-avoid-abi-change-in-3.2.44.patch
+features/all/cpu-devices/cpufreq-Longhaul-Disable-driver-by-default.patch