summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-12-17cgroup: Set CGRP_RELEASABLE when adding to a cgroupColin Cross
Changes the meaning of CGRP_RELEASABLE to be set on any cgroup that has ever had a task or cgroup in it, or had css_get called on it. The bit is set in cgroup_attach_task, cgroup_create, and __css_get. It is not necessary to set the bit in cgroup_fork, as the task is either in the root cgroup, in which can never be released, or the task it was forked from already set the bit in croup_attach_task. Signed-off-by: Colin Cross <ccross@android.com>
2010-12-14USB: gadget: composite: Use separate switches for connected and config stateMike Lockwood
Also remove disconnect debouncing, which didn't actually work on some platforms Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13PM: Wait for completion of the parent resume before resumingBenoit Goby
If the parent device is in the DPM_RESUMING state, resume might get called before the parent's resume has completed, because dpm_wait won't get called. This issue was introduced by: 3d46a3c PM: Prevent waiting forever on asynchronous resume after abort Wait for completion of the parent resume if the parent state is >= DPM_OFF or == DPM_RESUMING Change-Id: I14a4e16426f61efceaefedc7e772f53b7522b5dd Signed-off-by: Benoit Goby <benoit@android.com>
2010-12-13net: wireless: bcm4329: Update to Version 4.218.248-17Greg Goldman
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-12-11USB: gadget: acm,rndis: IAD class, subclass & prot should match 1st ifaceJohn Michelau
Microsoft recommends that the class and subclass fields of an IAD match the same fields from the first interface in the collection that the IAD is grouping. In practice, we are also finding that the protocol fields should also match. Without this change, the default Microsoft composite driver may not group interfaces properly, which is what allows child function drivers with IAD's to load correctly. Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-11USB: gadget: composite: Dynamically set IAD bFirstInterfaceJohn Michelau
bFirstInterface should be set equal to bInterfaceNumber of the first interface in a grouping. It's currently being set only when a composite device is bound, and it does not get updated when functions are enabled or disabled. Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-11USB: gadget: android Fix gadget descriptor compliance for IAD'sJohn Michelau
USB-IF core team mandates that composite devices containing IAD's must use bDeviceClass=0xEF, bDeviceSubClass=0x02, & bDeviceProtocol=0x01 instead of the usual 0x00 in all fields. This is not a problem currently on Linux hosts, but it is a problem when connecting to Windows hosts. Without this change the default Microsoft composite driver will not group interfaces properly, which is what allows child function drivers with IAD's to load correctly. Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-08Revert "futex: Restore one of the fast paths eliminated by ↵Dima Zavin
38d47c1b7075bd7ec3881141bb3629da58f88dab" This reverts commit cb93471ed5d924b6efdfe5d0215668a9b4b91c21. Change-Id: I7f0b45c29b3b91ba5282c51eb6b315d70ac6c813 Signed-off-by: Dima Zavin <dima@android.com>
2010-12-07net: wireless: bcm4329: Add CONFIG_FIRST_SCAN optionGreg Goldman
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-12-03usb: gadget: Multiple ACM gadget instancesJohn Michelau
- Added multiple ACM instance support in Android gadget - Fixed multiple instance naming issue in ACM function - Increased max instances from 4 to 8 Change-Id: I65f1b0be94da859bab7ec0ad7cd804b896c7c4c5 Signed-off-by: John Michelau <john.michelau@motorola.com>
2010-12-03usb: gadget: Fixed Android gadget function discovery & product matchingJohn Michelau
- Don't bind until all required functions have registered - Consider multi-instance functions when matching products Change-Id: I6fa10567db71d49cd81968c01d75e326ff9a17c8 Signed-off-by: John Michelau <john.michelau@motorola.com>
2010-12-03net: wireless: bcm4329: Fix memory leak in case of dhd_bus_init() failureDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-12-03cpufreq interactive governor save/restore IRQs around cpumask spinlocksTodd Poynor
Need to use irqsave/restore spin locking for cpumasks since these are accessed in timers and in thread context. Change-Id: I4a53eaf0ced7e73b445feddba90ec11482de9126 Signed-off-by: Todd Poynor <toddpoynor@google.com>
2010-12-02net: wireless: bcm4329: Fix driver 'start' retry abilityDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-12-02net: wireless: bcm4329: Fix watchdog syncronization during start/stopDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-12-01ext4: initialize the percpu counters before replaying the journalTheodore Ts'o
We now initialize the percpu counters before replaying the journal, but after the journal, we recalculate the global counters, to deal with the possibility of the per-blockgroup counts getting updated by the journal replay. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-12-01fuse: fix attributes after open(O_TRUNC)Ken Sumrall
The attribute cache for a file was not being cleared when a file is opened with O_TRUNC. If the filesystem's open operation truncates the file ("atomic_o_trunc" feature flag is set) then the kernel should invalidate the cached st_mtime and st_ctime attributes. Also i_size should be explicitly be set to zero as it is used sometimes without refreshing the cache. Signed-off-by: Ken Sumrall <ksumrall@android.com> Cc: Anfei <anfei.zhou@gmail.com> Cc: "Anand V. Avati" <avati@gluster.com> Signed-off-by: Miklos Szeredi <miklos@szeredi.hu> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-12-01cpufreq: interactive: New 'interactive' governorMike Chan
This governor is designed for latency-sensitive workloads, such as interactive user interfaces. The interactive governor aims to be significantly more responsive to ramp CPU quickly up when CPU-intensive activity begins. Existing governors sample CPU load at a particular rate, typically every X ms. This can lead to under-powering UI threads for the period of time during which the user begins interacting with a previously-idle system until the next sample period happens. The 'interactive' governor uses a different approach. Instead of sampling the CPU at a specified rate, the governor will check whether to scale the CPU frequency up soon after coming out of idle. When the CPU comes out of idle, a timer is configured to fire within 1-2 ticks. If the CPU is very busy from exiting idle to when the timer fires then we assume the CPU is underpowered and ramp to MAX speed. If the CPU was not sufficiently busy to immediately ramp to MAX speed, then the governor evaluates the CPU load since the last speed adjustment, choosing the highest value between that longer-term load or the short-term load since idle exit to determine the CPU speed to ramp to. A realtime thread is used for scaling up, giving the remaining tasks the CPU performance benefit, unlike existing governors which are more likely to schedule rampup work to occur after your performance starved tasks have completed. The tuneables for this governor are: /sys/devices/system/cpu/cpufreq/interactive/min_sample_time: The minimum amount of time to spend at the current frequency before ramping down. This is to ensure that the governor has seen enough historic CPU load data to determine the appropriate workload. Default is 80000 uS. /sys/devices/system/cpu/cpufreq/interactive/go_maxspeed_load The CPU load at which to ramp to max speed. Default is 85. Change-Id: Ib2b362607c62f7c56d35f44a9ef3280f98c17585 Signed-off-by: Mike Chan <mike@android.com> Signed-off-by: Todd Poynor <toddpoynor@google.com> Bug: 3152864
2010-11-22net: wireless: bcm4329: Add 'setdfschannels' commandDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-19usb: gadget: rndis: don't use dev_get_statsBenoit Goby
Since 2.6.36, spin_lock_bh has been added to dev_txq_stats_fold. So dev_get_stats cannot be called from atomic context. Replaced it by netdev_stats_to_stats64 to copy the stats directly. This will work if the device driver does not need txq tx stats folding. http://lkml.org/lkml/2010/9/20/250 Change-Id: I715b00892beda56cc369139d6e2bdc9efb6bfe79 Signed-off-by: Benoit Goby <benoit@android.com>
2010-11-18net: wireless: bcm4329: Use non-DFS channels only for USDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-18net: wireless: bcm4329: Improve way to detect BT SCO connection for BT-coexGreg Goldman
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-18net: wireless: bcm4329: Update to Version 4.218.248-15Greg Goldman
- Increase default Listen Interval to 20 Beacons - Add logic to adjust SKIP_DTIM if Listen Interval < DTIM * DTIM_SKIP to avoid data lost due to fact that packet maybe not retrieved during Listen Interval and AP may toss it - Fix problem with Hidden AP setting after AP reconfigure - Add new SoftAP optional parameter as COUNTRY to pass country code to SoftAP Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-17net: wireless: bcm4329: Set first channel passive scan to 30 msDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-17ARM: fiq_debugger: Add help commandDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-17USB: gadget: f_mtp: Zero length packet fixesMike Lockwood
Send zero length packets at end of transfers that are a multiple of the bulk max packet size as required by MTP. Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-17misc: kernel_debugger: Add help commandDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-17USB: gadget: f_mtp: Support for file transfer length greater than 4 gigabytesMike Lockwood
For backward compatibility with PTP, MTP is limited to a 32-bit file size. When transferring files greater than 4 gig, MTP uses 0xFFFFFFFF as the file size and the receiver reads until it receives a short packet. Expanded size of mtp_file_range.length to 64 bits and added support for writing zero length packets. Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-15USB: gadget: f_mtp: Return zero result for successful file transfer.Mike Lockwood
Returning number of bytes transfered does not work for files > 2 gig since ioctl() result is a signed integer. Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-10net: wireless: bcm4329: Fix Softap start/stop race conditionsDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-10ARM: fiq_debugger: make fiq_debugger be in debug mode by defaultDima Zavin
Adds a config option that controls whether or not the console is on at boot, defaulting to no. Change-Id: Id4a3cad1c9dd4fb3c2b8c2298ca5d385a8bd0f8d Signed-off-by: Dima Zavin <dima@android.com>
2010-11-10USB: gadget: f_mtp: MTP driver cleanup:Mike Lockwood
Use a work queue instead of a separate thread for file transfer ioctls (note: the file transfer must be done on a kernel thread rather than in process context so vfs_read and vfs_write will use the correct address space for the buffers) Enforce requirement that only one ioctl call may be active at a time, and remove mutex in mtp_send_event that is now no longer necessary. Synchronize around use of shared variables to avoid SMP issues Fix mismatched calls to fget and fput Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-10Bluetooth: Add BT_POWER L2CAP socket option.Jaikumar Ganesh
Add BT_POWER socket option used to control the power characteristics of the underlying ACL link. When the remote end has put the link in sniff mode and the host stack wants to send data we need need to explicitly exit sniff mode to work well with certain devices (For example, A2DP on Plantronics Voyager 855). However, this causes problems with HID devices. Hence, moving into active mode when sending data, irrespective of who set the sniff mode has been made as a socket option. By default, we will move into active mode. HID devices can set the L2CAP socket option to prevent this from happening. Currently, this has been implemented for L2CAP sockets. This has been tested with incoming and outgoing L2CAP sockets for HID and A2DP. Based on discussions on linux-bluetooth and patches submitted by Andrei Emeltchenko. Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
2010-11-10Revert "Bluetooth: Hack: Do not use power_save feature."Jaikumar Ganesh
This reverts commit 3b02c046c3dfef5b5c4fa0c45b69654c107c7403. Signed-off-by: Jaikumar Ganesh<jaikumar@google.com>
2010-11-09net: wireless: bcm4329: Add FW Reload event processingGreg Goldman
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-09net: wireless: bcm4329: Enable KEEP_ALIVE featureDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-09net: wireless: bcm4329: Fix watchdog termination after 'driver stop'Dmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-05net: wireless: bcm4329: Update to version 4.218.248-12Greg Goldman
- Fix crash during Specific Scan handling - Fix potential insmod crash by increase Registration Timeout to 12 sec - Added max time restriction to PNO scan timer - New IWPRIV "AP_STA_DISASSOC" to disassoc STAs in SoftAP mode - Add new setting to SoftAP "AP_SET_CFG" to enable Hidden SSID - Fixs bugs for SoftAP AP_SET_MAC_FLTR iwpriv commnd - Add STAs rssi filed to SoftAP "AP_GET_STA_LIST" IWPRIV commnd Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-04net: wireless: bcm4329: Add check for out of bounds scan bufferDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-04pm_qos: Fix reversed min and maxColin Cross
pm_qos_get_value had min and max reversed, causing all pm_qos requests to have no effect. Broken by the plist conversion, sha 5f279845f9d684661563894d44729a0c706375b4. Change-Id: I252c764821eac8d94de57eb482c05bf6afcea15b Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: mark gross <markgross@thegnar.org> Cc: James Bottomley <James.Bottomley@suse.de> Cc: stable <stable@kernel.org> Signed-off-by: Colin Cross <ccross@android.com>
2010-11-03net: wireless: bcm4329: Check for out of bounds in scan results parsingDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-02net: wireless: bcm4329: Update to version 4.218.248-11Greg Goldman
Check for 'driver start' failure, Set keep-alive feature forever Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-02net: wireless: bcm4329: Fix race conditions for sysioc_threadDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-10-29ext4: fix kernel oops if the journal superblock has a non-zero j_errnoTheodore Ts'o
Commit 84061e0 fixed an accounting bug only to introduce the possibility of a kernel OOPS if the journal has a non-zero j_errno field indicating that the file system had detected a fs inconsistency. After the journal replay, if the journal superblock indicates that the file system has an error, this indication is transfered to the file system and then ext4_commit_super() is called to write this to the disk. But since the percpu counters are now initialized after the journal replay, the call to ext4_commit_super() will cause a kernel oops since it needs to use the percpu counters the ext4 superblock structure. The fix is to skip setting the ext4 free block and free inode fields if the percpu counter has not been set. Thanks to Ken Sumrall for reporting and analyzing the root causes of this bug. Addresses-Google-Bug: #3054080 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-10-25sdhci: Always pass clock request value zero to set_clock host opTodd Poynor
To allow the set_clock host op to disable the SDCLK source when not needed, always call the host op when the requested clock speed is zero. Do this even if host->clock already equals zero, because the SDHCI driver may set that value (without calling the host op) to force an update at the next (non-zero-speed) call. Change-Id: If99230d76138679b5767f77cb925f15408ae518e Signed-off-by: Todd Poynor <toddpoynor@google.com>
2010-10-25[ARM] fiq_debugger: Print local timer irqs countRebecca Schultz Zavin
Prints the number of local timer irqs on each cpu when the irqs command is executed. Change-Id: Ic70fa9f528d98996fabb2d0cc80e937c5b239c1a Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2010-10-22net: wireless: bcm4329: Improve BT-coex for eSCOGreg Goldman
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-10-21Merge commit 'v2.6.36' into android-2.6.36Dima Zavin
2010-10-21staging: remove Greg's TODO, now obsolete.Brian Swetland
Signed-off-by: Brian Swetland <swetland@google.com>
2010-10-20Linux 2.6.36v2.6.36Linus Torvalds