Skip to content

fix(vfio): implement reset() for MsiCapMmio #203

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

Merged
Lencerf merged 1 commit into from
Dec 22, 2024
Merged

fix(vfio): implement reset() for MsiCapMmio #203

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
19 changes: 15 additions & 4 deletions alioth/src/vfio/pci.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,10 @@ where
M: MsiSender,
D: Device,
{
fn update_msi(&self, ctrl: MsiMsgCtrl, data: &[u32; 4]) -> Result<()> {
fn update_msi(&self) -> Result<()> {
let (hdr, body) = &*self.cap.read();
let ctrl = &hdr.control;
let data = &body.data;
let msg_mask = if ctrl.ext_msg_data() {
u32::MAX
} else {
Expand Down Expand Up @@ -783,8 +786,9 @@ where
}

fn write(&self, offset: u64, size: u8, val: u64) -> mem::Result<Action> {
let (hdr, body) = &mut *self.cap.write();
let mut need_update = false;
let mut cap = self.cap.write();
let (hdr, body) = &mut *cap;
match (offset as usize, size) {
(0x2, 2) => {
let ctrl = &mut hdr.control;
Expand All @@ -810,8 +814,9 @@ where
width = 2 * size as usize
),
}
drop(cap);
if need_update {
self.update_msi(hdr.control, &body.data)
self.update_msi()
.map_err(boxed_debug_trace)
.context(mem::error::Mmio)?;
}
Expand All @@ -825,6 +830,12 @@ where
M: MsiSender,
{
fn reset(&self) {
log::error!("{}: TODO: MsiCapMmio reset.", self.dev.name)
{
let (hdr, _) = &mut *self.cap.write();
hdr.control.set_enable(false);
}
if let Err(e) = self.update_msi() {
log::error!("{}: failed to reset: {e:?}", self.dev.name);
}
}
}
Loading