Skip to content

drivers: Modified code in virtio transport #2139

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.

Sign up for GitHub

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

Open
udaykiriti wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −9
Open

drivers: Modified code in virtio transport #2139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/drivers/virtio/transport/mmio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,19 @@ use crate::drivers::virtio::error::VirtioError;
pub struct VqCfgHandler<'a> {
vq_index: u16,
raw: VolatileRef<'a, DeviceRegisters>,
selected: bool,
}

impl VqCfgHandler<'_> {
// TODO: Create type for queue selected invariant to get rid of `self.select_queue()` everywhere.
fn select_queue(&mut self) {
self.raw
.as_mut_ptr()
.queue_sel()
.write(self.vq_index.into());
if !self.selected {
self.raw
.as_mut_ptr()
.queue_sel()
.write(self.vq_index.into());
self.selected = true;
}
}

/// Sets the size of a given virtqueue. In case the provided size exceeds the maximum allowed
Expand Down Expand Up @@ -122,6 +126,7 @@ impl ComCfg {
Some(VqCfgHandler {
vq_index: index,
raw: self.com_cfg.borrow_mut(),
selected: true,
})
}
}
Expand Down Expand Up @@ -266,6 +271,7 @@ impl ComCfg {
infoentry!("Device ID", "{:?}", ptr.device_id().read());
infoentry!("Vendor ID", "{:#X}", ptr.vendor_id().read());
infoentry!("Device Features", "{:#X}", self.dev_features());

let ptr = self.com_cfg.as_ptr();
infoentry!("Interrupt status", "{:#X}", ptr.interrupt_status().read());
infoentry!("Device status", "{:#X}", ptr.status().read());
Expand Down Expand Up @@ -380,7 +386,7 @@ pub(crate) fn init_device(
let dev_id: u16 = 0;

if registers.as_ptr().version().read().to_ne() == 0x1 {
error!("Legacy interface isn't supported!");
error!("Legacy Virtio interface (v1.0) is not supported!");
return Err(DriverError::InitVirtioDevFail(
VirtioError::DevNotSupported(dev_id),
));
Expand Down
13 changes: 9 additions & 4 deletions src/drivers/virtio/transport/pci.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,19 @@ impl ComCfg {
pub struct VqCfgHandler<'a> {
vq_index: u16,
raw: VolatileRef<'a, CommonCfg>,
selected: bool,
}

impl VqCfgHandler<'_> {
// TODO: Create type for queue selected invariant to get rid of `self.select_queue()` everywhere.
fn select_queue(&mut self) {
self.raw
.as_mut_ptr()
.queue_select()
.write(self.vq_index.into());
if !self.selected {
self.raw
.as_mut_ptr()
.queue_select()
.write(self.vq_index.into());
self.selected = true;
}
}

/// Sets the size of a given virtqueue. In case the provided size exceeds the maximum allowed
Expand Down Expand Up @@ -288,6 +292,7 @@ impl ComCfg {
Some(VqCfgHandler {
vq_index: index,
raw: self.com_cfg.borrow_mut(),
selected: true,
})
}
}
Expand Down
Loading