summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2011-10-28drivers/rtc/rtc-tegra.c: properly initialize spinlockUwe Kleine-König
commit e57ee01750c4954fd0b5e3c6109cd4b870880eb9 upstream. Using __SPIN_LOCK_UNLOCKED for a dynamically allocated lock is wrong and breaks the build with PREEMPT_RT_FULL. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Andrew Chew <achew@nvidia.com> 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> Change-Id: I28d31fa586ddab4be785d4bba1c2420ea0981161 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35596 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28rtc: limit frequencyThomas Gleixner
commit 431e2bcc371016824f419baa745f82388258f3ee upstream. Due to the hrtimer self rearming mode a user can DoS the machine simply because it's starved by hrtimer events. The RTC hrtimer is self rearming. We really need to limit the frequency to something sensible. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: Ben Greear <greearb@candelatech.com> 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> Change-Id: I9c1217a3d2e04c0be8a12b028d0a921c708b91d9 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35595 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28rtc: fix hrtimer deadlockThomas Gleixner
commit b830ac1d9a2262093bb0f3f6a2fd2a1c8278daf5 upstream. Ben reported a lockup related to rtc. The lockup happens due to: CPU0 CPU1 rtc_irq_set_state() __run_hrtimer() spin_lock_irqsave(&rtc->irq_task_lock) rtc_handle_legacy_irq(); spin_lock(&rtc->irq_task_lock); hrtimer_cancel() while (callback_running); So the running callback never finishes as it's blocked on rtc->irq_task_lock. Use hrtimer_try_to_cancel() instead and drop rtc->irq_task_lock while waiting for the callback. Fix this for both rtc_irq_set_state() and rtc_irq_set_freq(). Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reported-by: Ben Greear <greearb@candelatech.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Ingo Molnar <mingo@elte.hu> 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> Change-Id: I2b1a13e50b81eda763e175c58c7886e7c7b7f692 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35594 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28rtc: handle errors correctly in rtc_irq_set_state()Thomas Gleixner
commit 2c4f57d12df7696d65b0247bfd57fd082a7719e6 upstream. The code checks the correctness of the parameters, but unconditionally arms/disarms the hrtimer. The result is that a random task might arm/disarm rtc timer and surprise the real owner by either generating events or by stopping them. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: Ben Greear <greearb@candelatech.com> 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> Change-Id: If7bc32fff7a770c0e8a374f0e47cca6a0e6fcaa3 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35593 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28USB: EHCI: go back to using the system clock for QH unlinksAlan Stern
commit 004c19682884d4f40000ce1ded53f4a1d0b18206 upstream. This patch (as1477) fixes a problem affecting a few types of EHCI controller. Contrary to what one might expect, these controllers automatically stop their internal frame counter when no ports are enabled. Since ehci-hcd currently relies on the frame counter for determining when it should unlink QHs from the async schedule, those controllers run into trouble: The frame counter stops and the QHs never get unlinked. Some systems have also experienced other problems traced back to commit b963801164618e25fbdc0cd452ce49c3628b46c8 (USB: ehci-hcd unlink speedups), which made the original switch from using the system clock to using the frame counter. It never became clear what the reason was for these problems, but evidently it is related to use of the frame counter. To fix all these problems, this patch more or less reverts that commit and goes back to using the system clock. But this can't be done cleanly because other changes have since been made to the scan_async() subroutine. One of these changes involved the tricky logic that tries to avoid rescanning QHs that have already been seen when the scanning loop is restarted, which happens whenever an URB is given back. Switching back to clock-based unlinks would make this logic even more complicated. Therefore the new code doesn't rescan the entire async list whenever a giveback occurs. Instead it rescans only the current QH and continues on from there. This requires the use of a separate pointer to keep track of the next QH to scan, since the current QH may be unlinked while the scanning is in progress. That new pointer must be global, so that it can be adjusted forward whenever the _next_ QH gets unlinked. (uhci-hcd uses this same trick.) Simplification of the scanning loop removes a level of indentation, which accounts for the size of the patch. The amount of code changed is relatively small, and it isn't exactly a reversion of the b963801164 commit. This fixes Bugzilla #32432. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Tested-by: Matej Kenda <matejken@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I620d5e977656740a84fcbc88a03453a736d0624c Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35592 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28USB: OHCI: fix another regression for NVIDIA controllersAlan Stern
commit 6ea12a04d295235ed67010a09fdea58c949e3eb0 upstream. The NVIDIA series of OHCI controllers continues to be troublesome. A few people using the MCP67 chipset have reported that even with the most recent kernels, the OHCI controller fails to handle new connections and spams the system log with "unable to enumerate USB port" messages. This is different from the other problems previously reported for NVIDIA OHCI controllers, although it is probably related. It turns out that the MCP67 controller does not like to be kept in the RESET state very long. After only a few seconds, it decides not to work any more. This patch (as1479) changes the PCI initialization quirk code so that NVIDIA controllers are switched into the SUSPEND state after 50 ms of RESET. With no interrupts enabled and all the downstream devices reset, and thus unable to send wakeup requests, this should be perfectly safe (even for non-NVIDIA hardware). The removal code in ohci-hcd hasn't been changed; it will still leave the controller in the RESET state. As a result, if someone unloads ohci-hcd and then reloads it, the controller won't work again until the system is rebooted. If anybody complains about this, the removal code can be updated similarly. This fixes Bugzilla #22052. Tested-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: Ifa987254cbfa82aceca05093544e29d46e039619 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35591 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Staging: hv: netvsc: Increase the timeout value in the netvsc driverK. Y. Srinivasan
commit 5c5781b3f88567211ecaaada13431af15c8c6003 upstream. On some loaded windows hosts, we have discovered that the host may not respond to guest requests within the specified time (one second) as evidenced by the guest timing out. Fix this problem by increasing the timeout to 5 seconds. It may be useful to apply this patch to the 3.0 kernel as well. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: If27c75ecc09d3b259325d7ceb210d2b18409b7d2 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35590 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Staging: hv: vmbus: Increase the timeout value in the vmbus driverK. Y. Srinivasan
commit 2dfde9644fe8c4a77f9c73f95b25d6300ca23b5d upstream. On some loaded windows hosts, we have discovered that the host may not respond to guest requests within the specified time (one second) as evidenced by the guest timing out. Fix this problem by increasing the timeout to 5 seconds. It may be useful to apply this patch to the 3.0 kernel as well. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: If7edbf48ff9fba1003dd549482c0b0f9cf48dc0f Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35589 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Staging: hv: storvsc: Increase the timeout value in the storvsc driverK. Y. Srinivasan
commit 46d2eb6d82ef44be58ae192c35e8cd52485f02eb upstream. On some loaded windows hosts, we have discovered that the host may not respond to guest requests within the specified time (one second) as evidenced by the guest timing out. Fix this problem by increasing the timeout to 5 seconds. It may be useful to apply this patch to the 3.0 kernel as well. the 3.0 kernel as well. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I0834737d04e5f73d3bb139973bdd6b1170ca562e Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35588 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28staging: comedi: fix infoleak to userspaceVasiliy Kulikov
commit 819cbb120eaec7e014e5abd029260db1ca8c5735 upstream. driver_name and board_name are pointers to strings, not buffers of size COMEDI_NAMELEN. Copying COMEDI_NAMELEN bytes of a string containing less than COMEDI_NAMELEN-1 bytes would leak some unrelated bytes. Signed-off-by: Vasiliy Kulikov <segoon@openwall.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: If5220b6600a85e49d657e4dfe005d6cc4677f1f8 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35587 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28staging: r8192e_pci: Handle duplicate PCI ID 0x10ec:0x8192 conflict with ↵Larry Finger
rtl8192se commit 1c50bf7e415cf6ce9545dbecc2ac0d89d3916c53 upstream. There are two devices with PCI ID 0x10ec:0x8192, namely RTL8192E and RTL8192SE. The method of distinguishing them is by the revision ID at offset 0x8 of the PCI configuration space. If the value is 0x10, then the device uses rtl8192se for a driver. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I7bcf1251f21bac64374464ad8b5c4a2c61352245 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35586 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Staging: usbip: vhci-hcd: Do not kill already dead RX/TX kthreadTobias Klauser
commit 8547d4cc2b616e4f1dafebe2c673fc986422b506 upstream. When unbinding a device on the host which was still attached on the client, I got a NULL pointer dereference on the client. This turned out to be due to kthread_stop() being called on an already dead kthread. Here is how I was able to reproduce the problem: server:# usbip bind -b 1-2 client:# usbip attach -h server -b 1-2 server:# usbip unbind -b 1-2 This patch fixes the problem by checking the kthread before attempting to kill it, as it is done on the opposite side in stub_shutdown_connection(). Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I9aaa60ee923506237a325afdaf908a5dbd7be60e Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35585 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28mmc: sdhci-esdhc-imx: SDHCI_CARD_PRESENT does not get clearedShawn Guo
commit 803862a6f7de4939e0a557214e5e4b37e36f87ff upstream. The function esdhc_readl_le intends to clear bit SDHCI_CARD_PRESENT, when the card detect gpio tells there is no card. But it does not clear the bit actually. The patch gives a fix on that. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I18b0dd280b0d321a4da10d1233fc91dee7719360 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35582 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28mmc: Added quirks for Ricoh 1180:e823 lower base clock frequencyManoj Iyer
commit 15bed0f2fa8e1d7db201692532c210a7823d2d21 upstream. Ricoh 1180:e823 does not recognize certain types of SD/MMC cards, as reported at http://launchpad.net/bugs/773524. Lowering the SD base clock frequency from 200Mhz to 50Mhz fixes this issue. This solution was suggest by Koji Matsumuro, Ricoh Company, Ltd. This change has no negative performance effect on standard SD cards, though it's quite possible that there will be one on UHS-1 cards. Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Tested-by: Daniel Manrique <daniel.manrique@canonical.com> Cc: Koji Matsumuro <matsumur@nts.ricoh.co.jp> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I0ba5d1d3c71a9487850c9e499d30d2737673a6a9 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35581 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28USB: serial: add IDs for WinChipHead USB->RS232 adapterWolfgang Denk
commit 026dfaf18973404a01f488d6aa556a8c466e06a4 upstream. Add ID 4348:5523 for WinChipHead USB->RS 232 adapter with Prolifec PL2303 chipset Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I858f1852aff29b2ee439a1afe226a4b8b4bd0d2c Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35580 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: Ensure struct semaphore to be definedChih-Wei Huang
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: I7256ce5dc8433eb703d9f7f8ade55b5806cf348d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35578 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: Keep debug symbols for built-in driverDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: Ie3e6c7634dde5773dddd10357cc581c66bf22ace Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35577 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: Clean up formatting.Howard M. Harte
Change-Id: Idf0771201837ad00304107af3592c35a6236eb33 Signed-off-by: Howard M. Harte <hharte@broadcom.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35576 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: Improve arp_hostip_table processingDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: I08c164fe11238fb25d1d23db5d9b9e65f04cf10b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35575 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: Eliminate nested IOCTL callLin Ma
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: I215f25caaa613ffe90fd33019c5c829ef268ba0c Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35574 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: Remove noisy debug printsDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: Iaa8f9502ca7be89da84e49b4deb78036dc0b81a9 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35573 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcm4329: Remove obsolete fileDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: Iba7413e0cb5b0a2f0ad90c016fdd32f84627fd88 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35572 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: add support for mkeepalive.Howard M. Harte
Fix p2p group add issue. Change-Id: Ieb8fba54e04912b4002837243c00ba90fd150e5d Signed-off-by: Howard M. Harte <hharte@broadcom.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: Id628cdde1f48563db0270416872ad5067acd49f7 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35571 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: Check wldev_ioctl() for NULL parameterDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: I0229f48ae8422249844c6f739d36d58e1b4872b0 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35570 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: Fix memory corruption in wl_android_get_rssi()Dmitry Shmidt
In case of FW problem wldev_get_ssid() doesn't return error and ssid structure has garbage. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: I8d84a9b1ed1a0e423131a24da563151cd930a154 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35562 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: change logic for removing monitor interace for P2P.Howard M. Harte
Change-Id: Ie757ec25c86d0402d0463a9b7f2fff14b840f446 Signed-off-by: Howard M. Harte <hharte@broadcom.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35561 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Additional patch for scan and connection problem.Howard M. Harte
Change-Id: I79a25bd3f36f5d3accae83116084b8baf63a1033 Signed-off-by: Howard M. Harte <hharte@broadcom.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35560 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: Put p2p_dev_addr under DHD_P2P_DEV_ADDR_FROM_SYSFSDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: Iac27a11f1bdd6b217e975474641eebe5d4ec781d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35559 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: Fix rfkill cleaning on failureDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: I6721f317bcd0fe3e1ea296a02b79442c8e899165 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35558 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Fix scan and connection problem.Howard M. Harte
Change-Id: Idd77caf358fc77c4b81929c644020d09009e4f36 Signed-off-by: Howard M. Harte <hharte@broadcom.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35557 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Update to 5.90.125.52:Howard M. Harte
Fix unremoved monitor interface problem after killing hostapd. Add WPS support for hostapd. Change-Id: I4e476fafb203592fcdf5c15a526b67d4aa78df3e Signed-off-by: Howard M. Harte <hharte@broadcom.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35556 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Fix a potential crash/memory leak if NVRAM fails to load.Howard M. Harte
Change-Id: I27f41dd5833835b74f38524e9691d68ac807c991 Signed-off-by: Howard M. Harte <hharte@broadcom.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35555 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28net: wireless: bcmdhd: Ignore WL_BSS_INFO_VERSION valueDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Change-Id: I30f9accee0a1b200847f3675f2ed109bbe316560 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35554 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Fix ag band issue and escan crashesLin Ma
Change-Id: Ie1bdb52a362755b7c922be9b721e9cf0e4042d95 Signed-off-by: Howard M. Harte <hharte@broadcom.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35553 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28TEE driver: NULL variable usageBerne Hebark
Return if error in kmalloc, instead of goto err and call function using NULL variable. ST-Ericsson ID: 369796 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ib72acb6366f36febe3ea5cb7c9ceb275cfb1f038 Signed-off-by: Berne Hebark <berne.hebark@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35493 Reviewed-by: Joakim BECH <joakim.xx.bech@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QABUILD
2011-10-28u8500 : USB :New notification events for BatManrajaram
Added notification events for ACA cases so that battery manager can distinguish between Standard Host and ACA charger. ST-Ericsson Linux next: NA ST-Ericsson ID: 362951 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: rajaram <rajaram.ragupathy@stericsson.com> Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> Change-Id: I02a19bced97b408990d8effb785418bf182ac27b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34862 Tested-by: Rajaram REGUPATHY <ragupathy.rajaram@stericsson.com> Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com> Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
2011-10-28power:ab5500-fg: send UEvent when battery voltage is low/highArun Murthy
Send UEvent when battery voltage is low/high so that android power framework is being notified and actions are taken by android accordingly. This also ensure that the paltform is shutdown cleanly when battery voltage is below lower threshold. ST-Ericsson Linux next: NA ST-Ericsson ID: 365061 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I01e3579ba5860244cd5837c8eb59f71bd9b5d719 Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35050 Reviewed-by: QABUILD Reviewed-by: Rajagopala VENKATARAVANAPPA X <rajagopala.v@stericsson.com> Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
2011-10-28u5500: add MTIMER clocksourceRabin Vincent
ST-Ericsson ID: 368260 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Depends-On: I5307cb7f58fdf890896d641a8e4f49098a90b68e Change-Id: I9ef4ff1c63f6ec9293ece4013f13cf3caa707d9d Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34307 Reviewed-by: QATOOLS Reviewed-by: QABUILD
2011-10-27mmc: mmci: PM runtime updateUlf Hansson
In the suspend callback the pm_runtime_put_sync is now no more useable. To be able to force our device into runtime suspend state while doing a system suspend, the AMBA bus are using the suspend|resume_noirq functions. The AMBA bus will from these functions call for it's runtime_suspend|resume functions which then reaches mmci's runtime_suspend|resume as well. Change-Id: I86d7480fd8612d80e2f5e0e8d9d3b31f42637638 Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35506 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-27AMBA: Use suspend_noriq to force devices into runtime suspendUlf Hansson
To be able to make sure devices are put into runtime suspend after a suspend sequence, the suspend_noirq callback is used. Previously it was was possible for drivers doing pm_runtime_suspend and pm_runtime_put_sync directly from it's suspend callbacks. This is now not possible due to the following commit, which solve a race issue: PM: Limit race conditions between runtime PM and system sleep (v2) Change-Id: I48b988e9f7e411a0a122a58c0967fbee61256f89 Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35505 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-27PM: Limit race conditions between runtime PM and system sleep (v2)Rafael J. Wysocki
One of the roles of the PM core is to prevent different PM callbacks executed for the same device object from racing with each other. Unfortunately, after commit e8665002477f0278f84f898145b1f141ba26ee26 (PM: Allow pm_runtime_suspend() to succeed during system suspend) runtime PM callbacks may be executed concurrently with system suspend/resume callbacks for the same device. The main reason for commit e8665002477f0278f84f898145b1f141ba26ee26 was that some subsystems and device drivers wanted to use runtime PM helpers, pm_runtime_suspend() and pm_runtime_put_sync() in particular, for carrying out the suspend of devices in their .suspend() callbacks. However, as it's been determined recently, there are multiple reasons not to do so, inlcuding: * The caller really doesn't control the runtime PM usage counters, because user space can access them through sysfs and effectively block runtime PM. That means using pm_runtime_suspend() or pm_runtime_get_sync() to suspend devices during system suspend may or may not work. * If a driver calls pm_runtime_suspend() from its .suspend() callback, it causes the subsystem's .runtime_suspend() callback to be executed, which leads to the call sequence: subsys->suspend(dev) driver->suspend(dev) pm_runtime_suspend(dev) subsys->runtime_suspend(dev) recursive from the subsystem's point of view. For some subsystems that may actually work (e.g. the platform bus type), but for some it will fail in a rather spectacular fashion (e.g. PCI). In each case it means a layering violation. * Both the subsystem and the driver can provide .suspend_noirq() callbacks for system suspend that can do whatever the .runtime_suspend() callbacks do just fine, so it really isn't necessary to call pm_runtime_suspend() during system suspend. * The runtime PM's handling of wakeup devices is usually different from the system suspend's one, so .runtime_suspend() may simply be inappropriate for system suspend. * System suspend is supposed to work even if CONFIG_PM_RUNTIME is unset. * The runtime PM workqueue is frozen before system suspend, so if whatever the driver is going to do during system suspend depends on it, that simply won't work. Still, there is a good reason to allow pm_runtime_resume() to succeed during system suspend and resume (for instance, some subsystems and device drivers may legitimately use it to ensure that their devices are in full-power states before suspending them). Moreover, there is no reason to prevent runtime PM callbacks from being executed in parallel with the system suspend/resume .prepare() and .complete() callbacks and the code removed by commit e8665002477f0278f84f898145b1f141ba26ee26 went too far in this respect. On the other hand, runtime PM callbacks, including .runtime_resume(), must not be executed during system suspend's "late" stage of suspending devices and during system resume's "early" device resume stage. Taking all of the above into consideration, make the PM core acquire a runtime PM reference to every device and resume it if there's a runtime PM resume request pending right before executing the subsystem-level .suspend() callback for it. Make the PM core drop references to all devices right after executing the subsystem-level .resume() callbacks for them. Additionally, make the PM core disable the runtime PM framework for all devices during system suspend, after executing the subsystem-level .suspend() callbacks for them, and enable the runtime PM framework for all devices during system resume, right before executing the subsystem-level .resume() callbacks for them. Conflicts: drivers/base/power/main.c Change-Id: I184431a2e6663222685098d869272b5e84b93c11 Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35337 Reviewed-by: QABUILD Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-27PM: Introduce generic "noirq" callback routines for subsystems (v2)Rafael J. Wysocki
Introduce generic "noirq" power management callback routines for subsystems in addition to the "regular" generic PM callback routines. The new routines will be used, among other things, for implementing system-wide PM transitions support for generic PM domains. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Change-Id: I345a1c6d221b402f349837581681bc7b5c464ea9 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35335 Reviewed-by: QABUILD Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Ulf HANSSON <ulf.hansson@stericsson.com>
2011-10-27U8500 CM: fix re-entrancy issuePierre Peiffer
Fix a re-entrancy issue when killing two processes that use the CM driver simultaneously. ST-Ericsson ID: 364585 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I48cb434b87a85b635fe4506a92d7b1c7086071fb Signed-off-by: Pierre Peiffer <pierre.peiffer@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35216 Reviewed-by: QATOOLS Reviewed-by: QABUILD
2011-10-27mfd: u8500: remove Vape dependency for esram34Per Forlin
Dependency to Vape prevents the platform from being able to go ApSleep. When platform goes to ApSleep esram32 will switch to Vsafe. ST-Ericsson ID: 370266 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Change-Id: I451e1d866c5999b2365c0127fd1044964691834e Signed-off-by: Per Forlin <per.forlin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35424 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-27video: mcde: Add host_eot_gen propertyJimmy Rubin
Some DSI displays requires a EOT packet after a transfer in HS. This is optional in the MIPI standard and dependant on the display IC if it should be used or not. ST-Ericsson ID: 367923 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ia7f8d37cd0ab80847a6098489790d133dbcccb64 Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35324 Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com> Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com>
2011-10-27U9500: Add Vape consumer for STE HSIPawel Szyszuk
STE HSI Vape consumer was added to the old kernel 2.6.35, but it was not ported to kernel 3.0.0. ST-Ericsson ID: 370094 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Original Change-Id: I0a9e20f6ef944f9cfa93d425f79b611572992ec8 Change-Id: Iad4d628b06a5780001b14d659d7b282da626ca1c Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35330 Reviewed-by: Alex MACRO <alex.macro@stericsson.com> Reviewed-by: Derek MORTON <derek.morton@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
2011-10-27input: keyboard: nomadik-ske: Do not always enable on suspendJonas Aaberg
The resume hook did always enable the ske driver on resume. ST-Ericsson Linux next: - ST-Ericsson ID: 369127 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I613c0d0b0d626c77a422eaa65e3060dcc866ed56 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34793 Reviewed-by: QABUILD Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
2011-10-27b2r2: Add support for blending on background imageJörgen Nilsson
Instead of blending only on the destination there is now a possibility to blend on a supplied background using standard blending flags. The background blending option is enabled through setting a flag in the request. When background blending is enabled the destination blending is omitted and the destination buffer is simply overwritten. ST-Ericsson Linux next: NA Depends-On: I85ba9d0006e7480167f72f2a6b5c9d8fff272813, Ia34f98cfb20e2f0486049e82581dcea28b465ed4, I5cbeb4525a98a5b9884c3464154182810ee7449b ST-Ericsson ID: 350337 ST-Ericsson FOSS-OUT ID: Trivial Introduce non-backward compatible changes to exposed interfaces Signed-off-by: Jörgen Nilsson <jorgen.nilsson@stericsson.com> Change-Id: Ifeb8eb66c2fed97c541b09715a17251a81e493ab Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34023 Tested-by: Jorgen NILSSON <jorgen.nilsson@stericsson.com> Reviewed-by: Maciej SOCHA <maciej.socha@stericsson.com> Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-27video: mcde: use DSI display with one data laneAnders Bauer
This patch enables using displays with one DSI data lane. ST-Ericsson ID: 359227 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I852c55060c5c4ffa8b50eb6b8dbc3e002d4fe658 Signed-off-by: Anders Bauer <anders.bauer@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35323 Tested-by: Jimmy RUBIN <jimmy.rubin@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com> Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com> Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
2011-10-27power: ab8500-bm: Check the usb type in notifier callKalle Komierowski
This patch forces the charger driver to handle the dedicated usb. ST-Ericsson Linux next: NA ST-Ericsson ID: 362955 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: If7da233dd4b914fe95395748e15851002d9c2674 Signed-off-by: Kalle Komierowski <karl.komierowski@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35351 Reviewed-by: QABUILD Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 13:33:03 +0000