aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-13imx53: Make perf compile on Androidlt-3.2-imx5+androidBernhard Rosenkraenzer
Change-Id: Ifcfa381c423fbe6b6cd50aea1c0873ad28128e0a Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2012-02-22imx53: Various trivial compile fixesBernhard Rosenkraenzer
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2012-02-22imx5: Add defconfig for imx5/android/3.2Bernhard Rosenkraenzer
2012-02-22Merge branch 'linaro-androidization-3.2' of ↵Bernhard Rosenkraenzer
git://git.linaro.org/landing-teams/working/ti/kernel into lt-3.2-imx5+android
2012-01-09correct close bracketAndy Green
Signed-off-by: Andy Green <andy.green@linaro.org>
2012-01-09enforce zero diffAndy Green
Ran out of time to clean these up, they are whitespace or dead code. Signed-off-by: Andy Green <andy.green@linaro.org>
2012-01-09misc: add akm8975 compass driverColin Cross
Originally written by HTC. Contributions by Motorola and AKM. misc: Import akm8975 from Motorola Major style and code cleanups by Praveen Bharathi <pbharathi@motorola.com> misc: akm8975: clean up code violations in akm8975.c misc: akm8975: Clean up coding style, add suspend and resume Change-Id: I4196913f15aec2dfbed47506d3dc085aada8e92d Signed-off-by: Dima Zavin <dima@android.com>
2012-01-09Staging: android: timed_gpio: Properly discard invalid timeout values.Mike Lockwood
The timed output device never previously checked the return value of sscanf, resulting in an uninitialized int being passed to enable() if input value was invalid. Signed-off-by: Mike Lockwood <lockwood@android.com>
2012-01-09android: logger: Add new system log for framework/system log messagesSan Mehat
Signed-off-by: San Mehat <san@google.com>
2012-01-09Staging: android: timed_gpio: Request gpios.=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=
MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9e98250a04e5505ce2db2edd355e8fdf8391cabd Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-01-09FAT: Add new ioctl VFAT_IOCTL_GET_VOLUME_ID for reading the volume ID.Mike Lockwood
Signed-off-by: Brian Swetland <swetland@google.com>
2012-01-09fuse: Freeze client on suspend when request sent to userspaceTodd Poynor
Suspend attempts can abort when the FUSE daemon is already frozen and a client is waiting uninterruptibly for a response, causing freezing of tasks to fail. Use the freeze-friendly wait API, but disregard other signals. Change-Id: Icefb7e4bbc718ccb76bf3c04daaa5eeea7e0e63c Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-01-09block: genhd: Add partition name to the partition info uevent callbackBrian Swetland
For disk and partition devices, add new uevent parameter: PARTNAME specifices the partition name of a partition device Signed-off-by: Dima Zavin <dima@android.com>
2012-01-09fs: partitions: Fix warnings in fs/partitions/check.cColin Cross
Change-Id: I4398ace0c55d4833b1fcbb7a4e71ab8f0b1b044a Signed-off-by: Colin Cross <ccross@android.com>
2012-01-09block: genhd: Add disk/partition specific uevent callbacks for partition infoSan Mehat
For disk devices, a new uevent parameter 'NPARTS' specifies the number of partitions detected by the kernel. Partition devices get 'PARTN' which specifies the partitions index in the table. Signed-off-by: San Mehat <san@google.com>
2012-01-09fs: yaffs: don't force YAFFS_TRACE_ALWAYS for all trace levelsDima Zavin
Change-Id: I9ddc676382d26aef7f12145d412fe670cb486317 Signed-off-by: Dima Zavin <dima@android.com>
2012-01-09fs: yaffs: Import yaffs from Thu Dec 23 13:31:37 2010 +1300=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=
commit ddf33fed15c2376bfb602d62dd018c63fce60df8 Author: Timothy Manning <tfhmanning@gmail.com> Date: Thu Dec 23 13:31:37 2010 +1300 yaffs updated direct/timothy_tests/quick_tests Signed-off-by: Timothy Manning <tfhmanning@gmail.com> Change-Id: I5bbe5a05277bdf8a6fe188bbe4c77725b3fa2aae Signed-off-by: Dima Zavin <dima@android.com>
2012-01-09fs: block_dump: Don't display inode changes if block_dump < 2San Mehat
Signed-off-by: San Mehat <san@android.com>
2012-01-09android-common: include linux/slab.h=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=
Change-Id: Ib9655177bfaf00bd5682e1ac0d7e813e16a47eea
2012-01-09android-common: Fix slab.h includes for 2.6.34-rc4Colin Cross
2012-01-09binder: Fix memory corruption via page aliasingChristopher Lais
binder_deferred_release was not unmapping the page from the buffer before freeing it, causing memory corruption. This only happened when page(s) had not been freed by binder_update_page_range, which properly unmaps the pages. This only happens on architectures with VIPT aliasing. To reproduce, create a program which opens, mmaps, munmaps, then closes the binder very quickly. This should leave a page allocated when the binder is released. When binder_deferrred_release is called on the close, the page will remain mapped to the address in the linear proc->buffer. Later, we may map the same physical page to a different virtual address that has different coloring, and this may cause aliasing to occur. PAGE_POISONING will greatly increase your chances of noticing any problems. Change-Id: I6941bf212881b8bf846bdfda43d3609c7ae4892e Signed-off-by: Christopher Lais <chris+android@zenthought.org>
2012-01-09Staging: android: binder: Create dedicated workqueue for binder deferred work=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=
MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some drivers flush the global workqueue when closed. This would deadlock if the last reference to the file was released from the binder. Change-Id: Ifdabc0b383fecb20836d1bbb9786c632402a14e1 Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-01-09binder: Move debugging information from procfs to debugfs=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=
MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia0f9c8cec68054c6600a799ef864ebf1185c93ab Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-01-09binder: Use seq_file for debug interface.=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=
MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6e9c064ba024329099cb833b2ae9ab43c2ad8c6d Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-01-09ARM: idle: update idle ticks before call idle end notifierTodd Poynor
Such that interactive cpufreq governor uses up-to-date idle time information. Reported by Colin Cross <ccross@android.com> Change-Id: I06425444f800f803afc9dc7a6ad0fdb46c918bb6 Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-01-09PM: runtime: add might_sleep to PM runtime functionsColin Cross
The list of functions that can be called in atomic context is non-intuitive (pm_runtime_put_sync can not, but pm_runtime_put_sync_suspend can, if pm_runtime_irq_safe has been called?). The code is actively misleading - the entry points all start with spin_lock_irqsave, suggesting they are safe to call in atomic context, but may later enable interrupts. Add might_sleep_if to all the __pm_runtime_* entry points to enforce correct usage. Also add pm_runtime_put_sync_autosuspend to the list of functions that can be called in atomic context. Change-Id: Icac17a10d77c64d44bd2761a91a588dfd1d0c6f0 Signed-off-by: Colin Cross <ccross@android.com>
2012-01-09cpuidle: governor: menu: don't use loadavgColin Cross
get_loadavg doesn't work as intended. According to the comments, it should be returning an average over a few seconds, but it is actually reading the instantaneous load. It is almost always returning 0, but can sometimes, depending on workload, spike very high into the hundreds even when the average cpu load is under 10%. Disable it for now. Change-Id: I63ed100af1cf9463549939b8113ed83676db5f86 Signed-off-by: Colin Cross <ccross@android.com>
2012-01-09PM: Increase dpm suspend timeoutBenoit Goby
usbhid devices have a 10s timeout waiting for the out queue to clear. Increased the watchdog to 12s. Change-Id: I96368fca6dff98e4eba8aedb09c23be964c8f4b4 Signed-off-by: Benoit Goby <benoit@android.com>
2012-01-09PM: Backoff suspend if repeated attempts failTodd Poynor
Change-Id: I32289676d95a307ea3aa5e78f6c126ca979c0fec Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-01-09PM: 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>
2012-01-09power: Add option to log time spent in suspendColin Cross
Prints the time spent in suspend in the kernel log, and keeps statistics on the time spent in suspend in /sys/kernel/debug/suspend_time Change-Id: Ia6b9ebe4baa0f7f5cd211c6a4f7e813aefd3fa1d Signed-off-by: Colin Cross <ccross@android.com> Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-01-09PM: Change dpm watchdog to support async suspendBenoit Goby
Exclude from the watchdog the time spent waiting for children that are resumed asynchronously and time every devices, whether or not they resumed synchronously. Change-Id: I84209dfd5df72842e045096c906fd61e20e6d183 Signed-off-by: Benoit Goby <benoit@android.com>
2012-01-09Print pending wakeup IRQ preventing suspend to dmesgTodd Poynor
Change-Id: I36f90735c75fb7c7ab1084775ec0d0ab02336e6e Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-01-09PM: Dump suspend thread stack on dpm suspend timeoutBenoit Goby
When a driver takes more than 3 seconds to suspend, dump the suspend thread stack since BUG() might only dump the idle thread stack. Change-Id: If854db355fdcf3b773ea20b1b5e031def6d4b114 Signed-off-by: Benoit Goby <benoit@android.com>
2012-01-09power_supply: Hold a wake_lock while power supply change notifications are ↵=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=
pending MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When connecting usb or the charger the device would often go back to sleep before the charge led and screen turned on. Change-Id: I01def6d86ddece0d4e31d2a91d176ed0975b6b9d Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-01-09rtc another module.hAndy Green
Signed-off-by: Andy Green <andy.green@linaro.org>
2012-01-09rtc add module.hAndy Green
Signed-off-by: Andy Green <andy.green@linaro.org>
2012-01-09HACK: time: Disable alarmtimerColin Cross
kernel/time/alarmtimer.c conflicts with drivers/rtc/alarm.c, disable it for now. Change-Id: I6cdb3b885828d45836a54971adf16143039b0a0e Signed-off-by: Colin Cross <ccross@android.com>
2012-01-09rtc alarm: fix bad index when canceling alarms[]JP Abgrall
It was using ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK as an index. Change-Id: I919860cc71254453e382616bce9fd5455802cb3d Signed-off-by: JP Abgrall <jpa@google.com>
2012-01-09rtc: alarm: Update hrtimer if alarm at the head of the queue is reprogrammed=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=
MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If an alarm was restarted with a value that moved it away from the head of a queue, the hrtimer would not be updated. This would cause unnecessary wakeups. Change-Id: If379f8dd92b0bdb3173bd8d057adfe0dc1d15259 Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-01-09rtc: alarm: Don't use save_time_delta.=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=
MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iaefeca497de02fe36b7f5d79075912f6e349ec53 Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-01-09rtc: alarm: Add in-kernel alarm interface=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=
MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drivers can now create alarms that will use an hrtimer while the system is running and the rtc to wake up from suspend. Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-01-09Disable Android alarm driver by defaultPraneeth Kumar Bajjuri
tmp: do not enable Android alarm driver by default Change-Id: Iff8f7a65c4eceecfd084074937c72824697b5e7f Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
2012-01-09rtc: Add android alarm driver.=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=
2012-01-09Bluetooth: Fix l2cap conn failures for ssp devicesPeter Hurley
Commit 330605423c fixed l2cap conn establishment for non-ssp remote devices by not setting HCI_CONN_ENCRYPT_PEND every time conn security is tested (which was always returning failure on any subsequent security checks). However, this broke l2cap conn establishment for ssp remote devices when an ACL link was already established at SDP-level security. This fix ensures that encryption must be pending whenever authentication is also pending. Change-Id: I6876ea5134e90d1f3d0f84e8ed40b92977b3df64 Signed-off-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
2012-01-09Bluetooth: Clean up some code style issuesWaldemar Rymarkiewicz
Fix lines longer than 80 chars in length. Change-Id: I448077965c5f7723a4a9537977bfa664cfe104fd Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
2012-01-09Bluetooth: Allow unsegmented SDU retries on sock_queue_rcv_skb failureRuiyi Zhang
In L2CAP_SDU_UNSEGMENTED case, if sock_queue_rcv_skb returns error, l2cap_ertm_reassembly_sdu should not return 0 so as to insert the skb into BUSY_QUEUE for later retries. Signed-off-by: Ruiyi Zhang <Ruiyi.Zhang@Atheros.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
2012-01-09Bluetooth: fix set but not used warningGustavo F. Padovan
Change-Id: I6b5be004cdb85fee096f82eb4a599edba3af7e67 Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
2012-01-09Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections.Nick Pelly
__u16 sco_pkt_type is introduced to struct sockaddr_sco. It allows bitwise selection of SCO/eSCO packet types. Currently those bits are: 0x0001 HV1 may be used. 0x0002 HV2 may be used. 0x0004 HV3 may be used. 0x0008 EV3 may be used. 0x0010 EV4 may be used. 0x0020 EV5 may be used. 0x0040 2-EV3 may be used. 0x0080 3-EV3 may be used. 0x0100 2-EV5 may be used. 0x0200 3-EV5 may be used. This is similar to the Packet Type parameter in the HCI Setup Synchronous Connection Command, except that we are not reversing the logic on the EDR bits. This makes the use of sco_pkt_tpye forward portable for the use case of white-listing packet types, which we expect will be the primary use case. If sco_pkt_type is zero, or userspace uses the old struct sockaddr_sco, then the default behavior is to allow all packet types. Packet type selection is just a request made to the Bluetooth chipset, and it is up to the link manager on the chipset to negiotiate and decide on the actual packet types used. Furthermore, when a SCO/eSCO connection is eventually made there is no way for the host stack to determine which packet type was used (however it is possible to get the link type of SCO or eSCO). sco_pkt_type is ignored for incoming SCO connections. It is possible to add this in the future as a parameter to the Accept Synchronous Connection Command, however its a little trickier because the kernel does not currently preserve sockaddr_sco data between userspace calls to accept(). The most common use for sco_pkt_type will be to white-list only SCO packets, which can be done with the hci.h constant SCO_ESCO_MASK. This patch is motivated by broken Bluetooth carkits such as the Motorolo HF850 (it claims to support eSCO, but will actually reject eSCO connections after 5 seconds) and the 2007/2008 Infiniti G35/37 (fails to route audio if a 2-EV5 packet type is negiotiated). With this patch userspace can maintain a list of compatible packet types to workaround remote devices such as these. Based on a patch by Marcel Holtmann. Rebased to 2.6.39. Change-Id: Ide1c89574fa4f6f1b9218282e1af17051eb86315 Signed-off-by: Nick Pelly <npelly@google.com>
2012-01-09Bluetooth: Add ACL MTU, available buffers and total buffers to hci_conn_info.Nick Pelly
This provides userspace debugging tools access to ACL flow control state. Signed-off-by: Nick Pelly <npelly@google.com>