aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "ARM: cache-l2x0: update workaround for PL310 errata 727915"HEADmasterPraneeth Bajjuri2013-03-112-59/+15
| | | | This reverts commit 6cd07e44352d89c799df8bb0a88a864b15c91c47.
* netfilter: xt_qtaguid: fix bad tcp_time_wait sock handlingJP Abgrall2013-02-221-5/+11
| | | | | | | | Since (41063e9 ipv4: Early TCP socket demux), skb's can have an sk which is not a struct sock but the smaller struct inet_timewait_sock without an sk->sk_socket. Now we bypass sk_state == TCP_TIME_WAIT Signed-off-by: JP Abgrall <jpa@google.com>
* usb: gadget: Fix android gadget driver buildBenoit Goby2013-02-224-751/+43
| | | | | | | Removed obsolete f_adb function Change-Id: Idfb4110429bc0ea63f493c68ad667f49ca471987 Signed-off-by: Benoit Goby <benoit@android.com>
* HACK: usb: gadget: Fix enumeration on bootBenoit Goby2013-02-221-1/+9
| | | | | | | | | | | The Android gadget driver disconnects the gadget on bind and expects the gadget to stay disconnected until it calls usb_gadget_connect when userspace is ready. Removed the call to usb_gadget_connect in usb_gadget_probe_driver to avoid enabling the pullup before userspace is ready. Change-Id: I63707ac6e16a44eca52351a4bf80407d25fbd35e Signed-off-by: Benoit Goby <benoit@android.com>
* usb: gadget: android: Fixes and hacks to make android usb gadget compile on 3.8Arve Hjønnevåg2013-02-225-16/+10
| | | | Signed-off-by: Arve Hjønnevåg <arve@android.com>
* ARM: decompressor: Flush tlb before swiching domain 0 to client modeArve Hjønnevåg2013-02-221-0/+1
| | | | | | | | | If the bootloader used a page table that is incompatible with domain 0 in client mode, and boots with the mmu on, then swithing domain 0 to client mode causes a fault if we don't flush the tlb after updating the page table pointer. Signed-off-by: Arve Hjønnevåg <arve@android.com>
* ARM: mm: Split memory banks that span multiple sections when sparsemem is ↵Arve Hjønnevåg2013-02-221-0/+22
| | | | | | | | | enabled This fixes a crash in mem_init which assumes all pages in a memory bank are part of the same page array. Signed-off-by: Arve Hjønnevåg <arve@android.com>
* pstore/ram: Restore ecc information blockArve Hjønnevåg2013-02-222-2/+10
| | | | | | This was lost when proc/last_kmsg moved to pstore/console-ramoops. Signed-off-by: Arve Hjønnevåg <arve@android.com>
* mmc: block: Remove call to mmc_blk_set_blksizeArve Hjønnevåg2013-02-221-6/+1
| | | | | | It no longer exists. Signed-off-by: Arve Hjønnevåg <arve@android.com>
* gpu: ion: Remove __GFP_NO_KSWAPDArve Hjønnevåg2013-02-221-2/+2
| | | | | | It no longer exists. Signed-off-by: Arve Hjønnevåg <arve@android.com>
* gpu: ion: __dma_page_cpu_to_dev -> arm_dma_ops.sync_single_for_device hackArve Hjønnevåg2013-02-223-8/+13
| | | | Signed-off-by: Arve Hjønnevåg <arve@android.com>
* ARM: fiq_debugger: Update tty code for 3.8Arve Hjønnevåg2013-02-221-29/+38
| | | | Signed-off-by: Arve Hjønnevåg <arve@android.com>
* ARM: fiq_debugger: Use kmsg_dumper to dump kernel logsArve Hjønnevåg2013-02-221-30/+10
| | | | Signed-off-by: Arve Hjønnevåg <arve@android.com>
* ARM: fiq_debugger: Fix to compile on 3.7Arve Hjønnevåg2013-02-221-3/+4
| | | | | | Use for_each_irq_desc in arch/arm/common/fiq_debugger.c Signed-off-by: Arve Hjønnevåg <arve@android.com>
* usb: otg: otg-wakelock: Fix build for 3.7Arve Hjønnevåg2013-02-221-3/+6
| | | | Signed-off-by: Arve Hjønnevåg <arve@android.com>
* net: bluetooth: Remove the AID_NET_BT* gid numbersJP Abgrall2013-02-222-9/+5
| | | | | | | | Removed bluetooth checks for AID_NET_BT and AID_NET_BT_ADMIN which are not useful anymore. This is in preparation for getting rid of all the AID_* gids. Signed-off-by: JP Abgrall <jpa@google.com>
* sync: fix timeout = 0 wait behaviorJamie Gennis2013-02-221-4/+6
| | | | | Change-Id: I8b9254e92c26d9f44abbc0c77fb44624de947013 Signed-off-by: Jamie Gennis <jgennis@google.com>
* power: android-battery: push uevent whenever charge source changesTodd Poynor2013-02-191-0/+1
| | | | | | | | | Ensure userspace reads an up-to-date value for charging status whenever the charge source is updated. Avoid races where stale charging state may be reflected in userspace until the next battery state poll. Change-Id: Ia744db48584e9e9abf442710c279af9e3a25c079 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* power: android-battery: remove ac and usb suppliesTodd Poynor2013-02-191-76/+0
| | | | | | | Should no longer need to fix up AC/USB online state via these. Change-Id: I48d2ef0fbefee58cb47eafc11d9a44759920df7a Signed-off-by: Todd Poynor <toddpoynor@google.com>
* base: sync: Include seq_file.h in sync.hJonathan Hamilton2013-02-191-0/+1
| | | | | | | | sync.h uses struct seq_file in some function table prototypes. This causes compile failures when including the header in files that do not otherwise include seq_file.h Signed-off-by: Jonathan Hamilton <jonathan.hamilton@imgtec.com>
* netfilter: xt_qtaguid: Allow tracking loopbackJP Abgrall2013-02-191-15/+4
| | | | | | | | | In the past it would always ignore interfaces with loopback addresses. Now we just treat them like any other. This also helps with writing tests that check for the presence of the qtaguid module. Signed-off-by: JP Abgrall <jpa@google.com>
* sync: don't log wait timeouts when timeout = 0Erik Gilling2013-02-191-1/+1
| | | | Signed-off-by: Erik Gilling <konkers@android.com>
* netfilter: xt_qtaguid: extend iface stat to report protocolsJP Abgrall2013-02-193-43/+82
| | | | | | | | | | | | | In the past the iface_stat_fmt would only show global bytes/packets for the skb-based numbers. For stall detection in userspace, distinguishing tcp vs other protocols makes it easier. Now we report ifname total_skb_rx_bytes total_skb_rx_packets total_skb_tx_bytes total_skb_tx_packets {rx,tx}_{tcp,udp,ohter}_{bytes,packets} Bug: 6818637 Signed-off-by: JP Abgrall <jpa@google.com>
* gpu: ion: Only flush buffers in the chunk heap if they were used cachedRebecca Schultz Zavin2013-02-191-2/+3
| | | | | Change-Id: I4ffcf81a6be09e968310bbd882fb017415d61b48 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* gpu: ion: Refactor the code to zero buffersRebecca Schultz Zavin2013-02-194-26/+48
| | | | | | | | | Refactor the code in the system heap used to map and zero the buffers into a seperate utility so it can be called from other heaps. Use it from the chunk heap. Change-Id: I706341ae42b80bc4aae8a8614b4f73435bbf05d9 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* sync: Fix race condition between merge and signalØrjan Eide2013-02-191-3/+7
| | | | | | | | | | | | | | The copied sync_pt was activated immediately. If the sync_pt was signaled before the entire merge was completed, the new fence's pt_list could be iterated over while it is still in the process of being created. Moving the the sync_pt_activate call for all new sync_pts to after both the sync_fence_copy_pts and the sync_fence_merge_pts calls ensure that the pt_list is complete and immutable before it can be reached from the timeline's active list. Signed-off-by: Erik Gilling <konkers@android.com>
* cpufreq: interactive: fix race on governor start/stopLianwei Wang2013-02-191-4/+17
| | | | | | | | | | | | | There is race condition when both two cpu do CPUFREQ_GOV_STOP and one cpu do CPUFREQ_GOV_START soon. The sysfs_remove_group is not done yet on one cpu, but sysfs_create_group is called on another cpu, which cause governor start failed and then kernel panic in timer callback because the policy and cpu mask are all kfree in cpufreq driver. Replace atomic with mutex to lock the whole START/STOP sequence. Change-Id: I3762b3d44315ae021b8275aca84f5ea9147cc540 Signed-off-by: Lianwei Wang <a22439@motorola.com>
* netfilter: xt_qtaguid: remove AID_* dependency for access controlJP Abgrall2013-02-191-25/+26
| | | | | | | | | | qtaguid limits what can be done with /ctrl and /stats based on group membership. This changes removes AID_NET_BW_STATS and AID_NET_BW_ACCT, and picks up the groups from the gid of the matching proc entry files. Signed-off-by: JP Abgrall <jpa@google.com> Change-Id: I42e477adde78a12ed5eb58fbc0b277cdaadb6f94
* gpu: ion: Modify zeroing code so it only allocates address space onceRebecca Schultz Zavin2013-02-191-7/+21
| | | | | | | | | | vmap/vunmap spend a significant amount of time allocating the address space to map into. Rather than allocating address space for each page, instead allocate once for the entire allocation and then just map and unmap each page into that address space. Change-Id: I4a5c850717c80f75506a36b7ec2bcd55857b8dea Signed-off-by: Rebecca Schultz Zavin <rschultz@google.com>
* cpufreq: interactive: fix deadlock on spinlock in timerTodd Poynor2013-02-191-12/+17
| | | | | | | | Need to use irqsave/restore spinlock calls to avoid a deadlock in calls from the timer. Change-Id: I15b6b590045ba1447e34ca7b5ff342723e53a605 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* cpufreq: interactive: don't handle transition notification if not enabledTodd Poynor2013-02-191-1/+8
| | | | | | | | | If multiple governors are in use then avoid processing frequency transition notifications for CPUs on which the interactive governor is not enabled. Change-Id: Ibd75255b921d887501a64774a8c4f62302f2d4e4 Reported-by: Francisco Franco <francisco.franco@cloudcar.com> Signed-off-by: Todd Poynor <toddpoynor@google.com>
* cpufreq: interactive: init default values at compile timeTodd Poynor2013-02-191-9/+4
| | | | | Change-Id: Ia4966e949a6c24c34fdbd4a6e522cd7c37e4108e Signed-off-by: Todd Poynor <toddpoynor@google.com>
* cpufreq: interactive: default go_hispeed_load 99%, doc updatesTodd Poynor2013-02-192-33/+33
| | | | | | | | | | | | | | | Update default go_hispeed_load from 85% to 99%. Recent changes to the governor now use a default target_load of 90%. go_hispeed_load should not be lower than the target load for hispeed_freq, which could lead to oscillating speed decisions. Other recent changes reduce the need to dampen speed jumps on load spikes, while input event boosts from userspace are the preferred method for anticipating load spikes with UI impacts. General update to the documentation to reflect recent changes. Change-Id: I1b92f3091f42c04b10503cd1169a943b5dfd6faf Signed-off-by: Todd Poynor <toddpoynor@google.com>
* cpufreq: interactive: fix race on timer restart on governor startTodd Poynor2013-02-191-3/+3
| | | | | | | | | | | | Starting the governor, or restarting on a hotplugged-in CPU, can race with the timer start in idle, triggering a BUG on timer already pending. Start the timer before setting the enable flag, and use enable_sem to protect the sequence (and ensure correct order of the update to the enable flag). Delete any existing timer for safety. Change-Id: Ife77cf9fe099e8fd8543224cbf148c6722c2ffb0 Reported-by: Francisco Franco <francisco.franco@cloudcar.com> Signed-off-by: Todd Poynor <toddpoynor@google.com>
* cpufreq: interactive: fix racy timer stoppingTodd Poynor2013-02-191-10/+28
| | | | | | | | | | | | | | | | When stopping the governor, del_timer_sync() can race against an invocation of the idle notifier callback, which has the potential to reactivate the timer. To fix this issue, a read-write semaphore is used. Multiple readers are allowed as long as pcpu->governor_enabled is true. However it can be moved to false only after taking a write semaphore which would wait for any on-going asynchronous activities to complete and prevent any more of those activities to be initiated. [toddpoynor@google.com: cosmetic and commit text changes] Change-Id: Ib51165a735d73dcf964a06754c48bdc1913e13d0 Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
* cpufreq: interactive: fix boosting logicTodd Poynor2013-02-191-4/+11
| | | | | | | | | | | 35a84de cpufreq: interactive: apply above_hispeed_delay to each step above hispeed caused the speed choice logic to osciallate between boosting and not boosting. Add back code to ensure speed does not drop below boost frequency while boosting. Change-Id: Id420068480fcc7f5c4989ff523e2a8d22e2f4db2 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* cpufreq: interactive: add timer slack to limit idle at speed > minTodd Poynor2013-02-191-40/+61
| | | | | | | | | | | | | | | Always use deferrable timer for load sampling. Set a non-deferrable timer to an additional slack time to allow prior to waking up from idle to drop speed when not at minimum speed. Slack value -1 avoids wakeups to drop speed. Default is 80ms. Remove the governidle module param and its timer management in idle. For platforms on which holding speed above mimum in idle costs power, use the new timer slack to select how long to wait before waking up to drop speed. Change-Id: I270b3980667e2c70a68e5bff534124b4411dbad5 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* hardlockup: detect hard lockups without NMIs using secondary cpusColin Cross2013-02-193-7/+135
| | | | | | | | | | | | | | | | Emulate NMIs on systems where they are not available by using timer interrupts on other cpus. Each cpu will use its softlockup hrtimer to check that the next cpu is processing hrtimer interrupts by verifying that a counter is increasing. This patch is useful on systems where the hardlockup detector is not available due to a lack of NMIs, for example most ARM SoCs. Without this patch any cpu stuck with interrupts disabled can cause a hardware watchdog reset with no debugging information, but with this patch the kernel can detect the lockup and panic, which can result in useful debugging info. Signed-off-by: Colin Cross <ccross@android.com>
* cpufreq: interactive: specify duration of CPU speed boost pulseTodd Poynor2013-02-191-7/+45
| | | | | | | | | Sysfs attribute boostpulse_duration specifies the duration of boosting CPU speed in response to bootpulse events. Duration is specified in usecs, default 80ms. Change-Id: Ifd41625574891a44f1787a4e85d1e7b4f2afb52b Signed-off-by: Todd Poynor <toddpoynor@google.com>
* cpufreq: interactive: adjust load for changes in speedTodd Poynor2013-02-191-16/+71
| | | | | | | | | Add notifier for speed transitions. Keep a count of CPU active microseconds times current frequency, converted to a percentage relative to the current frequency when load is evaluated. Change-Id: I5c27adb11081c50490219784ca57cc46e97fc28c Signed-off-by: Todd Poynor <toddpoynor@google.com>
* gpu: ion: Remove heapmask from clientRebecca Schultz Zavin2013-02-192-13/+5
| | | | | | | | The heapmask in the client generally wasn't being used. This patch removes it. Change-Id: I3526723fbf8f2e81c28c0733deb583ea14bdd837 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* gpu: ion: Export ion_client_createJohan Mossberg2013-02-191-0/+1
| | | | | | Will enable modules to allocate memory with ion. Signed-off-by: Johan Mossberg <johan.mossberg@stericsson.com>
* gpu: ion: Clarify variable names and comments around heap ids v typesRebecca Schultz Zavin2013-02-192-41/+47
| | | | | | | | | | There is some confusion between when to use the heap type and when the id. This patch clarifies this by using clearer variable names and describing the intention in the comments. Also fixes the client debug code to print heaps by id instead of type. Change-Id: Ie8b3dadded52e18590fcb2ca94001f6ed46ef07d Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* gpu: ion: Add chunk heapRebecca Schultz Zavin2013-02-195-2/+189
| | | | | | | | | | This patch adds support for a chunk heap that allows for buffers that are made up of a list of fixed size chunks taken from a carveout. Chunk sizes are configured when the heaps are created by passing the chunk size in the priv field of the heap platform data. Change-Id: Ia9e003f727b553a92804264debe119dcf78b14e0 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* gpu: ion: Refactor common mapping functions out of system heapRebecca Schultz Zavin2013-02-193-78/+91
| | | | | | | | | The system heap contained several general purpose functions to map buffers to the kernel and userspace. This patch refactors those into ion_heap.c so they can be used by other heaps. Change-Id: If64591798bdc2c248bf9064ace2c927909d7adb8 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* gpu: ion: Switch heap rbtree to a prio listRebecca Schultz Zavin2013-02-192-29/+10
| | | | | | | | | | | | Switches the rbtree tree of heaps for a plist. This significantly simplifies the code and the list is small and is modified only at first boot so the rbtree is unnecessary. This also switches the traversal of the heap list to traverse from highest to lowest id's. This allows allocations to pass a heap mask that falls back on the system heap -- typically id 0, which is the common case. Change-Id: I715be6f4cf020a84ca4f1947c30ee3d2559fb523 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* gpu: ion: Fix bug where MAP ioctl was no longer supportedRebecca Schultz Zavin2013-02-191-0/+1
| | | | | Change-Id: Idbe628ed7dbd6a14469194120b94934d6e99d367 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* gpu: ion: Modify reserve function for carveouts with no start addressRebecca Schultz Zavin2013-02-191-7/+26
| | | | | | | | | This patch allows you to specify a heap that requires carveout memory but that doesn't specify a start address. Memblock_alloc will be called to find a location for these heaps. Change-Id: I9c79b30e3105e796060fc74b058f04093ee5e96e Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* cpufreq: interactive: remove load since last speed changeTodd Poynor2013-02-191-30/+4
| | | | | | | | | The longer-term load since last speed change isn't terribly useful, may delay recognition of dropping load, and would need forthcoming changes to adjust load for changing CPU speeds. Drop it. Change-Id: Ic3cbb0542cc3484617031787e03ed9bdd632dec1 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* cpufreq: interactive: allow arbitrary speed / target load mappingsTodd Poynor2013-02-192-14/+189
| | | | | | | | | | | | | | Accept a string of target loads and speeds at which to apply the target loads, per the documentation update in this patch. For example, "85 1000000:90 1700000:99" targets CPU load 85% below speed 1GHz, 90% at or above 1GHz, until 1.7GHz and above, at which load 99% is targeted. Attempt to avoid oscillations by evaluating the current speed weighted by current load against each new choice of speed, choosing a higher speed if the current load requires a higher speed. Change-Id: Ie3300206047c84eca5a26b0b63ea512e5207550e Signed-off-by: Todd Poynor <toddpoynor@google.com>