sys/linux: remove /dev/ion descriptions

The comment says:

// ION support was removed from kernel.
// We plan to leave the descriptions for some time as is and later remove them.

3 files changed, 0 insertions, 75 deletions

diff --git a/sys/linux/dev_ion.txt b/sys/linux/dev_ion.txt
deleted file mode 100644
index 464107048..000000000
--- a/sys/linux/dev_ion.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2017 syzkaller project authors. All rights reserved.
-# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-
-include <asm/ioctl.h>
-include <uapi/linux/fcntl.h>
-include <uapi/linux/dma-buf.h>
-include <drivers/staging/android/uapi/ion.h>
-
-resource fd_ion[fd]
-resource fd_dma_buf[fd]
-
-openat$ion(fd const[AT_FDCWD], file ptr[in, string["/dev/ion"]], flags flags[open_flags], mode const[0]) fd_ion
-
-ioctl$ION_IOC_ALLOC(fd fd_ion, cmd const[ION_IOC_ALLOC], arg ptr[inout, ion_allocation_data])
-ioctl$ION_IOC_HEAP_QUERY(fd fd_ion, cmd const[ION_IOC_HEAP_QUERY], arg ptr[inout, ion_heap_query])
-
-ioctl$DMA_BUF_IOCTL_SYNC(fd fd_dma_buf, cmd const[DMA_BUF_IOCTL_SYNC], arg ptr[in, flags[dma_buf_sync_flags, int64]])
-
-ion_allocation_data {
-	len		int64	(in)
-	heap_id_mask	flags[ion_heap_mask, int32]	(in)
-	flags		flags[ion_alloc_flags, int32]	(in)
-	fd		fd_dma_buf	(out)
-	unused		const[0, int32]
-}
-
-ion_heap_query {
-	cnt		len[heaps, int32]
-	reserved0	const[0, int32]
-	heaps		ptr64[out, ion_heap_data]
-	reserved1	const[0, int32]
-	reserved2	const[0, int32]
-}
-
-ion_heap_data {
-	name		string["name", MAX_HEAP_NAME]
-	type		int32
-	heap_id		int32
-	reserved0	int32
-	reserved1	int32
-	reserved2	int32
-}
-
-ion_alloc_flags = ION_FLAG_CACHED
-ion_heap_mask = ION_HEAP_TYPE_SYSTEM_BIT, ION_HEAP_TYPE_SYSTEM_CONTIG_BIT, ION_HEAP_TYPE_CARVEOUT_BIT, ION_HEAP_TYPE_CHUNK_BIT, ION_HEAP_TYPE_DMA_BIT, ION_HEAP_TYPE_CUSTOM_BIT
-dma_buf_sync_flags = DMA_BUF_SYNC_READ, DMA_BUF_SYNC_WRITE, DMA_BUF_SYNC_END
-
-define ION_HEAP_TYPE_SYSTEM_BIT	1 << ION_HEAP_TYPE_SYSTEM
-define ION_HEAP_TYPE_SYSTEM_CONTIG_BIT	1 << ION_HEAP_TYPE_SYSTEM_CONTIG
-define ION_HEAP_TYPE_CARVEOUT_BIT	1 << ION_HEAP_TYPE_CARVEOUT
-define ION_HEAP_TYPE_CHUNK_BIT	1 << ION_HEAP_TYPE_CHUNK
-define ION_HEAP_TYPE_DMA_BIT	1 << ION_HEAP_TYPE_DMA
-define ION_HEAP_TYPE_CUSTOM_BIT	1 << ION_HEAP_TYPE_CUSTOM
diff --git a/sys/linux/dev_ion.txt.const b/sys/linux/dev_ion.txt.const
deleted file mode 100644
index 37d90f2e6..000000000
--- a/sys/linux/dev_ion.txt.const
+++ /dev/null
@@ -1,19 +0,0 @@
-# Code generated by syz-sysgen. DO NOT EDIT.
-arches = 386, amd64, arm, arm64, mips64le, ppc64le, riscv64, s390x
-AT_FDCWD = 18446744073709551516
-DMA_BUF_IOCTL_SYNC = 1074291200, mips64le:ppc64le:2148033024
-DMA_BUF_SYNC_END = 4
-DMA_BUF_SYNC_READ = 1
-DMA_BUF_SYNC_WRITE = 2
-ION_FLAG_CACHED = 1
-ION_HEAP_TYPE_CARVEOUT_BIT = 4
-ION_HEAP_TYPE_CHUNK_BIT = 8
-ION_HEAP_TYPE_CUSTOM_BIT = 32
-ION_HEAP_TYPE_DMA_BIT = 16
-ION_HEAP_TYPE_SYSTEM_BIT = 1
-ION_HEAP_TYPE_SYSTEM_CONTIG_BIT = 2
-ION_IOC_ALLOC = 3222817024
-ION_IOC_HEAP_QUERY = 3222817032
-MAX_HEAP_NAME = 32
-__NR_ioctl = 54, amd64:16, arm64:riscv64:29, mips64le:5015
-__NR_openat = 56, 386:295, amd64:257, arm:322, mips64le:5247, ppc64le:286, s390x:288
diff --git a/sys/syz-extract/extract.go b/sys/syz-extract/extract.go
index 79eaccc9c..42fb1b008 100644
--- a/sys/syz-extract/extract.go
+++ b/sys/syz-extract/extract.go
@@ -272,9 +272,6 @@ func archFileList(os, arch string, files []string) (string, []string, []string,
 			// Not upstream, generated on:
 			// https://chromium.googlesource.com/chromiumos/third_party/kernel d2a8a1eb8b86
 			"dev_bifrost.txt": true,
-			// ION support was removed from kernel.
-			// We plan to leave the descriptions for some time as is and later remove them.
-			"dev_ion.txt": true,
 			// Not upstream, generated on unknown tree.
 			"dev_img_rogue.txt": true,
 		}