github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

dm/VBS-U: implement virtio_vq_enable

Browse Source 
Virtio modern changed the virtqueue cofiguration precedures. GPA
of descriptor table, available ring and used ring are written to
common configuration registers separately. A final write to
Q_ENABLE register triggered initialization of the virtqueue on
the backend device.

Signed-off-by: Jian Jun Chen <jian.jun.chen@intel.com>
Reviewed-by: Hao Li <hao.l.li@intel.com>
Reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Jian Jun Chen 2018-03-29 12:23:36 +08:00 committed by Jack Ren
parent 76422fd5f1
commit ce098260de
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
devicemodel/hw/pci/virtio/virtio.c
View File

@ -227,7 +227,40 @@ virtio_vq_init(struct virtio_base *base, uint32_t pfn)
static void static void
virtio_vq_enable(struct virtio_base *base) virtio_vq_enable(struct virtio_base *base)
{ {
/* TODO: to be implemented */ struct virtio_vq_info *vq;
uint16_t qsz;
uint64_t phys;
size_t size;
char *vb;
vq = &base->queues[base->curq];
qsz = vq->qsize;
/* descriptors */
phys = (((uint64_t)vq->gpa_desc[1]) << 32) | vq->gpa_desc[0];
size = qsz * sizeof(struct virtio_desc);
vb = paddr_guest2host(base->dev->vmctx, phys, size);
vq->desc = (struct virtio_desc *)vb;
/* available ring */
phys = (((uint64_t)vq->gpa_avail[1]) << 32) | vq->gpa_avail[0];
size = (2 + qsz + 1) * sizeof(uint16_t);
vb = paddr_guest2host(base->dev->vmctx, phys, size);
vq->avail = (struct vring_avail *)vb;
/* used ring */
phys = (((uint64_t)vq->gpa_used[1]) << 32) | vq->gpa_used[0];
size = sizeof(uint16_t) * 3 + sizeof(struct virtio_used) * qsz;
vb = paddr_guest2host(base->dev->vmctx, phys, size);
vq->used = (struct vring_used *)vb;
/* Mark queue as allocated, and start at 0 when we use it. */
vq->flags = VQ_ALLOC;
vq->last_avail = 0;
vq->save_used = 0;
/* Mark queue as enabled. */
vq->enabled = true;
} }
/* /*

3
devicemodel/include/virtio.h
View File

@ -318,7 +318,8 @@ struct vring_used {
/* From section 2.3, "Virtqueue Configuration", of the virtio specification */ /* From section 2.3, "Virtqueue Configuration", of the virtio specification */
/** /**
* @brief Calculate size of a virtual ring. * @brief Calculate size of a virtual ring, this interface is only valid for
* legacy virtio.
* *
* @param qsz Size of raw data in a certain virtqueue. * @param qsz Size of raw data in a certain virtqueue.
* *