Skip to content

build(deps): Upgrade to acpi x.y.z #2735

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

Draft
mkroening wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

build(deps): Upgrade to acpi x.y.z #2735

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
5 changes: 3 additions & 2 deletions Cargo.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ unreadable_literal = "warn"
unused_dependencies = "allow"

[patch.crates-io]
acpi = { git = "https://github.com/mkroening/acpi.git", branch = "unaligned-table-entries" }
safe-mmio = { git = "https://github.com/hermit-os/safe-mmio", branch = "0.3.x" }

[profile.dist]
Expand Down
10 changes: 4 additions & 6 deletions src/acpi/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use core::hint;
use core::ptr::{self, NonNull};

use acpi::aml::AmlError;
use acpi::{Handle, Handler, PciAddress, PhysicalMapping};
use acpi::{Handle, Handler, PciAddress, RawPhysicalMapping};
use align_address::Align;
use hermit_sync::{RawSpinMutex, SpinMutex};
use lock_api::RawMutex;
Expand All @@ -30,11 +30,10 @@ impl Handler for AcpiHandler {
&self,
physical_address: usize,
size: usize,
) -> PhysicalMapping<Self, T> {
) -> RawPhysicalMapping<T> {
let physical_start = physical_address.align_down(0x1000);
let physical_end = (physical_address + size).align_up(0x1000);
let mapped_length = physical_end - physical_start;
let handler = self.clone();

trace!(
"Mapping physical region... paddr = {physical_start:#x}, len = {mapped_length:#x}"
Expand All @@ -48,16 +47,15 @@ impl Handler for AcpiHandler {
let virtual_start = NonNull::new(virtual_start).unwrap();
let region_length = size;

PhysicalMapping {
RawPhysicalMapping {
physical_start,
virtual_start,
region_length,
mapped_length,
handler,
}
}

fn unmap_physical_region<T>(region: &PhysicalMapping<Self, T>) {
unsafe fn unmap_physical_region<T>(&self, region: RawPhysicalMapping<T>) {
trace!(
"Unmapping physical region... paddr = {:#x}, len = {:#x}",
region.physical_start, region.mapped_length
Expand Down
2 changes: 1 addition & 1 deletion src/acpi/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ fn rsdp_paddr<H: Handler>(handler: &H) -> Option<NonZero<usize>> {

#[cfg(target_arch = "x86_64")]
if let Ok(rsdp) = unsafe { acpi::rsdp::Rsdp::search_for_on_bios(handler.clone()) } {
let rsdp_paddr = rsdp.virtual_start.addr();
let rsdp_paddr = rsdp.raw.virtual_start.addr();
info!("Found RSDP paddr by searching on BIOS systems: {rsdp_paddr:#x}");
return Some(rsdp_paddr);
}
Expand Down
Loading