Skip to content

uefi: Fix io-align == 0 edgecase handling for ata & nvme #1698

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 1 commit into from
Jun 10, 2025
Merged

uefi: Fix io-align == 0 edgecase handling for ata & nvme #1698

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
4 changes: 3 additions & 1 deletion uefi/src/proto/ata/pass_thru.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ impl AtaPassThru {
/// The [`AtaPassThruMode`] structure containing configuration details of the protocol.
#[must_use]
pub fn mode(&self) -> AtaPassThruMode {
unsafe { (*self.0.mode).clone() }
let mut mode = unsafe { (*self.0.mode).clone() };
mode.io_align = mode.io_align.max(1); // 0 and 1 is the same, says UEFI spec
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the record, this is documented here: https://uefi.org/specs/UEFI/2.10/13_Protocols_Media_Access.html#efi-ata-pass-thru-protocol

mode
}

/// Retrieves the I/O buffer alignment required by this SCSI channel.
Expand Down
4 changes: 3 additions & 1 deletion uefi/src/proto/nvme/pass_thru.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ impl NvmePassThru {
/// An instance of [`NvmePassThruMode`] describing the NVMe controller's capabilities.
#[must_use]
pub fn mode(&self) -> NvmePassThruMode {
unsafe { (*self.0.mode).clone() }
let mut mode = unsafe { (*self.0.mode).clone() };
mode.io_align = mode.io_align.max(1); // 0 and 1 is the same, says UEFI spec
mode
}

/// Retrieves the alignment requirements for I/O buffers.
Expand Down