summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'constify' into releaseLen Brown2009-04-057-27/+34
|\
| * video: build fixLen Brown2009-04-041-4/+4
| | | | | | | | | | | | | | acpi_video_device_write_state() and friends now return ssize_t, while the constify patch assumed it was still int. Signed-off-by: Len Brown <len.brown@intel.com>
| * ACPI: constify VFTs (2/2)Jan Engelhardt2009-04-031-9/+16
| | | | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Len Brown <len.brown@intel.com>
| * ACPI: constify VFTs (1/2)Jan Engelhardt2009-04-037-18/+18
| | | | | | | | | | Signed-off-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Len Brown <len.brown@intel.com>
| |
| \
*-. \ Merge branches 'bugzilla-12461' and 'bugzilla-9998' into releaseLen Brown2009-04-051-8/+22
|\ \ \
| | * | ACPI: EC: Separate delays for MSI hardwareAlexey Starikovskiy2009-04-011-3/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | MSI notebooks require very strict delays, while all others are happy with msleep(). References: http://bugzilla.kernel.org/show_bug.cgi?id=9998 Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
| * | ACPI: EC: Always parse EC deviceAlexey Starikovskiy2009-04-011-5/+9
| |/ | | | | | | | | | | | | | | | | | | If ECDT info is not valid, we have last chance to configure EC driver properly at this point, don't miss it. http://bugzilla.kernel.org/show_bug.cgi?id=12461 Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
* | Merge branch 'acpi_enforce_resources' into releaseLen Brown2009-04-052-3/+19
|\ \
| * | ACPI: acpi_enforce_resource=strict by defaultLuca Tettamanti2009-04-022-3/+19
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce strict resource checking - disallowing access by native drivers to IO ports and memory regions claimed by ACPI firmware. The patch is mainly aimed to block native hwmon drivers from touching monitoring chips that ACPI thinks it own. If this causes a regression, boot with "acpi_enforce_resources=lax" which was the previous default. http://bugzilla.kernel.org/show_bug.cgi?id=12376 http://bugzilla.kernel.org/show_bug.cgi?id=12541 Signed-off-by: Luca Tettamanti <kronos.it@gmail.com> Acked-by: Pavel Machek <pavel@suse.cz> Acked-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Len Brown <len.brown@intel.com>
* | Merge branch 'async-battery' into releaseLen Brown2009-04-052-5/+12
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: drivers/acpi/Makefile Signed-off-by: Len Brown <len.brown@intel.com>
| * | ACPI: battery: asynchronous initArjan van de Ven2009-04-042-5/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The battery driver tends to take quite some time to initialize (100ms-300ms is quite typical). This patch initializes the batter driver asynchronously, so that other things in the kernel can initialize in parallel to this 300 msec. As part of this, the battery driver had to move to the back of the ACPI init order (hence the Makefile change). Without this move, the next ACPI driver would just block on the ACPI/devicee layer semaphores until the battery driver was done anyway, not gaining any boot time. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
* | Merge branch 'acpi-modparam' into releaseLen Brown2009-04-054-33/+26
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: drivers/acpi/Makefile Signed-off-by: Len Brown <len.brown@intel.com>
| * | ACPI: simplify processor lines in MakefileLen Brown2009-04-021-5/+4
| | | | | | | | | | | | | | | Suggested-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Len Brown <len.brown@intel.com>
| * | ACPI: simplify module_param namespaceRusty Russell2009-04-024-37/+28
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Impact: cleanup Rather than overriding MODULE_PARAM_PREFIX, build via acpi.o so KBUILD_MODNAME is set to "acpi". This is the logical way to do it, even though acpi cannot be a module due to these config options being bool. Those parts of ACPI which can be modular are not built into the acpi "module". Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Len Brown <len.brown@intel.com>
* | Merge branch 'sony-laptop' into releaseLen Brown2009-04-053-138/+402
|\ \
| * | sony-laptop: fix event reporting for new style eventsMatthias Welwarsky2009-04-031-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In short Fn key events are always reported through acpi. The input layer gets all the old style events and only those new style events that, after being decoded, are mapped to an locally represented events. rfkill only update the rfkill device status. Signed-off-by: Matthias Welwarsky <matze@welwarsky.de> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop should depend on RFKILLAlexander Beregalov2009-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes this build error when RFKILL is not set: drivers/platform/x86/sony-laptop.c:1050: undefined reference to `rfkill_unregister' and so on.. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Acked-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: new style events typo fixesMatthias Welwarsky2009-04-031-2/+2
| | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Welwarsky <matze@welwarsky.de> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: Fix some typos in log messages (Unabe/Unable)Alessio Igor Bogani2009-04-031-4/+4
| | | | | | | | | | | | | | | | | | Signed-off-by: Alessio Igor Bogani <abogani@texware.it> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: Kill the BKLAlessio Igor Bogani2009-03-271-4/+8
| | | | | | | | | | | | | | | | | | Signed-off-by: Alessio Igor Bogani <abogani@texware.it> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: update copyrightMattia Dongili2009-03-271-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: Make sony_pic_set_wwanpower not take mutexesMattia Dongili2009-03-271-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | For consistency with __sony_pic_set_bluetoothpower, this is also needed later to allow setting the wwanpower attribute from the resume path and only lock the mutex once. Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: Add FW specific hotkey eventsAnton Veretenenko2009-03-271-0/+6
| | | | | | | | | | | | | | | | | | Signed-off-by: Anton Veretenenko <anton@veretenenko.ru> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: notify the hardware of a state change in wwanpowerSergey Yanovich2009-03-271-0/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Sergey Yanovich <ynvich@gmail.com> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: detect the ICH9 chipset as Type3ISHIKAWA Mutsumi2009-03-271-0/+7
| | | | | | | | | | | | | | | | | | Signed-off-by: ISHIKAWA Mutsumi <ishikawa@hanzubon.jp> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: Eliminate BKL in ioctlsAlan Cox2009-03-271-3/+3
| | | | | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: VGN-A317M hotkey supportHarald Jenny2009-03-272-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This laptop has 5 SPIC managed buttons above the keyboard: sound + and - as well as brightness, zoom and S1. Possibly the entire VGN-A serie behaves the same. Signed-off-by: Harald Jenny <harald@a-little-linux-box.at> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: merge Type4 into Type3Mattia Dongili2009-03-271-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating Type4 was a mistake in the first place. Some users report that also Type3 vaios require the same extra hotkey handling which the Type4 for was menat to guard from. Merging down Type4 into Type3 will just remove a useless distinction. Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: Add support for extended hotkeysMatthew Garrett2009-03-272-12/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | Recent Sony SR-series machines have an additional set of buttons accessed via the 0x127 method rather than the 0x100 method. Add support for these. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: Add rfkill support on new modelsMatthew Garrett2009-03-271-0/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer Vaios provide a full featured rfkill implementation via their platform methods. Add support for enumerating the available devices and providing rfkill access to them. Support for the physical kill switch is added, with the devices moving into the HARD_BLOCKED state when toggled. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: Add support for extra keyboard eventsMatthew Garrett2009-03-272-27/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current sony-laptop code assumes that the keyboard event method is always located at slot 2 in the platform code. Remove this assumption and add support for some additional hotkeys. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: Enable EC on newer hardwareMatthew Garrett2009-03-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest Vaios can execute certain codepaths in two ways - either using system management mode or using pure ACPI methods. The latter is only used if the OS has called the ECON method. Ensure that this is done where the method is available. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
| * | sony-laptop: Add support for new Sony platform APIMatthew Garrett2009-03-271-81/+65
| |/ | | | | | | | | | | | | | | | | | | | | | | Newer Sony Vaios provide a new API for accessing platform functionality. It consists of a set of standardised methods for enabling events and performing queries. These are each identified by a unique handle. This patch adds support for calling functions based on their handle and ports the existing code for these machines over to it. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
* | Merge branch 'thinkpad-acpi' into releaseLen Brown2009-04-053-246/+657
|\ \
| * | thinkpad-acpi: rework brightness supportHenrique de Moraes Holschuh2009-04-042-102/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and redesign the brightness control backend... In order to fix bugzilla #11750... Add a new brightness control mode: support direct NVRAM checkpointing of the backlight level (i.e. store directly to NVRAM without the need for UCMS calls), and use that together with the EC-based control. Disallow UCMS+EC, thus avoiding races with the SMM firmware. Switch the models that define HBRV (EC Brightness Value) in the DSDT to the new mode. These are: T40-T43, R50-R52, R50e, R51e, X31-X41. Change the default for all other IBM ThinkPads to UCMS-only. The Lenovo models already default to UCMS-only. Reported-by: Alexey Fisher <bug-track@fisher-privat.net> Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
| * | thinkpad-acpi: enhanced debugging messages for the fan subdriverHenrique de Moraes Holschuh2009-04-042-5/+42
| | | | | | | | | | | | | | | | | | | | | Enhance debugging messages for the fan subdriver. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
| * | thinkpad-acpi: enhanced debugging messages for the hotkey subdriverHenrique de Moraes Holschuh2009-04-042-10/+30
| | | | | | | | | | | | | | | | | | | | | Enhance debugging messages for the hotkey subdriver. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
| * | thinkpad-acpi: enhanced debugging messages for rfkill subdriversHenrique de Moraes Holschuh2009-04-042-21/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhance debugging messages for all rfkill subdrivers in thinkpad-acpi. Also, log a warning if the deprecated sysfs attributes are in use. These attributes are going to be removed sometime in 2010. There is an user-visible side-effect: we now coalesce attempts to enable/disable bluetooth or WWAN in the procfs interface, instead of hammering the firmware with multiple requests. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
| * | thinkpad-acpi: restrict access to some firmware LEDsHenrique de Moraes Holschuh2009-04-043-20/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the ThinkPad LEDs indicate critical conditions that can cause data loss or cause hardware damage when ignored (e.g. force-ejecting a powered up bay; ignoring a failing battery, or empty battery; force- undocking with the dock buses still active, etc). On almost all ThinkPads, LED access is write-only, and the firmware usually does fire-and-forget signaling on them, so you effectively lose whatever message the firmware was trying to convey to the user when you override the LED state, without any chance to restore it. Restrict access to all LEDs that can convey important alarms, or that could mislead the user into incorrectly operating the hardware. This will make the Lenovo engineers less unhappy about the whole issue. Allow users that really want it to still control all LEDs, it is the unaware user that we have to worry about. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
| * | thinkpad-acpi: remove HKEY disable functionalityHenrique de Moraes Holschuh2009-04-042-42/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HKEY disable functionality basically cripples the entire event model of the ThinkPad firmware and of the thinkpad-acpi driver. Remove this functionality from the driver. HKEY must be enabled at all times while thinkpad-acpi is loaded, and disabled otherwise. For sysfs, according to the sysfs ABI and the thinkpad-acpi sysfs rules of engagement, we will just remove the attributes. This will be done in two stages: disable their function now, after two kernel releases, remove the attributes. For procfs, we call WARN(). If nothing triggers it, I will simply remove the enable/disable commands entirely in the future along with the sysfs attributes. I don't expect much, if any fallout from this. There really isn't any reason to mess with hotkey_enable or with the enable/disable commands to /proc/acpi/ibm/hotkey, and this has been true for years... Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
| * | thinkpad-acpi: add new debug helpers and warn of deprecated attsHenrique de Moraes Holschuh2009-04-042-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a debug helper that discloses the TGID of the userspace task attempting to access the driver. This is highly useful when dealing with bug reports, since often the user has no idea that some userspace application is accessing thinkpad-acpi... Also add a helper to log warnings about sysfs attributes that are deprecated. Use the new helpers to issue deprecation warnings for bluetooth_enable and wwan_enabled, that have been deprecated for a while, now. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
| * | thinkpad-acpi: add missing log levelsHenrique de Moraes Holschuh2009-04-041-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing log levels in a standalone commit, to avoid dependencies in future unrelated changes, just because they wanted to use one of the missing log levels. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
| * | thinkpad-acpi: cleanup debug helpersHenrique de Moraes Holschuh2009-04-041-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the vdbg_printk macro definition to be sane when CONFIG_THINKPAD_ACPI_DEBUG is undefined, and move the mess into a file section of its own. This doesn't change anything in the current code, but future code will need the proper behaviour. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
| * | thinkpad-acpi: documentation cleanupHenrique de Moraes Holschuh2009-04-041-24/+52
| | | | | | | | | | | | | | | | | | | | | Some cleanups to the documentation of the driver. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
| * | thinkpad-acpi: drop ibm-acpi aliasHenrique de Moraes Holschuh2009-04-041-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The driver was renamed two years ago, on 2.6.21. Drop the old compatibility alias, we have given everybody quite enough time to update their configs to the new name. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
| * | thinkpad-acpi: update copyright noticesHenrique de Moraes Holschuh2009-04-041-1/+1
| |/ | | | | | | | | | | | | It is that time of the year again... Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
* | Merge branch 'acer' into releaseLen Brown2009-04-052-5/+40
|\ \
| * | acer-wmi: Update copyright notice & documentationCarlos Corbacho2009-04-042-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Explicitly note in the documentation that the Acer Aspire One is not supported. Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk> Signed-off-by: Len Brown <len.brown@intel.com>
| * | acer-wmi: Cleanup the failure cleanup handlingAndy Whitcroft2009-04-041-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup the failure cleanup handling for brightness and email led. [cc: Split out from another patch] Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk> Signed-off-by: Len Brown <len.brown@intel.com>
| * | acer-wmi: Blacklist Acer Aspire OneCarlos Corbacho2009-04-041-0/+25
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Aspire One's ACPI-WMI interface is a placeholder that does nothing, and the invalid results that we get from it are now causing userspace problems as acer-wmi always returns that the rfkill is enabled (i.e. the radio is off, when it isn't). As it's hardware controlled, acer-wmi isn't needed on the Aspire One either. Thanks to Andy Whitcroft at Canonical for tracking down Ubuntu's userspace issues to this. Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk> Reported-by: Andy Whitcroft <apw@canonical.com> Cc: stable@kernel.org Signed-off-by: Len Brown <len.brown@intel.com>
OpenPOWER on IntegriCloud