aboutsummaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2011-09-23rt2x00: fix crash in rt2800usb_write_tx_descStanislaw Gruszka
BugLink: http://bugs.launchpad.net/bugs/842955 Patch should fix this oops: BUG: unable to handle kernel NULL pointer dereference at 000000a0 IP: [<f8e06078>] rt2800usb_write_tx_desc+0x18/0xc0 [rt2800usb] *pdpt = 000000002408c001 *pde = 0000000024079067 *pte = 0000000000000000 Oops: 0000 [#1] SMP EIP: 0060:[<f8e06078>] EFLAGS: 00010282 CPU: 0 EIP is at rt2800usb_write_tx_desc+0x18/0xc0 [rt2800usb] EAX: 00000035 EBX: ef2bef10 ECX: 00000000 EDX: d40958a0 ESI: ef1865f8 EDI: ef1865f8 EBP: d4095878 ESP: d409585c DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Call Trace: [<f8da5e85>] rt2x00queue_write_tx_frame+0x155/0x300 [rt2x00lib] [<f8da424c>] rt2x00mac_tx+0x7c/0x370 [rt2x00lib] [<c04882b2>] ? mark_held_locks+0x62/0x90 [<c081f645>] ? _raw_spin_unlock_irqrestore+0x35/0x60 [<c04884ba>] ? trace_hardirqs_on_caller+0x5a/0x170 [<c04885db>] ? trace_hardirqs_on+0xb/0x10 [<f8d618ac>] __ieee80211_tx+0x5c/0x1e0 [mac80211] [<f8d631fc>] ieee80211_tx+0xbc/0xe0 [mac80211] [<f8d63163>] ? ieee80211_tx+0x23/0xe0 [mac80211] [<f8d632e1>] ieee80211_xmit+0xc1/0x200 [mac80211] [<f8d63220>] ? ieee80211_tx+0xe0/0xe0 [mac80211] [<c0487d45>] ? lock_release_holdtime+0x35/0x1b0 [<f8d63986>] ? ieee80211_subif_start_xmit+0x446/0x5f0 [mac80211] [<f8d637dd>] ieee80211_subif_start_xmit+0x29d/0x5f0 [mac80211] [<f8d63924>] ? ieee80211_subif_start_xmit+0x3e4/0x5f0 [mac80211] [<c0760188>] ? sock_setsockopt+0x6a8/0x6f0 [<c0760000>] ? sock_setsockopt+0x520/0x6f0 [<c076daef>] dev_hard_start_xmit+0x2ef/0x650 Oops might happen because we perform parallel putting new entries in a queue (rt2x00queue_write_tx_frame()) and removing entries after finishing transmitting (rt2800usb_work_txdone()). There are cases when _txdone may process an entry that was not fully send and nullify entry->skb . To fix check in _txdone if entry has flags that indicate pending transmission and wait until flags get cleared. Reported-by: Justin Piszcz <jpiszcz@lucidpixels.com> Cc: stable@kernel.org Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> (cherry picked from commit 4b1bfb7d2d125af6653d6c2305356b2677f79dc6) Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23rt2x00: fix crash in rt2800usb_get_txwiStanislaw Gruszka
BugLink: http://bugs.launchpad.net/bugs/842955 Patch should fix this oops: BUG: unable to handle kernel NULL pointer dereference at 000000a0 IP: [<f81b30c9>] rt2800usb_get_txwi+0x19/0x70 [rt2800usb] *pdpt = 0000000000000000 *pde = f000ff53f000ff53 Oops: 0000 [#1] SMP Pid: 198, comm: kworker/u:3 Tainted: G W 3.0.0-wl+ #9 LENOVO 6369CTO/6369CTO EIP: 0060:[<f81b30c9>] EFLAGS: 00010283 CPU: 1 EIP is at rt2800usb_get_txwi+0x19/0x70 [rt2800usb] EAX: 00000000 EBX: f465e140 ECX: f4494960 EDX: ef24c5f8 ESI: 810f21f5 EDI: f1da9960 EBP: f4581e80 ESP: f4581e70 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Process kworker/u:3 (pid: 198, ti=f4580000 task=f4494960 task.ti=f4580000) Call Trace: [<f804790f>] rt2800_txdone_entry+0x2f/0xf0 [rt2800lib] [<c045110d>] ? warn_slowpath_common+0x7d/0xa0 [<f81b3a38>] ? rt2800usb_work_txdone+0x288/0x360 [rt2800usb] [<f81b3a38>] ? rt2800usb_work_txdone+0x288/0x360 [rt2800usb] [<f81b3a13>] rt2800usb_work_txdone+0x263/0x360 [rt2800usb] [<c046a8d6>] process_one_work+0x186/0x440 [<c046a85a>] ? process_one_work+0x10a/0x440 [<f81b37b0>] ? rt2800usb_probe_hw+0x120/0x120 [rt2800usb] [<c046c283>] worker_thread+0x133/0x310 [<c04885db>] ? trace_hardirqs_on+0xb/0x10 [<c046c150>] ? manage_workers+0x1e0/0x1e0 [<c047054c>] kthread+0x7c/0x90 [<c04704d0>] ? __init_kthread_worker+0x60/0x60 [<c0826b42>] kernel_thread_helper+0x6/0x1 Oops might happen because we check rt2x00queue_empty(queue) twice, but this condition can change and we can process entry in rt2800_txdone_entry(), which was already processed by rt2800usb_txdone_entry_check() -> rt2x00lib_txdone_noinfo() and has nullify entry->skb . Reported-by: Justin Piszcz <jpiszcz@lucidpixels.com> Cc: stable@kernel.org Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> (cherry picked from commit 674db1344443204b6ce3293f2df8fd1b7665deea) Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23rt2x00: Move rt2800_txdone and rt2800_txdone_entry_check to rt2800usb.Gertjan van Wingerde
BugLink: http://bugs.launchpad.net/bugs/842955 These two functions are only used by rt2800usb so they don't have to be in rt2800lib. Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> (cherry picked from commit 8f66bbb5248c59b69b521b35e097ffa6cad07f01) Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23UBUNTU: SAUCE: HID: add MacBookAir4, 2 to hid_have_special_driver[]Jiri Kosina
Otherwise the generic driver wouldn't unbind from it and wouldn't let hid-apple to automatically take over. This patch has been accepted upstream and should land in 3.1.0. Without this support, the "fn" key on the keyboards does not work properly, among other possible issues. Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: HID: add support for MacBookAir4,2 keyboard.Joshua V. Dillon
Added USB device IDs for MacBookAir4,2 keyboard. Device constants were copied from the MacBookAir3,2 constants. The 4,2 device specification is reportedly unchanged from the 3,2 predecessor and seems to work well. This patch has been accepted upstream and should land in 3.1.0. Without this support, the "fn" key on the keyboards does not work properly, among other possible issues. Signed-off-by: Joshua V Dillon <jvdillon@gmail.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: HID: magicmouse: Set resolution of touch surfacesChase Douglas
Add touch surface resolution information. The size of the touch surfaces has been determined to the hundredth of a mm. This patch has been accepted upstream and should land in 3.1.0. Touch surface resolution is becoming important for our stack. This patch does not change any existing functionality, but merely fills in the resolution details. Cc: Jiri Kosina <jkosina@suse.cz> Cc: Michael Poole <mdpoole@troilus.org> Cc: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Chase Douglas <chase.douglas@canonical.com> [jkosina@suse.cz: update comments and commit message] Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23drm/i915: set GFX_MODE to pre-Ivybridge default value even on IvybridgeJesse Barnes
Prior to Ivybridge, the GFX_MODE would default to 0x800, meaning that MI_FLUSH would flush the TLBs in addition to the rest of the caches indicated in the MI_FLUSH command. However starting with Ivybridge, the register defaults to 0x2800 out of reset, meaning that to invalidate the TLB we need to use PIPE_CONTROL. Since we're not doing that yet, go back to the old default so things work. v2: don't forget to actually *clear* the new bit Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Tested-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> (cherry picked from commit b095cd0a0ccdbc00c9fd99d90b22f8563687971f) Signed-off-by: Robert Hooker <robert.hooker@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23Input: bcm5974 - Add support for newer MacBookPro8,2Andrew Drake
New MacBook Pro devices reporting product name MacBookPro8,2 come with newer/higher resolution touchpads than others with the same product name with USB ID 05ac:0252. This patch adds support for these devices. Signed-off-by: Andrew Drake <adrake@adrake.org> Reviewed-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> (cherry picked from commit c331eb580a0a7906c0cdb8dbae3cfe99e3c0e555) Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23Input: bcm5974 - add support for touchpads found in MacBookAir4,2Joshua V. Dillon
Added USB device IDs for MacBookAir4,2 trackpad. Device constants were copied from the MacBookAir3,2 constants. The 4,2 device specification is reportedly unchanged from the 3,2 predecessor and seems to work well. Signed-off-by: Joshua V Dillon <jvdillon@gmail.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> (cherry picked from commit db0b34b07438d92c4c190998c42a502fbf90064e) Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23UBUNTU: SAUCE: (drop after 3.1) usb_storage: Don't freeze in usb-stor-scanSeth Forshee
Should be merged for 3.2.0 BugLink: http://bugs.launchpad.net/bugs/810020 Scanning cannot be run during suspend or hibernation, but if usb-stor-scan freezes another thread waiting on scanning to complete may fail to freeze. However, if usb-stor-scan is left freezable without ever actually freezing then the freezer will wait on it to exit, and threads waiting for scanning to finish will no longer be blocked. One problem with this approach is that usb-stor-scan has a delay to wait for devices to settle (which is currently the only point where it can freeze). To work around this we can request that the freezer send a fake signal when freezing, then use interruptible sleep to wake the thread early when freezing happens. To make this happen, the following changes are made to usb-stor-scan: * Use set_freezable_with_signal() instead of set_freezable() to request a fake signal when freezing * Use wait_event_interruptible_timeout() instead of wait_event_freezable_timeout() to avoid freezing Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23UBUNTU: SAUCE: (no-up) Input: elantech - Add v3 hardware supportSeth Forshee
BugLink: https://bugs.launchpad.net/bugs/681904 Adds basic v3 hardware support for newer devices not currently supported by the driver. Thanks to JJ Ding <jj_ding@emc.com.tw>, Tom Lin <tom_lin@emc.com.tw>, and Mark A. Stratman <stratman@gmail.com>, whose work on other patcesh revealed the workings of the v3 protocol. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23UBUNTU: SAUCE: i915: do not setup intel_backlight twiceKamal Mostafa
The commit "Not all systems expose a firmware or platform mechanism for changing the backlight intensity on i915, so add native driver support" adds calls to intel_panel_setup_backlight() from intel_{lvds,dp}_init so do not call it again from intel_setup_outputs(). BugLink: http://bugs.launchpad.net/bugs/831542 Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23Revert "UBUNTU: SAUCE: OMAP: DSS2: check for both cpu type and revision, ↵Leann Ogasawara
rather than just revision" This reverts commit f9c5baa2a6f1cbaa587840a5acbccf1e750ee333. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23Revert "UBUNTU: SAUCE: OMAP: DSS2: enable hsclk in dsi_pll_init for OMAP36XX"Leann Ogasawara
This reverts commit d360158cc2b48727a2215ebc1e78c3b1d171335e. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23Not all systems expose a firmware or platform mechanism for changing the ↵Matthew Garrett
backlight intensity on i915, so add native driver support. BugLink: http://bugs.launchpad.net/bugs/568611 Signed-off-by: Matthew Garrett <mjg@redhat.com> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: David Airlie <airlied@linux.ie> Cc: Alex Deucher <alexdeucher@gmail.com> Cc: Ben Skeggs <bskeggs@redhat.com> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Len Brown <lenb@kernel.org> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Tested-by: Sedat Dilek <sedat.dilek@googlemail.com> Tested-by: Michel Alexandre Salim <salimma@fedoraproject.org> Tested-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit aaa6fd2a004147bf32fce05720938236de3361d9) Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23ideapad: add missing ideapad_input_exit in ideapad_acpi_add error pathAxel Lin
In the case of ideapad_backlight_init() failure, we need to free the resources allocated by ideapad_input_init(). Aslo drop __devexit annotation for ideapad_input_exit() because we also call it in ideapad_acpi_add() error path. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> (cherry picked from mainline commit 7451a55af08d40fd6b28802f4e26a13264114430) Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23ideapad: add backlight driverIke Panhc
When acpi_backlight=vendor in cmdline or no backlight support in acpi video device, ideapad-laptop will register backlight device and control brightness and backlight power via the command in VPC2004. Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> (cherry picked from mainline commit a4ecbb8ae7be16497db2f984ee7a3ffec0f164c3) Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23ideapad: let camera_power node invisiable if no cameraIke Panhc
Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> (cherry picked from mainline commit a84511f7fbeb37e26aacb9c72f5a21ffc24e909e) Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23ideapad: define cfg bits and create sysfs node for cfgIke Panhc
Create /sys/devices/platform/ideapad/cfg for showing cfg value. Signed-off-by: Ike Panhc <ike.pan@canonical.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> (cherry picked from mainline commit 3371f48167e04017125dd08cc1f70fa93d2f2e17) Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23dell-wmi: Add keys for Dell XPS L502XSeth Forshee
All of these keys are being reported on the keyboard controller but are also generating WMI events. Add them to the legacy keymap to silence the noise. BugLink: http://bugs.launchpad.net/bugs/815914 Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> (cherry picked from commit f1566f0dc07ec9b5409b348070f5a700032d7881) Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23UBUNTU: SAUCE: vt -- allow grub to request automatic vt_handoffAndy Whitcroft
Grub may be able to select a graphics mode and paint a splash screen for us. If so it needs to be able to tell us it has done so. Add support for detecting a new graphics mode selected bit in the screen_info passed over at boot. Use this to automatically enable vt_handoff mode. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: vt -- maintain bootloader screen mode and content until vt switchAndy Whitcroft
Introduce a new VT mode KD_TRANSPARENT which endevours to leave the current content of the framebuffer untouched. This allows the bootloader to insert a graphical splash and have the kernel maintain it until the OS splash can take over. When we finally switch away (either through programs like plymouth or manually) the content is lost and the VT reverts to text mode. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: (no-up) Input: ALPS - Enable Intellimouse mode for Lenovo ↵Keng-Yu Lin
Zhaoyang E47 The quirk enables the edge-scrolling function of the touchpad. This patch depends on the following sauce patch: commit 83ccc92aa7bc9b9d47fc31a7b54e663fb9a3d992 Author: Rezwanul Kabir <Rezwanul_Kabir@dell.com> Date: Tue Nov 23 20:15:14 2010 +0000 Add support for Intellimouse Mode in ALPS touchpad on Dell E2 series Laptops Resending modified patch to fix suspend/resume issues and restricting the quirks to Dell portables only. Dell E2 series laptops ( M4500, E6510, E6410 etc.) have ALPS touchpads which are enabled by default as 3-byte generic PS/2 mouse mode. This patch enables the 4-byte "Intellimouse Mode" ( e.g scrolling support). Signed-off-by: Rezwanul_Kabir <Rezwanul_Kabir@dell.com> BugLink: http://bugs.launchpad.net/bugs/632884 Signed-off-by: Andy Whitcroft <apw@canonical.com> BugLink: http://bugs.launchpad.net/bugs/803005 Signed-off-by: Keng-Yu Lin <kengyu@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: (no-up) Add support for Intellimouse Mode in ALPS touchpad on ↵Rezwanul Kabir
Dell E2 series Laptops Resending modified patch to fix suspend/resume issues and restricting the quirks to Dell portables only. Dell E2 series laptops ( M4500, E6510, E6410 etc.) have ALPS touchpads which are enabled by default as 3-byte generic PS/2 mouse mode. This patch enables the 4-byte "Intellimouse Mode" ( e.g scrolling support). Signed-off-by: Rezwanul_Kabir <Rezwanul_Kabir@dell.com> BugLink: http://bugs.launchpad.net/bugs/632884 Signed-off-by: Andy Whitcroft <apw@canonical.com>
2011-09-23(drop after 3.0.0) acer-wmi: Add support for Aspire 1830 wlan hotkeySeth Forshee
This patch is queued upstream for 3.1. BugLink: http://bugs.launchpad.net/bugs/771758 Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23UBUNTU: SAUCE: (drop after 3.0) asus-wmi: Enable autorepeat for hotkey input ↵Seth Forshee
device The T101MT Home/Express Gate key autorepeats in hardware, but sparse-keymap does not support hardware autorepeat. Enable the input core's software autorepeat to emulate the hardware behavior. Normal hotkeys are autoreleased, so the behavior of these keys will not be affected. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Corentin Chary <corentin.chary@gmail.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23UBUNTU: SAUCE: (drop after 3.0) eeepc-wmi: Add support for T101MT ↵Seth Forshee
Home/Express Gate key This key is different than other hotkeys, having seperate scan codes for press, release, and hold, so it requires some special filtering. Press and release events are passed on, and hold events are ignored since sparse-keymap does not support hardware autorepeat. Note that "Home" in the context of this button doesn't mean the same thing as the usual Home key, and it really isn't clear at all what is meant by "Home". The manufacurer's description of the button indicates that it should launch some sort of touch screen settings interface on short press and apply a desktop rotation on long press. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Corentin Chary <corentin.chary@gmail.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23UBUNTU: SAUCE: (drop after 3.0) asus-wmi: Add callback for hotkey filteringSeth Forshee
This is required for the T101MT home key, which behaves differently than other hotkeys. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Corentin Chary <corentin.chary@gmail.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2011-09-23UBUNTU: SAUCE: vesafb: enable mtrr WC by defaultThomas Schlichter
BugLink: http://bugs.launchpad.net/bugs/778043 Move to enabling a write-combining MTRR by default, this then matches the uvesafb module. Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> Acked-by: Brad Figg <brad.figg@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2011-09-23UBUNTU: SAUCE: vesafb: mtrr module parameter is uint, not boolThomas Schlichter
BugLink: http://bugs.launchpad.net/bugs/778043 As noted by the reporter the mtrr kernel command line option is actually a positive numeric not a boolean, move the module parameter we add to match. Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> Acked-by: Brad Figg <brad.figg@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2011-09-23UBUNTU: SAUCE: Revert "Bluetooth: Add new PID for Atheros 3011"Gustavo F. Padovan
This reverts commit be93112accb42c5586a459683d71975cc70673ca. Bug https://bugzilla.kernel.org/show_bug.cgi?id=27402 reported that some devices are not working after this commit, so as I don't have the hardware I'll revert it until a solution comes. Conflicts: drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> BugLink: http://bugs.launchpad.net/bugs/720949 cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: olpc_dcon_xo_1_5 needs delay.hLeann Ogasawara
ubuntu-2.6/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c:155:3: error: implicit declaration of function 'udelay' Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: olpc_dcon_xo_1 needs delay.hLeann Ogasawara
ubuntu-2.6/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c:168:3: error: implicit declaration of function 'udelay' Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: HID: ntrig: fix suspend/resume on recent modelsHenrik Rydberg
The recent 1b96:0006 model does not come up after suspend, which seems to be related to the initialization problems reported upstream. This patch adds a wakeup call via the reset-resume hook, which fixes the problem. Tested on older hardware without sign of regressions. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: HID: hid-ntrig: add support for 1b96:0006 modelHenrik Rydberg
This patch adds support for 1b96:0006 with firmware version 1.12.1.41.0. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23Revert "mmc: fix all hangs related to mmc/sd card insert/removal during ↵Andy Whitcroft
suspend/resume" This reverts commit 93cddb91e1a94859adfd99982b47da8328c3cfc1. Signed-off-by: Andy Whitcroft <apw@canonical.com>
2011-09-23UBUNTU: SAUCE: Added quirk to recognize GE0301 3G modem as an interface.Manoj Iyer
OriginalAuthor: Timo Aaltonen <tjaalton@ubuntu.com> BugLink: http://bugs.launchpad.net/bugs/348861 Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com>
2011-09-23hid: ntrig: Mask pen switch eventsHenrik Rydberg
When the pen comes in proximity, special packets appear on the multitouch device. This confuses userland to misinterpret the touch state. This patch masks the special pen packets consisting of a single finger of width 10, thereby fixing the problem. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2011-09-23hid: ntrig: Support single-touch devicesHenrik Rydberg
The current driver was regressed to not work for single-touch devices, and the driver occasionally crashes in those cases. The HID report which resets the array index is never received, resulting in out-of-range memory access. This patch restores functionality by detecting the presence of the multitouch firmware, and adds a range check to make the driver resilient to unknown firmware versions. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2011-09-23UBUNTU: SAUCE: hid: ntrig: New ghost-filtering event logicHenrik Rydberg
The ntrig devices are notoriously poor at resolving ghost touches, which affects almost every device on the market. Moreoever, the performance degrades over time, rendering the screen unusable. In order to work out of the box, the driver needs to cater for this deficiency, and should ideally do so without any special tuning. This patch attempts to paper over this problem, by detecting and filtering out ghost touches using additional knowledge of the sensor mechanism. A small number of dimensionless parameters are used, to keep the complexity at a minimum. The driver has been reported to work well on Dell Studio 17, Dell XT2, HP TX2 and Lenovo T410s. Also added Canonical, Ltd. to the copyright. Not likely to go upstream in its present form. However, it does help constitue a tuning-free driver which works well together with Unity, and as such are vital to the MT push. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2011-09-23UBUNTU: SAUCE: hid: ntrig: Setup input filtering manuallyHenrik Rydberg
The hid core does not set fuzz parameters properly, so take over setup of all input parameters for the multitouch device. Has been tested succesfully on Dell Studio 17, Dell XT2, HP TX2 and Lenovo T410s. Not likely to go upstream in its present form. However, it does help constitue a tuning-free driver which works well together with Unity, and as such are vital to the MT push. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2011-09-23UBUNTU: SAUCE: hid: ntrig: remove sysfs nodesHenrik Rydberg
Aiming at a driver that requires no tuning, remove the sysfs nodes for the filter parameters. Has been tested succesfully on Dell Studio 17, Dell XT2, HP TX2 and Lenovo T410s. Not likely to go upstream in its present form. However, it does help constitue a tuning-free driver which works well together with Unity, and as such are vital to the MT push. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2011-09-23UBUNTU: SAUCE: drm -- stop early access to drm devicesAndy Whitcroft
When a drm driver is initialised we first allocate and initialise the drm minor numbers including creating the sysfs files, then we trigger the driver load method. The act of creating the sysfs files triggers the uevent. This means udev may start programs which open /dev/dri/card0 and other interfaces, this can occur before the load method has even started and thus before the driver has fully initialised its data structures. In the case of plymouthd this leads to it opening and closing (in disgust) the interface, which in turn leads to a kernel panic as the mutexes are yet to be initialised. This patch delays the linking up of the drm devices minor numbers until the driver is fully initialised. As it is possible for consumers of these interfaces to reach them before they are fully initialised we arrange for opens of these devices to return EAGAIN until the device is fully initialised. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: Improve Amazon EBS performance for EC2John Johansen
OriginalAuthor: Amazona from Ben Howard <behoward@amazon.com> BugLink: http://bugs.launchpad.net/bugs/634316 The pv-ops kernel suffers from poor performance when using Amazon's Elastic block storage (EBS). This patch from Amazon improves pv-ops kernel performance, and has not exhibited any regressions. Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: hid: ntrig: zero-initialize ntrig structHenrik Rydberg
Setting zeros using kzalloc instead. Has been tested succesfully on Dell Studio 17, Dell XT2, HP TX2 and Lenovo T410s. Not likely to go upstream in its present form. However, it does help constitue a tuning-free driver which works well together with Unity, and as such are vital to the MT push. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: hid: ntrig: Correct logic for quirksHenrik Rydberg
The driver data is a bitmask, check for correct bits. Has been tested succesfully on Dell Studio 17, Dell XT2, HP TX2 and Lenovo T410s. Not likely to go upstream in its present form. However, it does help constitue a tuning-free driver which works well together with Unity, and as such are vital to the MT push. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: hid: ntrig: Remove unused device idsHenrik Rydberg
The current set of devices (Dell Studio 17, Dell XT2, HP TX2, Lenovo T810s) all use the same device id (1b96:0001). However, the driver defines a range of device ids. Remove these and reintroduce when needed, in anticipation that new devices will not work with the current driver anyways. Has been tested succesfully on Dell Studio 17, Dell XT2, HP TX2 and Lenovo T410s. Not likely to go upstream in its present form. However, it does help constitue a tuning-free driver which works well together with Unity, and as such are vital to the MT push. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: (no-up) ARM: Resetting power_mode to its original value.Mathieu J. Poirier
This reverts the second part of patch: commit 6da20c89af64b75302399369a90b9d50c1a87665 Author: Adrian Hunter <adrian.hunter@nokia.com> Date: Mon Feb 15 10:03:34 2010 -0800 omap_hsmmc: Ensure regulator enable / disable are paired Without this the kernel fails to initialize the SDHC card and find the root partition. Work is currently underway with the community to find a real solution to the problem. This a temporary measure to unblock developers and will have to be reverted when the real fix gets upstream. BugLink: https://bugs.launchpad.net/bugs/591941 Signed-off-by: Mathieu Poirier <mathieu.poirier@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: (no-up) Modularize vesafb -- fix initialisationAndy Whitcroft
When this patch was rolled forward, likely between Dapper and Hardy a chunk of initialisation was lost. Pull this back in so we actually have an vesafb_info structure initialised. Else we may well panic when we rmmod vesafb. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Acked-by: Brad Figg <brad.figg@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
2011-09-23UBUNTU: SAUCE: OMAP: DSS2: enable hsclk in dsi_pll_init for OMAP36XXLee Jones
BugLink: http://bugs.launchpad.net/bugs/608095 This helps provide the required setup to enable USB Ethernet (usb0) and USB host on the XM Beagleboard (A rev). This will be submitted upstream by Steve Sakoman. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Lee Jones <lee.jones@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>