summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.iksaif.net/acpi4asus into x86-platformMatthew Garrett2010-03-015-847/+939
|\
| * Merge branch 'eeepc-laptop' into acpi4asusCorentin Chary2010-02-282-6/+25
| |\
| | * eeepc-laptop: check wireless hotplug eventsAlan Jenkins2010-02-281-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we mark the wireless device as unplugged, check PCI config space to see whether the wireless device is really disabled (and vice versa). This works around newer models which don't want the hotplug code, where we end up disabling the wired network device. My old 701 still works correctly with this. I can also simulate an afflicted model by changing the hardcoded PCI bus/slot number in the driver, and it seems to work nicely (although it is a bit noisy). In future this type of hotplug support will be implemented by the PCI core. The existing blacklist and the new warning message will be removed at that point. Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| | * eeepc-laptop: disable wireless hotplug for 1005PEAlan Jenkins2010-02-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wireless hotplug code is not needed on this model, and it disables the wired ethernet card. (Like on the 1005HA and 1201N). References: <http://lists.alioth.debian.org/pipermail/debian-eeepc-devel/2010-February/003281.html> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Reported-by: Ansgar Burchardt <ansgar@43-1.org> CC: stable@kernel.org
| | * eeepc-laptop: set the right paths in the documentationCorentin Chary2010-02-281-5/+5
| | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: fix style problems reported by checkpath.plCorentin Chary2010-02-281-47/+47
| | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: use device_create_file() instead of platform_groupCorentin Chary2010-02-281-82/+84
| | | | | | | | | | | | | | | | | | | | | | | | There is two reason to do that: - we don't want a "gps" file if the model doesn't have a gps - we don't want to use global variables anymore Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: clean led codeCorentin Chary2010-02-281-120/+115
| | | | | | | | | | | | | | | | | | Remove all "templates" and add a generic struct asus_led instead. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: add gps rfkillCorentin Chary2010-02-282-7/+59
| | | | | | | | | | | | | | | | | | The rfkill subsystem will enable gps by default. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: set initial lcd stateCorentin Chary2010-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | There is no way to find the initial lcd state. A quick workaround is to set it "on" by default. Anyway this feature is scheduled for removal. Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
| * | asus-laptop: leds, remove dead code and fix asus_led_exit()/asus_led_init()Corentin Chary2010-02-281-17/+14
| | | | | | | | | | | | | | | | | | These bug where introduced in "asus-laptop: code movement". Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
| * | asus-laptop: add backlight changes notificationsCorentin Chary2010-02-281-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to send KEY_BRIGHTNESSDOWN or KEY_BRIGHTNESSUP because it would be a lie to tell userspace that we want to change the brightness while it's actually done by the firmware. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: add bluetooth keys found on M9VCorentin Chary2010-02-281-0/+2
| | | | | | | | | | | | | | | | | | Reported by Andrey F. Ilchuk Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: switch to sparse keymap libraryCorentin Chary2010-02-282-141/+68
| | | | | | | | | | | | | | | | | | | | | This patch is based on Dmitry Torokhov's patch with some modifications and cleanups. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: rename wireless_status to wlan_status to avoid confusionCorentin Chary2010-02-281-5/+5
| | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: add error check for write_acpi_int callsCorentin Chary2010-02-281-8/+25
| | | | | | | | | | | | | | | | | | Also add to helpers for bluetooth and wlan. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: stop using ASUS_HANDLE and use relative methods insteadCorentin Chary2010-02-281-111/+129
| | | | | | | | | | | | | | | | | | | | | | | | Stop using ASUS_HANDLE because most of the time it is not needed. This macro was introduced to display_get and lcd_switch which are not part of the interface provided by Asus, and are scheduled for removal. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: rename function talking directly to acpi with asus_xxx schemeCorentin Chary2010-02-281-19/+19
| | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: removing read_status/store_status/write_status and asus->statusCorentin Chary2010-02-281-57/+24
| | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: stop using read_status for lcdCorentin Chary2010-02-281-17/+20
| | | | | | | | | | | | | | | | | | (anyway lcd code is scheduled for removal) Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: stop using read_status and store_status for GPSCorentin Chary2010-02-281-21/+35
| | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: stop using read_status for bluetooth and wlanCorentin Chary2010-02-281-26/+29
| | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: code movementCorentin Chary2010-02-281-217/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | The asus-laptop driver implements a number of interfaces like the backlight class driver. This change makes it easier to examine the implementation of one interface at at a time, without having to search through the file to find init() and exit() functions etc. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: callbacks should use "driver data" parameter or fieldCorentin Chary2010-02-281-153/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Changelog stolen from Alan's patch for eeepc-laptop, but this patch does the same thing for asus-laptop) Callback methods should not refer to a variable like "asus" (formally "hotk"). Instead, they should extract the data they need either from a "driver data" parameter, or the "driver data" field of the object which they operate on. The "asus" variable can then be removed. In practice, drivers under "drivers/platform" can get away without using driver data, because it doesn't make sense to have more than one instance of them. However this makes it harder to review them for correctness. This is especially true for core ACPI developers who have not previously been exposed to this anti-pattern :-). This will serve as an example of best practice for new driver writers (whether they find it themselves, or have it pointed out during review :-). Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: move backlight and dsdt info inside asus_laptop structCorentin Chary2010-02-281-39/+30
| | | | | | | | | | | | | | | | | | Prepare the use of "driver data" for callbacks. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: revise namesCorentin Chary2010-02-281-110/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | asus-laptop now does a lot more than just hotkeys. Replace the "hotk" names used throughout the driver with some slightly more appropriate names. The actual strings used in kernel messages and sysfs are left unchanged. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: change initialization orderCorentin Chary2010-02-281-189/+180
| | | | | | | | | | | | | | | | | | Clean asus-laptop initialization to match new eeepc-laptop code. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: remove unecessary hotk != NULL checkCorentin Chary2010-02-281-4/+1
| | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: use tabs to indent macros and remove unused onesCorentin Chary2010-02-281-29/+22
| | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: simplify write_acpi_intCorentin Chary2010-02-281-11/+16
| | | | | | | | | | | | | | | | | | We only need a buffer for "INIT". Adds write_acpi_init_ret for it. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: no need to check argument of set_brightness()Corentin Chary2010-02-281-8/+2
| | | | | | | | | | | | | | | | | | | | | We already tell the backlight class our maximum brightness value; it will validate the user requested values for us. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: set the right paths in the documentationCorentin Chary2010-02-281-6/+6
| | | | | | | | | | | | Signed-off-by: Corentin Chary <corentincj@iksaif.net>
| * | asus-laptop: add wireless and bluetooth status parameterCorentin Chary2010-02-281-2/+17
| |/ | | | | | | | | | | | | | | | | These to parameter allow to set the status of wlan and bluetooth device when the module load. On some models, the device will always be down on boot, so the default behavior is to always enable these devices. Signed-off-by: Corentin Chary <corentincj@iksaif.net>
* | toshiba-acpi: fix multimedia keys on some machinesFrans Pop2010-03-011-14/+16
| | | | | | | | | | | | | | | | Some Toshibas only send ACPI events on key down, not key release. Ignore any release events and send key down and key up events on every ACPI key down event. Signed-off-by: Frans Pop <elendil@planet.nl>
* | dell-laptop: Fix errors on failure and exit pathsMatthew Garrett2010-03-011-2/+3
| | | | | | | | | | | | | | | | Make sure that work is cancelled after removing the i8042 filter, and unregister the platform device rather than deleting it. Signed-off-by: Matthew Garrett <mjg@redhat.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* | dell-laptop: Fix build error by making buffer_mutex staticIngo Molnar2010-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following build bug (x86, allyesconfig): arch/x86/oprofile/built-in.o:(.data+0x250): multiple definition of `buffer_mutex' Was triggered in -tip testing, caused by this upstream commit: 116ee77: dell-laptop: Use buffer with 32-bit physical address There's multiple buffer_mutex's in the kernel. Make this new one static. Signed-off-by: Ingo Molnar <mingo@elte.hu>
* | Merge branch 'x86-uv-for-linus' of ↵Linus Torvalds2010-02-284-18/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, uv: Remove recursion in uv_heartbeat_enable() x86, uv: uv_global_gru_mmr_address() macro fix x86, uv: Add serial number parameter to uv_bios_get_sn_info()
| * | x86, uv: Remove recursion in uv_heartbeat_enable()Roel Kluin2010-01-071-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | The recursion is not needed and does not improve readability. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> LKML-Reference: <4B45F13E.3040202@gmail.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| * | x86, uv: uv_global_gru_mmr_address() macro fixJack Steiner2010-01-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug in uv_global_gru_mmr_address macro. Macro failed to cast an int value to a long prior to a left shift > 32. Signed-off-by: Jack Steiner <steiner@sgi.com> LKML-Reference: <20100107161240.GA2610@sgi.com> Cc: <stable@kernel.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| * | x86, uv: Add serial number parameter to uv_bios_get_sn_info()Russ Anderson2009-12-173-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add system_serial_number to the information returned by uv_bios_get_sn_info() UV BIOS call. Signed-off-by: Russ Anderson <rja@sgi.com> LKML-Reference: <20091217165323.GA30774@sgi.com> Cc: Jack Steiner <steiner@sgi.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | Merge branch 'x86-ptrace-for-linus' of ↵Linus Torvalds2010-02-289-9/+284
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-ptrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, ptrace: Remove set_stopped_child_used_math() in [x]fpregs_set x86, ptrace: Simplify xstateregs_get() ptrace: Fix ptrace_regset() comments and diagnose errors specifically parisc: Disable CONFIG_HAVE_ARCH_TRACEHOOK ptrace: Add support for generic PTRACE_GETREGSET/PTRACE_SETREGSET x86, ptrace: regset extensions to support xstate
| * | | x86, ptrace: Remove set_stopped_child_used_math() in [x]fpregs_setSuresh Siddha2010-02-231-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | init_fpu() already ensures that the used_math() is set for the stopped child. Remove the redundant set_stopped_child_used_math() in [x]fpregs_set() Reported-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> LKML-Reference: <20100222225240.642169080@sbs-t61.sc.intel.com> Acked-by: Rolan McGrath <roland@redhat.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| * | | x86, ptrace: Simplify xstateregs_get()Suresh Siddha2010-02-231-23/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48 bytes (bytes 464..511) of the xstateregs payload come from the kernel defined structure (xstate_fx_sw_bytes). Rest comes from the xstate regs structure in the thread struct. Instead of having multiple user_regset_copyout()'s, simplify the xstateregs_get() by first copying the SW bytes into the xstate regs structure in the thread structure and then using one user_regset_copyout() to copyout the xstateregs. Requested-by: Roland McGrath <roland@redhat.com> Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> LKML-Reference: <20100222225240.494688491@sbs-t61.sc.intel.com> Acked-by: Roland McGrath <roland@redhat.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Oleg Nesterov <oleg@redhat.com>
| * | | ptrace: Fix ptrace_regset() comments and diagnose errors specificallySuresh Siddha2010-02-232-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return -EINVAL for the bad size and for unrecognized NT_* type in ptrace_regset() instead of -EIO. Also update the comments for this ptrace interface with more clarifications. Requested-by: Roland McGrath <roland@redhat.com> Requested-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> LKML-Reference: <20100222225240.397523600@sbs-t61.sc.intel.com> Acked-by: Roland McGrath <roland@redhat.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| * | | parisc: Disable CONFIG_HAVE_ARCH_TRACEHOOKRoland McGrath2010-02-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > FYI, this commit broke tip:master on PARISC (other architectures are fine): > > kernel/built-in.o: In function `ptrace_request': > (.text.ptrace_request+0x2cc): undefined reference to `task_user_regset_view' This means that parisc failed to meet the documented requirements for setting CONFIG_HAVE_ARCH_TRACEHOOK, but set it anyway. If arch folks don't follow the specs, it defeats the whole purpose of having clear statements of requirements for arch code. Until parisc finishes up its requirements, disable CONFIG_HAVE_ARCH_TRACEHOOK. Signed-off-by: H. Peter Anvin <hpa@zytor.com> LKML-Reference: <20100222183707.8749D64C@magilla.sf.frob.com> Cc: <linux-parisc@vger.kernel.org> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Helge Deller <deller@gmx.de> Cc: James E.J. Bottomley <jejb@parisc-linux.org>
| * | | ptrace: Add support for generic PTRACE_GETREGSET/PTRACE_SETREGSETSuresh Siddha2010-02-113-1/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generic support for PTRACE_GETREGSET/PTRACE_SETREGSET commands which export the regsets supported by each architecture using the correponding NT_* types. These NT_* types are already part of the userland ABI, used in representing the architecture specific register sets as different NOTES in an ELF core file. 'addr' parameter for the ptrace system call encode the REGSET type (using the corresppnding NT_* type) and the 'data' parameter points to the struct iovec having the user buffer and the length of that buffer. struct iovec iov = { buf, len}; ret = ptrace(PTRACE_GETREGSET/PTRACE_SETREGSET, pid, NT_XXX_TYPE, &iov); On successful completion, iov.len will be updated by the kernel specifying how much the kernel has written/read to/from the user's iov.buf. x86 extended state registers are primarily exported using this interface. Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> LKML-Reference: <20100211195614.886724710@sbs-t61.sc.intel.com> Acked-by: Hongjiu Lu <hjl.tools@gmail.com> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| * | | x86, ptrace: regset extensions to support xstateSuresh Siddha2010-02-117-4/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the xstate regset support which helps extend the kernel ptrace and the core-dump interfaces to support AVX state etc. This regset interface is designed to support all the future state that gets supported using xsave/xrstor infrastructure. Looking at the memory layout saved by "xsave", one can't say which state is represented in the memory layout. This is because if a particular state is in init state, in the xsave hdr it can be represented by bit '0'. And hence we can't really say by the xsave header wether a state is in init state or the state is not saved in the memory layout. And hence the xsave memory layout available through this regset interface uses SW usable bytes [464..511] to convey what state is represented in the memory layout. First 8 bytes of the sw_usable_bytes[464..467] will be set to OS enabled xstate mask(which is same as the 64bit mask returned by the xgetbv's xCR0). The note NT_X86_XSTATE represents the extended state information in the core file, using the above mentioned memory layout. Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> LKML-Reference: <20100211195614.802495327@sbs-t61.sc.intel.com> Signed-off-by: Hongjiu Lu <hjl.tools@gmail.com> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | | Merge branch 'x86-pci-for-linus' of ↵Linus Torvalds2010-02-2811-8/+161
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Enable NMI on all cpus on UV vgaarb: Add user selectability of the number of GPUS in a system vgaarb: Fix VGA arbiter to accept PCI domains other than 0 x86, uv: Update UV arch to target Legacy VGA I/O correctly. pci: Update pci_set_vga_state() to call arch functions
| * | | | x86: Enable NMI on all cpus on UVRuss Anderson2010-02-275-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable NMI on all cpus in UV system and add an NMI handler to dump_stack on each cpu. By default on x86 all the cpus except the boot cpu have NMI masked off. This patch enables NMI on all cpus in UV system and adds an NMI handler to dump_stack on each cpu. This way if a system hangs we can NMI the machine and get a backtrace from all the cpus. Version 2: Use x86_platform driver mechanism for nmi init, per Ingo's suggestion. Version 3: Clean up Ingo's nits. Signed-off-by: Russ Anderson <rja@sgi.com> LKML-Reference: <20100226164912.GA24439@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * | | | vgaarb: Add user selectability of the number of GPUS in a systemMike Travis2010-02-052-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the VGA Arbiter to allow the user to select the number of GPU's supported in a system. v2: simplify setting of MAX_USER_CARDS, revert back to original default of 16 Signed-off-by: Mike Travis <travis@sgi.com> LKML-Reference: <4B68D51D.6090401@sgi.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Robin Holt <holt@sgi.com> Cc: Jack Steiner <steiner@sgi.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Cc: David Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>