Skip to content

NVMe-MI fixes #6

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
merged 3 commits into from
Sep 23, 2025
Merged

NVMe-MI fixes #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0717f6
nvme-mi: Accept command effects that maintain current state
amboar Sep 23, 2025
1e07eae
nvme-mi: Constrain to one controller
amboar Sep 23, 2025
2edcdd6
Update nvme-mi-dev
amboar Sep 23, 2025
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 19 additions & 10 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,6 @@ async fn nvme_mi_task(router: &'static Router<'static>) -> ! {
let mut subsys = Subsystem::new(SubsystemInfo::environment());
let ppid = subsys.add_port(PortType::Pcie(PciePort::new())).unwrap();
let ctrlid0 = subsys.add_controller(ppid).unwrap();
let _ctrlid1 = subsys.add_controller(ppid).unwrap();

let size_blocks = 10_000_000_000_000_u64.div_ceil(512);
let nsid = subsys.add_namespace(size_blocks).unwrap();
Expand All @@ -428,19 +427,29 @@ async fn nvme_mi_task(router: &'static Router<'static>) -> ! {
debug!("Handling NVMe-MI message: {msg:x?}");
mep.handle_async(&mut subsys, msg, ic, resp, async |cmd| match cmd {
CommandEffect::SetMtu { port_id, mtus } => {
if port_id == ppid {
if port_id != twpid {
warn!("NVMe-MI: Set MTU bad Port ID {port_id:?}");
return Err(CommandEffectError::InternalError);
}
if mtus != 64 {
// TODO: implement once PortLookup::by_eid trait takes a
// non-mut reference.
warn!("NVMe-MI: Set MTU Port ID {port_id:?} MTU {mtus}, not currently handled");
Err(CommandEffectError::Unsupported)
} else {
warn!("NVMe-MI: Set MTU bad Port ID {port_id:?}");
Err(CommandEffectError::InternalError)
warn!("NVMe-MI: Application lacks support for MTU ({mtus}) != BTU (64)");
return Err(CommandEffectError::Unsupported);
}

Ok(())
}
CommandEffect::SetSmbusFreq { .. } => {
info!("NVMe-MI: Ignoring Set SMBUS Frequency");
Err(CommandEffectError::Unsupported)
CommandEffect::SetSmbusFreq { port_id: _, freq } => {
use nvme_mi_dev::nvme::mi::SmbusFrequency;

if freq != SmbusFrequency::Freq100Khz {
warn!("NVMe-MI: Application lacks support for I2C bus frequency {:?}", freq);
return Err(CommandEffectError::Unsupported)
}

// Not an error to ignore SMBus frequency when we're using USB
Ok(())
}
})
.await;
Expand Down