metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

fix: 🐛 Update rpi4 target to use virtual MMIO bases

This commit is contained in:
Berkus Decker 2023-11-12 00:09:22 +02:00 committed by Berkus Decker
parent 90d5d96098
commit 89943857af
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
machine/src/platform/raspberrypi/device_driver/arm/gicv2/gicc.rs
View File

@ -5,7 +5,11 @@
//! GICC Driver - GIC CPU interface. //! GICC Driver - GIC CPU interface.
use { use {
crate::{exception, platform::device_driver::common::MMIODerefWrapper}, crate::{
exception,
memory::{Address, Virtual},
platform::device_driver::common::MMIODerefWrapper,
},
tock_registers::{ tock_registers::{
interfaces::{Readable, Writeable}, interfaces::{Readable, Writeable},
register_bitfields, register_structs, register_bitfields, register_structs,
@ -75,7 +79,7 @@ impl GICC {
/// # Safety /// # Safety
/// ///
/// - The user must ensure to provide a correct MMIO start address. /// - The user must ensure to provide a correct MMIO start address.
pub const unsafe fn new(mmio_start_addr: usize) -> Self { pub const unsafe fn new(mmio_start_addr: Address<Virtual>) -> Self {
Self { Self {
registers: Registers::new(mmio_start_addr), registers: Registers::new(mmio_start_addr),
} }

3
machine/src/platform/raspberrypi/device_driver/arm/gicv2/gicd.rs
View File

@ -9,6 +9,7 @@
use { use {
crate::{ crate::{
memory::{Address, Virtual},
platform::device_driver::common::MMIODerefWrapper, platform::device_driver::common::MMIODerefWrapper,
state, state,
synchronization::{self, IRQSafeNullLock}, synchronization::{self, IRQSafeNullLock},
@ -131,7 +132,7 @@ impl GICD {
/// # Safety /// # Safety
/// ///
/// - The user must ensure to provide a correct MMIO start address. /// - The user must ensure to provide a correct MMIO start address.
pub const unsafe fn new(mmio_start_addr: usize) -> Self { pub const unsafe fn new(mmio_start_addr: Address<Virtual>) -> Self {
Self { Self {
shared_registers: IRQSafeNullLock::new(SharedRegisters::new(mmio_start_addr)), shared_registers: IRQSafeNullLock::new(SharedRegisters::new(mmio_start_addr)),
banked_registers: BankedRegisters::new(mmio_start_addr), banked_registers: BankedRegisters::new(mmio_start_addr),

6
machine/src/platform/raspberrypi/device_driver/arm/gicv2/mod.rs
View File

@ -81,6 +81,7 @@ mod gicd;
use crate::{ use crate::{
cpu, drivers, exception, cpu, drivers, exception,
memory::{Address, Virtual},
platform::{self, cpu::BOOT_CORE_ID, device_driver::common::BoundedUsize}, platform::{self, cpu::BOOT_CORE_ID, device_driver::common::BoundedUsize},
synchronization::{self, InitStateLock}, synchronization::{self, InitStateLock},
}; };
@ -125,7 +126,10 @@ impl GICv2 {
/// # Safety /// # Safety
/// ///
/// - The user must ensure to provide a correct MMIO start address. /// - The user must ensure to provide a correct MMIO start address.
pub const unsafe fn new(gicd_mmio_start_addr: usize, gicc_mmio_start_addr: usize) -> Self { pub const unsafe fn new(
gicd_mmio_start_addr: Address<Virtual>,
gicc_mmio_start_addr: Address<Virtual>,
) -> Self {
Self { Self {
gicd: gicd::GICD::new(gicd_mmio_start_addr), gicd: gicd::GICD::new(gicd_mmio_start_addr),
gicc: gicc::GICC::new(gicc_mmio_start_addr), gicc: gicc::GICC::new(gicc_mmio_start_addr),