summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-09-16PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPCAndres Salomon
Previously, one would have to specifically choose CONFIG_OLPC and CONFIG_PCI_GOOLPC in order to enable PCI_OLPC. That doesn't really work for distro kernels, so this patch allows one to choose CONFIG_OLPC and CONFIG_PCI_GOANY in order to build in OLPC support in a generic kernel (as requested by Robert Millan). This also moves GOOLPC before GOANY in the menuconfig list. Finally, make pci_access_init return early if we detect OLPC hardware. There's no need to continue probing stuff, and pci_pcbios_init specifically trashes our settings (we didn't run into that before because PCI_GOANY wasn't supported). Signed-off-by: Andres Salomon <dilinger@debian.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2008-09-14libertas: Reduce the WPA key installation time.Javier Cardona
WPA requires that the PTK is installed immediately after the 4-way handshake in order to properly decrypt the subsequent incoming EAPOL-GTK frame. If the PTK is not enabled by the time the EAPOL-GTK frame arrives, the frame is dropped and the supplicant does not receive the group key. This will happen with fast Access Points that send the EAPOL-GTK frame before the suplicant has successfully installed and enabled the PTK. To mitigate this situation, this patch simplifies and accelerates the SIOCSIWENCODEEXT execution.
2008-09-14OLPC: allow olpc-dcon to be built as a moduleAndres Salomon
Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-14OLPC: allow promfs to be built as a moduleAndres Salomon
Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-14OLPC: don't allow olpc-pm to be built as a moduleAndres Salomon
The RTC code that was tacked in there defines an arch_initcall; meanwhile, the code also has a module_init function that conflicts w/ the RTC initcall. The RTC code should probably be separated or.. something. For now, just don't allow modular building of olpc-pm. Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-14config: add a config based upon debian's config-2.6.25-2-686Andres Salomon
...plus xo.config, of course. Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-14config: add a base XO configAndres Salomon
This config has the config snippets that an XO requires. Everything's modular, as well. This can be combined w/ a generic distro config, or to a minimalist, super-optimized config for a tiny kernel. Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-13DCON: select FB_BACKLIGHT when enabling the DCON driverAndres Salomon
Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-12Merge branch 'testing' of git+ssh://dev.laptop.org/git/olpc-2.6 into testingAndres Salomon
2008-09-12psmouse: upstream sync, fix low power toggle bugsAndres Salomon
Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-09Re-enable Lid events on wakeup760Deepak Saxena
We currently do not re-enable the lid events when we wake up, leading to the following bug, as per OLPC Trac #8117: Power button -> Suspend Power button -> Wake up Lid close -> No Suspend Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
2008-09-09If certain commands were in-flight when the card was pulled or theDan Williams
driver rmmod-ed, cleanup would block on the work queue stopping, but the work queue was in turn blocked on the current command being canceled, which didn't happen. Fix that. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
2008-09-08Add interface to enable/disable all wakeup events from sysfsDeepak Saxena
As per OLPC trac #7981, we need a fastpath method to enable/disable all events via a single EC command to decrease resume latency time. This patch adds an "all" file to /sys/power/wakeup_events that provides this capability. Writing 1 to this file will enable all SCI events, writing 0 will disable them all. Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
2008-09-05OLPC: power_supply: drop EMPTY from statusAndres Salomon
Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-05Revert "power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL"Andres Salomon
This reverts commit 8efe444038a205e79b38b7ad03878824901849a8.
2008-09-05Revert "power_supply: remove capacity_level from list of sysfs attributes"Andres Salomon
This reverts commit 4cbc76eadf56399cd11fb736b33c53aec9caab8c.
2008-09-04OLPC: power_supply: have status treat TRICKLE and CHARGING differentlyAndres Salomon
Spit out either "Charging" or "Charging (trickle)" depending upon whether or not TRICKLE is set. Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-04OLPC: power_supply: add an 'error' property that displays raw errorsAndres Salomon
Grab the error code from EC_BAT_ERRCODE and let the user see it (rather than attempting to decode it as we do with PROP_HEALTH). Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-04OLPC: power_supply: replace CRITICAL with EMPTYAndres Salomon
As per richard's request, when the red LED comes on, let that state be known as EMPTY rather than CRITICAL. Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-09-02OLPC: psmouse: add support for disabling recalibration in the driverAndres Salomon
requested by Richard Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-08-29[DCON]: Make sure the backlight level gets restored after sleepJordan Crouse
Apparently somewhere along the line, the backlight value gets reset to full in the DCON silicon after coming back from a DCON sleep. This patch should remedy that. Signed-off-by: Jordan Crouse <jordan.crouse@amd.com> Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-08-26OLPC: pm: don't mess with EC mask during suspend759Andres Salomon
a) OHM handles this b) we weren't resetting stuff on resume, which meant the mask was incorrect. see #8010. Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-08-13OLPC: psmouse: don't race with irq/resync handlers when recalibratingAndres Salomon
I was seeing a race with irq and resync handlers that sometimes caused commands to fail. In particularly bad cases, it would cause the keyboard to stop working. Hopefully this fixes it. Signed-off-by: Andres Salomon <dilinger@debian.org>
2008-08-12Add support for WOL signaturesShailendra Govardhan
This patch from Marvell adds support for enabling WOL based on matching packet headers to signatures provided via the an iwpriv call. See http://dev.laptop.org/ticket/6993 for details. Signed-off-by: Shailendra Govardhan <shailen@marvell.com> Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
2008-08-12Add QEMU-specific config fileDeepak Saxena
This patch adds a new olpc_qemu_defconfig file to build a kernel for use on QEMU images. Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
2008-08-11Enable Group SchedulingDeepak Saxena
As per OLPC Trac #7603, this enables group scheduling in the kernel to improve audio performance, specifically that of TamTamMini. This is not a fix as such as it does not rootcause the issue in the scheduler changes from 2.6.22 to 2.6.25, but it is a working solution that allows us to improve audio quality while we dig deeper. Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
2008-08-10Merge commit 'v2.6.25.15' into olpc-testingDeepak Saxena
2008-08-10Merge commit 'v2.6.25.14' into olpc-testingDeepak Saxena
2008-08-06Linux 2.6.25.15v2.6.25.15Greg Kroah-Hartman
2008-08-06sound: ensure device number is valid in snd_seq_oss_synth_make_infoWilly Tarreau
commit 82e68f7ffec3800425f2391c8c86277606860442 upstream snd_seq_oss_synth_make_info() incorrectly reports information to userspace without first checking for the validity of the device number, leading to possible information leak (CVE-2008-3272). Reported-By: Tobias Klein <tk@trapkit.de> Acked-and-tested-by: Takashi Iwai <tiwai@suse.de> Cc: stable@kernel.org Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06vfs: fix lookup on deleted directoryMiklos Szeredi
commit d70b67c8bc72ee23b55381bd6a884f4796692f77 upstream Lookup can install a child dentry for a deleted directory. This keeps the directory dentry alive, and the inode pinned in the cache and on disk, even after all external references have gone away. This isn't a big problem normally, since memory pressure or umount will clear out the directory dentry and its children, releasing the inode. But for UBIFS this causes problems because its orphan area can overflow. Fix this by returning ENOENT for all lookups on a S_DEAD directory before creating a child dentry. Thanks to Zoltan Sogor for noticing this while testing UBIFS, and Artem for the excellent analysis of the problem and testing. Reported-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Tested-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06ALSA: hda - Fix wrong volumes in AD1988 auto-probe modeTakashi Iwai
commit 43785eaeb1cfb8aed3cf8027f298b242f88fdc45 upstream Don't create mixer volume elements for Headphone and Speaker if they use the same DAC as normal line-outs on AD1988. Otherwise the amp value gets screwed up, e.g. https://bugzilla.novell.com/show_bug.cgi?id=398255 Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06ALSA: hda - Add missing Thinkpad Z60m supportTakashi Iwai
commit 470eaf6be78424fc499a5039e5d5fe58bace2bc3 upstream Added the missing SSID of Thinkpad Z60m for model=thinkpad with AD1981HD. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06ALSA: Fix Oops with usb-audio reconnectionTakashi Iwai
Backport fixes for usb-audio Oops at reconnection. 9eb70e6... [ALSA] usb-audio - Fix race in reconnection f18638d... [ALSA] Clean up snd_card_free*() 73d38b1... [ALSA] Fix the race of card instance unregistration Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06ALSA: emu10k1 - Fix inverted Analog/Digital mixer switch on Audigy2Takashi Iwai
commit d2cd74b158d7214a556226e3312f9fb1de64d7ae upstream On Audigy2 Platinum, the Analog/Digital mixer switch is inverted. https://bugzilla.novell.com/show_bug.cgi?id=396204 The patch adds a simple workaround. There might be another device requiring a similar fix, too (or fix for audigy2 generically), but right now I fix only the known broken one. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06ALSA: Add more fallbacks to OSS PHONEOUT mixer mapTakashi Iwai
commit 6c4cc3a8ed15aacc06a5fd369639fef633cee2bc upstream Added more fallbacks to OSS PHONEOUT mixer mapping. This corresponds to the speaker output in general, so now "Mono" and "Speaker" are assigned. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06ALSA: ac97 - Fix ASUS A9T laptop outputTakashi Iwai
commit e48d6d97bb6bd8c008045ea0522ea8278fdccc55 upstream ASUS A9T laptop uses line-out pin as the real front-output while other devices use it as the surround. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06pci: VT3336 can't do MSI eitherTejun Heo
commit 66d715c95a39e84cd25204a665915621457d9691 upstream It seems VT3336 can't do msi either as with its bro 3351. Disable it. Reported in the following SUSE bug. https://bugzilla.novell.com/show_bug.cgi?id=300001 Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06USB: EHCI: fix remote-wakeup regressionAlan Stern
commit d1f114d12bb4db3147e1b1342ae31083c5a79c84 upstream This patch (as1097) fixes a bug in the remote-wakeup handling in ehci-hcd. The driver currently does not keep track of whether the change-suspend feature is enabled for each port; the feature is automatically reset the first time it is read. But recent changes to the hub driver require that the feature be read at least twice in order to work properly. A bit-vector is added for storing the change-suspend feature values. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06Input: appletouch - implement reset-resume logicOliver Neukum
commit 90d95ef617a535a8832bdcb8dee07bf591e5dd82 upstream On some boxes the touchpad needs to be reinitialized after resume to make it function again. This fixes bugzilla #10825. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06ACPI: update thermal temperatureZhang, Rui
commit 76ecb4f2d7ea5c3aac8970b9529775316507c6d2 upstream Fix the problem that thermal_get_temp returns the cached value, which causes the temperature in generic thermal never updates. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Acked-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06ACPI: Reject below-freezing temperatures as invalid critical temperaturesArjan van de Ven
commit a39a2d7c72b358c6253a2ec28e17b023b7f6f41c upstream My laptop thinks that it's a good idea to give -73C as the critical CPU temperature.... which isn't the best thing since it causes a shutdown right at bootup. Temperatures below freezing are clearly invalid critical thresholds so just reject these as such. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Acked-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06Add compat handler for PTRACE_GETSIGINFOAndreas Schwab
commit e4cc58944c1e2ce41e3079d4eb60c95e7ce04b2b upstream Current versions of gdb require a working implementation of PTRACE_GETSIGINFO for proper watchpoint support. Since struct siginfo contains pointers it must be converted when passed to a 32-bit debugger. Signed-off-by: Andreas Schwab <schwab@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06ath5k: Use software encryption for nowLuis R. Rodriguez
Commit 6844e63a9458d15b4437aa467c99128d994b0f6c Hardware encryption doesn't work yet so lets use software encryption for now. Changes-licensed-under: 3-Clause-BSD Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> Signed-off-by: John W. Linville <linville@tuxdriver.com> Cc: Jiri Benc <jbenc@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06bay: exit if notify handler cannot be installedHolger Macht
commit 7efd52a407bed6a2b02015b8ebbff7beba155392 upstream If acpi_install_notify_handler() for a bay device fails, the bay driver is superfluous. Most likely, another driver (like libata) is already caring about this device anyway. Furthermore, register_hotplug_dock_device(acpi_handle) from the dock driver must not be called twice with the same handler. This would result in an endless loop consuming 100% of CPU. So clean up and exit. Signed-off-by: Holger Macht <hmacht@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06Bluetooth: Signal user-space for HIDP and BNEP socket errorsMarcel Holtmann
commit ec8dab36e0738d3059980d144e34f16a26bbda7d upstream When using the HIDP or BNEP kernel support, the user-space needs to know if the connection has been terminated for some reasons. Wake up the application if that happens. Otherwise kernel and user-space are no longer on the same page and weird behaviors can happen. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06fat: detect media without partition table correctlyFrank Seidel
commit 0607fd02587a6b4b086dc746d63123c1f284db68 upstream I received a complaint that some FAT formated medias (e.g. sd memory cards) trigger a "unknown partition table" message even though there is no partition table and they work correctly, while in general (when e.g. formated with mkdosfs or even Windows Vista) this message is not shown. Currently this seems only to happen when the medias get formatted with Windows XP (and possibly Win 2000). Then the boot indicator byte contains garbage (part of text message) and so do the other parts checked by msdos_paritition which then later triggers this message. References: novell bug #364365 Most fat formatted media without partition table contains zeros in the boot indication and the other tested bytes and so falls through the checks in msdos_partition, leading it to return with 1 (all is fine). But some (e.g. WinXP formatted) fat fomated medias don't use boot_ind and so the check fails and causes a "unkown partition table" warning eventhough there is none and everything would be fine. This additional check directly verifies if there is a fat formatted medium without a partition table. Signed-off-by: Frank Seidel <fseidel@suse.de> Cc: Andreas Dilger <adilger@sun.com> Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06FAT_VALID_MEDIA(): remove pointless testAndrew Morton
commit 73f20e58b1d586e9f6d3ddc3aad872829aca7743 upstream The on-disk media specification field in FAT is only 8-bits, so testing for <=0xff is pointless, and can generate a "comparison is always true due to limited range of data type" warning. While we're there, convert FAT_VALID_MEDIA() into a C function - the present implementation is buggy: it generates either one or two references to its argument. Cc: Frank Seidel <fseidel@suse.de> Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06Input: i8042 - add Acer Aspire 1360 to nomux blacklistJiri Kosina
commit 0376bce7b0659fe1e80d045860087072583ab93f upstream. Acer Aspire 1360 needs to be added to nomux blacklist, otherwise its touchpad misbehaves. Reported-by: Clark Tompsett <clarkt@cnsp.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-08-06Input: i8042 - add Fujitsu-Siemens Amilo Pro 2010 to nomux listJiri Kosina
commit 3f79b1e94002791a42837a46b5817e87a0ac0873 upstream Reported-by: Hans Aschauer <Hans.Aschauer@web.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>