-
Notifications
You must be signed in to change notification settings - Fork 295
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
virtqueue: add more virtqueue apis for the virtio device side #631
Open
CV-Bowen
wants to merge
1
commit into
OpenAMP:main
Choose a base branch
from
CV-Bowen:virtqueue_next_buffer
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+88
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -231,6 +231,63 @@ void *virtqueue_get_available_buffer(struct virtqueue *vq, uint16_t *avail_idx, | |
return buffer; | ||
} | ||
|
||
void *virtqueue_get_next_avail_buffer(struct virtqueue *vq, uint16_t idx, | ||
uint16_t *next_idx, uint32_t *next_len) | ||
{ | ||
void *buffer; | ||
uint16_t next; | ||
|
||
VRING_INVALIDATE(vq->vq_ring.desc[idx], sizeof(struct vring_desc)); | ||
if (!(vq->vq_ring.desc[idx].flags & VRING_DESC_F_NEXT)) | ||
return NULL; | ||
|
||
next = vq->vq_ring.desc[idx].next; | ||
if (next_idx) | ||
*next_idx = next; | ||
|
||
VRING_INVALIDATE(vq->vq_ring.desc[next], sizeof(struct vring_desc)); | ||
buffer = virtqueue_phys_to_virt(vq, vq->vq_ring.desc[next].addr); | ||
if (next_len) | ||
*next_len = vq->vq_ring.desc[next].len; | ||
|
||
return buffer; | ||
} | ||
|
||
int virtqueue_get_available_buffers(struct virtqueue *vq, | ||
struct virtqueue_buf *vb, int vbsize, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. as mentioned in my previous comment you should return a struct vq_buf that contain the address, the size and the index of the needed buffers instead of just returning the buffer |
||
int *vbcnt) | ||
{ | ||
uint16_t head; | ||
uint16_t idx; | ||
uint32_t len; | ||
void *buf; | ||
int i; | ||
|
||
buf = virtqueue_get_available_buffer(vq, &head, &len); | ||
if (!buf) | ||
return ERROR_VRING_NO_BUFF; | ||
|
||
vb[0].buf = buf; | ||
vb[0].len = len; | ||
|
||
for (i = 1, idx = head; ; i++) { | ||
buf = virtqueue_get_next_avail_buffer(vq, idx, &idx, &len); | ||
if (!buf) | ||
break; | ||
else if (i >= vbsize) { | ||
metal_log(METAL_LOG_ERROR, "vbsize %d is not enough\n", | ||
vbsize); | ||
return ERROR_VQUEUE_INVLD_PARAM; | ||
} | ||
|
||
vb[i].buf = buf; | ||
vb[i].len = len; | ||
} | ||
|
||
*vbcnt = i; | ||
return head; | ||
} | ||
|
||
int virtqueue_add_consumed_buffer(struct virtqueue *vq, uint16_t head_idx, | ||
uint32_t len) | ||
{ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you still need this one? virtqueue_get_available_buffers should replace this function