Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-12-29 15:03:02 +0100
committerJiri Kosina <jkosina@suse.cz>2010-12-29 15:03:02 +0100
commit77504b53dfcb96e9e09282543c7758c678f3a148 (patch)
treeeb53d3ccb487cad0186d9045a2cfcbf669eadf72
parent8c0080bd950aaef83f5f50740febeae6f16a98aa (diff)
- patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch:rpm-2.6.32.27-0.2
Input: introduce 'notimeout' blacklist for Dell Vostro V13 (bnc#641105).
-rw-r--r--kernel-source.changes7
-rw-r--r--patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch89
-rw-r--r--series.conf1
3 files changed, 97 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index c2718763b7..9d426b9ceb 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Dec 29 15:02:55 CET 2010 - jkosina@suse.cz
+
+- patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch:
+ Input: introduce 'notimeout' blacklist for Dell Vostro V13
+ (bnc#641105).
+
+-------------------------------------------------------------------
Wed Dec 29 14:09:24 CET 2010 - jbohac@suse.cz
- patches.fixes/xfrm-ipv6-fragment-locally-generated-packets.patch:
diff --git a/patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch b/patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch
new file mode 100644
index 0000000000..74968ecadd
--- /dev/null
+++ b/patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch
@@ -0,0 +1,89 @@
+From: Jiri Kosina <jkosina@suse.cz>
+Subject: [PATCH] Input: introduce 'notimeout' blacklist for Dell Vostro V13
+References: bnc#641105
+Patch-mainline: not yet, submitted
+
+i8042 controller present in Dell Vostro V13 errorneously signals spurious
+timeouts.
+
+Introduce i8042.notimeout parameter for ignoring i8042-signalled timeouts
+and apply this quirk automatically for Dell Vostro V13, based on DMI match.
+
+In addition to that, this machine also needs to be added to nomux blacklist.
+
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+---
+ drivers/input/serio/i8042-x86ia64io.h | 21 +++++++++++++++++++++
+ drivers/input/serio/i8042.c | 6 +++++-
+ 2 files changed, 26 insertions(+), 1 deletions(-)
+
+Index: linux-2.6.32-SLE11-SP1/drivers/input/serio/i8042-x86ia64io.h
+===================================================================
+--- linux-2.6.32-SLE11-SP1.orig/drivers/input/serio/i8042-x86ia64io.h
++++ linux-2.6.32-SLE11-SP1/drivers/input/serio/i8042-x86ia64io.h
+@@ -423,6 +423,13 @@ static const struct dmi_system_id __init
+ DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
+ },
+ },
++ {
++ /* Dell Vostro V13 */
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
++ DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"),
++ },
++ },
+ { }
+ };
+
+@@ -544,6 +551,17 @@ static const struct dmi_system_id __init
+ };
+ #endif
+
++static const struct dmi_system_id __initconst i8042_dmi_notimeout_table[] = {
++ {
++ /* Dell Vostro V13 */
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
++ DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"),
++ },
++ },
++ { }
++};
++
+ /*
+ * Some Wistron based laptops need us to explicitly enable the 'Dritek
+ * keyboard extension' to make their extra keys start generating scancodes.
+@@ -873,6 +891,9 @@ static int __init i8042_platform_init(vo
+ if (dmi_check_system(i8042_dmi_nomux_table))
+ i8042_nomux = true;
+
++ if (dmi_check_system(i8042_dmi_notimeout_table))
++ i8042_notimeout = true;
++
+ if (dmi_check_system(i8042_dmi_dritek_table))
+ i8042_dritek = true;
+ #endif /* CONFIG_X86 */
+Index: linux-2.6.32-SLE11-SP1/drivers/input/serio/i8042.c
+===================================================================
+--- linux-2.6.32-SLE11-SP1.orig/drivers/input/serio/i8042.c
++++ linux-2.6.32-SLE11-SP1/drivers/input/serio/i8042.c
+@@ -64,6 +64,10 @@ static unsigned int i8042_blink_frequenc
+ module_param_named(panicblink, i8042_blink_frequency, uint, 0600);
+ MODULE_PARM_DESC(panicblink, "Frequency with which keyboard LEDs should blink when kernel panics");
+
++static bool i8042_notimeout;
++module_param_named(notimeout, i8042_notimeout, bool, 0);
++MODULE_PARM_DESC(notimeout, "Ignore timeouts signalled by i8042");
++
+ #ifdef CONFIG_X86
+ static bool i8042_dritek;
+ module_param_named(dritek, i8042_dritek, bool, 0);
+@@ -434,7 +438,7 @@ static irqreturn_t i8042_interrupt(int i
+ } else {
+
+ dfl = ((str & I8042_STR_PARITY) ? SERIO_PARITY : 0) |
+- ((str & I8042_STR_TIMEOUT) ? SERIO_TIMEOUT : 0);
++ ((str & I8042_STR_TIMEOUT && !i8042_notimeout) ? SERIO_TIMEOUT : 0);
+
+ port_no = (str & I8042_STR_AUXDATA) ?
+ I8042_AUX_PORT_NO : I8042_KBD_PORT_NO;
diff --git a/series.conf b/series.conf
index b737205743..0dcb6edf02 100644
--- a/series.conf
+++ b/series.conf
@@ -2008,6 +2008,7 @@
patches.drivers/synaptics-hp-clickpad
patches.fixes/hvc_console-fix-race-between-hvc_close-and-hvc_remove
patches.fixes/hvc_console-fix-race-between-hvc_close-and-hvc_remove2
+ patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch
##########################################################
# Sound