[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RFC v4 04/16] virtio-iommu: Decode the command payload
From: |
Eric Auger |
Subject: |
[Qemu-arm] [RFC v4 04/16] virtio-iommu: Decode the command payload |
Date: |
Tue, 19 Sep 2017 09:46:36 +0200 |
This patch adds the command payload decoding and
introduces the functions that will do the actual
command handling. Those functions are not yet implemented.
Signed-off-by: Eric Auger <address@hidden>
---
v3 -> v4:
- no flags field anymore in struct virtio_iommu_req_unmap
- test reserved on attach/detach, change trace proto
v3 -> v4:
- rebase on v2.10.0.
---
hw/virtio/trace-events | 4 ++
hw/virtio/virtio-iommu.c | 104 +++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 104 insertions(+), 4 deletions(-)
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index 98cf9a1..a35dc62 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -32,3 +32,7 @@ virtio_iommu_set_features(uint64_t features) "features
accepted by the driver =0
virtio_iommu_device_reset(void) "reset!"
virtio_iommu_device_status(uint8_t status) "driver status = %d"
virtio_iommu_get_config(uint64_t page_size_mask, uint64_t start, uint64_t end,
uint8_t ioasid_bits, uint32_t probe_size) "page_size_mask=0x%"PRIx64"
start=0x%"PRIx64" end=0x%"PRIx64" ioasid_bits=%d probe_size=0x%x"
+virtio_iommu_attach(uint32_t as, uint32_t dev) "as=%d dev=%d"
+virtio_iommu_detach(uint32_t dev) "dev=%d"
+virtio_iommu_map(uint32_t as, uint64_t phys_addr, uint64_t virt_addr, uint64_t
size, uint32_t flags) "as= %d phys_addr=0x%"PRIx64" virt_addr=0x%"PRIx64"
size=0x%"PRIx64" flags=%d"
+virtio_iommu_unmap(uint32_t as, uint64_t virt_addr, uint64_t size) "as= %d
virt_addr=0x%"PRIx64" size=0x%"PRIx64
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 36e5b5f..51f9003 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -35,29 +35,125 @@
/* Max size */
#define VIOMMU_DEFAULT_QUEUE_SIZE 256
+static int virtio_iommu_attach(VirtIOIOMMU *s,
+ struct virtio_iommu_req_attach *req)
+{
+ uint32_t asid = le32_to_cpu(req->address_space);
+ uint32_t devid = le32_to_cpu(req->device);
+ uint32_t reserved = le32_to_cpu(req->reserved);
+
+ trace_virtio_iommu_attach(asid, devid);
+
+ if (reserved) {
+ return VIRTIO_IOMMU_S_INVAL;
+ }
+
+ return VIRTIO_IOMMU_S_UNSUPP;
+}
+
+static int virtio_iommu_detach(VirtIOIOMMU *s,
+ struct virtio_iommu_req_detach *req)
+{
+ uint32_t devid = le32_to_cpu(req->device);
+ uint32_t reserved = le32_to_cpu(req->reserved);
+
+ trace_virtio_iommu_detach(devid);
+
+ if (reserved) {
+ return VIRTIO_IOMMU_S_INVAL;
+ }
+
+ return VIRTIO_IOMMU_S_UNSUPP;
+}
+
+static int virtio_iommu_map(VirtIOIOMMU *s,
+ struct virtio_iommu_req_map *req)
+{
+ uint32_t asid = le32_to_cpu(req->address_space);
+ uint64_t phys_addr = le64_to_cpu(req->phys_addr);
+ uint64_t virt_addr = le64_to_cpu(req->virt_addr);
+ uint64_t size = le64_to_cpu(req->size);
+ uint32_t flags = le32_to_cpu(req->flags);
+
+ trace_virtio_iommu_map(asid, phys_addr, virt_addr, size, flags);
+
+ return VIRTIO_IOMMU_S_UNSUPP;
+}
+
+static int virtio_iommu_unmap(VirtIOIOMMU *s,
+ struct virtio_iommu_req_unmap *req)
+{
+ uint32_t asid = le32_to_cpu(req->address_space);
+ uint64_t virt_addr = le64_to_cpu(req->virt_addr);
+ uint64_t size = le64_to_cpu(req->size);
+
+ trace_virtio_iommu_unmap(asid, virt_addr, size);
+
+ return VIRTIO_IOMMU_S_UNSUPP;
+}
+
+#define get_payload_size(req) (\
+sizeof((req)) - sizeof(struct virtio_iommu_req_tail))
+
static int virtio_iommu_handle_attach(VirtIOIOMMU *s,
struct iovec *iov,
unsigned int iov_cnt)
{
- return -ENOENT;
+ struct virtio_iommu_req_attach req;
+ size_t sz, payload_sz;
+
+ payload_sz = get_payload_size(req);
+
+ sz = iov_to_buf(iov, iov_cnt, 0, &req, payload_sz);
+ if (sz != payload_sz) {
+ return VIRTIO_IOMMU_S_INVAL;
+ }
+ return virtio_iommu_attach(s, &req);
}
static int virtio_iommu_handle_detach(VirtIOIOMMU *s,
struct iovec *iov,
unsigned int iov_cnt)
{
- return -ENOENT;
+ struct virtio_iommu_req_detach req;
+ size_t sz, payload_sz;
+
+ payload_sz = get_payload_size(req);
+
+ sz = iov_to_buf(iov, iov_cnt, 0, &req, payload_sz);
+ if (sz != payload_sz) {
+ return VIRTIO_IOMMU_S_INVAL;
+ }
+ return virtio_iommu_detach(s, &req);
}
static int virtio_iommu_handle_map(VirtIOIOMMU *s,
struct iovec *iov,
unsigned int iov_cnt)
{
- return -ENOENT;
+ struct virtio_iommu_req_map req;
+ size_t sz, payload_sz;
+
+ payload_sz = get_payload_size(req);
+
+ sz = iov_to_buf(iov, iov_cnt, 0, &req, payload_sz);
+ if (sz != payload_sz) {
+ return VIRTIO_IOMMU_S_INVAL;
+ }
+ return virtio_iommu_map(s, &req);
}
static int virtio_iommu_handle_unmap(VirtIOIOMMU *s,
struct iovec *iov,
unsigned int iov_cnt)
{
- return -ENOENT;
+ struct virtio_iommu_req_unmap req;
+ size_t sz, payload_sz;
+
+ payload_sz = get_payload_size(req);
+
+ sz = iov_to_buf(iov, iov_cnt, 0, &req, payload_sz);
+ if (sz != payload_sz) {
+ return VIRTIO_IOMMU_S_INVAL;
+ }
+ return virtio_iommu_unmap(s, &req);
}
static void virtio_iommu_handle_command(VirtIODevice *vdev, VirtQueue *vq)
--
2.5.5
- [Qemu-arm] [RFC v4 00/16] VIRTIO-IOMMU device, Eric Auger, 2017/09/19
- [Qemu-arm] [RFC v4 01/16] update-linux-headers: import virtio_iommu.h, Eric Auger, 2017/09/19
- [Qemu-arm] [RFC v4 02/16] linux-headers: Update for virtio-iommu, Eric Auger, 2017/09/19
- [Qemu-arm] [RFC v4 03/16] virtio-iommu: add skeleton, Eric Auger, 2017/09/19
- [Qemu-arm] [RFC v4 04/16] virtio-iommu: Decode the command payload,
Eric Auger <=
- [Qemu-arm] [RFC v4 05/16] virtio-iommu: Add the iommu regions, Eric Auger, 2017/09/19
- [Qemu-arm] [RFC v4 06/16] virtio-iommu: Register attached devices, Eric Auger, 2017/09/19
- [Qemu-arm] [RFC v4 07/16] virtio-iommu: Implement attach/detach command, Eric Auger, 2017/09/19
- [Qemu-arm] [RFC v4 08/16] virtio-iommu: Implement map/unmap, Eric Auger, 2017/09/19
- [Qemu-arm] [RFC v4 09/16] virtio-iommu: Implement translate, Eric Auger, 2017/09/19
- [Qemu-arm] [RFC v4 10/16] virtio-iommu: Implement probe request, Eric Auger, 2017/09/19