aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-06wakeup: Use irqsave/irqrestore for events_locktracking-linaro-android-3.6-llct-20120910.0tracking-linaro-android-3.6-llct-20120907.1tracking-linaro-android-3.6-llct-20120907.0John Stultz
Jon Medhurst (Tixy) recently noticed a problem with the events_lock usage. One of the Android patches that uses wakeup_sources calls wakeup_source_add() with irqs disabled. However, the event_lock usage in wakeup_source_add() uses spin_lock_irq()/spin_unlock_irq(), which reenables interrupts. This results in lockdep warnings. The fix is to use spin_lock_irqsave()/spin_lock_irqrestore() instead for the events_lock. Full bug report here: https://bugs.launchpad.net/linaro-landing-team-arm/+bug/1037565 Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: Android Team <kernel-team@android.com> Cc: Arve Hjønnevåg <arve@android.com> Reported-and-debugged-by: Jon Medhurst (Tixy) <tixy@linaro.org> Signed-off-by: John Stultz <john.stultz@linaro.org>
2012-08-10Staging: android: binder: Add some missing binder_stat_br callstracking-linaro-android-3.6-llct-20120903.0tracking-linaro-android-3.6-llct-20120822.0tracking-linaro-android-3.6-llct-20120821.0tracking-linaro-android-3.6-llct-20120820.1tracking-linaro-android-3.6-llct-20120820.0tracking-linaro-android-3.6-llct-20120816.0tracking-linaro-android-3.6-llct-20120814.0tracking-linaro-android-3.6-llct-20120813.0Arve Hjønnevåg
Cached thread return errors, death notifications and new looper requests were not included in the stats. Change-Id: Iabe14b351b662d3f63009ecb3900f92fc3d72cc4 Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-08-10cgroup: Fixup mismergeJohn Stultz
Tixy noticed: I'm using linaro-android-3.5-jstultz-rebase and notice that this patch: http://git.linaro.org/gitweb?p=people/jstultz/android.git;a=commit;h=ea41cae1ff4a919082afe28fbe9ae0e7b00af8d doesn't delete a chunk in put_css_set that was deleted in the upstream/android-3.4 tree: http://git.linaro.org/gitweb?p=people/jstultz/android.git;a=commit;h=befae2f2c9137d6af5c8b38670f00441019032bb The erroneous chunk seems to come from mainline Linux code and deleting it gets things compiling again (see patch at bottom of email). I don't know how to test the affected code as it doesn't seem to get executed just by enabling cgroups and booting Android. BTW, I enabled cgroups because the prototype scheduler code for Asymmetric Multi Processing depends on it, but I have no idea about how it's going to be used. This patch resolves the mismerge by deteling the chunk in question. Signed-off-by: John Stultz <john.stultz@linaro.org>
2012-08-10PM: earlysuspend: Hack Compatability shim layer for earlysuspend sysfs files.John Stultz
Since early suspend was dropped in 3.3 kernels, old (4.1 and lower) versions of Android userland poll looking for /sys/power/wait_for_fb_sleep and /sys/power/wait_for_fb_wake. This burns cpu time, affecting performance and adds noise to the log. So I've found the driver that adds theses files and hacked out its dependency on the earlysuspend infrastructure, so calls to /sys/power/wait_for_fb_sleep block and /sys/power/wait_for_fb_wake always return awake. The compatability shim originated with the following commit: commit 6753172b8a439cf9ac466e7dc31780a39f255ec2 Author: Rebecca Schultz <rschultz@google.com> Date: Thu Jul 17 18:14:55 2008 -0700 PM: earlysuspend: Removing dependence on console. Rather than signaling a full update of the display from userspace via a console switch, this patch introduces 2 files int /sys/power, wait_for_fb_sleep and wait_for_fb_wake. Reading these files will block until the requested state has been entered. When a read from wait_for_fb_sleep returns userspace should stop drawing. When wait_for_fb_wake returns, it should do a full update. If either are called when the fb driver is already in the requested state, they will return immediately. Signed-off-by: Rebecca Schultz <rschultz@google.com> Signed-off-by: Arve Hjønnevåg <arve@android.com> [jstultz: Reworked as an interface shim so userland is happpy] Signed-off-by: John Stultz <john.stultz@linaro.org>
2012-08-10Hack around mmc_blk_set_blksize build issueJohn Stultz
Signed-off-by: John Stultz <john.stultz@linaro.org>
2012-08-10config: Set Andorid config options to default nJohn Stultz
Tixy noted some problems using combined source trees to build ubuntu kernels, as some Android features default on. This patch changes them to default N. Signed-off-by: John Stultz <john.stultz@linaro.org>
2012-08-10Input: Use monotonic time for event time stamps.Arve Hjønnevåg
Since wall time can jump backwards, it cannot be used to determine if one event occured before another or for how long a key was pressed. Signed-off-by: Arve Hjønnevåg <arve@android.com> [jstultz: Reworked to deal with new clkid switch. Until userland catches up, set all clkids to monotonic] Signed-off-by: John Stultz <john.stultz@linaro.org>
2012-08-10debug: add parameters to prevent entering debug mode on errorsColin Cross
On non-developer devices kgdb prevents CONFIG_PANIC_TIMEOUT from rebooting the device after a panic. Add module parameters debug_core.break_on_exception and debug_core.break_on_panic to allow skipping debug on panics and exceptions respectively. Both default to true to preserve existing behavior. Change-Id: I75dce7263e96cee069a9750920cce83dc6f98e8c Signed-off-by: Colin Cross <ccross@android.com>
2012-08-10net: wireless: bcmdhd: Fix division by 0 if dhd_watchdog_ms is 0Dmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-08-10sync: add poll supportErik Gilling
Change-Id: I294e481bba92658e6dd26f157ddbf0e9ff4ce8a5 Signed-off-by: Erik Gilling <konkers@android.com>
2012-08-10sw_sync: add fill_driver_data supportErik Gilling
Change-Id: Ib3812d282db56362d82f5ccc9a12b7d2100ab93a Signed-off-by: Erik Gilling <konkers@android.com>
2012-08-10sync: add ioctl to get fence dataErik Gilling
Change-Id: I71410aef7e03a52562f7cb15b993ac8441b1fa12 Signed-off-by: Erik Gilling <konkers@android.com>
2012-08-10sw_sync: add debug supportErik Gilling
Change-Id: Ibcc5fa8cb36e283cdf0e3308064876722e2675fc Signed-off-by: Erik Gilling <konkers@android.com>
2012-08-10sync: add debugfs supportErik Gilling
Change-Id: I8a7ea63e454fbeee1ecf17e6c3caff7c43b24734 Signed-off-by: Erik Gilling <konkers@android.com>
2012-08-10sync: add timestamps to sync_ptsErik Gilling
Change-Id: I2ad855072b86873880769a09a3176e85aa1199d7 Signed-off-by: Erik Gilling <konkers@android.com>
2012-08-10sw_sync: add cpu based sync driverErik Gilling
Change-Id: I1042851f5e30f9fdc2f35bdad84123bcf108560f Signed-off-by: Erik Gilling <konkers@android.com>
2012-08-10sync: Add synchronization frameworkErik Gilling
not run through checkpatch yet. Change-Id: I209f9db2824e0313f467f11ab09e5f54f0a4a6b5 Signed-off-by: Erik Gilling <konkers@android.com>
2012-08-10net: wireless: bcmdhd: Update to version 1.27Dmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-08-10usb: otg: otg-wakelock: Fix build for 3.4Benoit Goby
Change-Id: I97e21e9e6645bf18522675039e512f85fe836794 Signed-off-by: Benoit Goby <benoit@android.com>
2012-08-10trace: power: add trace_clock_set_parentColin Cross
Adds a new trace event to be called from clk_set_parent. Some cpufreq drivers, including Tegra, reparent the cpu clock to a slower clock while the main pll is relocking, tracing clk_set_parent allows traces to show how for long the cpu is running slower. Uses a separate TRACE_EVENT instead of the clock event class to allow the event to contain string names for the child and the parent. Signed-off-by: Colin Cross <ccross@android.com>
2012-08-10netfilter: xt_qtaguid: start tracking iface rx/tx at low levelJP Abgrall
qtaguid tracks the device stats by monitoring when it goes up and down, then it gets the dev_stats(). But devs don't correctly report stats (either they don't count headers symmetrically between rx/tx, or they count internal control messages). Now qtaguid counts the rx/tx bytes/packets during raw:prerouting and mangle:postrouting (nat is not available in ipv6). The results are in /proc/net/xt_qtaguid/iface_stat_fmt which outputs a format line (bash expansion): ifname total_skb_{rx,tx}_{bytes,packets} Added event counters for pre/post handling. Added extra ctrl_*() pid/uid debugging. Change-Id: Id84345d544ad1dd5f63e3842cab229e71d339297 Signed-off-by: JP Abgrall <jpa@google.com>
2012-08-10netfilter: xt_IDLETIMER: Add new netlink msg typeJP Abgrall
Send notifications when the label becomes active after an idle period. Send netlink message notifications in addition to sysfs notifications. Using a uevent with subsystem=xt_idletimer INTERFACE=... STATE={active,inactive} This is backport from common android-3.0 commit: beb914e987cbbd368988d2b94a6661cb907c4d5a with uevent support instead of a new netlink message type. Change-Id: I31677ef00c94b5f82c8457e5bf9e5e584c23c523 Signed-off-by: Ashish Sharma <ashishsharma@google.com> Signed-off-by: JP Abgrall <jpa@google.com>
2012-08-10Include if_pppolac.h and if_pppopns.h into header-y targetAndrey Konovalov
This is required to pass the headers_check Change-Id: Ic4c773973278cbdf1cb4eb66473826cb96ccbfb3 Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
2012-08-10security: Add proper checks for Android specific capability checksTushar Behera
Commit b641072 ("security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable().") introduces additional checks for AID_NET_xxx macros. Since the header file including those macros are conditionally included, the checks should also be conditionally executed. Change-Id: Iaec5208d5b95a46b1ac3f2db8449c661e803fa5b Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
2012-08-10cpufreq-interactive: Compile fixupJohn Stultz
Looks like AOSP has a compile bug. Fix it up. Signed-off-by: John Stultz <john.stultz@linaro.org>
2012-08-10cpufreq: interactive: add boost pulse interfaceTodd Poynor
Change-Id: Icf1e86d2065cc8f0816ba9c6b065eb056d4e8249 Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10cpufreq: interactive: set floor for boosted speedTodd Poynor
Allow speed to drop to flooor frequency but not below, don't pin to speed at last boost. Change-Id: I0147c2b7a2e61ba16820605af6baaf09570be787 Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10cpufreq: interactive: Add sysfs boost interface for hints from userspaceTodd Poynor
The explicit hint on/off version. Change-Id: Ibf62b6d45bf6fb8c9c055b9bdaf074ce9374c04f Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10cpufreq: interactive: remove unused target_validate_time_in_idleTodd Poynor
Change-Id: I37c5085b91318242612440dfd775ad762996612f Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10cpufreq: interactive: Boost frequency on touchscreen inputTodd Poynor
Based on previous patches by Tero Kristo <tero.kristo@nokia.com>, Brian Steuer <bsteuer@codeaurora.org>, David Ng <dave@codeaurora.org>, Antti P Miettinen <amiettinen@nvidia.com>, and Thomas Renninger <trenn@suse.de> Change-Id: Ic55fedcf6f9310f43a7022fb88e23b0392122769 Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10cpufreq: interactive: Separate speed target revalidate time and initial set timeTodd Poynor
Allow speed drop after min_sample_time elapses from last time the current speed was last re-validated as appropriate for current load / input boost. Allow speed bump after min_sample_time (or above_hispeed_delay) elapses from the time the current speed was originally set. Change-Id: Ic25687a7a53d25e6544c30c47d7ab6f27a47bee8 Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10cpufreq: interactive: base hispeed bump on target freq, not actualTodd Poynor
For systems that set a common speed for all CPUs, checking current speed here could bypass the intermediate hispeed bump decision for this CPU when another CPU was already at hispeed. This could result in an overly high setting (for all CPUs) in situations where all CPUs were about to drop to load levels that map to hispeed or below. Change-Id: I186f23dcfc5e2b6336cab8b0327f0c8a9a4482bc Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10net: wireless: bcmdhd: HACK - force active power modeDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-08-10cpufreq: interactive: adjust code and documentation to matchTodd Poynor
Change-Id: If59c668d514a29febe5c35404fd9d01df8548eb1 Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10cpufreq: interactive: configurable delay before raising above hispeedTodd Poynor
Change-Id: I4d6ac40b23a3790d48e30c37408284e9f955e8fa Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10cpufreq: interactive: don't drop speed if recently at higher loadTodd Poynor
Apply min_sample_time to the last time the current target speed was originally requested or re-validated as appropriate for the current load, not to the time since the current speed was originally set. Avoids periodic dips in speed during bursty loads. Change-Id: I250bda657985de60373f9897cc41f480664d51a1 Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10cpufreq: interactive: set at least hispeed when above hispeed loadTodd Poynor
If load is above go_hispeed_load, always go to at least hispeed_freq, even when reducing speed from a higher speed, not just when jumping up from minimum speed. Avoids running at a lower than intended speed after a burst of even higher load. Change-Id: I5b9d2a15ba25ce609b21bac7c724265cf6838dee Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10cpufreq: interactive: apply intermediate load to max speed not currentTodd Poynor
Evaluate spikes in load (below go_hispeed_load) against the maximum speed supported by the device, not the current speed (which tends to make it too difficult to raise speed to intermediate levels until very busy). Change-Id: Ib937006abf8bedb60891a739acd733e89b732ae0 Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10cpufreq interactive governor: event tracingTodd Poynor
Change-Id: Ic13614a3da2faa2d4bd215ca3eb7191614f0cf66 Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-08-10netfilter: xt_qtaguid: fix ipv6 protocol lookupJP Abgrall
When updating the stats for a given uid it would incorrectly assume IPV4 and pick up the wrong protocol when IPV6. Change-Id: Iea4a635012b4123bf7aa93809011b7b2040bb3d5 Signed-off-by: JP Abgrall <jpa@google.com>
2012-08-10netfilter: qtaguid: initialize a local var to keep compiler happy.JP Abgrall
There was a case that might have seemed like new_tag_stat was not initialized and actually used. Added comment explaining why it was impossible, and a BUG() in case the logic gets changed. Change-Id: I1eddd1b6f754c08a3bf89f7e9427e5dce1dfb081 Signed-off-by: JP Abgrall <jpa@google.com>
2012-08-10net: wireless: bcmdhd: Update to version 1.26Dmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-08-10ARM: etm: Add sysfs entry to enable return stack if supportedArve Hjønnevåg
Change-Id: Icb73d60324ad0ddfc3e8a450a28bb3d90c702788 Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-08-10ARM: etm: Add sysfs entry to disable branch_output flagArve Hjønnevåg
Change-Id: Ib91208a2c33621aa2d7bd9aa72bfbc670d9d5f1d Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-08-10ARM: etm: Add sysfs entry to set context-id-sizeArve Hjønnevåg
Change-Id: I520dfb6e593dac131de8b9b1db77f1c734f18c24 Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-08-10ARM: etm: Add sysfs entry to enable timestamps if supportedArve Hjønnevåg
Change-Id: Iff964ba2f6236ed81863e02ec7b3ec9fbc48044a Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-08-10ARM: etm: Check arch version and disable data tracing for ptmArve Hjønnevåg
Change-Id: If2cb7928d0711f48348443d882a12416be9c5910 Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-08-10ARM: etm: Wait for etm/ptm(s) to stop before requesting PowerDownArve Hjønnevåg
When PowerDown was requested at the same time as ProgBit, the formatter flush command that follows could get stuck. Change-Id: Iafb665f61f055819e64ca1dcb60398c656f593e4 Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-08-10net: wireless: bcmdhd: Update to Version 6.10.83.0 (1.23)Dmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-08-10HACK: bcmdhd: fix compile for 3.4Colin Cross
Disable the removed set_beacon/add_beacon interface, and add the new dBm parameter to cfg80211_rx_mgmt. Change-Id: Id68530e978886ef482bce51cc8233ffa76a86c5a Signed-off-by: Colin Cross <ccross@android.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 11:11:39 +0000