Commit Graph

472 Commits

Author SHA1 Message Date
CMY
f0ab5f44c0 rk: ion: add drm heap for secure buffer allocation 2014-10-15 15:31:17 +08:00
CMY
f5a876c480 rk: ion: finished ION memory reserve more gracefully 2014-10-10 15:10:24 +08:00
CMY
a7500ac9e9 rk: ion: add event tracer 2014-10-07 14:07:28 +08:00
CMY
45a3aef37a rk: ion: shrink memory more positive 2014-09-04 11:44:58 +08:00
CMY
f5a146f1e7 rk: ion: Add IBUF debug info to check memory shared in vmalloc heap 2014-08-28 09:21:53 +08:00
CMY
0aaedd101e rk: ion: return appropriate value if iommu map fail 2014-08-14 10:49:26 +08:00
CMY
059e52c528 rk: ion: check the iommu map's result 2014-08-14 09:03:21 +08:00
黄涛
68fe6924d3 Merge remote-tracking branch 'origin/develop-3.10-next' into develop-3.10
Conflicts:
	arch/arm/mach-rockchip/vcodec_service.c
	drivers/iommu/rockchip-iommu.c
	drivers/iommu/rockchip-iovmm.c
	drivers/net/ethernet/rockchip/gmac/stmmac_platform.c
	include/linux/rockchip/sysmmu.h
2014-08-12 17:39:16 +08:00
xxm
768c87ccb9 rk: ion: update iovmm_map to rockchip_iovmm_map 2014-08-08 11:00:38 +08:00
黄涛
c7412991e9 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	arch/arm/mach-rockchip/vcodec_service.c
	drivers/input/Makefile
2014-08-08 10:21:50 +08:00
黄涛
898d52d96c fiq_debugger: rockchip: enlarge kmsg buffer size 2014-08-07 16:08:09 +08:00
黄涛
fcef60e36f Merge tag 'lsk-v3.10-android-14.07' into develop-3.10
LSK v3.10 Android 14.07 release

Conflicts:
	drivers/clocksource/arm_arch_timer.c
	lib/Makefile
2014-08-06 15:34:14 +08:00
CMY
ff0660a172 rk: ion: iommu: fix build error 2014-07-28 16:29:41 +08:00
CMY
d38e801e1d rk: ion: iommu: fix build error 2014-07-28 16:26:04 +08:00
CMY
87c0f56f96 rk: ion: add caller info in snapshot if alloc failed 2014-06-30 14:53:13 +08:00
CMY
f5c4d1ac8e rk: ion: Add support cma heap placed in highmem zone
Add CONFIG_ION_CMA_HIGHMEM to support cma that placed in highmem zone.

Use dma_alloc_attrs() with DMA_ATTR_NO_KERNEL_MAPPING to alloc memory from
cma heap that placed in highmem zone, and use dma_free_attrs() with
DMA_ATTR_NO_KERNEL_MAPPING to free the memory.

Use ion_heap_map_kernel/ion_heap_unmap_kernel for map/unmap to the kernel
when support cma in highmem.
2014-06-26 14:42:20 +08:00
CMY
1cb1bd40a6 rk: ion: fix build warning for iommu API 2014-06-25 10:59:18 +08:00
CMY
217438370d rk: lowmemorykiller: calculator free pages exclude CMA's free 2014-06-23 10:11:35 +08:00
xxm
1e51b0ee15 Told to update this issue to avoid midgard compile warning 2014-06-19 10:40:55 +08:00
wdc
6be1549533 fiq_debugger: disable usb uart by pass during booting time, when uart irqs are too many 2014-06-17 09:30:27 +08:00
黄涛
ee25a425b9 Merge tag 'lsk-android-14.05' into develop-3.10
lsk 14.05 android release

Conflicts:
	arch/arm/common/Kconfig
	arch/arm64/include/asm/arch_timer.h
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/Kconfig
2014-06-12 21:04:26 +08:00
CMY
b6d8214f0b rk: ion: register rockchip cma device 2014-06-12 17:14:36 +08:00
CMY
874f3ff67e rk: ion: fix build warning 2014-06-12 08:44:26 +08:00
CMY
1a7dec640d rk: ion: resolve sg table alloc failed if ion's vmalloc heap is used 2014-06-05 12:04:47 +08:00
黄涛
0fc71500f8 rk: ion: fix ion.h build warnings 2014-06-04 20:33:45 +08:00
CMY
3ecb7a87e8 rk: ion: resolve snapshot error and enable it by default 2014-05-31 13:50:10 +08:00
CMY
2305db926f Revert "rk: ion: support cache ops for CMA heap"
This reverts commit 98ad00141c.

Conflicts:
	drivers/staging/android/ion/ion.c
	drivers/staging/android/ion/ion_cma_heap.c
	drivers/staging/android/ion/ion_priv.h
2014-05-14 10:40:01 +08:00
Mark Brown
8de7c4692e Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android 2014-05-12 17:43:10 +01:00
CMY
e1ee585f1f rk: ion: CMA is working abnormal when it placed in high zone
Revert "rk: ion: support High Memory for CMA"

This reverts commit bf46fdf5df.
2014-05-12 16:14:53 +08:00
John Stultz
53a9dbb18e Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 2014-05-09 15:16:40 -07:00
CMY
bf46fdf5df rk: ion: support High Memory for CMA 2014-05-07 15:14:41 +08:00
Arve Hjønnevåg
1b48727337 fiq_debugger: Add fiq_watchdog_triggered api
Dumps registers and stacktrace into console-ramoops when called
from a watchdog fiq.

Change-Id: Ib6fab5a52f670db18e64214d5e4890e8292a749c
Signed-off-by: Arve Hjønnevåg <arve@android.com>
2014-05-05 17:02:07 -07:00
Arve Hjønnevåg
4498669afb fiq_debugger: Call fiq_debugger_printf through a function pointer from cpu specific code
This allows the output from the register and stack trace code to be
sent elsewhere.

Change-Id: I41bb0d5a25e1b9ca55feef5dbd675818b2f832d5
Signed-off-by: Arve Hjønnevåg <arve@android.com>
2014-05-02 20:47:38 -07:00
CMY
174296e734 rk: ion: fixed build bug 2014-04-30 09:46:49 +08:00
CMY
f52cfbfccb rk: ion: add version control
disable ion snapshot by default
		 fix build warn
2014-04-30 08:38:25 +08:00
黄涛
7fe47454f2 Merge tag 'lsk-android-14.04' into develop-3.10
lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h
2014-04-24 19:04:10 +08:00
CMY
93d866ae0c rk: ion: shows the maximum allocated memory 2014-04-23 10:27:27 +08:00
CMY
6dcfa84ccd rk: ion: reduce snapshot buf 2014-04-18 18:44:54 +08:00
CMY
b58fa64555 rk: ion: support last snapshot like last log 2014-04-18 18:20:30 +08:00
Colin Cross
a0f3f0f28e fiq_debugger: add ARM64 support
Add fiq_debugger_arm64.c that implements the platform-specific
functions.

Change-Id: I4d8b96777bb8503a93d4eb47bbde8e018740a5bf
Signed-off-by: Colin Cross <ccross@android.com>
2014-04-16 18:22:52 -07:00
Colin Cross
86098e6f33 fiq_debugger: split arm support into fiq_debugger_arm.c
Split arm support into a separate .c file that is only built for
CONFIG_ARM.

Change-Id: Iba16f4d51608bf9c3e5c8acefefcd38fead9797c
Signed-off-by: Colin Cross <ccross@android.com>
2014-04-16 17:35:45 -07:00
Colin Cross
c000c88d07 fiq_debugger: use pt_regs for registers
IRQ mode already passes in a struct pt_regs from get_irq_regs().
FIQ mode passes in something similar but not identical to a
struct pt_regs - FIQ mode stores the spsr of the interrupted mode
in slot 17, while pt_regs expects orig_r0.

Replace the existing mixture of void *regs, unsigned *regs, and
struct pt_regs * const with const struct pt_regs *.  Modify
dump_regs not to print the spsr since it won't be there in a
struct pt_regs anyways.  Modify dump_allregs to highlight the
mode that was interrupted, making spsr easy to find there.

Change-Id: Ibfe1723d702306c7605fd071737d7be9ee9d8c12
Signed-off-by: Colin Cross <ccross@android.com>
2014-04-16 17:35:45 -07:00
Colin Cross
ab71250a48 fiq_debugger: allow compiling without CONFIG_FIQ_GLUE
Allow compiling fiq_debugger.c without CONFIG_FIQ_GLUE for
platforms that don't support FIQs.

Change-Id: Iabdfd790d24fa9d47b29d2f850c567af2dcad78f
Signed-off-by: Colin Cross <ccross@android.com>
2014-04-16 17:35:44 -07:00
Colin Cross
a6273046d9 fiq_debugger: rename debug->fiq_debugger
Rename variables and functions in the global namespace to avoid
future collisions.

Change-Id: Ic23a304b0f794efc94cc6d086fddd63231d99c98
Signed-off-by: Colin Cross <ccross@android.com>
2014-04-16 17:35:44 -07:00
Colin Cross
5bcc457a96 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>
2014-04-15 11:33:32 -07:00
Mark Brown
3736e39e6a Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/john.stultz/android into linux-linaro-lsk-android 2014-04-15 18:12:51 +01:00
黄涛
0ffd56dafe Merge tag 'lsk-android-14.03' into develop-3.10
lsk 14.03 Android release
2014-04-15 12:51:10 +08:00
CMY
c934f4e7a2 rk: ion: Add ion snapshot function for debug
currently supported features: buffer allocation failure in time to
  save the current ion each heap and client status, etc.
2014-04-14 10:14:43 +08:00
CMY
d307ec0171 rk: ion: revise client debug info 2014-04-09 15:48:17 +08:00
CMY
b9195ee4f9 rk: ion: resolve build err 2014-04-09 10:22:48 +08:00