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

gpu: ion: dereferencing an ERR_PTR

2014-02-07T19:08:46+00:00

We dereference "heap->task" before checking if it's an ERR_PTR.

Fixes: ea313b5f88ed ('gpu: ion: Also shrink memory cached in the deferred free list')
Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

staging: android: ion: dummy: fix an error code

2014-02-07T19:08:46+00:00

We should be returning -ENOMEM here instead of zero.

Signed-off-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

staging: ion: Fix build warning

2014-02-07T17:03:16+00:00

Add #include  to fix the following warning seen
with gcc 4.7.3:

In file included from drivers/staging/android/ion/ion_heap.c:26:0:
drivers/staging/android/ion/ion_priv.h:358:21: warning: ‘struct device’ declared inside parameter list [enabled by default]
drivers/staging/android/ion/ion_priv.h:358:21: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]

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

staging: ion: Fix ION_IOC_FREE compat ioctl

2014-02-07T17:03:16+00:00

The compat ioctl for ION_IOC_FREE currently passes allocation data
instead of the free data. Correct this.

Cc: Colin Cross 
Cc: Android Kernel Team 
Signed-off-by: Laura Abbott 
[jstultz: Folded in a small build fix]
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: ion: Fix overflow and list bugs in system heap

2014-02-07T17:03:16+00:00

Fix a few bugs in ion_system_heap:

Initialize the list node in the info block.

Don't store size_remaining in a signed long, allocating >2GB
could overflow, resulting in a call to sg_alloc_table with
nents=0 which panics.  alloc_largest_available will never
return a block larger than size_remanining, so it can never
go negative.

Limit a single allocation to half of all memory.  Prevents a
large allocation from taking down the whole system.

Cc: Colin Cross 
Cc: Android Kernel Team 
Signed-off-by: Colin Cross 
[jstultz: Minor commit subject tweak]
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

staging: don't use module_init in non-modular ion_dummy_driver.c

2014-02-07T17:01:09+00:00

The ION_DUMMY option is bool, and hence this code is either
present or absent.  It will never be modular, so using
module_init as an alias for __initcall is rather misleading.

Fix this up now, so that we can relocate module_init from
init.h into module.h in the future.  If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.

Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups.  As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.

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

ion: dummy driver: use ARRAY_SIZE for nr of heaps

2014-02-07T17:01:09+00:00

use ARRAY_SIZE to count number of heaps in static array

Signed-off-by: Tomas Winkler 
Signed-off-by: Greg Kroah-Hartman

drivers: staging: android: ion: ion_dummy_driver: include "linux/io.h"

2014-02-07T17:01:08+00:00

Need add "linux/io.h" to pass compiling under metag architecture with
allmodconfig (which use the default 'virt_to_phys'), the related error:

    CC      drivers/staging/android/ion/ion_dummy_driver.o
  drivers/staging/android/ion/ion_dummy_driver.c: In function 'ion_dummy_init':
  drivers/staging/android/ion/ion_dummy_driver.c:81: error: implicit declaration of function 'virt_to_phys'

Signed-off-by: Chen Gang 
Signed-off-by: Greg Kroah-Hartman

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