| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 1 | From dfa152d399d7e6a285ab31bcc2172f61d5db907d Mon Sep 17 00:00:00 2001 |
| 2 | From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
| 3 | Date: Thu, 19 May 2022 09:59:06 +0100 |
| 4 | Subject: [PATCH 38/40] ANDROID: trusty-ipc: fix VIRTIO_ID_TRUSTY_IPC ID |
| 5 | |
| 6 | Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
| 7 | Upstream-Status: Pending [Not submitted to upstream yet] |
| 8 | Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com |
| 9 | --- |
| 10 | include/uapi/linux/virtio_ids.h | 4 ++++ |
| 11 | 1 file changed, 4 insertions(+) |
| 12 | |
| 13 | diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h |
| 14 | index 909905cd7618..06ccbf2db5fa 100644 |
| 15 | --- a/include/uapi/linux/virtio_ids.h |
| 16 | +++ b/include/uapi/linux/virtio_ids.h |
| 17 | @@ -42,6 +42,10 @@ |
| 18 | #define VIRTIO_ID_RPROC_SERIAL 11 /* virtio remoteproc serial link */ |
| 19 | #define VIRTIO_ID_CAIF 12 /* Virtio caif */ |
| 20 | #define VIRTIO_ID_MEMORY_BALLOON 13 /* virtio memory balloon */ |
| 21 | +/* |
| 22 | + * todo: VIRTIO_ID_TRUSTY_IPC conflicts with VIRTIO_ID_MEMORY_BALLOON |
| 23 | + * replace with unused ID and update trusty kernel header tipc_virtio_dev.h |
| 24 | + */ |
| 25 | #define VIRTIO_ID_TRUSTY_IPC 13 /* virtio trusty ipc */ |
| 26 | #define VIRTIO_ID_GPU 16 /* virtio GPU */ |
| 27 | #define VIRTIO_ID_CLOCK 17 /* virtio clock/timer */ |
| 28 | -- |
| 29 | 2.34.1 |
| 30 | |