summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-28gro: Only reset frag0 when skb can be pulledHerbert Xu
commit 17dd759c67f21e34f2156abcf415e1f60605a188 upstream. Currently skb_gro_header_slow unconditionally resets frag0 and frag0_len. However, when we can't pull on the skb this leaves the GRO fields in an inconsistent state. This patch fixes this by only resetting those fields after the pskb_may_pull test. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: Ib97b8d7f52c19c34283adf2382403c9bf9dac9f0 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35584 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28bridge: send proper message_age in config BPDUstephen hemminger
commit 0c03150e7ea8f7fcd03cfef29385e0010b22ee92 upstream. A bridge topology with three systems: +------+ +------+ | A(2) |--| B(1) | +------+ +------+ \ / +------+ | C(3) | +------+ What is supposed to happen: * bridge with the lowest ID is elected root (for example: B) * C detects that A->C is higher cost path and puts in blocking state What happens. Bridge with lowest id (B) is elected correctly as root and things start out fine initially. But then config BPDU doesn't get transmitted from A -> C. Because of that the link from A-C is transistioned to the forwarding state. The root cause of this is that the configuration messages is generated with bogus message age, and dropped before sending. In the standardmessage_age is supposed to be: the time since the generation of the Configuration BPDU by the Root that instigated the generation of this Configuration BPDU. Reimplement this by recording the timestamp (age + jiffies) when recording config information. The old code incorrectly used the time elapsed on the ageing timer which was incorrect. See also: https://bugzilla.vyatta.com/show_bug.cgi?id=7164 Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: I09afcb8a4fb21bca030e8f10a706fe7fafe14438 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35583 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-28ipv6: updates to privacy addresses per RFC 4941JP Abgrall
Update the code to handle some of the differences between RFC 3041 and RFC 4941, which obsoletes it. Also a couple of janitorial fixes. - Allow router advertisements to increase the lifetime of temporary addresses. This was not allowed by RFC 3041, but is specified by RFC 4941. It is useful when RA lifetimes are lower than TEMP_{VALID,PREFERRED}_LIFETIME: in this case, the previous code would delete or deprecate addresses prematurely. - Change the default of MAX_RETRY to 3 per RFC 4941. - Add a comment to clarify that the preferred and valid lifetimes in inet6_ifaddr are relative to the timestamp. - Shorten lines to 80 characters in a couple of places. Change-Id: I4da097664d4b1de7c1cebf410895319601c7f1cc Signed-off-by: Lorenzo Colitti <lorenzo@google.com> Signed-off-by: JP Abgrall <jpa@google.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35579 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-28Bluetooth: l2cap: Fix lost wakeup waiting for ERTM acksPeter Hurley
Fix race condition which can result in missing wakeup during l2cap socket shutdown. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> Change-Id: I8797d086ebbc222ec468bb5b5ac7335b826f64e9 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35569 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Bluetooth: bnep: Fix lost wakeup of session threadPeter Hurley
Fix race condition which can result in missing the wakeup intended to stop the session thread. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> Change-Id: I7047dfb72066d726d04f6ca97f2fada70339fdaa Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35568 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Bluetooth: sco: Fix lost wakeups waiting to accept socketPeter Hurley
Fix race conditions which can cause lost wakeups (or missed signals) while waiting to accept a sco socket connection. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> Change-Id: I905dbb0c2ab840960fc420b30fb5a8032afb8c9e Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35567 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Bluetooth: l2cap: Fix lost wakeups waiting to accept socketPeter Hurley
Fix race conditions which can cause lost wakeups (or misssed signals) while waiting to accept an l2cap socket connection. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> Change-Id: I71c320d161dfbb2bf45f2b2ccbcc2c30f7507558 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35566 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Bluetooth: Fix lost wakeups waiting for sock state changePeter Hurley
Fix race conditions which can cause lost wakeups while waiting for sock state to change. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> Change-Id: Ida23c4881653c90354bff85984d969cc5b323dba Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35565 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Bluetooth: rfcomm: Fix lost wakeups waiting to accept socketPeter Hurley
Fix race conditions which can cause lost wakeups (or missed signals) while waiting to accept an rfcomm socket connection. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> Change-Id: Iafe477372e4dcf4a4519cc79ff61bc457c3d8642 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35564 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-28Bluetooth: rfcomm: Remove unnecessary krfcommd eventPeter Hurley
Removed superfluous event handling which was used to signal that the rfcomm kthread had been woken. This appears to have been used to prevent lost wakeups. Correctly ordering when the task state is set to TASK_INTERRUPTIBLE is sufficient to prevent lost wakeups. To prevent wakeups which occurred prior to initially setting TASK_INTERRUPTIBLE from being lost, the main work of the thread loop - rfcomm_process_sessions() - is performed prior to sleeping. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> Change-Id: I03b9763f014b9bb243c3ff83828029d9f72e70d0 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35563 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-28PM: Fix printing IRQ names for pending wakeup IRQsTodd Poynor
The IRQ name has moved to the struct irqaction list (so print first action's name). Change-Id: I65a627457f9abaf7c1dcc32d8814243ba2ff4717 Signed-off-by: Todd Poynor <toddpoynor@google.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35552 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: QABUILD 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-28ARM: ux500: gpio-keys: Remove dynamic handling of pinsJonas Aaberg
Dynamic handling of pins does not work properly if done manually from suspend/resume hooks, so let's remove it for the time beeing. ST-Ericsson Linux next: - ST-Ericsson ID: 369952 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I3b130256b19af7feae9db0e4a1bd72c7856bb88c Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35405 Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com> 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-27ARM: ux500: SDI: enable DMA on all SDI devicesPer Forlin
Enable DMA again now when power save for MMC and DMA is in place. Patch is tested: * suspend and resume successfully in Android. * suspend video playback from sd-card and resume it successfully in Android. ST-Ericsson ID: 370129 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I4eb9367c3feeb8661e33035d4d3022205b9e924b Signed-off-by: Per Forlin <per.forlin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35325 Reviewed-by: Stefan NILSSON9 <stefan.xk.nilsson@stericsson.com> Tested-by: Stefan NILSSON9 <stefan.xk.nilsson@stericsson.com> Reviewed-by: Ulf HANSSON <ulf.hansson@stericsson.com>
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-27mach-ux500: Fixup use of supend|resume_noirqUlf Hansson
Changes needed due to the following commit: PM: Limit race conditions between runtime PM and system sleep (v2) Previously it was was possible for drivers doing pm_runtime_suspend and pm_runtime_put_sync directly from it's suspend callbacks. Now suspend_noirq shall be used, thus this is implemented for AMBA. Additionally pm_runtime is now disabled during system suspend, meaning "pm_runtime_status_suspended" must be used in suspend|resume_noirq context instead of "pm_runtime_suspended". Change-Id: Idda935d422884ecb3c4b6f5e415cd2e0077b06c7 Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35504 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
2011-10-27PM / Runtime: Add new helper function: pm_runtime_status_suspended()Kevin Hilman
This boolean function simply returns whether or not the runtime status of the device is 'suspended'. Unlike pm_runtime_suspended(), this function returns the runtime status whether or not runtime PM for the device has been disabled or not. Also add entry to Documentation/power/runtime.txt Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Change-Id: I2e31841f087b5d44a0f4d6e2f8bba2d08cfc7b64 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35338 Reviewed-by: QABUILD Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Ulf HANSSON <ulf.hansson@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 / Runtime: Update documentation of interactions with system sleepRafael J. Wysocki
The documents describing the interactions between runtime PM and system sleep generally refer to the model in which the system sleep state is entered through a global firmware or hardware operation. As a result, some recommendations given in there are not entirely suitable for systems in which this is not the case. Update the documentation to take the existence of those systems into account. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Reviewed-by: Kevin Hilman <khilman@ti.com> Change-Id: I926b72b01331e563d2e4a1e3b48c9e4c2ce29a05 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35336 Reviewed-by: QABUILD Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Ulf HANSSON <ulf.hansson@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-27header files: install STE multimedia headersThierry STRUDEL
Installs STE multimedia header files to allow building the STE Ux5xx STELP. ST-Ericsson Linux next: NA ST-Ericsson ID: 322357 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I07829a94862f6178e4c291a7dd9371ed146858d3 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34893 Reviewed-by: Thierry STRUDEL <thierry.strudel@stericsson.com> Tested-by: Thierry STRUDEL <thierry.strudel@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-27suspend: plug/unplug non-boot cpus in threadsJonas Aaberg
In order to save >100ms during resume, plugging and unplugging the secondary cpus are done in separate threads instead of in sequence with device suspend/resume calls. ST-Ericsson Linux next: Not tested, ask SSM for ER ST-Ericsson ID: ER356920 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ie2b28595e777b056e486ae6c3d90736bb274a307 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34871 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>