Skip to content

efi: Refactor EFI layer #337

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 5 commits into from
May 27, 2024
Merged

efi: Refactor EFI layer #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8aa4a0e
efi/alloc: Add `alloc_pool` and `free_pool`
retrage May 24, 2024
49edbf2
efi/alloc: Use r-efi constants
retrage May 26, 2024
028a9c8
efi/block: Use r-efi constants
retrage May 25, 2024
4d0510b
efi: Break down mod.rs into multiple files
retrage May 21, 2024
e823068
efi/alloc: Use page size defined in layout.rs
retrage May 26, 2024
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
170 changes: 101 additions & 69 deletions src/efi/alloc.rs
View file
Open in desktop

Large diffs are not rendered by default.

107 changes: 24 additions & 83 deletions src/efi/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,94 +4,35 @@
use core::ffi::c_void;

use r_efi::{
efi::{self, Guid, Status},
eficall, eficall_abi,
protocols::device_path::Protocol as DevicePathProtocol,
efi::{self, Status},
protocols::{
block_io::{Media, Protocol as BlockIoProtocol},
device_path::{HardDriveMedia, Protocol as DevicePathProtocol},
},
};

use crate::{
block::{SectorBuf, VirtioBlockDevice},
part::{get_partitions, PartitionEntry},
};

pub const PROTOCOL_GUID: Guid = Guid::from_fields(
0x964e_5b21,
0x6459,
0x11d2,
0x8e,
0x39,
&[0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b],
);

#[allow(dead_code)]
#[repr(packed)]
pub struct HardDiskDevicePathProtocol {
pub device_path: DevicePathProtocol,
pub partition_number: u32,
pub partition_start: u64,
pub partition_size: u64,
pub partition_signature: [u8; 16],
pub partition_format: u8,
pub signature_type: u8,
}

#[allow(dead_code)]
#[repr(packed)]
pub struct ControllerDevicePathProtocol {
pub device_path: DevicePathProtocol,
pub controller: u32,
}

#[repr(C)]
struct BlockIoMedia {
media_id: u32,
removable_media: bool,
media_present: bool,
logical_partition: bool,
read_only: bool,
write_caching: bool,
block_size: u32,
io_align: u32,
last_block: u64,
}

#[repr(C)]
pub struct BlockIoProtocol {
revision: u64,
media: *const BlockIoMedia,
reset: eficall! {fn(
*mut BlockIoProtocol,
bool
) -> Status},
read_blocks: eficall! {fn(
*mut BlockIoProtocol,
u32,
u64,
usize,
*mut c_void
) -> Status},
write_blocks: eficall! {fn(
*mut BlockIoProtocol,
u32,
u64,
usize,
*mut c_void
) -> Status},
flush_blocks: eficall! {fn(
*mut BlockIoProtocol,
) -> Status},
}

#[repr(C)]
pub struct BlockWrapper<'a> {
hw: super::HandleWrapper,
block: &'a VirtioBlockDevice<'a>,
media: BlockIoMedia,
media: Media,
pub proto: BlockIoProtocol,
// The ordering of these paths are very important, along with the C
// representation as the device path "flows" from the first.
pub controller_path: ControllerDevicePathProtocol,
pub disk_paths: [HardDiskDevicePathProtocol; 2],
pub disk_paths: [HardDriveMedia; 2],
start_lba: u64,
}

Expand All @@ -100,7 +41,7 @@ pub struct BlockWrappers<'a> {
pub count: usize,
}

pub extern "efiapi" fn reset(_: *mut BlockIoProtocol, _: bool) -> Status {
pub extern "efiapi" fn reset(_: *mut BlockIoProtocol, _: efi::Boolean) -> Status {
Status::UNSUPPORTED
}

Expand Down Expand Up @@ -183,13 +124,10 @@ impl<'a> BlockWrapper<'a> {
) -> *mut BlockWrapper {
let last_block = (*block).get_capacity() - 1;

let size = core::mem::size_of::<BlockWrapper>();
let (_status, new_address) = super::ALLOCATOR.borrow_mut().allocate_pages(
efi::ALLOCATE_ANY_PAGES,
efi::LOADER_DATA,
((size + super::PAGE_SIZE as usize - 1) / super::PAGE_SIZE as usize) as u64,
0_u64,
);
let (status, new_address) = super::ALLOCATOR
.borrow_mut()
.allocate_pool(efi::LOADER_DATA, core::mem::size_of::<BlockWrapper>());
assert!(status == Status::SUCCESS);

let bw = new_address as *mut BlockWrapper;

Expand All @@ -199,7 +137,7 @@ impl<'a> BlockWrapper<'a> {
handle_type: super::HandleType::Block,
},
block,
media: BlockIoMedia {
media: Media {
media_id: 0,
removable_media: false,
media_present: true,
Expand All @@ -209,6 +147,9 @@ impl<'a> BlockWrapper<'a> {
block_size: SectorBuf::len() as u32,
io_align: 0,
last_block,
lowest_aligned_lba: 0,
logical_blocks_per_physical_block: 1,
optimal_transfer_length_granularity: 1,
},
proto: BlockIoProtocol {
revision: 0x0001_0000, // EFI_BLOCK_IO_PROTOCOL_REVISION
Expand All @@ -230,8 +171,8 @@ impl<'a> BlockWrapper<'a> {
// full disk vs partition
disk_paths: if partition_number == 0 {
[
HardDiskDevicePathProtocol {
device_path: DevicePathProtocol {
HardDriveMedia {
header: DevicePathProtocol {
r#type: r_efi::protocols::device_path::TYPE_END,
sub_type: 0xff, // End of full path
length: [4, 0],
Expand All @@ -243,8 +184,8 @@ impl<'a> BlockWrapper<'a> {
partition_signature: [0; 16],
signature_type: 0,
},
HardDiskDevicePathProtocol {
device_path: DevicePathProtocol {
HardDriveMedia {
header: DevicePathProtocol {
r#type: r_efi::protocols::device_path::TYPE_END,
sub_type: 0xff, // End of full path
length: [4, 0],
Expand All @@ -259,8 +200,8 @@ impl<'a> BlockWrapper<'a> {
]
} else {
[
HardDiskDevicePathProtocol {
device_path: DevicePathProtocol {
HardDriveMedia {
header: DevicePathProtocol {
r#type: r_efi::protocols::device_path::TYPE_MEDIA,
sub_type: 1,
length: [42, 0],
Expand All @@ -272,8 +213,8 @@ impl<'a> BlockWrapper<'a> {
partition_signature: uuid,
signature_type: 0x02,
},
HardDiskDevicePathProtocol {
device_path: DevicePathProtocol {
HardDriveMedia {
header: DevicePathProtocol {
r#type: r_efi::protocols::device_path::TYPE_END,
sub_type: 0xff, // End of full path
length: [4, 0],
Expand Down
Loading