Commit e722a295 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: ion: remove from the tree 



The ION android code has long been marked to be removed, now that we
dma-buf support merged into the real part of the kernel.

It was thought that we could wait to remove the ion kernel at a later
time, but as the out-of-tree Android fork of the ion code has diverged
quite a bit, and any Android device using the ion interface uses that
forked version and not this in-tree version, the in-tree copy of the
code is abandonded and not used by anyone.

Combine this abandoned codebase with the need to make changes to it in
order to keep the kernel building properly, which then causes merge
issues when merging those changes into the out-of-tree Android code, and
you end up with two different groups of people (the in-kernel-tree
developers, and the Android kernel developers) who are both annoyed at
the current situation.  Because of this problem, just drop the in-kernel
copy of the ion code now, as it's not used, and is only causing problems
for everyone involved.

Cc: "Arve Hjønnevåg" <arve@android.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Christian Brauner <christian@brauner.io>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Hridya Valsaraju <hridya@google.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Laura Abbott <laura@labbott.name>
Cc: Martijn Coenen <maco@android.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Todd Kjos <tkjos@android.com>
Acked-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/20200827123627.538189-1-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3650b228

MAINTAINERS

+0 −10
Original line number Diff line number Diff line
@@ -1173,16 +1173,6 @@ S: Supported 
F:	Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt

F:	drivers/rtc/rtc-goldfish.c









ANDROID ION DRIVER









M:	Laura Abbott <labbott@redhat.com>









M:	Sumit Semwal <sumit.semwal@linaro.org>









L:	devel@driverdev.osuosl.org









L:	dri-devel@lists.freedesktop.org









L:	linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)









S:	Supported









F:	drivers/staging/android/ion









F:	drivers/staging/android/uapi/ion.h

















AOA (Apple Onboard Audio) ALSA DRIVER









M:	Johannes Berg <johannes@sipsolutions.net>









L:	linuxppc-dev@lists.ozlabs.org
































drivers/staging/android/Kconfig



+0
−2






























Original line number
Diff line number
Diff line







@@ -14,8 +14,6 @@ config ASHMEM







	  It is, in theory, a good memory allocator for low-memory devices,









	  because it can discard shared memory units when under memory pressure.



















source "drivers/staging/android/ion/Kconfig"



















endif # if ANDROID



















endmenu
























drivers/staging/android/Makefile



+0
−2






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









ccflags-y += -I$(src)			# needed for trace events



















obj-y					+= ion/



















obj-$(CONFIG_ASHMEM)			+= ashmem.o
























drivers/staging/android/TODO



+0
−5






























Original line number
Diff line number
Diff line







@@ -4,10 +4,5 @@ TODO:







	- add proper arch dependencies as needed









	- audit userspace interfaces to make sure they are sane





























ion/









 - Split /dev/ion up into multiple nodes (e.g. /dev/ion/heap0)









 - Better test framework (integration with VGEM was suggested)



















Please send patches to Greg Kroah-Hartman <greg@kroah.com> and Cc:









Arve Hjønnevåg <arve@android.com> and Riley Andrews <riandrews@android.com>
























drivers/staging/android/ion/Kconfig
deleted100644 → 0



+0
−27






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









menuconfig ION









	bool "Ion Memory Manager"









	depends on HAS_DMA && MMU









	select GENERIC_ALLOCATOR









	select DMA_SHARED_BUFFER









	help









	  Choose this option to enable the ION Memory Manager,









	  used by Android to efficiently allocate buffers









	  from userspace that can be shared between drivers.









	  If you're not using Android its probably safe to









	  say N here.



















config ION_SYSTEM_HEAP









	bool "Ion system heap"









	depends on ION









	help









	  Choose this option to enable the Ion system heap. The system heap









	  is backed by pages from the buddy allocator. If in doubt, say Y.



















config ION_CMA_HEAP









	bool "Ion CMA heap support"









	depends on ION && DMA_CMA









	help









	  Choose this option to enable CMA heaps with Ion. This heap is backed









	  by the Contiguous Memory Allocator (CMA). If your system has these









	  regions, you should say Y here.