Upstream sddf blk to use offsets, and initialise blk system with blk_config.h #74
Conversation
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
erichchan999
force-pushed
the
upstream_blk
branch
from
ffabf89 to
37f6e7c
Compare
erichchan999
force-pushed
the
upstream_blk
branch
from
e849ebe to
5160f65
Compare
examples/virtio/include/blk_config.h
Outdated
| _Static_assert(BLK_DATA_REGION_SIZE_DRIV >= BLK_TRANSFER_SIZE && BLK_DATA_REGION_SIZE_DRIV % BLK_TRANSFER_SIZE == 0, | ||
| "Driver data region size must be a multiple of the transfer size"); | ||
|
|
||
| // @ericc: TODO: improve the default switch case error handling |
There was a problem hiding this comment.
Remove this, this whole header will be removed hopefully soon and so no todos.
examples/virtio/Makefile
Outdated
|
|
||
| SDDF_DIR := $(abspath ../../dep/sddf) | ||
|
|
||
| INCLUDE := include |
There was a problem hiding this comment.
Suggested change
| INCLUDE := include | |
| VMM_INCLUDE := include |
tools/linux/uio_drivers/blk/blk.c
Outdated
Comment on lines
64
to
65
| // @ericc: After changing to using offsets in the sddf protocol, we no longer need to know the | ||
| // physical address of any mappings. But now that it is a part of the libuio library, we'll simply do nothing. |
There was a problem hiding this comment.
This seems just like a comment explaining things rather than a TODO. If that's the case we should remove the @ericc.
| @@ -214,16 +214,15 @@ | |||
| <map mr="req_blk_driver" vaddr="0x20200000" perms="rw" cached="false" setvar_vaddr="blk_req_queue_driver" /> | |||
| <map mr="resp_blk_driver" vaddr="0x20400000" perms="rw" cached="false" setvar_vaddr="blk_resp_queue_driver" /> | |||
| <map mr="data_blk_driver" vaddr="0x20800000" perms="rw" cached="true" setvar_vaddr="blk_data_driver" /> | |||
|
|
|||
src/virtio/block.c
Outdated
| @@ -421,10 +427,10 @@ bool virtio_blk_handle_resp(struct virtio_blk_device *state) | |||
| data->sddf_data, data->sddf_count, | |||
| data->sddf_block_number, 0, 0, true | |||
| }; | |||
|
|
|||
There was a problem hiding this comment.
Remove the whitespace.
Ivan-Velickovic
force-pushed
the
upstream_blk
branch
from
ef2b782 to
3c59b74
Compare
…config.h Signed-off-by: Eric Chan <[email protected]> Signed-off-by: Ivan Velickovic <[email protected]>
Ivan-Velickovic
force-pushed
the
upstream_blk
branch
from
3c59b74 to
6955523
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR changes the vaddr used in the sddf block queues to offsets instead.
It also pushes some of the initialisation of the sddf block memory regions logic in a header file blk_config.h This now matches how other device classes are initialised.
The linux userspace block directories are refactored to match that of the sound system.
Max sddf buffers size for block increased, its quite easily possible that we have more than 4192 buffers.