ecb9f50c80f1c675cfe5fe02020a72d75c3fbbef |
|
27-Jan-2015 |
John Stultz <john.stultz@linaro.org> |
staging: Remove logger and alarm-dev from android Makefile My previous patches deleting logger and alarm-dev from staging missed the android Makefile. This patch cleans up the Makefile to remove the now non-existent files. Cc: Rom Lemarchand <romlem@google.com>, Cc: Mark Salyzyn <salyzyn@google.com>, Cc: Kees Cook <keescook@chromium.org>, Cc: Android Kernel Team <kernel-team@android.com>, Cc: Valentin Rothberg <valentinrothberg@gmail.com>, Cc: Greg Hackmann <ghackmann@google.com>, Cc: Elliott Hughes <enh@google.com>, Cc: Todd Poynor <toddpoynor@google.com>, Reported-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: John Stultz <john.stultz@linaro.org> Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Bug: 13505761 Change-Id: Id8c027ce51a663ee2e9ea2618612921db7cf7638
|
2a2f434d743209cda09c68acd63cbcae8e6d17c6 |
|
03-Apr-2014 |
Colin Cross <ccross@android.com> |
fiq_debugger: move into drivers/staging/android/fiq_debugger/ Move fiq_debugger into drivers/staging/android/fiq_debugger/ to allow for sharing between ARM and ARM64. Change-Id: I6ca5e8b7e3d000f57da3234260261c5592cef2a8 Signed-off-by: Colin Cross <ccross@android.com>
|
0f0d8406fb9c3c5ed1b1609a0f51c504c5b37aea |
|
01-Jul-2014 |
Maarten Lankhorst <maarten.lankhorst@canonical.com> |
android: convert sync to fence api, v6 Just to show it's easy. Android syncpoints can be mapped to a timeline. This removes the need to maintain a separate api for synchronization. I've left the android trace events in place, but the core fence events should already be sufficient for debugging. v2: - Call fence_remove_callback in sync_fence_free if not all fences have fired. v3: - Merge Colin Cross' bugfixes, and the android fence merge optimization. v4: - Merge with the upstream fixes. v5: - Fix small style issues pointed out by Thomas Hellstrom. v6: - Fix for updates to fence api. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Acked-by: John Stultz <john.stultz@linaro.org> Acked-by: Sumit Semwal <sumit.semwal@linaro.org> Acked-by: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
24b3aa09970304ece816e73c3d7174d0dd315b98 |
|
14-Dec-2013 |
John Stultz <john.stultz@linaro.org> |
ion: Reenable the build Now that ION builds, reenable it in the build. Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
c30707be128e952ca2ba77417cb5509e254a4aac |
|
14-Dec-2013 |
Rebecca Schultz Zavin <rebecca@android.com> |
gpu: ion: Add ION Memory Manager Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com> [jstultz: Squished in Colin Cross' move to staging change, also disables ION from the build, as it won't compile till the end of the patchset] Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
9d1906e61dda982070e3910a04d9cce050f7f1a4 |
|
01-Mar-2013 |
Erik Gilling <konkers@android.com> |
staging: sw_sync: Add cpu based sync driver Adds a base sync driver that uses the cpu for serialization. Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com> Cc: Erik Gilling <konkers@android.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Rob Clark <robclark@gmail.com> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: dri-devel@lists.freedesktop.org Cc: Android Kernel Team <kernel-team@android.com> Signed-off-by: Erik Gilling <konkers@android.com> [jstultz: Add commit message, whitespace fixes and move to staging directory] Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
7ad530bf2499c702a6dcbb279cf78b76845ed584 |
|
01-Mar-2013 |
Erik Gilling <konkers@android.com> |
staging: sync: Add synchronization framework Sync is a framework for synchronization between multiple drivers. Sync implementations can take advantage of hardware synchronization built into devices like GPUs. Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com> Cc: Erik Gilling <konkers@android.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Rob Clark <robclark@gmail.com> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: dri-devel@lists.freedesktop.org Cc: Android Kernel Team <kernel-team@android.com> Signed-off-by: Erik Gilling <konkers@android.com> [jstultz: Added commit message, moved to staging, squished minor fix in] Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
975a1ac9a9fe65d66ee1726c0db6dc58e53d232a |
|
17-Oct-2012 |
Arve Hjønnevåg <arve@android.com> |
Staging: android: binder: Add some tracepoints Add tracepoints: - ioctl entry and exit - Main binder lock: lock, locked and unlock - Command and return buffer opcodes - Transaction: create and receive - Transaction buffer: create and free - Object and file descriptor transfer - binder_update_page_range Signed-off-by: Arve Hjønnevåg <arve@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
15d76446205710ddfcba6cc9156c7883074f84b1 |
|
26-May-2012 |
Anton Vorontsov <anton.vorontsov@linaro.org> |
staging/android: Remove ram_console driver All the functionality is now supported by pstore and pstore_ram drivers. Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org> Acked-by: Kees Cook <keescook@chromium.org> Acked-by: Colin Cross <ccross@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
cddb8751c80348df75149f44fc3bf38d3dd1f3e6 |
|
17-May-2012 |
Anton Vorontsov <anton.vorontsov@linaro.org> |
staging: android: persistent_ram: Move to fs/pstore/ram_core.c This is a first step for adding ECC support for pstore RAM backend: we will use the persistent_ram routines, kindly provided by Google. Basically, persistent_ram is a set of helper routines to deal with the [optionally] ECC-protected persistent ram regions. A bit of Makefile, Kconfig and header files adjustments were needed because of the move. Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org> Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
449a2bf5e881b2a00d42a7c0baa67119c8cb5dce |
|
23-Apr-2012 |
MyungJoo Ham <myungjoo.ham@samsung.com> |
Remove "switch" class in drivers/staging/android/switch Because extcon can also be a switch class for legacy userspace (Android) and is a superset of switch class in drivers/staging/android/switch, switch class may be removed. - Remove switch class - Remove switch class consideration in extcon class Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
ef2353d26bdc44c78713da1a6eb2325ba9dac6f7 |
|
20-Apr-2012 |
John Stultz <john.stultz@linaro.org> |
android-alarm: Remove unused android alarm in-kernel interfaces Now that alarm-dev.c uses the upstreamed alarmtimer interfaces, we can remove the otherwise unused in-kernel android alarm api. CC: Colin Cross <ccross@android.com> CC: Thomas Gleixner <tglx@linutronix.de> CC: Android Kernel Team <kernel-team@android.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
c672528aec4a1cf6f3df7a6022e6823a20b20f8e |
|
08-Mar-2012 |
Colin Cross <ccross@android.com> |
staging: android: ram_console: split out persistent ram Split ram_console into two halves. persistent_ram is a set of apis that handle a block of memory that does not get erased across a reboot. It provides functions to fill it as a single buffer or a ring buffer, and to extract the old data after a reboot. It handles ecc on the data to correct bit errors introduced during reboot. ram_console is now a small wrapper around persistent_ram that feeds console data into the ringbuffer, and exports the old data to /proc/last_kmsg after a reboot. [jstultz: Moved persistent_ram.h to staging dir] CC: Greg KH <gregkh@linuxfoundation.org> CC: Android Kernel Team <kernel-team@android.com> Signed-off-by: Colin Cross <ccross@android.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
fe8d2727ffa65bcb516b4947bec1c546841e7d25 |
|
09-Feb-2012 |
John Stultz <john.stultz@linaro.org> |
staging: android-alarm: Reenable android alarm driver Now that it builds, re-enable android alarm driver in the makefile and kconfig CC: Arve Hjønnevåg <arve@android.com> CC: Android Kernel Team <kernel-team@android.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
b0d017e80e9f4e6b37e699b9a944646e64deb473 |
|
27-Jan-2012 |
Shuah Khan <shuahkhan@gmail.com> |
Staging: android: Remove pmem driver Addroid pmem driver is no longer used in any of the Android products. This patch removes pmem driver from Android staging area Reference: https://lkml.org/lkml/2012/1/23/183 Signed-off-by: Shuah Khan <shuahkhan@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
11980c2ac4ccfad21a5f8ee9e12059f1e687bb40 |
|
21-Dec-2011 |
Robert Love <rlove@google.com> |
ashmem: Anonymous shared memory subsystem The anonymous shared memory (ashmem) subsystem provides a Unix-y,file-based shared memory interface to user-space. It works like anonymous memory (e.g. mmapping fd=0) except if you share the file descriptor via the usual means, you will share the mapping. The shared memory can be accessed via both mmap or file I/O. The backing store is a simple shmem file. Additionally, ashmem introduces the concept of page pinning. Pinned pages (the default) behave like any anonymous memory. Unpinned pages are available to the kernel for eviction during VM pressure. When repinning the pages, the return value instructs user-space as to any eviction. In this manner, user-space processes may implement caching and similar resource management that efficiently integrates with kernel memory management. Signed-off-by: Robert Love <rlove@google.com> ashmem: Don't install fault handler for private mmaps. Ashmem is used to create named private heaps. If this heap is backed by a tmpfs file it will allocate two pages for every page touched. In 2.6.27, the extra page would later be freed, but 2.6.29 does not scan anonymous pages when running without swap so the memory is not freed while the file is referenced. This change changes the behavior of private ashmem mmaps to match /dev/zero instead tmpfs. Signed-off-by: Arve Hjønnevåg <arve@android.com> ashmem: Add common prefix to name reported in /proc/pid/maps Signed-off-by: Arve Hjønnevåg <arve@android.com> ashmem: don't require a page aligned size This makes ashmem more similar to shmem and mmap, by not requiring the specified size to be page aligned, instead rounding it internally as needed. Signed-off-by: Marco Nelissen <marcone@android.com> [jstultz: Improved commit subject and included patch description from rlove. Also moved ashmem files to staging dir, and reworked code to avoid touching mm/shmem.c while we're in staging.] CC: Brian Swetland <swetland@google.com> CC: Colin Cross <ccross@android.com> CC: Arve Hjønnevåg <arve@android.com> CC: Dima Zavin <dima@android.com> CC: Robert Love <rlove@google.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
b6aba85c35baa7d08b7a601b30589bcae607d9e0 |
|
24-Jul-2008 |
Rebecca Schultz <rschultz@google.com> |
staging: android: add pmem driver This adds the Android pmem driver to the staging tree. [At this point in time, it is dependent on the ARM platform, due to some build issues that require it. - gregkh] Signed-off-by: Rebecca Schultz <rschultz@google.com> Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com> Signed-off-by: Dima Zavin <dima@android.com> Signed-off-by: Jamie Gennis <jgennis@google.com> Cc: Brian Swetland <swetland@google.com> Cc: Arve Hjønnevåg <arve@android.com> Cc: Colin Cross <ccross@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
e0f5bb9b3850bdd7907eda9eb923cd3f9d4358b8 |
|
14-Oct-2008 |
Mike Lockwood <lockwood@android.com> |
staging: android: switch: switch class and GPIO drivers. This adds the Android switch driver code to the staging tree. [Note, this code was located in drivers/switch/ in the Android kernel releases, but as that api wasn't generally accepted, and the interface is working toward changing to the newly proposed extcon inteface, this driver was placed here until the extcon code is merged into mainline and the Android userspace code is converted over to using it. - gregkh] Signed-off-by: Arve Hjønnevåg <arve@android.com> Signed-off-by: Mike Lockwood <lockwood@android.com> Cc: MyungJoo Ham <myungjoo.ham@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Donggeun Kim <dg77.kim@samsung.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: MyungJoo Ham <myungjoo.ham@gmail.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: NeilBrown <neilb@suse.de> Cc: Morten CHRISTIANSEN <morten.christiansen@stericsson.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
355b0502f6efea0ff9492753888772c96972d2a3 |
|
30-Nov-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Revert "Staging: android: delete android drivers" This reverts commit b0a0ccfad85b3657fe999805df65f5cfe634ab8a. Turns out I was wrong, we want these in the tree. Note, I've disabled the drivers from the build at the moment, so other patches can be applied to fix some build issues due to internal api changes since the code was removed from the tree. Cc: Arve Hjønnevåg <arve@android.com> Cc: Brian Swetland <swetland@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
b0a0ccfad85b3657fe999805df65f5cfe634ab8a |
|
06-Oct-2009 |
Greg Kroah-Hartman <gregkh@suse.de> |
Staging: android: delete android drivers These drivers are no longer being developed and the original authors seem to have abandonded them and hence, do not want them in the mainline kernel tree. So sad :( Cc: Brian Swetland <swetland@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
241e12879be74fdfadf3abc820a2e3c455599c3c |
|
05-May-2009 |
Mike Lockwood <lockwood@android.com> |
Staging: android: timed_gpio: Separate timed_output class into a separate driver. Signed-off-by: Mike Lockwood <lockwood@android.com> Signed-off-by: Arve Hjønnevåg <arve@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
08b88cc7844bf984e2e474134c207bb2c46c007d |
|
20-Dec-2008 |
San Mehat <san@android.com> |
Staging: android: add lowmemorykiller driver From: San Mehat <san@android.com> Cc: Brian Swetland <swetland@google.com> Cc: Robert Love <rlove@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
1fa7026ff026012f3a819b49d44dd6267997f379 |
|
20-Dec-2008 |
Greg Kroah-Hartman <gregkh@suse.de> |
Staging: android: remove dummy android.c driver There are files now in the drivers/staging/android/ directory, so the dummy android.c file can be safely removed. Cc: Robert Love <rlove@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
99f41131b8d82cde1a84fec5b93ce31632552f0b |
|
20-Dec-2008 |
Mike Lockwood <lockwood@android.com> |
Staging: android: add timed_gpio driver driver for GPIOs that turn back off after a delay From: Mike Lockwood <lockwood@android.com> Signed-off-by: Brian Swetland <swetland@google.com> Cc: Robert Love <rlove@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
adc567e8a9c25f08e91eb18b83bdaa5ff9705919 |
|
20-Dec-2008 |
Arve Hjønnevåg <arve@android.com> |
Staging: android: add ram_console driver Doesn't quite link properly under all configurations, and it has way too many different build options, but it's a start. Signed-off-by: Arve Hjønnevåg <arve@android.com> Signed-off-by: Brian Swetland <swetland@google.com> Cc: Robert Love <rlove@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
875f194c48ddae3797f8d61e98aacd8a8ecef927 |
|
20-Dec-2008 |
Robert Love <rlove@google.com> |
Staging: android: add logging driver Signed-off-by: Robert Love <rlove@google.com> Signed-off-by: Brian Swetland <swetland@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
457b9a6f09f011ebcb9b52cc203a6331a6fc2de7 |
|
20-Dec-2008 |
Arve Hjønnevåg <arve@android.com> |
Staging: android: add binder driver It builds, but not as a module, and with lots of warnings. I also had to fix up a few syntax errors to get it to build properly, I'm doubting that anyone has built it in a while :( Signed-off-by: Arve Hjønnevåg <arve@android.com> Signed-off-by: Brian Swetland <swetland@google.com> Cc: Robert Love <rlove@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
6dc9c9e8b0b51abd9a332f5f4767df729848d579 |
|
20-Dec-2008 |
Greg Kroah-Hartman <gregkh@suse.de> |
Staging: add android framework This prepares us to start adding the android drivers to the build. The dummy android.c file will go away in the next few patches, as it will not be needed once drivers/staging/android/ has a driver in it. Cc: Robert Love <rlove@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|