linux.git/drivers/staging/android, branch v3.14-rc2

ion: Add carveout and chunk heaps to dummy driver

2014-01-10T05:16:40+00:00

Add support to the dummy driver for basic carveout and chunk heaps.

Since we're generating these heaps at module_init, and we want
this driver to be generic enough to be tested on any arch, we
don't have the ability to alloc bootmem, so both of these heaps
are conventionally allocated using alloc_pages(), which limits us
to 4M in size.

Should look into using CMA for heap allocation eventually, but
this provides enough to test the basic functionality of the
heaps.

Cc: Colin Cross 
Cc: Greg KH 
Cc: Jesse Barker 
Cc: Android Kernel Team 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

ion: Add dummy driver for testing

2014-01-10T05:16:40+00:00

Provide a basic dummy driver to register the ion device
and to install basic SYSTEM and SYSTEM_CONTIG heaps.

This allows for basic testing with ION without having
access to drivers or systems that have been enabled to use
ION.

Cc: Colin Cross 
Cc: Greg KH 
Cc: Jesse Barker 
Cc: Android Kernel Team 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

ion_test: Add compat_ioctl support (v2)

2013-12-20T00:10:25+00:00

Prior to subitting this, Colin reworked the compat_ioctl support
for the ion_test driver, moving the structure to be the same size
on both 32 and 64 bit architectures.

Two small things were left out. The compat_ioctl ptr assignment,
and the fact that despite having uniform sized types in the
structure, the structure pads out to different sizes on different
arches.

This patch resolves this issue by adding a padding entry after
the write flag, and adding the compat_ioctl ptr.

Changes in v2:
- Add a padding int rather then making write a u64

Acked-by: Colin Cross 
Cc: Android Kernel Team 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: ion: Avoid using rt_mutexes directly

2013-12-18T01:16:51+00:00

RT_MUTEXES can be configured out of the kernel, causing compile
problems with ION.

To quote Colin:
"rt_mutexes were added with the deferred freeing feature.  Heaps need
to return zeroed memory to userspace, but zeroing the memory on every
allocation was causing performance issues.  We added a SCHED_IDLE
thread to zero memory in the background after freeing, but locking the
heap from the SCHED_IDLE thread might block a high priority allocation
thread for a long time.

The lock is only used to protect the heap's free_list and
free_list_size members, and is not held for any long or sleeping
operations.  Converting to a spinlock should prevent priority
inversion without using the rt_mutex.  I'd also rename it to free_lock
to so it doesn't get used as a general heap lock."

Thus this patch converts the rt_mutex usage to a spinlock and
renames the lock free_lock to be more clear as to its use.

I also had to change a bit of logic in ion_heap_freelist_drain()
to safely avoid list corruption.

Acked-by: Colin Cross 
Cc: Android Kernel Team 
Reported-by: Jim Davis 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: ion: Fix possible null pointer dereference

2013-12-17T16:57:21+00:00

The kbuild test robot reported:

drivers/staging/android/ion/ion_system_heap.c:122 alloc_largest_available() error: potential null dereference 'info'.  (kmalloc returns null)

Where the pointer returned from kmalloc goes unchecked for failure.

This patch checks the return for NULL, and reworks the logic, as
suggested by Colin, so we allocate the page_info structure first.

Acked-by: Colin Cross 
Cc: Android Kernel Team 
Reported-by: kbuild test robot 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: ion: Add HAVE_MEMBLOCK config dependency

2013-12-17T16:57:21+00:00

The kbuild test robot reported a build issue w/ ION on m68k:

drivers/staging/android/ion/ion.c: In function 'ion_reserve':
drivers/staging/android/ion/ion.c:1526:4: error: implicit declaration of function 'memblock_alloc_base' [-Werror=implicit-function-declaration]
drivers/staging/android/ion/ion.c:1528:11: error: 'MEMBLOCK_ALLOC_ANYWHERE' undeclared (first use in this function)
drivers/staging/android/ion/ion.c:1528:11: note: each undeclared identifier is reported only once for each function it appears in
drivers/staging/android/ion/ion.c:1537:4: error: implicit declaration of function 'memblock_reserve' [-Werror=implicit-function-declaration]
   cc1: some warnings being treated as errors

This is caused by ION using memblock functionality which m68k doesn't support.

This patch adds a HAVE_MEMBLOCK dependency to the ION config.

Acked-by: Colin Cross 
Cc: Android Kernel Team 
Reported-by: kbuild test robot 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

gpu: ion: fix sparse non static symbol warnings

2013-12-17T03:33:22+00:00

Fixes the following sparse warnings:

drivers/staging/android/ion/tegra/tegra_ion.c:23:19: warning:
 symbol 'idev' was not declared. Should it be static?
drivers/staging/android/ion/tegra/tegra_ion.c:24:19: warning:
 symbol 'tegra_user_mapper' was not declared. Should it be static?
drivers/staging/android/ion/tegra/tegra_ion.c:25:5: warning:
 symbol 'num_heaps' was not declared. Should it be static?
drivers/staging/android/ion/tegra/tegra_ion.c:26:17: warning:
 symbol 'heaps' was not declared. Should it be static?
drivers/staging/android/ion/tegra/tegra_ion.c:28:5: warning:
 symbol 'tegra_ion_probe' was not declared. Should it be static?
drivers/staging/android/ion/tegra/tegra_ion.c:66:5: warning:
 symbol 'tegra_ion_remove' was not declared. Should it be static?

Signed-off-by: Wei Yongjun 
Signed-off-by: Greg Kroah-Hartman

gpu: ion: use module_platform_driver to simplify the code

2013-12-17T03:25:31+00:00

module_platform_driver() makes the code simpler by eliminating
boilerplate code.

Signed-off-by: Wei Yongjun 
Signed-off-by: Greg Kroah-Hartman

ion: remove ion_user_handle_t from ion_test.h

2013-12-17T01:18:22+00:00

ion_test.h should not define ion_user_handle_t, and defining it
causes a warning:
In file included from drivers/staging/android/ion/ion_test.c:31:
drivers/staging/android/ion/../uapi/ion_test.h:23: error: redefinition of typedef 'ion_user_handle_t'
drivers/staging/android/ion/../uapi/ion.h:23: note: previous declaration of 'ion_user_handle_t' was here

Reported-by: Andrew Morton 
Cc: John Stultz 
Signed-off-by: Colin Cross 
Signed-off-by: Greg Kroah-Hartman

ion: Reenable the build

2013-12-15T17:40:11+00:00

Now that ION builds, reenable it in the build.

Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman