aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* net: bluetooth: Remove the AID_NET_BT* gid numbersJP Abgrall2013-02-221-2/+2
| | | | | | | | 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>
* 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>
* hardlockup: detect hard lockups without NMIs using secondary cpusColin Cross2013-02-191-1/+4
| | | | | | | | | | | | | | | | 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>
* gpu: ion: Remove heapmask from clientRebecca Schultz Zavin2013-02-191-1/+0
| | | | | | | | 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: Clarify variable names and comments around heap ids v typesRebecca Schultz Zavin2013-02-191-23/+28
| | | | | | | | | | 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-191-0/+5
| | | | | | | | | | 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>
* cpufreq: interactive: trace actual speed in target speed decisionsTodd Poynor2013-02-191-15/+21
| | | | | | | | Tracing adds actual speed since this is expected to be key to the choice of target speed. Change-Id: Iec936102d0010c4e9dfa143c38a9fd0d551189c3 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* sync: add tracepoint supportErik Gilling2013-02-191-0/+82
| | | | | Change-Id: I181326db4247009161557e45444c9b3548b83d25 Signed-off-by: Erik Gilling <konkers@android.com>
* sync: refactor sync debug printingErik Gilling2013-02-191-6/+13
| | | | | | | | Move driver callbacks to fill strings instead of using seq_files. This will allow those values to be used in a future tracepoint patch. Change-Id: I9b706343e35b11124141fe520e520514a32003d2 Signed-off-by: Erik Gilling <konkers@android.com>
* power: android-battery: add charge timeouts and recharge logicHongMin Son2013-02-191-0/+5
| | | | | | | | | | Add recharge logic when voltage threshold reached. Add charge and recharge timeouts. Change-Id: I3ef3b926ce694115dde7f8056072bef63884a5d0 Signed-off-by: HongMin Son <hongmin.son@samsung.com> Signed-off-by: Todd Poynor <toddpoynor@google.com>
* gpu: ion: Add support for cached mappings that don't faultRebecca Schultz Zavin2013-02-191-0/+3
| | | | | | | | | | | | | | We have found that faulting in the mappings for cached allocations has a significant performance impact and is only a benefit if only a small part of the buffer is touched by the cpu (an uncommon case for software rendering). This patch introduces a ION_FLAG_CACHED_NEEDS_SYNC which determines whether a mapping should be created by faulting or at mmap time. If this flag is set, userspace must manage the caches explictly using the SYNC ioctl. Change-Id: I227561f49e0f382a481728fb55ac5c930fc26025 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* USB: gadget: f_accessory: Add support for HID input devicesMike Lockwood2013-02-191-1/+49
| | | | | Change-Id: I4f1452db32508382df52acdc47c0eb395ae328c7 Signed-off-by: Mike Lockwood <lockwood@google.com>
* USB: gadget: Add ACCESSORY_SET_AUDIO_MODE control request and ioctlMike Lockwood2013-02-191-1/+16
| | | | | | | | The control request will be used by the host to enable/disable USB audio and the ioctl will be used by userspace to read the audio mode Change-Id: I81c38611b588451e80eacdccc417ca6e11c60cab Signed-off-by: Mike Lockwood <lockwood@google.com>
* w1: ds2482: Manage SLPZ pin sleep stateTodd Poynor2013-02-191-0/+21
| | | | | | | | Place SLPZ pin in sleep state at system suspend time if a GPIO is provided by board platform data. Change-Id: I93c61fa0ae474e968e0f909209c9bfcaafe3dd2c Signed-off-by: Todd Poynor <toddpoynor@google.com>
* sync: change wait timeout to mirror poll semanticsErik Gilling2013-02-191-4/+4
| | | | | Change-Id: Ib38e6d339d41885a33027752690d65a52b6897f6 Signed-off-by: Erik Gilling <konkers@android.com>
* sync: add reference counting to timelinesErik Gilling2013-02-191-0/+2
| | | | | | | | | If a timeline is destroyed while fences still hold pts on it, the reworked fence release handler can cause the timeline to be freed before all it's points are freed. Change-Id: I1cd8ddb638eded7db9db446ff6b37f3dd165d6c4 Signed-off-by: Erik Gilling <konkers@android.com>
* sync: add internal refcounting to fencesErik Gilling2013-02-191-0/+5
| | | | | | | | | | If a fence is released while a timeline that one of it's pts is on is being signaled, it is possible for that fence to be deleted before it is signaled. This patch adds a refcount for internal references such as signaled pt processing. Change-Id: Ie8605e6fd2ac026c207220a03d84e1c1078ec719 Signed-off-by: Erik Gilling <konkers@android.com>
* power: android battery: add generic android battery driverTodd Poynor2013-02-191-0/+42
| | | | | | | | | | | | | | | | | | | | Add a generic battery power supply and glue logic for talking to the board battery driver. This driver handles common chores such as: * periodic battery level and health monitoring * kernel log reporting and other debugging features for key properties provided by different charger, fuel gauge, etc. components * ensure properties such as battery health are made available to userspace * common processing for board-level battery/case temperature sensors and policy for charging status based on battery health Based on work by himihee.seo@samsung.com, ms925.kim@samsung.com, and joshua.chang@samsung.com. Change-Id: I5fa8e8d68811d84820b7a130b0245ad2b5b6d36b Signed-off-by: Todd Poynor <toddpoynor@google.com>
* power: power_supply: add POWER_SUPPLY_PROP_CHARGE_ENABLEDTodd Poynor2013-02-191-0/+1
| | | | | Change-Id: I3e93b502452811cbfc4d904202b4f1d94edc143d Signed-off-by: Todd Poynor <toddpoynor@google.com>
* cpufreq: interactive: handle speed up and down in the realtime taskTodd Poynor2013-02-191-7/+1
| | | | | | | | Not useful to have a separate, non-realtime workqueue for speed down events, avoid priority inversion for speed up events. Change-Id: Iddcd05545245c847aa1bbe0b8790092914c813d2 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* power: power_supply: add POWER_SUPPLY_PROP_USB_OTGTodd Poynor2013-02-191-0/+1
| | | | | Change-Id: Idfc6ef2e37d62aad6f26cc8eafa53db642cd352b Signed-off-by: Todd Poynor <toddpoynor@google.com>
* power: power_supply: move POWER_SUPPLY_PROP_USB_HC to type 'int' orderTodd Poynor2013-02-191-2/+2
| | | | | Change-Id: I001af30ab5fe06dde5f368241f21b9e0864777a1 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* power_supply: Add custom property for USB High Current modeTodd Poynor2013-02-191-0/+2
| | | | | | | For smb347. Change-Id: I3323469072e1ee5085d61af8a89612b06b91f94a Signed-off-by: Todd Poynor <toddpoynor@google.com>
* gpu: ion: Add explicit sync ioctlRebecca Schultz Zavin2013-02-191-1/+11
| | | | | | | | | | This is deprecated in favor of using the dma_buf api which will automatically sync a buffer to memory when it is mapped to a device. However, that functionality is not ready, so this patch adds the ability to sync a buffer explicitly. Change-Id: Ia15810a13cd5c4b939f4afa5c8e721c89fac76d4 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* gpu: ion: Add cache maintenance to ion.Rebecca Schultz Zavin2013-02-191-2/+17
| | | | | | | | | | | | | | This patch adds cache maintenance operations to ion. As per mailing list discussions regarding dma_buf, cache operations are done implicitly. At buffer allocaiton time the user can select whether he'd like mappings (both kernel and user) to be cached. When cached mappings are selected, no mappings will be created for a buffer at mmap time. Instead pages will be faulted in one at a time so we can track which pages require flushing before dma. When the buffers are mapped for dma (via the dma_buf apis) any pages which were touched will be synced for device. Change-Id: Id5d6894e8bb52af038c91dd895143bf3b4203b0b Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* gpu: ion: Switch max num_heaps to 16 to work around an issue elsewereRebecca Schultz Zavin2013-02-191-1/+1
| | | | | | Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com> Change-Id: I3bcbc9c424086f5921a1641afeb16040deffcece
* power_supply: convert wakelock to wakeup sourceTodd Poynor2013-02-191-2/+0
| | | | | | | And supply name will be used as wakeup source name. Change-Id: I53075491c6e1a4c66755afe8a40b7166cd8d6cb2 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* gpu: ion: Fix bug in heap type enumRebecca Schultz Zavin2013-02-191-2/+4
| | | | | Change-Id: I8bf1345896774f02bd25c8d25a05d2c1eae262ef Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* android: persistent_ram: Allow specifying ecc parameters in platform dataArve Hjønnevåg2013-02-191-4/+10
| | | | | Change-Id: If5aaa968f6ce85ac8e18f07cca286f20f0aa6e58 Signed-off-by: Arve Hjønnevåg <arve@android.com>
* sync: allow async waits to be canceledErik Gilling2013-02-191-7/+29
| | | | | | | | | In order to allow drivers to cleanly handled teardown we need to allow them to cancel pending async waits. To do this cleanly, we move allocation of sync_fence_waiter to the driver calling sync_async_wait(). Change-Id: Ifcd95648be6ec07026d67f810070a4310f099989 Signed-off-by: Erik Gilling <konkers@android.com>
* gpu: ion: Get an sg_table from an ion handleRebecca Schultz Zavin2013-02-191-1/+12
| | | | | | | | This patch adds an interface to return and sg_table given a valid ion handle. Change-Id: Icd948c60c1af0a4279f337bcd591cd39b46325e8 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* cpufreq: interactive: fixup trace of string paramsTodd Poynor2013-02-191-8/+8
| | | | | Change-Id: Iac47f62437e61b13724afbbf9df1a0729f58f236 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* ion: Switch ion to use dma-bufRebecca Schultz Zavin2013-02-191-49/+9
| | | | | | | | | | Ion now uses dma-buf file descriptors to share buffers with userspace. Ion becomes a dma-buf exporter and any driver that can import dma-bufs can now import ion file descriptors. Change-Id: Ia04d6d72fb301dc088eb8db6576822e9260ff332 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* ion: Add reserve function to ionRebecca Schultz Zavin2013-02-191-0/+11
| | | | | | | | Rather than requiring each platform call memblock_remove or reserve from the board file, add this to ion Change-Id: Ie418a692c13e9e0cfe93ecc83d253d3ce860fc83 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* ion: Switch map/unmap dma api to sg_tablesRebecca Schultz Zavin2013-02-191-3/+3
| | | | | | | Switch these api's from scatterlists to sg_tables Change-Id: I8b99e39633df009d472ce24704fa26af7bb50fa2 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* sync: add ioctl to get fence dataErik Gilling2013-02-191-0/+57
| | | | | Change-Id: I71410aef7e03a52562f7cb15b993ac8441b1fa12 Signed-off-by: Erik Gilling <konkers@android.com>
* sync: add debugfs supportErik Gilling2013-02-191-3/+17
| | | | | Change-Id: I8a7ea63e454fbeee1ecf17e6c3caff7c43b24734 Signed-off-by: Erik Gilling <konkers@android.com>
* sync: add timestamps to sync_ptsErik Gilling2013-02-191-0/+5
| | | | | Change-Id: I2ad855072b86873880769a09a3176e85aa1199d7 Signed-off-by: Erik Gilling <konkers@android.com>
* sw_sync: add cpu based sync driverErik Gilling2013-02-191-0/+58
| | | | | Change-Id: I1042851f5e30f9fdc2f35bdad84123bcf108560f Signed-off-by: Erik Gilling <konkers@android.com>
* sync: Add synchronization frameworkErik Gilling2013-02-191-0/+314
| | | | | | | not run through checkpatch yet. Change-Id: I209f9db2824e0313f467f11ab09e5f54f0a4a6b5 Signed-off-by: Erik Gilling <konkers@android.com>
* trace: power: add trace_clock_set_parentColin Cross2013-02-191-0/+19
| | | | | | | | | | | | | | 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>
* netfilter: xt_IDLETIMER: Add new netlink msg typeJP Abgrall2013-02-191-0/+8
| | | | | | | | | | | | | | | | | 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>
* Include if_pppolac.h and if_pppopns.h into header-y targetAndrey Konovalov2013-02-191-0/+2
| | | | | | | This is required to pass the headers_check Change-Id: Ic4c773973278cbdf1cb4eb66473826cb96ccbfb3 Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
* cpufreq: interactive: add boost pulse interfaceTodd Poynor2013-02-191-10/+10
| | | | | Change-Id: Icf1e86d2065cc8f0816ba9c6b065eb056d4e8249 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* cpufreq: interactive: Add sysfs boost interface for hints from userspaceTodd Poynor2013-02-191-0/+13
| | | | | | | The explicit hint on/off version. Change-Id: Ibf62b6d45bf6fb8c9c055b9bdaf074ce9374c04f Signed-off-by: Todd Poynor <toddpoynor@google.com>
* cpufreq: interactive: Boost frequency on touchscreen inputTodd Poynor2013-02-191-0/+12
| | | | | | | | | | | 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>
* cpufreq interactive governor: event tracingTodd Poynor2013-02-191-0/+87
| | | | | Change-Id: Ic13614a3da2faa2d4bd215ca3eb7191614f0cf66 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* usb: gadget: accessory: Add Android Accessory functionBenoit Goby2013-02-191-0/+83
| | | | | | | | | | | | | USB accessory mode allows users to connect USB host hardware specifically designed for Android-powered devices. The accessories must adhere to the Android accessory protocol outlined in the http://accessories.android.com documentation. This allows Android devices that cannot act as a USB host to still interact with USB hardware. When an Android device is in USB accessory mode, the attached Android USB accessory acts as the host, provides power to the USB bus, and enumerates connected devices. Signed-off-by: Mike Lockwood <lockwood@android.com>
* usb: gadget: mtp: Add MTP/PTP functionBenoit Goby2013-02-191-0/+75
| | | | | | | | | USB gadget function driver used by the Android framework to implement the MTP and PTP protocols. It creates a character device that provides an interface for fast transfer of files and supports transferring files greater than 4GB. Signed-off-by: Mike Lockwood <lockwood@android.com>
* HID: Add input_register callback.Jaikumar Ganesh2013-02-191-2/+2
| | | | | | | | | | | | | | | | | | Add input_register callback which gets called after hid_configure_usage is called for all the reports and before the input device is registered. This allows individual drivers to do extra work like input mapping just before device registration. Based on discussions with David Herrmann <dh.herrmann@googlemail.com> Change-Id: Idab6fb4f7b1e5e569bd0410967288717e9d34c98 Signed-off-by: Jaikumar Ganesh <jaikumarg@android.com> Changed to add return code to input_configured instead of adding input_register Signed-off-by: Arve Hjønnevåg <arve@android.com>