git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/hns3: fix timing in mailbox
[dpdk.git]
/
drivers
/
net
/
virtio
/
virtio_ring.h
diff --git
a/drivers/net/virtio/virtio_ring.h
b/drivers/net/virtio/virtio_ring.h
index
1760823
..
17a56b0
100644
(file)
--- a/
drivers/net/virtio/virtio_ring.h
+++ b/
drivers/net/virtio/virtio_ring.h
@@
-15,10
+15,15
@@
#define VRING_DESC_F_WRITE 2
/* This means the buffer contains a list of buffer descriptors. */
#define VRING_DESC_F_INDIRECT 4
#define VRING_DESC_F_WRITE 2
/* This means the buffer contains a list of buffer descriptors. */
#define VRING_DESC_F_INDIRECT 4
+
/* This flag means the descriptor was made available by the driver */
/* This flag means the descriptor was made available by the driver */
-#define VRING_
DESC_F_AVAIL(b) ((uint16_t)(b)
<< 7)
+#define VRING_
PACKED_DESC_F_AVAIL (1
<< 7)
/* This flag means the descriptor was used by the device */
/* This flag means the descriptor was used by the device */
-#define VRING_DESC_F_USED(b) ((uint16_t)(b) << 15)
+#define VRING_PACKED_DESC_F_USED (1 << 15)
+
+/* Frequently used combinations */
+#define VRING_PACKED_DESC_F_AVAIL_USED (VRING_PACKED_DESC_F_AVAIL | \
+ VRING_PACKED_DESC_F_USED)
/* The Host uses this in used->flags to advise the Guest: don't kick me
* when you add a buffer. It's unreliable, so it's simply an
/* The Host uses this in used->flags to advise the Guest: don't kick me
* when you add a buffer. It's unreliable, so it's simply an
@@
-54,7
+59,7
@@
struct vring_used_elem {
struct vring_used {
uint16_t flags;
struct vring_used {
uint16_t flags;
-
volatile
uint16_t idx;
+ uint16_t idx;
struct vring_used_elem ring[0];
};
struct vring_used_elem ring[0];
};
@@
-78,10
+83,9
@@
struct vring_packed_desc_event {
struct vring_packed {
unsigned int num;
struct vring_packed {
unsigned int num;
- struct vring_packed_desc *desc_packed;
- struct vring_packed_desc_event *driver_event;
- struct vring_packed_desc_event *device_event;
-
+ struct vring_packed_desc *desc;
+ struct vring_packed_desc_event *driver;
+ struct vring_packed_desc_event *device;
};
struct vring {
};
struct vring {
@@
-129,7
+133,7
@@
vring_size(struct virtio_hw *hw, unsigned int num, unsigned long align)
{
size_t size;
{
size_t size;
- if (v
tpci
_packed_queue(hw)) {
+ if (v
irtio_with
_packed_queue(hw)) {
size = num * sizeof(struct vring_packed_desc);
size += sizeof(struct vring_packed_desc_event);
size = RTE_ALIGN_CEIL(size, align);
size = num * sizeof(struct vring_packed_desc);
size += sizeof(struct vring_packed_desc_event);
size = RTE_ALIGN_CEIL(size, align);
@@
-161,11
+165,11
@@
vring_init_packed(struct vring_packed *vr, uint8_t *p, unsigned long align,
unsigned int num)
{
vr->num = num;
unsigned int num)
{
vr->num = num;
- vr->desc
_packed
= (struct vring_packed_desc *)p;
- vr->driver
_event
= (struct vring_packed_desc_event *)(p +
+ vr->desc = (struct vring_packed_desc *)p;
+ vr->driver = (struct vring_packed_desc_event *)(p +
vr->num * sizeof(struct vring_packed_desc));
vr->num * sizeof(struct vring_packed_desc));
- vr->device
_event
= (struct vring_packed_desc_event *)
- RTE_ALIGN_CEIL((
uintptr_t)(vr->driver_event
+
+ vr->device = (struct vring_packed_desc_event *)
+ RTE_ALIGN_CEIL((
(uintptr_t)vr->driver
+
sizeof(struct vring_packed_desc_event)), align);
}
sizeof(struct vring_packed_desc_event)), align);
}