Commit Graph
957 Commits
Author SHA1 Message Date
Yan He f879bb0f09 platform-drivers: msm: sps: add new features on NDP-BAM/BAM-Lite
Commmand Descriptor, Pipe Lock, Notify-When-Done(NWD) and Immediate
Commmand Descriptor are enabled in NDP-BAM and BAM-Lite. Add the
support in SPS driver for these new features.

Change-Id: I0ec9efe0bd801345aa416270739a52d7d6c5e01c
Signed-off-by: Yan He <yanhe@codeaurora.org>
2012-03-30 13:25:50 -07:00
Rohit Vaswani a76e99abc5 Merge branch 'Linux 3.0.21' into msm-3.0
Merge Upstream's stable 3.0.21 branch into msm-3.0
This consists 814 commits and some merge conflicts.

The merge conflicts are because of some local changes to
msm-3.0 as well as some conflicts between google's tree and
the upstream tree.

Conflicts:
	arch/arm/kernel/head.S
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/mmc/core/core.c
	drivers/tty/serial/serial_core.c
	drivers/usb/host/ehci-hub.c
	drivers/usb/serial/qcserial.c
	fs/namespace.c
	fs/proc/base.c

Change-Id: I62e2edbe213f84915e27f8cd6e4f6ce23db22a21
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
2012-03-30 00:09:34 -07:00
Linux Build Service Account bd090e4f8a Merge "platform-drivers: msm: sps: fix an error in pipe assignment" into msm-3.0 2012-03-28 10:51:24 -07:00
Lena Salman 72957305a9 msm: usb_bam: choose dynamically between usb and hsic bam
This change allows to change between a usb and hsic via sysfs
interface. This allows the same image to support both flavors and
pass between them upon sysfs change and reboot.

Change-Id: I94640c0ed7f0af9a882a20de60ad44288abe8141
Signed-off-by: Lena Salman <esalman@codeaurora.org>
2012-03-28 11:17:59 +02:00
Yan He 1ad4982314 platform-drivers: msm: sps: fix an error in pipe assignment
When set up a new pipe but the resource for that pipe is already
in use, we should return error directly instead of first disabling
that pipe in BAM HW.

CRs-Fixed: 341066
Signed-off-by: Yan He <yanhe@codeaurora.org>
2012-03-26 17:10:24 -07:00
Linux Build Service Account 89d637e1f1 Merge "platform-drivers: msm: sps: enhance the debugging functions" into msm-3.0 2012-03-09 22:28:48 -08:00
Yan He fd730fdb5e platform-drivers: msm: sps: enhance the debugging functions
The debugging functions in SPS driver are enhanced as follows:
1> Change some logging output from pr_info() to pr_debug() to reduce
   log amount.
2> Formalize the log content since some logs did not have the keyword
   which shows they are from SPS driver. This modification can help
   people find the error or other information from SPS driver more
   conveniently.
3> SPS driver did not output error messages in some places where an
   error is captured. Add error message output for these places.
4> SPS driver is used by some peripherals (such as SDCC) which have
   high throughput. When DEBUG level logging is enabled, the log
   output is tremendous and sometimes even hinders the analysis of
   the log, although some log messages are very helpful to the
   debugging of particular issues. Thus, add fine-grained DEBUG level
   log output control via debugfs.
5> Add the options via debugfs which dump the content of selected BAM
   registers. This can help analyze the BAM-related issues without
   additional software tools.

Change-Id: Ie97dc5d3b2736ea840125dad978e81abb960b27a
Signed-off-by: Yan He <yanhe@codeaurora.org>
2012-01-29 01:16:48 -07:00
Ofir Cohen 010009b830 usb: gadget: Add HSIC Peripheral over SPS support
Add support in HSIC peripheral(device)
over SPS.
Only one USB core can be use - currently HSUSB
is enabled by default.
To enable HSIC core defconfig file should be changed.

Change-Id: I256aecd9e6dfd8bfd71719c32beed8b24225e11c
Signed-off-by: Ofir Cohen <ofirc@codeaurora.org>
2012-01-29 09:03:19 +02:00
Yan He fe572dec64 platform-drivers: msm: sps: migrate to new clock API
Upstream has changed the clock voting api from a single api that must
be atmoic context compatable, to a split api with atomic and non-atomic
components. Migrate to the new api as the old one is deprecated and
will be removed soon.

Change-Id: I5e2eaad78728a8fb9e10e18d8fd49bbec67cb40e
Signed-off-by: Yan He <yanhe@codeaurora.org>
2012-01-26 13:58:44 -08:00
Kenneth Heitke 84245ed3ba ssbi: add remote spinlock support
Remote spinlocks are needed for targets that share the SSBI2 controller
with other processors (i.e. modem).  Targets that have the PMIC Arbiter
are not impacted because the hardware handles the arbitration of the
different software masters.

Change-Id: I3ffd41d7d259e0745ff4d03cd99d5c4bdbc94fa6
Signed-off-by: Kenneth Heitke <kheitke@codeaurora.org>
2012-01-12 14:08:13 -07:00
Linux Build Service Account 1aa2e29e45 Merge "platform-drivers: msm: sps: improve robustness of SPS driver" into msm-3.0 2011-12-16 14:45:07 -08:00
Yan He c5570a0d24 platform-drivers: msm: sps: improve robustness of SPS driver
Add checking of null pointer and array index boundary

Change-Id: I5a8d044af791897c7e728d0a870069b1c7b24acb
Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-12-13 17:42:39 -08:00
Ofir Cohen c7827e45a3 usb: gadget: SPS BAM-to-BAM - USB BAM driver
USB BAM driver to support BAM-to-BAM
USB<->Peripheral transactions.

Change-Id: Ib49a41f5dcdccb6f6bff2492fa64ead40f18b870
Signed-off-by: Ofir Cohen <ofirc@codeaurora.org>
2011-12-13 20:46:22 +02:00
Yan He 1466daa90c platform-drivers: msm: sps: Add SPS support for msm copper
Change-Id: If5b686e17fe8691024ef7475d5a89f2670390b8e
Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-12-05 12:49:11 -08:00
Bryan Huntsman 849b79e1f0 msm: trivial: 'chmod 644' for non-executable files
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
2011-11-22 18:44:06 -08:00
Bryan Huntsman d074fa2796 Merge remote-tracking branch 'common/android-3.0' into msm-3.0
* common/android-3.0: (570 commits)
  misc: remove kernel debugger core
  ARM: common: fiq_debugger: dump sysrq directly to console if enabled
  ARM: common: fiq_debugger: add irq context debug functions
  net: wireless: bcmdhd: Call init_ioctl() only if was started properly for WEXT
  net: wireless: bcmdhd: Call init_ioctl() only if was started properly
  net: wireless: bcmdhd: Fix possible memory leak in escan/iscan
  cpufreq: interactive governor: default 20ms timer
  cpufreq: interactive governor: go to intermediate hi speed before max
  cpufreq: interactive governor: scale to max only if at min speed
  cpufreq: interactive governor: apply intermediate load on current speed
  ARM: idle: update idle ticks before call idle end notifier
  input: gpio_input: don't print debounce message unless flag is set
  net: wireless: bcm4329: Skip dhd_bus_stop() if bus is already down
  net: wireless: bcmdhd: Skip dhd_bus_stop() if bus is already down
  net: wireless: bcmdhd: Improve suspend/resume processing
  net: wireless: bcmdhd: Check if FW is Ok for internal FW call
  tcp: Don't nuke connections for the wrong protocol
  ARM: common: fiq_debugger: make uart irq be no_suspend
  net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT
  mm: avoid livelock on !__GFP_FS allocations
  ...

Conflicts:
	arch/arm/mm/cache-l2x0.c
	arch/arm/vfp/vfpmodule.c
	drivers/mmc/core/host.c
	kernel/power/wakelock.c
	net/bluetooth/hci_event.c

Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
2011-11-16 13:52:50 -08:00
Yan He 2027bd8023 platform-drivers: msm: sps: Add APIs for BAM-to-BAM connection
Add new APIs which facilitates the setup of BAM-to-BAM connections
in client drivers.

Change-Id: Id6653961c3125bcc15b31a9c4061e76d927ae2b2
Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-11-14 10:26:48 -08:00
Yan He c324a794ba platform-drivers: msm: sps: Support IRQ wakeup in SPS driver
Change-Id: Ibe994732dca2433db19445a92742d298ce15f1cf
Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-11-11 11:44:49 -07:00
Dmitry Torokhov cf541bb3f2 WMI: properly cleanup devices to avoid crashes
commit 023b956597 upstream.

We need to remove devices that we destroy from the list, otherwise
we'll crash if there are more than one "_WDG" methods in DSDT.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=32052

Tested-by: Ilya Tumaykin <librarian_rus@yahoo.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-11-11 09:36:09 -08:00
David Herrmann 50f621d8f5 Platform: Fix error path in samsung-laptop init
commit a7ea19926f upstream.

samsung_init() should not return success if not all devices are initialized.
Otherwise, samsung_exit() will dereference sdev NULL pointers and others.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-11-11 09:35:48 -08:00
Jason Stubbs 08a84a609d platform: samsung_laptop: fix samsung brightness min/max calculations
commit bee460be8c upstream.

The min_brightness value of the sabi_config is incorrectly used in brightness
calculations. For the config where min_brightness = 1 and max_brightness = 8,
the user visible range should be 0 to 7 with hardware being set in the range
of 1 to 8. What is actually happening is that the user visible range is 0 to
8 with hardware being set in the range of -1 to 7.

This patch fixes the above issue as well as a miscalculation that would occur
in the case of min_brightness > 1.

Signed-off-by: Jason Stubbs <jasonbstubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-11-11 09:35:48 -08:00
Smelov Andrey 4728065742 Platform: samsung_laptop: samsung backlight for R528/R728
commit 093ed56164 upstream.

patch works for me, but I need to add "acpi_backlight=vendor" to kernel
params

Signed-off-by: Smelov Andrey <xor29a@bk.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-11-11 09:35:48 -08:00
Tommaso Massimi b0da5e7b14 Platform: samsung_laptop: add support for X520 machines.
commit 7500eeb08a upstream.

my samsung laptop would be very happy if you add
these lines to the file drivers/platform/x86/samsung-laptop.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-11-11 09:35:47 -08:00
Stefan Beller b78db0895f platform: samsung_laptop: add dmi information for Samsung R700 laptops
commit f87d02996f upstream.

My DMI model is this:
>dmesg |grep DMI
[    0.000000] DMI present.
[    0.000000] DMI: SAMSUNG ELECTRONICS CO., LTD. SR700/SR700, BIOS
04SR 02/20/2008

adding dmi information of Samsung R700 laptops
This adds the dmi information of Samsungs R700 laptops.

Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-11-11 09:35:47 -08:00
Yan He 93c04f0890 platform-drivers: msm: sps: fix sleeping function called from atomic issue
sps_disconnect() calls mutex inside spinlock protected code, and thus gets
the warning "sleeping function called from invalid context". Change
spinlock to mutex in sps_disconnect().

Change-Id: Ied30595f20d0f5976d53575138b072ba251fc10e
Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-11-08 09:52:29 -08:00
Yan He 0446b43fb1 platform-drivers: msm: sps: remove dfab clock voting in SPS driver
Client drivers of SPS driver will vote for dfab clock when it is
needed and relinquish the clock when it is not needed.
SPS driver only votes for dfab clock when it configures BAM-DMA
and relinquishes the clock after that.

Change-Id: I46a03633069a30f73b5159545c21e300140c5e6e
Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-11-07 16:31:28 -08:00
Thomas Courbon 6fb50607d4 Platform: fix samsung-laptop DMI identification for N150/N210/220/N230
commit 78a7539b88 upstream.

Some samsung latop of the N150/N2{10,20,30} serie are badly detected by the samsung-laptop platform driver, see bug # 36082.
It appears that N230 identifies itself as N150/N210/N220/N230 whereas the other identify themselves as N150/N210/220.
This patch attemtp fix #36082 allowing correct identification for all the said netbook model.

Reported-by: Daniel Eklöf <daniel@ekloef.se>
Signed-off-by: Thomas Courbon <thcourbon@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: Josh Boyer <jwboyer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-25 07:10:14 +02:00
Anirudh Ghayal b65f532893 msm: ssbi extensions for fsm9xxx
The ssbi controller in FSM9xxx is slightly different for rest of msm
arch. The address mask and shift is different. Ported FSM9xx specific
changes from i2c_ssbi driver to msm_ssbi driver.

Change-Id: I0b66ab3ee785d678fb0cd586d145663365dc41b3
Acked-by: Kaushik Sikdar <ksikdar@qualcomm.com>
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2011-10-17 12:52:58 +05:30
Yan He 092b727722 platform-drivers: msm: sps: Add SPS/BAM support for MDM9x15
Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-10-03 16:20:43 -07:00
Yan He 06913ce0b7 platform-drivers: msm: sps: Add SPS/BAM support for APQ8064
Signed-off-by: Yan He <yanhe@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/devices-8064.c
2011-10-03 16:20:14 -07:00
Matt Wagantall d86d683996 msm: sps: Rename PMEM clocks to match the new naming convention
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
2011-10-03 16:18:07 -07:00
Yan He 7887c510b7 platform-drivers: msm: sps: use spin_lock_irqsave for SPS driver
Use spin_lock_irqsave to prevent the deadlock caused by SoftIRQ

Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-10-03 16:16:18 -07:00
Yan He 9775260c6a platform-drivers: msm: sps: clear BAM global IRQ status after interrupt
Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-10-03 16:14:54 -07:00
Yan He 882152a3d3 platform-drivers: msm: sps: fix spinlock bug
add init for spinlock.

Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-10-03 10:28:38 -07:00
Yan He 161d678fa7 platform-drivers: msm: sps: debugging function enhancement
improvements include:
1> avoid unnecessary string operation in ISR
2> enable detailed debug info output at runtime
3> use unlikely() macro to improve success of branch prediction

Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-10-03 10:27:25 -07:00
Yan He 160633ed06 platform-drivers: msm: sps: add DFAB clock support for SPS driver.
Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-10-03 10:26:49 -07:00
Yan He 15f8646855 platform-drivers: msm: sps: add spinlock for BAM
When client drivers use spinlock and embrace SPS APIs that use mutex,
scheduling error may happen. Use spinlock for these SPS APIs instead.

Signed-off-by: Yan He <yanhe@codeaurora.org>
2011-10-03 10:26:39 -07:00
Bryan Huntsman 3f2bc4d6eb Initial Contribution
msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142

Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
2011-10-03 09:57:10 -07:00
Corentin Chary edf400e549 asus-wmi: return proper value in store_cpufv()
commit 3df5fdadf6 upstream.

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-15 18:31:35 -07:00
Corentin Chary 2c4ee76990 asus-wmi: fix hwmon/pwm1
commit 49979d091d upstream.

The code was completly broken, and should never had been sent
to the kernel. That's what happens when you write code without
hardware to test it.

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-15 18:31:35 -07:00
Eric Dumazet 0401846c33 hp-wmi: fix use after free
[  191.310008] WARNING: kmemcheck: Caught 32-bit read from freed memory (f0d25f14)
[  191.310011] c056d2f088000000105fd2f00000000050415353040000000000000000000000
[  191.310020]  i i i i f f f f f f f f f f f f f f f f f f f f f f f f f f f f
[  191.310027]                                          ^
[  191.310029]
[  191.310032] Pid: 737, comm: modprobe Not tainted 3.0.0-rc5+ #268 Hewlett-Packard HP Compaq 6005 Pro SFF PC/3047h
[  191.310036] EIP: 0060:[<f80b3104>] EFLAGS: 00010286 CPU: 0
[  191.310039] EIP is at hp_wmi_perform_query+0x104/0x150 [hp_wmi]
[  191.310041] EAX: f0d25601 EBX: f0d25f00 ECX: 000121cf EDX: 000121ce
[  191.310043] ESI: f0d25f10 EDI: f0f97ea8 EBP: f0f97ec4 ESP: c173f34c
[  191.310045]  DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
[  191.310046] CR0: 8005003b CR2: f540c000 CR3: 30f30000 CR4: 000006d0
[  191.310048] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
[  191.310050] DR6: ffff4ff0 DR7: 00000400
[  191.310051]  [<f80b317b>] hp_wmi_dock_state+0x2b/0x40 [hp_wmi]
[  191.310054]  [<f80b6093>] hp_wmi_init+0x93/0x1a8 [hp_wmi]
[  191.310057]  [<c10011f0>] do_one_initcall+0x30/0x170
[  191.310061]  [<c107ab9f>] sys_init_module+0xef/0x1a60
[  191.310064]  [<c149f998>] sysenter_do_call+0x12/0x28
[  191.310067]  [<ffffffff>] 0xffffffff

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-07-11 09:52:35 -04:00
Jose Alonso b486742a12 dell-laptop - using buffer without mutex_lock
Using buffer->output[1] without mutex_lock()

Signed-off-by: Jose Alonso <joalonsof@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-07-11 09:52:31 -04:00
Keng-Yu Lin be65dde82a Revert: "dell-laptop: Toggle the unsupported hardware killswitch"
This reverts commit a3d77411e8,

as it causes a mess in the wireless rfkill status on some models.
It is probably a bad idea to toggle the rfkill for all dell models
without the respect to the claim that it is hardware-controlled.

Cc: stable@kernel.org
Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-07-11 09:52:19 -04:00
Axel Lin 60cfa098dc platform-drivers-x86: set backlight type to BACKLIGHT_PLATFORM
Some newly added drivers do not set backlight type, as a result
/sys/class/backlight/<backlight>/type shows incorrect backlight type.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: Yin Kangkai <kangkai.yin@intel.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-07-07 11:27:17 -04:00
Henrique de Moraes Holschuh a50245af78 thinkpad-acpi: handle HKEY 0x4010, 0x4011 events
Handle events 0x4010 and 0x4011 so that we do not pester users about them.

These events report when the thinkpad is docked/undocked to a native
hotplug dock (i.e. one that does not need ACPI handling, nor is represented
in the ACPI device tree).  Such docks are based on USB 2.0/3.0, and also
work as port replicators.

We really want a proper dock class to report these, or at least new input
EV_SW events.  Since it is not clear which one to use yet, keep reporting
them as vendor-specific ThinkPad events.

WARNING: As defined by the thinkpad-acpi sysfs ABI rules of engagement, the
vendor-specific events will be REMOVED as soon as generic events are made
available (duplicate events are a big problem), with an appropriate update
to the thinkpad-acpi sysfs/event ABI versioning.  Userspace is already
prepared to provide easy backwards compatibility for such changes when
convenient to the distro (see acpi-fakekey).

* Event 0x4010: docking to hotplug dock/port replicator
* Event 0x4011: undocking from hotplug dock/port replicator

Typical usecase would be to trigger display reconfiguration.

Reports mention T410, T510, and series 3 docks/port replicators.  Special
thanks to Robert de Rooy for his extensive report and analysis of the
situation.

http://www.thinkwiki.org/wiki/ThinkPad_Port_Replicator_Series_3
http://www.thinkwiki.org/wiki/ThinkPad_Mini_Dock_Series_3
http://www.thinkwiki.org/wiki/ThinkPad_Mini_Dock_Plus_Series_3
http://www.thinkwiki.org/wiki/ThinkPad_Mini_Dock_Plus_Series_3_for_Mobile_Workstations
http://lenovoblogs.com/insidethebox/?p=290

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Reported-by: Claudius Hubig <claudiushubig@chubig.net>
Reported-by: Doctor Bill <docbill@gmail.com>
Reported-by: Korte Noack <gbk.noack@gmx.de>
Reported-by: Robert de Rooy <robert.de.rooy@gmail.com>
Reported-by: Sebastian Will <swill@csail.mit.edu>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-07-07 10:39:05 -04:00
Andre Bartke 96b269c1b0 drivers/platform/x86: Fix memory leak
data is not freed in the error case of
compal_probe().

Signed-off-by: Andre Bartke <andre.bartke@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-07-07 10:39:03 -04:00
Henrique de Moraes Holschuh 2d43f671c8 thinkpad-acpi: handle some new HKEY 0x60xx events
Handle some user interface events from the newer Lenovo models.  We are likely
to do something smart with these events in the future, for now, hide the ones
we are already certain about from the user and userspace both.

* Events 0x6000 and 0x6005 are key-related.  0x6005 is not properly identified
  yet.  Ignore these events, and do not report them.

* Event 0x6040 has not been properly identified yet, and we don't know if it
  is important (looks like it isn't, but still...).  Keep reporting it.

* Change the message the driver outputs on unknown 0x6xxx events, as all
  recent events are not related to thermal alarms.  Degrade log level from
  ALERT to WARNING.

Thanks to all users who reported these events or asked about them in a number
of mailing lists.  Your help is highly appreciated, even if I did took a lot of
time to act on them.  For that I apologise.

I will list those that identified the reasons for the events as "reported-by",
and I apologise in advance if I leave anyone out: it was not done on purpose, I
made the mistake of not properly tagging all event report emails separately,
and might have missed some.

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Reported-by: Markus Malkusch <markus@malkusch.de>
Reported-by: Peter Giles <g1l3sp@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-07-07 10:39:00 -04:00
Lee, Chun-Yi ae821c1b2f acer-wmi: fix bitwise bug when set device state
Fix a bitwise bug that was found by Joern Heissler, it must be OR
but not AND when we query current device state.

Acked-by: Joern Heissler <linux-acpi@joern.heissler.de>
Cc: Carlos Corbacho <carlos@strangeworlds.co.uk>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Corentin Chary <corentincj@iksaif.net>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: Lee, Chun-Yi <jlee@novell.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-07-07 10:38:58 -04:00
Seth Forshee 92530664bb acer-wmi: Only update rfkill status for associated hotkey events
acer-wmi is indiscriminately using the device state from hotkey
events to update the various rfkill states. On the Aspire 1830 this
can result in a soft block on the wlan when the touchpad hotkey is
pressed, as it is reporting a non-zero device state that does not
reflect the wireless status. To fix this, only update rfkill states
when a wlan or bluetooth hotkey is pressed.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
2011-07-07 10:38:56 -04:00
Linus Torvalds 2ba781ced9 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (43 commits)
  acer-wmi: support integer return type from WMI methods
  msi-laptop: fix section mismatch in reference from the function load_scm_model_init
  acer-wmi: support to set communication device state by new wmid method
  acer-wmi: allow 64-bits return buffer from WMI methods
  acer-wmi: check the existence of internal 3G device when set capability
  platform/x86:delete two unused variables
  support wlan hotkey on Acer Travelmate 5735Z
  platform-x86: intel_mid_thermal: Fix memory leak
  platform/x86: Fix Makefile for intel_mid_powerbtn
  platform/x86: Simplify intel_mid_powerbtn
  acer-wmi: Delete out-of-date documentation
  acerhdf: Clean up includes
  acerhdf: Drop pointless dependency on THERMAL_HWMON
  acer-wmi: Update MAINTAINERS
  wmi: Orphan ACPI-WMI driver
  tc1100-wmi: Orphan driver
  acer-wmi: does not allow negative number set to initial device state
  platform/oaktrail: ACPI EC Extra driver for Oaktrail
  thinkpad_acpi: Convert printks to pr_<level>
  thinkpad_acpi: Correct !CONFIG_THINKPAD_ACPI_VIDEO warning
  ...
2011-05-29 11:44:33 -07:00