Commit Graph

18454 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
黄涛
4b19ba3477 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	drivers/staging/android/ion/ion.c
	include/linux/rockchip/sysmmu.h
2014-08-04 16:52:07 +08:00
Minchan Kim
66db73c14b zram: don't grab mutex in zram_slot_free_noity
[1] introduced down_write in zram_slot_free_notify to prevent race
between zram_slot_free_notify and zram_bvec_[read|write]. The race
could happen if somebody who has right permission to open swap device
is reading swap device while it is used by swap in parallel.

However, zram_slot_free_notify is called with holding spin_lock of
swap layer so we shouldn't avoid holing mutex. Otherwise, lockdep
warns it.

This patch adds new list to handle free slot and workqueue
so zram_slot_free_notify just registers slot index to be freed and
registers the request to workqueue. If workqueue is expired,
it holds mutex_lock so there is no problem any more.

If any I/O is issued, zram handles pending slot-free request
caused by zram_slot_free_notify right before handling issued
request because workqueue wouldn't be expired yet so zram I/O
request handling function can miss it.

Lastly, when zram is reset, flush_work could handle all of pending
free request so we shouldn't have memory leak.

NOTE: If zram_slot_free_notify's kmalloc with GFP_ATOMIC would be
failed, the slot will be freed when next write I/O write the slot.

[1] [57ab0485, zram: use zram->lock to protect zram_free_page()
    in swap free notify path]

* from v2
  * refactoring

* from v1
  * totally redesign

Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit a0c516cbfc)

Conflicts:
	drivers/staging/zram/zram_drv.c
2014-08-04 16:34:53 +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
Mark Brown
471dd6b43f Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-07-01 11:20:33 +01:00
Paul Bolle
06fc222e9d staging: tidspbridge: check for CONFIG_SND_OMAP_SOC_MCBSP
commit d3921a03a8 upstream.

Commit d0f47ff17f ("ASoC: OMAP: Build config cleanup for McBSP")
removed the Kconfig symbol OMAP_MCBSP. It left two checks for
CONFIG_OMAP_MCBSP untouched.

Convert these to checks for CONFIG_SND_OMAP_SOC_MCBSP. That must be
correct, since that re-enables calls to functions that are all found in
sound/soc/omap/mcbsp.c. And that file is built only if
CONFIG_SND_OMAP_SOC_MCBSP is defined.

Fixes: d0f47ff17f ("ASoC: OMAP: Build config cleanup for McBSP")
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-30 20:09:41 -07:00
CMY
87c0f56f96 rk: ion: add caller info in snapshot if alloc failed 2014-06-30 14:53:13 +08:00
Mario Schuknecht
3605c64ece staging: iio: tsl2x7x_core: fix proximity treshold
commit c404618cd0 upstream.

Consider high byte of proximity min and max treshold in function
'tsl2x7x_chip_on'. So far, the high byte was not set.

Signed-off-by: Mario Schuknecht <mario.schuknecht@dresearch-fe.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-26 15:12:40 -04: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
Alex Shi
4a29519b4a Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-06-12 17:36:21 +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
Ian Abbott
f3c0ca9b1a staging: comedi: ni_daq_700: add mux settling delay
commit ffed54dced upstream.

I got a patch from the original author, Fred Brooks, to add a small
settling delay after setting the AI channel multiplexor.  The lack of
delay resulted in unstable or scrambled data on faster processors.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reported-by: Fred Brooks <nsaspook@nsaspook.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-11 12:03:25 -07:00
Ben Hutchings
e7eb1ab9a3 Staging: speakup: Move pasting into a work item
commit d750013580 upstream.

Input is handled in softirq context, but when pasting we may
need to sleep.  speakup_paste_selection() currently tries to
bodge this by busy-waiting if in_atomic(), but that doesn't
help because the ldisc may also sleep.

For bonus breakage, speakup_paste_selection() changes the
state of current, even though it's not running in process
context.

Move it into a work item and make sure to cancel it on exit.

References: https://bugs.debian.org/735202
References: https://bugs.debian.org/744015
Reported-by: Paul Gevers <elbrus@debian.org>
Reported-and-tested-by: Jarek Czekalski <jarekczek@poczta.onet.pl>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-11 12:03:24 -07: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
Mark Brown
6ba9615888 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-05-07 09:50:19 +01:00
CMY
bf46fdf5df rk: ion: support High Memory for CMA 2014-05-07 15:14:41 +08:00
Larry Finger
6c9dcf2b7c staging: r8712u: Fix case where ethtype was never obtained and always be checked against 0
commit f764cd68d9 upstream.

Zero-initializing ether_type masked that the ether type would never be
obtained for 8021x packets and the comparison against eapol_type
would always fail.

Reported-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-06 07:55:28 -07:00
Himangi Saraogi
8012af5c10 staging:serqt_usb2: Fix sparse warning restricted __le16 degrades to integer
commit abe5d64d1a upstream.

This patch fixes the following sparse warning :
drivers/staging/serqt_usb2/serqt_usb2.c:727:40: warning: restricted __le16 degrades to integer

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-06 07:55:28 -07: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
Ian Abbott
7a63f58358 staging: comedi: 8255_pci: initialize MITE data window
commit 268d1e7996 upstream.

According to National Instruments' PCI-DIO-96/PXI-6508/PCI-6503 User
Manual, the physical address in PCI BAR1 needs to be OR'ed with 0x80 and
written to register offset 0xC0 in the "MITE" registers (BAR0).  Do so
during initialization of the National Instruments boards handled by the
"8255_pci" driver.  The boards were previously handled by the
"ni_pcidio" driver, where the initialization was done by `mite_setup()`
in the "mite" module.  The "mite" module comes with too much extra
baggage for the "8255_pci" driver to deal with so use a local, simpler
initialization function.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-26 17:15:34 -07: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