WIP

Cargo.lock

@@ -38,12 +38,6 @@ dependencies = [
  "rustc-std-workspace-core",
 ]
 
-[[package]]
-name = "accessor"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd8b2abd55bf1f9cffbf00fd594566c51a9d31402553284920c1309ca8351086"
-
 [[package]]
 name = "acpi"
 version = "4.1.1"
@@ -532,12 +526,6 @@ dependencies = [
  "hashbrown 0.14.5",
 ]
 
-[[package]]
-name = "elf"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b"
-
 [[package]]
 name = "encode_unicode"
 version = "1.0.0"
@@ -655,7 +643,7 @@ checksum = "581d3afdd654deb68c19fcbe4bc411910cc64067d4a13d8637bda7722cb9c2ea"
 dependencies = [
  "endian-type-rs",
  "fallible-iterator",
- "memoffset 0.5.6",
+ "memoffset",
  "num-derive",
  "num-traits",
  "rustc_version 0.2.3",
@@ -741,18 +729,6 @@ dependencies = [
  "pin-utils",
 ]
 
-[[package]]
-name = "gentables"
-version = "0.1.0"
-dependencies = [
- "bitflags 2.8.0",
- "bytemuck",
- "clap",
- "elf 0.7.4",
- "memtables",
- "thiserror",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -1119,7 +1095,6 @@ dependencies = [
  "cfg-if",
  "kernel-arch-aarch64",
  "kernel-arch-hosted",
- "kernel-arch-i686",
  "kernel-arch-interface",
  "kernel-arch-riscv64",
  "kernel-arch-x86_64",
@@ -1135,7 +1110,6 @@ dependencies = [
  "device-api",
  "kernel-arch-interface",
  "libk-mm-interface",
- "memtables",
  "static_assertions",
  "tock-registers",
  "yggdrasil-abi",
@@ -1151,21 +1125,6 @@ dependencies = [
  "yggdrasil-abi",
 ]
 
-[[package]]
-name = "kernel-arch-i686"
-version = "0.1.0"
-dependencies = [
- "bitflags 2.8.0",
- "device-api",
- "kernel-arch-interface",
- "kernel-arch-x86",
- "libk-mm-interface",
- "log",
- "static_assertions",
- "tock-registers",
- "yggdrasil-abi",
-]
-
 [[package]]
 name = "kernel-arch-interface"
 version = "0.1.0"
@@ -1184,7 +1143,6 @@ dependencies = [
  "kernel-arch-interface",
  "libk-mm-interface",
  "log",
- "memtables",
  "static_assertions",
  "tock-registers",
  "yggdrasil-abi",
@@ -1212,7 +1170,6 @@ dependencies = [
  "kernel-arch-x86",
  "libk-mm-interface",
  "log",
- "memtables",
  "static_assertions",
  "tock-registers",
  "yggdrasil-abi",
@@ -1270,7 +1227,7 @@ dependencies = [
  "cfg-if",
  "crossbeam-queue",
  "device-api",
- "elf 0.7.2",
+ "elf",
  "futures-util",
  "kernel-arch",
  "libc",
@@ -1456,23 +1413,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memtables"
-version = "0.1.0"
-dependencies = [
- "bitflags 2.8.0",
- "bytemuck",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.4"
@@ -1557,12 +1497,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -2606,18 +2540,6 @@ dependencies = [
  "rustix",
 ]
 
-[[package]]
-name = "xhci"
-version = "0.9.2"
-source = "git+https://github.com/rust-osdev/xhci.git#f2254c86d5ba12754259bf0ae483c6c8dc821aad"
-dependencies = [
- "accessor",
- "bit_field",
- "num-derive",
- "num-traits",
- "paste",
-]
-
 [[package]]
 name = "xtask"
 version = "0.1.0"
@@ -2663,26 +2585,6 @@ dependencies = [
  "rsdp",
 ]
 
-[[package]]
-name = "ygg_driver_ahci"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "bytemuck",
- "device-api",
- "futures-util",
- "kernel-fs",
- "libk",
- "libk-mm",
- "libk-util",
- "log",
- "memoffset 0.9.1",
- "static_assertions",
- "tock-registers",
- "ygg_driver_pci",
- "yggdrasil-abi",
-]
-
 [[package]]
 name = "ygg_driver_fat32"
 version = "0.1.0"
@@ -2725,21 +2627,6 @@ dependencies = [
  "yggdrasil-abi",
 ]
 
-[[package]]
-name = "ygg_driver_net_igbe"
-version = "0.1.0"
-dependencies = [
- "device-api",
- "libk",
- "libk-mm",
- "libk-util",
- "log",
- "tock-registers",
- "ygg_driver_net_core",
- "ygg_driver_pci",
- "yggdrasil-abi",
-]
-
 [[package]]
 name = "ygg_driver_net_loopback"
 version = "0.1.0"
@@ -2753,22 +2640,6 @@ dependencies = [
  "yggdrasil-abi",
 ]
 
-[[package]]
-name = "ygg_driver_net_rtl81xx"
-version = "0.1.0"
-dependencies = [
- "device-api",
- "futures-util",
- "libk",
- "libk-mm",
- "libk-util",
- "log",
- "tock-registers",
- "ygg_driver_net_core",
- "ygg_driver_pci",
- "yggdrasil-abi",
-]
-
 [[package]]
 name = "ygg_driver_net_stmmac"
 version = "0.1.0"
@@ -2786,26 +2657,6 @@ dependencies = [
  "yggdrasil-abi",
 ]
 
-[[package]]
-name = "ygg_driver_nvme"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "bytemuck",
- "device-api",
- "futures-util",
- "kernel-arch",
- "kernel-fs",
- "libk",
- "libk-mm",
- "libk-util",
- "log",
- "static_assertions",
- "tock-registers",
- "ygg_driver_pci",
- "yggdrasil-abi",
-]
-
 [[package]]
 name = "ygg_driver_pci"
 version = "0.1.0"
@@ -2853,94 +2704,6 @@ dependencies = [
  "yggdrasil-abi",
 ]
 
-[[package]]
-name = "ygg_driver_usb_xhci"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "atomic_enum",
- "bytemuck",
- "device-api",
- "futures-util",
- "libk",
- "libk-mm",
- "libk-util",
- "log",
- "tock-registers",
- "xhci",
- "ygg_driver_pci",
- "ygg_driver_usb",
- "yggdrasil-abi",
-]
-
-[[package]]
-name = "ygg_driver_virtio_blk"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "bytemuck",
- "device-api",
- "libk",
- "libk-mm",
- "libk-util",
- "log",
- "tock-registers",
- "ygg_driver_pci",
- "ygg_driver_virtio_core",
- "yggdrasil-abi",
-]
-
-[[package]]
-name = "ygg_driver_virtio_core"
-version = "0.1.0"
-dependencies = [
- "bitflags 2.8.0",
- "device-api",
- "kernel-arch-hosted",
- "libk",
- "libk-mm",
- "libk-util",
- "log",
- "tock-registers",
- "ygg_driver_pci",
- "yggdrasil-abi",
-]
-
-[[package]]
-name = "ygg_driver_virtio_gpu"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "bytemuck",
- "device-api",
- "libk",
- "libk-mm",
- "libk-util",
- "log",
- "ygg_driver_pci",
- "ygg_driver_virtio_core",
- "yggdrasil-abi",
-]
-
-[[package]]
-name = "ygg_driver_virtio_net"
-version = "0.1.0"
-dependencies = [
- "bitflags 2.8.0",
- "bytemuck",
- "device-api",
- "futures-util",
- "libk",
- "libk-mm",
- "libk-util",
- "log",
- "tock-registers",
- "ygg_driver_net_core",
- "ygg_driver_pci",
- "ygg_driver_virtio_core",
- "yggdrasil-abi",
-]
-
 [[package]]
 name = "yggdrasil-abi"
 version = "0.1.0"
@@ -2974,13 +2737,12 @@ dependencies = [
  "device-api",
  "device-api-macros",
  "device-tree",
- "elf 0.7.2",
+ "elf",
  "ext2",
  "futures-util",
  "git-version",
  "kernel-arch",
  "kernel-arch-aarch64",
- "kernel-arch-i686",
  "kernel-arch-interface",
  "kernel-arch-riscv64",
  "kernel-arch-x86",
@@ -2990,28 +2752,19 @@ dependencies = [
  "libk-util",
  "log",
  "memfs",
- "memtables",
  "prettyplease",
  "static_assertions",
  "tock-registers",
  "vmalloc",
  "yboot-proto",
  "ygg_driver_acpi",
- "ygg_driver_ahci",
  "ygg_driver_fat32",
  "ygg_driver_input",
  "ygg_driver_net_core",
- "ygg_driver_net_igbe",
  "ygg_driver_net_loopback",
- "ygg_driver_net_rtl81xx",
  "ygg_driver_net_stmmac",
- "ygg_driver_nvme",
  "ygg_driver_pci",
  "ygg_driver_usb",
- "ygg_driver_usb_xhci",
- "ygg_driver_virtio_blk",
- "ygg_driver_virtio_gpu",
- "ygg_driver_virtio_net",
  "yggdrasil-abi",
 ]
 

Cargo.toml

@@ -11,7 +11,6 @@ exclude = [
 ]
 members = [
     "xtask",
-    "kernel/tools/gentables",
     "kernel",
     "lib/abi",
     "lib/libyalloc",
@@ -67,7 +66,6 @@ libk-util.path = "kernel/libk/libk-util"
 libk-mm.path = "kernel/libk/libk-mm"
 libk-mm-interface.path = "kernel/libk/libk-mm/interface"
 libk-device.path = "kernel/libk/libk-device"
-memtables.path = "kernel/lib/memtables"
 vmalloc.path = "kernel/lib/vmalloc"
 device-api-macros.path = "kernel/lib/device-api/macros"
 device-tree.path = "kernel/lib/device-tree"

boot/yboot-proto/src/lib.rs

@@ -1,3 +1,4 @@
+#![allow(unused)]
 #![no_std]
 
 use bytemuck::{Pod, Zeroable};

boot/yboot/src/elf.rs

@@ -1,7 +1,8 @@
 use core::mem::size_of;
 
 use bytemuck::Zeroable;
-use log::{debug, error, info};
+use log::{error, info};
+use types::{Rela, SHT_RELA};
 // TODO use 'elf' crate
 use uefi::{
     prelude::BootServices,
@@ -15,6 +16,7 @@ use crate::elf::types::{PT_LOAD, SHF_ALLOC, SHF_WRITE, SHT_PROGBITS};
 
 use self::types::{Ehdr, Phdr, Shdr};
 
+#[allow(unused)]
 mod types {
     use bytemuck::{Pod, Zeroable};
 
@@ -23,14 +25,18 @@ mod types {
     pub type Half = u16;
     pub type Word = u32;
     pub type XWord = u64;
+    pub type SXWord = i64;
 
     pub const PT_LOAD: Word = 1;
 
     pub const SHT_PROGBITS: Word = 1;
+    pub const SHT_RELA: Word = 4;
 
     pub const SHF_WRITE: XWord = 1 << 0;
     pub const SHF_ALLOC: XWord = 1 << 1;
 
+    pub const R_X86_64_RELATIVE: u32 = 8;
+
     #[derive(Clone, Copy, Zeroable, Pod)]
     #[repr(C)]
     pub struct Ehdr {
@@ -77,6 +83,20 @@ mod types {
         pub memsz: XWord,
         pub align: XWord,
     }
+
+    #[derive(Clone, Copy, Zeroable, Pod)]
+    #[repr(C)]
+    pub struct Rela {
+        pub offset: Addr,
+        pub info: XWord,
+        pub addend: SXWord,
+    }
+
+    impl Rela {
+        pub fn r_type(&self) -> u32 {
+            self.info as u32
+        }
+    }
 }
 
 // Maximum address this loader can map in the target kernel
@@ -92,6 +112,8 @@ pub struct LoadedObject {
     pub image_start: u64,
     pub image_end: u64,
 
+    pub load_address: u64,
+
     pub entry: u64,
 
     pub protocol_struct_paddr: u64,
@@ -105,6 +127,12 @@ struct LocatedProtocol {
     size: usize,
 }
 
+struct RelaSection {
+    offset: u64,
+    entry_count: usize,
+    entry_size: usize,
+}
+
 trait ReadExact {
     fn read_exact(&mut self, buf: &mut [u8]) -> Result<(), Error>;
 }
@@ -119,6 +147,23 @@ impl ReadExact for RegularFile {
     }
 }
 
+impl RelaSection {
+    pub fn from_shdr(shdr: &Shdr) -> Option<Self> {
+        if shdr.type_ != SHT_RELA {
+            return None;
+        }
+
+        let entry_size = shdr.entsize as usize;
+        let entry_count = shdr.size as usize / entry_size;
+
+        Some(Self {
+            offset: shdr.offset,
+            entry_size,
+            entry_count,
+        })
+    }
+}
+
 impl Object {
     pub fn open<D: File>(root: &mut D, path: &CStr16) -> Result<Self, Error> {
         let file = root.open(path, FileMode::Read, FileAttribute::empty())?;
@@ -140,11 +185,11 @@ impl Object {
             return Err(Error::new(Status::LOAD_ERROR, ()));
         }
 
-        // Check that the entry point is set
-        if ehdr.entry == 0 {
-            error!("Image does not have a valid entry point");
-            return Err(Error::new(Status::LOAD_ERROR, ()));
-        }
+        // // Check that the entry point is set
+        // if ehdr.entry == 0 {
+        //     error!("Image does not have a valid entry point");
+        //     return Err(Error::new(Status::LOAD_ERROR, ()));
+        // }
 
         Ok(Self { file, ehdr })
     }
@@ -170,11 +215,6 @@ impl Object {
         self.file
             .read_exact(bytemuck::bytes_of_mut(&mut proto_data))?;
 
-        info!(
-            "Kernel is virtually mapped at {:#x}",
-            proto_data.kernel_virt_offset
-        );
-
         // 2. Find the kernel's range and check that the loaded physical addresses are actually
         //    usable from UEFI
         let mut image_start = u64::MAX;
@@ -209,16 +249,22 @@ impl Object {
         assert_eq!(image_start & 0xFFF, 0);
         assert_eq!(image_end & 0xFFF, 0);
 
-        info!("Image start: {:#x}, end: {:#x}", image_start, image_end);
-        // Reserve the kernel memory
-        let reserved_addr = bs
+        // Allocate memory to load the kernel into
+        let kernel_load_address = bs
             .allocate_pages(
-                AllocateType::Address(image_start),
+                AllocateType::MaxAddress(0xFFFFFFFF),
                 MemoryType::LOADER_DATA,
                 (image_end - image_start) as usize / 0x1000,
             )
-            .expect("Could not allocate memory for kernel image");
-        assert_eq!(reserved_addr, image_start);
+            .expect("Could not allocate memory for the kernel");
+
+        // Print info
+        info!("Image start: {:#x}, end: {:#x}", image_start, image_end);
+        info!(
+            "Kernel virtual offset: {:#x}",
+            proto_data.kernel_virt_offset
+        );
+        info!("Kernel load address: {kernel_load_address:#x}");
 
         // 3. Load the segments
         for i in 0..self.ehdr.phnum {
@@ -228,53 +274,80 @@ impl Object {
                 continue;
             }
 
+            let segment_load_base = phdr.paddr + kernel_load_address;
+
             info!(
-                "Load segment {}: {:#x?}",
-                i,
-                phdr.paddr..phdr.paddr + phdr.memsz
+                "[{i}] Load {:#x?}",
+                segment_load_base..segment_load_base + phdr.memsz
             );
 
             if phdr.filesz > 0 {
-                // The section has load data
-                let dst = unsafe {
-                    core::slice::from_raw_parts_mut(phdr.paddr as *mut u8, phdr.filesz as usize)
+                let dst_slice = unsafe {
+                    core::slice::from_raw_parts_mut(
+                        segment_load_base as *mut u8,
+                        phdr.filesz as usize,
+                    )
                 };
 
-                debug!(
-                    "Load {:#x?} from ELF offset {:#x}",
-                    phdr.paddr..phdr.paddr + phdr.filesz,
-                    phdr.offset
-                );
                 self.file.set_position(phdr.offset)?;
-                self.file.read_exact(dst)?;
+                self.file.read_exact(dst_slice)?;
             }
 
             if phdr.memsz > phdr.filesz {
-                let dst = unsafe {
+                let dst_slice = unsafe {
                     core::slice::from_raw_parts_mut(
-                        (phdr.paddr + phdr.filesz) as *mut u8,
+                        (segment_load_base + phdr.filesz) as *mut u8,
                         (phdr.memsz - phdr.filesz) as usize,
                     )
                 };
 
-                debug!(
-                    "Zero data {:#x?}",
-                    phdr.paddr + phdr.filesz..phdr.paddr + phdr.memsz
-                );
+                dst_slice.fill(0);
+            }
+        }
 
-                dst.fill(0);
+        // 4. Perform kernel relocation
+        let mut rela_section = None;
+        for i in 0..self.ehdr.shnum as usize {
+            let shdr = self.read_shdr(i)?;
+            if let Some(rela) = RelaSection::from_shdr(&shdr) {
+                rela_section = Some(rela);
+                break;
+            }
+        }
+
+        if let Some(rela_section) = rela_section {
+            info!("Relocating kernel: {image_start:#x} -> {kernel_load_address:#x}");
+            info!("({} relocations)", rela_section.entry_count);
+
+            let b = (kernel_load_address + proto_data.kernel_virt_offset) as i64;
+
+            for i in 0..rela_section.entry_count {
+                let mut rela = Rela::zeroed();
+                self.file
+                    .set_position(rela_section.offset + (i * rela_section.entry_size) as u64)?;
+                self.file.read_exact(bytemuck::bytes_of_mut(&mut rela))?;
+
+                match rela.r_type() {
+                    types::R_X86_64_RELATIVE => {
+                        let qword = (rela.offset + kernel_load_address) as *mut i64;
+                        let value = rela.addend + b;
+                        unsafe { qword.write_volatile(value) };
+                    }
+                    other => todo!("Unsupported relocation type: {other}"),
+                }
             }
         }
 
         // Now that the image is in memory, protocol structure can be written in the further steps
-        let protocol_struct_paddr = (loc_proto.address as u64) - proto_data.kernel_virt_offset;
+        let protocol_struct_paddr = loc_proto.address as u64 + kernel_load_address; // (loc_proto.address as u64) - proto_data.kernel_virt_offset;
         let protocol_version = proto_data.header.version;
 
-        let entry = self.ehdr.entry;
+        let entry = self.ehdr.entry + kernel_load_address;
 
         Ok(LoadedObject {
             image_start,
             image_end,
+            load_address: kernel_load_address,
             entry,
             protocol_struct_paddr,
             protocol_version,

boot/yboot/src/initrd.rs

@@ -25,7 +25,7 @@ pub fn load_somewhere(
 
     let file_info: &FileInfo = file.get_info(&mut info_buffer).unwrap();
     let size = file_info.file_size();
-    let page_count = (size + 0xFFF) / 0x1000;
+    let page_count = size.div_ceil(0x1000);
 
     let base = bs.allocate_pages(
         AllocateType::MaxAddress(MAXIMUM_ADDRESS),

boot/yboot/src/main.rs

@@ -93,7 +93,7 @@ fn locate_rsdp(st: &SystemTable<Boot>) -> Option<u64> {
 fn boot_partition(
     image: Handle,
     bs: &BootServices,
-) -> Result<ScopedProtocol<SimpleFileSystem>, Error> {
+) -> Result<ScopedProtocol<'_, SimpleFileSystem>, Error> {
     let loaded_image = bs.open_protocol_exclusive::<LoadedImage>(image)?;
     let device_handle = loaded_image.device();
 
@@ -113,7 +113,7 @@ fn load_kernel<'a>(
     config: &Config,
     root: &mut Directory,
     st: &SystemTable<Boot>,
-) -> Result<(u64, u64, &'a mut LoadProtocolV1), Error> {
+) -> Result<(u64, u64, u64, &'a mut LoadProtocolV1), Error> {
     let bs = st.boot_services();
 
     let mut kernel_obj = Object::open(root, cstr16!("kernel.elf"))?;
@@ -183,13 +183,14 @@ fn load_kernel<'a>(
 
     let entry = loaded_obj.entry + proto_data.kernel_virt_offset;
 
-    Ok((entry, mmap_memory, proto_data))
+    Ok((entry, loaded_obj.load_address, mmap_memory, proto_data))
 }
 
 unsafe fn map_and_enter_kernel(
     st: SystemTable<Boot>,
     proto_data: &mut LoadProtocolV1,
     mmap_memory: u64,
+    load_base: u64,
     entry: u64,
 ) -> ! {
     let (_, mmap) = st.exit_boot_services();
@@ -216,7 +217,7 @@ unsafe fn map_and_enter_kernel(
     let cr3 = mem::map_image();
     asm!("cli; wbinvd; mov {0}, %cr3", in(reg) cr3, options(att_syntax));
 
-    asm!("jmp *{0}", in(reg) entry, in("eax") LOADER_MAGIC, options(noreturn, att_syntax));
+    asm!("jmp *{0}", in(reg) entry, in("eax") LOADER_MAGIC, in("ecx") load_base, options(noreturn, att_syntax));
 }
 
 #[entry]
@@ -243,15 +244,16 @@ fn efi_main(image_handle: Handle, mut system_table: SystemTable<Boot>) -> Status
         }
     };
 
-    let (entry, mmap_memory, proto_data) = match load_kernel(&config, &mut root, &system_table) {
-        Ok(e) => e,
-        Err(error) => {
-            error!("Failed to load the kernel/initrd: {error:?}");
-            return Status::LOAD_ERROR;
-        }
-    };
+    let (entry, load_base, mmap_memory, proto_data) =
+        match load_kernel(&config, &mut root, &system_table) {
+            Ok(e) => e,
+            Err(error) => {
+                error!("Failed to load the kernel/initrd: {error:?}");
+                return Status::LOAD_ERROR;
+            }
+        };
 
     unsafe {
-        map_and_enter_kernel(system_table, proto_data, mmap_memory, entry);
+        map_and_enter_kernel(system_table, proto_data, mmap_memory, load_base, entry);
     }
 }

boot/yboot/src/mem.rs

@@ -66,7 +66,7 @@ impl MemoryDescriptorExt for MemoryDescriptor {
     }
 }
 
-pub fn memory_map(bs: &BootServices) -> Result<MemoryMap, Error> {
+pub fn memory_map(bs: &BootServices) -> Result<MemoryMap<'_>, Error> {
     bs.memory_map(unsafe { &mut MMAP_BUFFER.data })
 }
 

doc/raspi4b.txt

@@ -3,55 +3,43 @@
 
 Booting Yggdrasil on Raspberry Pi 4B with u-boot:
 
-1. Clone u-boot sources to some directory and checkout some
-   stable branch. I've used v2024.10.
-2. Modify cmd/boot.c by replacing the do_go_exec function:
+1. Clone u-boot sources and build with rpi_4_defconfig
 
-/* Allow ports to override the default behavior */
-__attribute__((weak))
-unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
-				 char *const argv[])
-{
-    void *entry_ptr = (void *) entry;
-    ulong fdt_addr_r = 0;
-    if (argc >= 2) {
-        fdt_addr_r = hextoul(argv[1], NULL);
-    }
-    void (*func)(ulong) = entry_ptr;
-    func(fdt_addr_r);
-
-    return 0;
-}
-
-3. make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 rpi_4_defconfig
-4. make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 -j
-5. Copy u-boot.bin into your Pi SD-card's boot partition.
 **NOTE** I assume you have all the bootloader parts in the boot partition already.
          If not, clone raspberry fw repo and copy the following files to the boot partition:
             * bootcode.bin
             * start4.elf
             * all the .dtb files (a bcm2711-rpi-4-b.dtb should be enough though)
-6. config.txt:
+
+2. Copy u-boot.bin into the Pi's boot partition and edit the config.txt:
 enable_uart=1
 arm64_bit=1
 kernel=u-boot.bin
 
-7. Compile the OS with `cargo xtask --arch=aarch64 --board=raspi4b --release`
-8. Copy the following files into some directory:
-    * target/aarch64-unknown-raspi4b/release/yggdrasil-kernel
+3. Compile the OS with `cargo xtask --arch=aarch64 --board=raspi4b --release`
+4. Copy the following files into some directory:
+    * target/aarch64-unknown-raspi4b/release/kernel.bin
     * userspace/target/aarch64-unknown-yggdrasil/release/initrd.tar
-9. cd into that directory and start a TFTP server of your choice. I used `uftpd`.
+5. cd into that directory and start a TFTP server of your choice. I used `uftpd`.
 
-10. Connect an ethernet and serial to the Pi and run the following commands in u-boot shell:
+6. Connect an ethernet and serial to the Pi and run the following commands in u-boot shell:
 
-tftpboot 0x04000000 <YOUR IP>:initrd.tar
-tftpboot ${loadaddr} <YOUR IP>:yggdrasil-kernel
-load mmc 0:1 ${fdt_addr_r} bcm2711-rpi-4-b.dtb
-fdt addr ${fdt_addr_r}
-fdt resize
-fdt memory 0x0 0x3C000000
-fdt chosen 0x04000000 <WHATEVER SIZE WAS PRINTED WHEN RUNNING THE FIRST COMMAND>
-bootelf -p
-go ${kernel_addr_r} ${fdt_addr_r}
+### If using DHCP
+$ dhcp
+### If not using DHCP
+$ env set ipaddr <RASPBERRY-IP-ADDR>
+$ env set fdt_addr_r 0x11000000
+$ env set initrd_addr_r 0x04000000
+$ tftpboot ${initrd_addr_r} <BUILD-MACHINE-IP-ADDR>:initrd.tar
+$ tftpboot ${loadaddr} <BUILD-MACHINE-IP-ADDR>:kernel.bin
+$ load mmc 0:1 ${fdt_addr_r} bcm2711-rpi-4-b.dtb
+$ fdt addr ${fdt_addr_r}
+$ fdt resize
+$ fdt memory 0x0 0x3C000000
+$ booti ${loadaddr} ${initrd_addr_r}:<SIZE-PRINTED-WHEN-LOADING-INITRD> ${fdt_addr_r}
 
-11. Yggdrasil OS should start!
+###### Assuming BUILD-MACHINE-IP-ADDR is 13.0.0.1 and RASPBERRY-IP-ADDR is 13.0.0.2, here's
+###### a quick command for a development boot
+###### (FIXME when initrd gets larger than 64MiB)
+
+env set ipaddr 13.0.0.2; env set fdt_addr_r 0x11000000; env set initrd_addr_r 0x04000000; tftpboot ${initrd_addr_r} 13.0.0.1:initrd.tar; tftpboot ${loadaddr} 13.0.0.1:kernel.bin; load mmc 0:1 ${fdt_addr_r} bcm2711-rpi-4-b.dtb; fdt addr ${fdt_addr_r}; fdt resize; fdt memory 0x0 0x3C000000; booti ${loadaddr} ${initrd_addr_r}:67108864 ${fdt_addr_r}

doc/visionfive2.txt

@@ -1,7 +1,6 @@
 Booting Yggdrasil OS on Starfive VisionFive 2 RISC-V board:
 
 * TODO: proper format for initrd image
-* TODO: 0x70000000 can be replaced with a builtin var?
 
 Prerequisites:
 
@@ -13,18 +12,28 @@ Steps:
 
 1. Copy yggdrasil-kernel.bin and initrd.img into some directory and start a TFTP server there
 2. Connect to VF2's serial port, ethernet and enter u-boot
-3. Run the following commands:
+3. Run the following commands in u-boot:
+
+### If using DHCP
+$ dhcp
+### If not using DHCP
+$ env set ipaddr <VF2-IP-ADDR>
+$ env set initrd_addr_r 0x70000000
+### [Optional] set some kernel cmdline params
+$ env set bootargs "debug.serial-level=info"
+$ tftpboot ${initrd_addr_r} <BUILD-MACHINE-IP-ADDR>:initrd.img
+$ tftpboot ${loadaddr} <BUILD-MACHINE-IP-ADDR>:yggdrasil-kernel.bin
+$ load mmc 1:3 ${fdt_addr_r} dtbs/6.6.20-starfive/starfive/${fdtfile}
+$ fdt resize
+$ booti ${loadaddr} ${initrd_addr_r}:<initrd-size> ${fdt_addr_r}
+
+###### Assuming BUILD-MACHINE-IP-ADDR is 13.0.0.1 and VF2-IP-ADDR is 13.0.0.2, here's
+###### a quick command for a development boot
+###### (FIXME when initrd gets larger than 64MiB)
+
+env set ipaddr 13.0.0.2; env set initrd_addr_r 0x70000000; tftpboot ${initrd_addr_r} 13.0.0.1:initrd.img; tftpboot ${loadaddr} 13.0.0.1:yggdrasil-kernel.bin; load mmc 1:3 ${fdt_addr_r} dtbs/6.6.20-starfive/starfive/${fdtfile}; fdt resize; booti ${loadaddr} ${initrd_addr_r}:60000000 ${fdt_addr_r}
+
+#### For DHCP boot with BUILD-MACHINE-IP-ADDR 192.168.88.10
 
-# Get an IP address
 dhcp
-# [Optional] set some kernel cmdline params
-setenv bootargs "debug.serial-level=info"
-# Load initrd
-tftpboot 0x70000000 <your-ip-address>:initrd.img
-# Load kernel
-tftpboot ${loadaddr} <your-ip-address>:yggdrasil-kernel.bin
-# Load dtb
-load mmc 1:3 ${fdt_addr_r} dtbs/...-starfive/starfive/${fdtfile}
-fdt resize
-# Enter the kernel
-booti ${loadaddr} 0x70000000:<initrd-size> ${fdt_addr_r}
+dhcp; env set initrd_addr_r 0x70000000; tftpboot ${initrd_addr_r} 192.168.88.10:initrd.img; tftpboot ${loadaddr} 192.168.88.10:yggdrasil-kernel.bin; load mmc 1:3 ${fdt_addr_r} dtbs/6.6.20-starfive/starfive/${fdtfile}; fdt resize; booti ${loadaddr} ${initrd_addr_r}:60000000 ${fdt_addr_r}

etc/aarch64-unknown-none.json

@@ -13,6 +13,7 @@
   "panic-strategy": "abort",
   "dynamic-linking": true,
   "relocation-model": "pic",
+  "position-independent-executables": true,
   "eh-frame-header": false,
 
   "linker": "rust-lld",

etc/dtb/aarch64-qemu-virt.dts

@@ -0,0 +1,433 @@
+/dts-v1/;
+
+/ {
+	interrupt-parent = <0x8005>;
+	dma-coherent;
+	model = "linux,dummy-virt";
+	#size-cells = <0x02>;
+	#address-cells = <0x02>;
+	compatible = "linux,dummy-virt";
+
+	psci {
+		migrate = <0xc4000005>;
+		cpu_on = <0xc4000003>;
+		cpu_off = <0x84000002>;
+		cpu_suspend = <0xc4000001>;
+		method = "smc";
+		compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
+	};
+
+	memory@40000000 {
+		reg = <0x00 0x40000000 0x00 0x20000000>;
+		device_type = "memory";
+	};
+
+	platform-bus@c000000 {
+		interrupt-parent = <0x8005>;
+		ranges = <0x00 0x00 0xc000000 0x2000000>;
+		#address-cells = <0x01>;
+		#size-cells = <0x01>;
+		compatible = "qemu,platform", "simple-bus";
+	};
+
+	fw-cfg@9020000 {
+		dma-coherent;
+		reg = <0x00 0x9020000 0x00 0x18>;
+		compatible = "qemu,fw-cfg-mmio";
+	};
+
+	virtio_mmio@a000000 {
+		dma-coherent;
+		interrupts = <0x00 0x10 0x01>;
+		reg = <0x00 0xa000000 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a000200 {
+		dma-coherent;
+		interrupts = <0x00 0x11 0x01>;
+		reg = <0x00 0xa000200 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a000400 {
+		dma-coherent;
+		interrupts = <0x00 0x12 0x01>;
+		reg = <0x00 0xa000400 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a000600 {
+		dma-coherent;
+		interrupts = <0x00 0x13 0x01>;
+		reg = <0x00 0xa000600 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a000800 {
+		dma-coherent;
+		interrupts = <0x00 0x14 0x01>;
+		reg = <0x00 0xa000800 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a000a00 {
+		dma-coherent;
+		interrupts = <0x00 0x15 0x01>;
+		reg = <0x00 0xa000a00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a000c00 {
+		dma-coherent;
+		interrupts = <0x00 0x16 0x01>;
+		reg = <0x00 0xa000c00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a000e00 {
+		dma-coherent;
+		interrupts = <0x00 0x17 0x01>;
+		reg = <0x00 0xa000e00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a001000 {
+		dma-coherent;
+		interrupts = <0x00 0x18 0x01>;
+		reg = <0x00 0xa001000 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a001200 {
+		dma-coherent;
+		interrupts = <0x00 0x19 0x01>;
+		reg = <0x00 0xa001200 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a001400 {
+		dma-coherent;
+		interrupts = <0x00 0x1a 0x01>;
+		reg = <0x00 0xa001400 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a001600 {
+		dma-coherent;
+		interrupts = <0x00 0x1b 0x01>;
+		reg = <0x00 0xa001600 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a001800 {
+		dma-coherent;
+		interrupts = <0x00 0x1c 0x01>;
+		reg = <0x00 0xa001800 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a001a00 {
+		dma-coherent;
+		interrupts = <0x00 0x1d 0x01>;
+		reg = <0x00 0xa001a00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a001c00 {
+		dma-coherent;
+		interrupts = <0x00 0x1e 0x01>;
+		reg = <0x00 0xa001c00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a001e00 {
+		dma-coherent;
+		interrupts = <0x00 0x1f 0x01>;
+		reg = <0x00 0xa001e00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a002000 {
+		dma-coherent;
+		interrupts = <0x00 0x20 0x01>;
+		reg = <0x00 0xa002000 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a002200 {
+		dma-coherent;
+		interrupts = <0x00 0x21 0x01>;
+		reg = <0x00 0xa002200 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a002400 {
+		dma-coherent;
+		interrupts = <0x00 0x22 0x01>;
+		reg = <0x00 0xa002400 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a002600 {
+		dma-coherent;
+		interrupts = <0x00 0x23 0x01>;
+		reg = <0x00 0xa002600 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a002800 {
+		dma-coherent;
+		interrupts = <0x00 0x24 0x01>;
+		reg = <0x00 0xa002800 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a002a00 {
+		dma-coherent;
+		interrupts = <0x00 0x25 0x01>;
+		reg = <0x00 0xa002a00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a002c00 {
+		dma-coherent;
+		interrupts = <0x00 0x26 0x01>;
+		reg = <0x00 0xa002c00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a002e00 {
+		dma-coherent;
+		interrupts = <0x00 0x27 0x01>;
+		reg = <0x00 0xa002e00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a003000 {
+		dma-coherent;
+		interrupts = <0x00 0x28 0x01>;
+		reg = <0x00 0xa003000 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a003200 {
+		dma-coherent;
+		interrupts = <0x00 0x29 0x01>;
+		reg = <0x00 0xa003200 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a003400 {
+		dma-coherent;
+		interrupts = <0x00 0x2a 0x01>;
+		reg = <0x00 0xa003400 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a003600 {
+		dma-coherent;
+		interrupts = <0x00 0x2b 0x01>;
+		reg = <0x00 0xa003600 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a003800 {
+		dma-coherent;
+		interrupts = <0x00 0x2c 0x01>;
+		reg = <0x00 0xa003800 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a003a00 {
+		dma-coherent;
+		interrupts = <0x00 0x2d 0x01>;
+		reg = <0x00 0xa003a00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a003c00 {
+		dma-coherent;
+		interrupts = <0x00 0x2e 0x01>;
+		reg = <0x00 0xa003c00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	virtio_mmio@a003e00 {
+		dma-coherent;
+		interrupts = <0x00 0x2f 0x01>;
+		reg = <0x00 0xa003e00 0x00 0x200>;
+		compatible = "virtio,mmio";
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		poweroff {
+			gpios = <0x8007 0x03 0x00>;
+			linux,code = <0x74>;
+			label = "GPIO Key Poweroff";
+		};
+	};
+
+	pl061@9030000 {
+		phandle = <0x8007>;
+		clock-names = "apb_pclk";
+		clocks = <0x8000>;
+		interrupts = <0x00 0x07 0x04>;
+		gpio-controller;
+		#gpio-cells = <0x02>;
+		compatible = "arm,pl061", "arm,primecell";
+		reg = <0x00 0x9030000 0x00 0x1000>;
+	};
+
+	pcie@10000000 {
+		interrupt-map-mask = <0x1800 0x00 0x00 0x07>;
+		interrupt-map = <0x00 0x00 0x00 0x01 0x8005 0x00 0x00 0x00 0x03 0x04 0x00 0x00 0x00 0x02 0x8005 0x00 0x00 0x00 0x04 0x04 0x00 0x00 0x00 0x03 0x8005 0x00 0x00 0x00 0x05 0x04 0x00 0x00 0x00 0x04 0x8005 0x00 0x00 0x00 0x06 0x04 0x800 0x00 0x00 0x01 0x8005 0x00 0x00 0x00 0x04 0x04 0x800 0x00 0x00 0x02 0x8005 0x00 0x00 0x00 0x05 0x04 0x800 0x00 0x00 0x03 0x8005 0x00 0x00 0x00 0x06 0x04 0x800 0x00 0x00 0x04 0x8005 0x00 0x00 0x00 0x03 0x04 0x1000 0x00 0x00 0x01 0x8005 0x00 0x00 0x00 0x05 0x04 0x1000 0x00 0x00 0x02 0x8005 0x00 0x00 0x00 0x06 0x04 0x1000 0x00 0x00 0x03 0x8005 0x00 0x00 0x00 0x03 0x04 0x1000 0x00 0x00 0x04 0x8005 0x00 0x00 0x00 0x04 0x04 0x1800 0x00 0x00 0x01 0x8005 0x00 0x00 0x00 0x06 0x04 0x1800 0x00 0x00 0x02 0x8005 0x00 0x00 0x00 0x03 0x04 0x1800 0x00 0x00 0x03 0x8005 0x00 0x00 0x00 0x04 0x04 0x1800 0x00 0x00 0x04 0x8005 0x00 0x00 0x00 0x05 0x04>;
+		#interrupt-cells = <0x01>;
+		ranges = <0x1000000 0x00 0x00 0x00 0x3eff0000 0x00 0x10000 0x2000000 0x00 0x10000000 0x00 0x10000000 0x00 0x2eff0000 0x3000000 0x80 0x00 0x80 0x00 0x80 0x00>;
+		reg = <0x40 0x10000000 0x00 0x10000000>;
+		msi-map = <0x00 0x8006 0x00 0x10000>;
+		dma-coherent;
+		bus-range = <0x00 0xff>;
+		linux,pci-domain = <0x00>;
+		#size-cells = <0x02>;
+		#address-cells = <0x03>;
+		device_type = "pci";
+		compatible = "pci-host-ecam-generic";
+	};
+
+	pl031@9010000 {
+		clock-names = "apb_pclk";
+		clocks = <0x8000>;
+		interrupts = <0x00 0x02 0x04>;
+		reg = <0x00 0x9010000 0x00 0x1000>;
+		compatible = "arm,pl031", "arm,primecell";
+	};
+
+	pl011@9000000 {
+		clock-names = "uartclk", "apb_pclk";
+		clocks = <0x8000 0x8000>;
+		interrupts = <0x00 0x01 0x04>;
+		reg = <0x00 0x9000000 0x00 0x1000>;
+		compatible = "arm,pl011", "arm,primecell";
+	};
+
+	pmu {
+		interrupts = <0x01 0x07 0xf04>;
+		compatible = "arm,armv8-pmuv3";
+	};
+
+	intc@8000000 {
+		phandle = <0x8005>;
+		interrupts = <0x01 0x09 0x04>;
+		reg = <0x00 0x8000000 0x00 0x10000 0x00 0x8010000 0x00 0x10000 0x00 0x8030000 0x00 0x10000 0x00 0x8040000 0x00 0x10000>;
+		compatible = "arm,cortex-a15-gic";
+		ranges;
+		#size-cells = <0x02>;
+		#address-cells = <0x02>;
+		interrupt-controller;
+		#interrupt-cells = <0x03>;
+
+		v2m@8020000 {
+			phandle = <0x8006>;
+			reg = <0x00 0x8020000 0x00 0x1000>;
+			msi-controller;
+			compatible = "arm,gic-v2m-frame";
+		};
+	};
+
+	flash@0 {
+		bank-width = <0x04>;
+		reg = <0x00 0x00 0x00 0x4000000 0x00 0x4000000 0x00 0x4000000>;
+		compatible = "cfi-flash";
+	};
+
+	cpus {
+		#size-cells = <0x00>;
+		#address-cells = <0x01>;
+
+		cpu-map {
+
+			socket0 {
+
+				cluster0 {
+
+					core0 {
+						cpu = <0x8004>;
+					};
+
+					core1 {
+						cpu = <0x8003>;
+					};
+
+					core2 {
+						cpu = <0x8002>;
+					};
+
+					core3 {
+						cpu = <0x8001>;
+					};
+				};
+			};
+		};
+
+		cpu@0 {
+			phandle = <0x8004>;
+			reg = <0x00>;
+			enable-method = "psci";
+			compatible = "arm,cortex-a57";
+			device_type = "cpu";
+		};
+
+		cpu@1 {
+			phandle = <0x8003>;
+			reg = <0x01>;
+			enable-method = "psci";
+			compatible = "arm,cortex-a57";
+			device_type = "cpu";
+		};
+
+		cpu@2 {
+			phandle = <0x8002>;
+			reg = <0x02>;
+			enable-method = "psci";
+			compatible = "arm,cortex-a57";
+			device_type = "cpu";
+		};
+
+		cpu@3 {
+			phandle = <0x8001>;
+			reg = <0x03>;
+			enable-method = "psci";
+			compatible = "arm,cortex-a57";
+			device_type = "cpu";
+		};
+	};
+
+	timer {
+		interrupts = <0x01 0x0d 0xf04 0x01 0x0e 0xf04 0x01 0x0b 0xf04 0x01 0x0a 0xf04 0x01 0x0c 0xf04>;
+		always-on;
+		compatible = "arm,armv8-timer", "arm,armv7-timer";
+	};
+
+	apb-pclk {
+		phandle = <0x8000>;
+		clock-output-names = "clk24mhz";
+		clock-frequency = <0x16e3600>;
+		#clock-cells = <0x00>;
+		compatible = "fixed-clock";
+	};
+
+	aliases {
+		serial0 = "/pl011@9000000";
+	};
+
+	chosen {
+		linux,initrd-end = <0x00 0x49fd4600>;
+		linux,initrd-start = <0x00 0x48000000>;
+		stdout-path = "/pl011@9000000";
+		rng-seed = <0xf119f64b 0xacade219 0xaefd1e87 0x5fb37f65 0xc770054a 0xd779b25f 0x1ba6d6e9 0x8121c19d>;
+		kaslr-seed = <0x1f500308 0xbb36e27a>;
+	};
+};

etc/dtb/riscv64-qemu-virt.dts

@@ -0,0 +1,217 @@
+/dts-v1/;
+
+/ {
+	#address-cells = <0x02>;
+	#size-cells = <0x02>;
+	compatible = "riscv-virtio";
+	model = "riscv-virtio,qemu";
+
+	poweroff {
+		value = <0x5555>;
+		offset = <0x00>;
+		regmap = <0x04>;
+		compatible = "syscon-poweroff";
+	};
+
+	reboot {
+		value = <0x7777>;
+		offset = <0x00>;
+		regmap = <0x04>;
+		compatible = "syscon-reboot";
+	};
+
+	platform-bus@4000000 {
+		interrupt-parent = <0x03>;
+		ranges = <0x00 0x00 0x4000000 0x2000000>;
+		#address-cells = <0x01>;
+		#size-cells = <0x01>;
+		compatible = "qemu,platform", "simple-bus";
+	};
+
+	memory@80000000 {
+		device_type = "memory";
+		reg = <0x00 0x80000000 0x00 0x40000000>;
+	};
+
+	cpus {
+		#address-cells = <0x01>;
+		#size-cells = <0x00>;
+		timebase-frequency = <0x989680>;
+
+		cpu@0 {
+			phandle = <0x01>;
+			device_type = "cpu";
+			reg = <0x00>;
+			status = "okay";
+			compatible = "riscv";
+			riscv,cbop-block-size = <0x40>;
+			riscv,cboz-block-size = <0x40>;
+			riscv,cbom-block-size = <0x40>;
+			riscv,isa-extensions = "i", "m", "a", "f", "d", "c", "h", "zic64b", "zicbom", "zicbop", "zicboz", "ziccamoa", "ziccif", "zicclsm", "ziccrse", "zicntr", "zicsr", "zifencei", "zihintntl", "zihintpause", "zihpm", "zmmul", "za64rs", "zaamo", "zalrsc", "zawrs", "zfa", "zca", "zcd", "zba", "zbb", "zbc", "zbs", "shcounterenw", "shgatpa", "shtvala", "shvsatpa", "shvstvala", "shvstvecd", "ssccptr", "sscounterenw", "sstc", "sstvala", "sstvecd", "ssu64xl", "svadu", "svvptc";
+			riscv,isa-base = "rv64i";
+			riscv,isa = "rv64imafdch_zic64b_zicbom_zicbop_zicboz_ziccamoa_ziccif_zicclsm_ziccrse_zicntr_zicsr_zifencei_zihintntl_zihintpause_zihpm_zmmul_za64rs_zaamo_zalrsc_zawrs_zfa_zca_zcd_zba_zbb_zbc_zbs_shcounterenw_shgatpa_shtvala_shvsatpa_shvstvala_shvstvecd_ssccptr_sscounterenw_sstc_sstvala_sstvecd_ssu64xl_svadu_svvptc";
+			mmu-type = "riscv,sv57";
+
+			interrupt-controller {
+				#interrupt-cells = <0x01>;
+				interrupt-controller;
+				compatible = "riscv,cpu-intc";
+				phandle = <0x02>;
+			};
+		};
+
+		cpu-map {
+
+			cluster0 {
+
+				core0 {
+					cpu = <0x01>;
+				};
+			};
+		};
+	};
+
+	pmu {
+		riscv,event-to-mhpmcounters = <0x01 0x01 0x7fff9 0x02 0x02 0x7fffc 0x10019 0x10019 0x7fff8 0x1001b 0x1001b 0x7fff8 0x10021 0x10021 0x7fff8>;
+		compatible = "riscv,pmu";
+	};
+
+	fw-cfg@10100000 {
+		dma-coherent;
+		reg = <0x00 0x10100000 0x00 0x18>;
+		compatible = "qemu,fw-cfg-mmio";
+	};
+
+	flash@20000000 {
+		bank-width = <0x04>;
+		reg = <0x00 0x20000000 0x00 0x2000000 0x00 0x22000000 0x00 0x2000000>;
+		compatible = "cfi-flash";
+	};
+
+	aliases {
+		serial0 = "/soc/serial@10000000";
+	};
+
+	chosen {
+		linux,initrd-end = <0x00 0xa2b4f200>;
+		linux,initrd-start = <0x00 0xa0200000>;
+		stdout-path = "/soc/serial@10000000";
+		rng-seed = <0xa7074b10 0xf3373c0c 0x94a3a9a0 0xa2442477 0x817e30af 0x6460a6d7 0xbcaa71c4 0xb75dd35>;
+	};
+
+	soc {
+		#address-cells = <0x02>;
+		#size-cells = <0x02>;
+		compatible = "simple-bus";
+		ranges;
+
+		rtc@101000 {
+			interrupts = <0x0b>;
+			interrupt-parent = <0x03>;
+			reg = <0x00 0x101000 0x00 0x1000>;
+			compatible = "google,goldfish-rtc";
+		};
+
+		serial@10000000 {
+			interrupts = <0x0a>;
+			interrupt-parent = <0x03>;
+			clock-frequency = "", "8@";
+			reg = <0x00 0x10000000 0x00 0x100>;
+			compatible = "ns16550a";
+		};
+
+		test@100000 {
+			phandle = <0x04>;
+			reg = <0x00 0x100000 0x00 0x1000>;
+			compatible = "sifive,test1", "sifive,test0", "syscon";
+		};
+
+		virtio_mmio@10008000 {
+			interrupts = <0x08>;
+			interrupt-parent = <0x03>;
+			reg = <0x00 0x10008000 0x00 0x1000>;
+			compatible = "virtio,mmio";
+		};
+
+		virtio_mmio@10007000 {
+			interrupts = <0x07>;
+			interrupt-parent = <0x03>;
+			reg = <0x00 0x10007000 0x00 0x1000>;
+			compatible = "virtio,mmio";
+		};
+
+		virtio_mmio@10006000 {
+			interrupts = <0x06>;
+			interrupt-parent = <0x03>;
+			reg = <0x00 0x10006000 0x00 0x1000>;
+			compatible = "virtio,mmio";
+		};
+
+		virtio_mmio@10005000 {
+			interrupts = <0x05>;
+			interrupt-parent = <0x03>;
+			reg = <0x00 0x10005000 0x00 0x1000>;
+			compatible = "virtio,mmio";
+		};
+
+		virtio_mmio@10004000 {
+			interrupts = <0x04>;
+			interrupt-parent = <0x03>;
+			reg = <0x00 0x10004000 0x00 0x1000>;
+			compatible = "virtio,mmio";
+		};
+
+		virtio_mmio@10003000 {
+			interrupts = <0x03>;
+			interrupt-parent = <0x03>;
+			reg = <0x00 0x10003000 0x00 0x1000>;
+			compatible = "virtio,mmio";
+		};
+
+		virtio_mmio@10002000 {
+			interrupts = <0x02>;
+			interrupt-parent = <0x03>;
+			reg = <0x00 0x10002000 0x00 0x1000>;
+			compatible = "virtio,mmio";
+		};
+
+		virtio_mmio@10001000 {
+			interrupts = <0x01>;
+			interrupt-parent = <0x03>;
+			reg = <0x00 0x10001000 0x00 0x1000>;
+			compatible = "virtio,mmio";
+		};
+
+		plic@c000000 {
+			phandle = <0x03>;
+			riscv,ndev = <0x5f>;
+			reg = <0x00 0xc000000 0x00 0x600000>;
+			interrupts-extended = <0x02 0x0b 0x02 0x09>;
+			interrupt-controller;
+			compatible = "sifive,plic-1.0.0", "riscv,plic0";
+			#address-cells = <0x00>;
+			#interrupt-cells = <0x01>;
+		};
+
+		clint@2000000 {
+			interrupts-extended = <0x02 0x03 0x02 0x07>;
+			reg = <0x00 0x2000000 0x00 0x10000>;
+			compatible = "sifive,clint0", "riscv,clint0";
+		};
+
+		pci@30000000 {
+			interrupt-map-mask = <0x1800 0x00 0x00 0x07>;
+			interrupt-map = <0x00 0x00 0x00 0x01 0x03 0x20 0x00 0x00 0x00 0x02 0x03 0x21 0x00 0x00 0x00 0x03 0x03 0x22 0x00 0x00 0x00 0x04 0x03 0x23 0x800 0x00 0x00 0x01 0x03 0x21 0x800 0x00 0x00 0x02 0x03 0x22 0x800 0x00 0x00 0x03 0x03 0x23 0x800 0x00 0x00 0x04 0x03 0x20 0x1000 0x00 0x00 0x01 0x03 0x22 0x1000 0x00 0x00 0x02 0x03 0x23 0x1000 0x00 0x00 0x03 0x03 0x20 0x1000 0x00 0x00 0x04 0x03 0x21 0x1800 0x00 0x00 0x01 0x03 0x23 0x1800 0x00 0x00 0x02 0x03 0x20 0x1800 0x00 0x00 0x03 0x03 0x21 0x1800 0x00 0x00 0x04 0x03 0x22>;
+			ranges = <0x1000000 0x00 0x00 0x00 0x3000000 0x00 0x10000 0x2000000 0x00 0x40000000 0x00 0x40000000 0x00 0x40000000 0x3000000 0x04 0x00 0x04 0x00 0x04 0x00>;
+			reg = <0x00 0x30000000 0x00 0x10000000>;
+			dma-coherent;
+			bus-range = <0x00 0xff>;
+			linux,pci-domain = <0x00>;
+			device_type = "pci";
+			compatible = "pci-host-ecam-generic";
+			#size-cells = <0x02>;
+			#interrupt-cells = <0x01>;
+			#address-cells = <0x03>;
+		};
+	};
+};

etc/i686-unknown-none.json

@@ -1,29 +0,0 @@
-{
-  "arch": "x86",
-  "cpu": "pentium4",
-  "os": "none",
-  "abi": "softfloat",
-  "llvm-target": "i686-unknown-linux-gnu",
-  "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128",
-  "max-atomic-width": 64,
-  "target-pointer-width": "32",
-  "features": "-avx,-sse,+soft-float",
-
-  "executables": true,
-  "stack-probes": {
-    "kind": "inline"
-  },
-  "dynamic-linking": true,
-  "panic-strategy": "abort",
-  "relocation-model": "pic",
-
-  "has-thread-local": false,
-
-  "supported-split-debuginfo": [
-    "packed",
-    "unpacked",
-    "off"
-  ],
-  "linker": "rust-lld",
-  "linker-flavor": "ld.lld"
-}

etc/ld/aarch64-unknown-none.ld

@@ -0,0 +1,75 @@
+ENTRY(__aarch64_entry);
+
+SECTIONS {
+    . = 0x0;
+
+    PROVIDE(__kernel_start = .);
+
+    .text : {
+        *(.text.entry)
+        *(.text*)
+    }
+
+    . = ALIGN(4K);
+
+    .rodata : {
+        *(.rodata*)
+        *(.eh_frame*)
+
+        . = ALIGN(16);
+        PROVIDE(__init_array_start = .);
+        KEEP(*(.init_array*));
+        PROVIDE(__init_array_end = .);
+    }
+
+    . = ALIGN(4K);
+
+    .rela : {
+        PROVIDE(__rela_start = .);
+        *(.rela*)
+        PROVIDE(__rela_end = .);
+    }
+
+    .got : {
+        *(.got*)
+    }
+
+    .dynamic : {
+        *(.dynamic)
+    }
+
+    . = ALIGN(4K);
+
+    .data : {
+        *(.data*)
+    }
+
+    . = ALIGN(4K);
+    PROVIDE(__bss_start = .);
+
+    .bss : {
+        *(COMMON)
+        *(.bss*)
+    }
+
+    . = ALIGN(4K);
+    PROVIDE(__bss_end = .);
+    PROVIDE(__kernel_end = .);
+    PROVIDE(__kernel_size = __kernel_end - __kernel_start);
+
+    .dynsym : {
+        *(.dynsym)
+    }
+
+    .gnu.hash : {
+        *(.gnu.hash)
+    }
+
+    .hash : {
+        *(.hash)
+    }
+
+    .dynstr : {
+        *(.dynstr)
+    }
+}

etc/ld/arm/aarch64-unknown-qemu.ld

@@ -1,55 +0,0 @@
-ENTRY(__aarch64_entry);
-
-KERNEL_PHYS_BASE = 0x40080000;
-KERNEL_VIRT_OFFSET = 0xFFFFFF8000000000;
-
-SECTIONS {
-    . = KERNEL_PHYS_BASE;
-    PROVIDE(__kernel_start = . + KERNEL_VIRT_OFFSET);
-
-    .text.entry : {
-        *(.text.entry)
-    }
-
-    . = ALIGN(16);
-    . = . + KERNEL_VIRT_OFFSET;
-
-    .text : AT(. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.text.vectors));
-        *(.text*)
-    }
-
-    . = ALIGN(4K);
-    .rodata : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.rodata*)
-        *(.eh_frame*)
-
-        . = ALIGN(16);
-        PROVIDE(__init_array_start = .);
-        KEEP(*(.init_array*))
-        PROVIDE(__init_array_end = .);
-    }
-
-    . = ALIGN(4K);
-    .data.tables : AT (. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.data.tables))
-    }
-
-    . = ALIGN(4K);
-    .data : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.data*)
-        *(.got*)
-    }
-
-    . = ALIGN(4K);
-    PROVIDE(__bss_start_phys = . - KERNEL_VIRT_OFFSET);
-    .bss : AT(. - KERNEL_VIRT_OFFSET) {
-        *(COMMON)
-        *(.bss*)
-    }
-    . = ALIGN(4K);
-    PROVIDE(__bss_end_phys = . - KERNEL_VIRT_OFFSET);
-    PROVIDE(__bss_size = __bss_end_phys - __bss_start_phys);
-
-    PROVIDE(__kernel_end = .);
-};

etc/ld/arm/aarch64-unknown-raspi4b.ld

@@ -1,55 +0,0 @@
-ENTRY(__aarch64_entry);
-
-KERNEL_PHYS_BASE = 0x80000;
-KERNEL_VIRT_OFFSET = 0xFFFFFF8000000000;
-
-SECTIONS {
-    . = KERNEL_PHYS_BASE;
-    PROVIDE(__kernel_start = . + KERNEL_VIRT_OFFSET);
-
-    .text.entry : {
-        *(.text.entry)
-    }
-
-    . = ALIGN(16);
-    . = . + KERNEL_VIRT_OFFSET;
-
-    .text : AT(. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.text.vectors));
-        *(.text*)
-    }
-
-    . = ALIGN(4K);
-    .rodata : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.rodata*)
-        *(.eh_frame*)
-
-        . = ALIGN(16);
-        PROVIDE(__init_array_start = .);
-        KEEP(*(.init_array*))
-        PROVIDE(__init_array_end = .);
-    }
-
-    . = ALIGN(4K);
-    .data.tables : AT (. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.data.tables))
-    }
-
-    . = ALIGN(4K);
-    .data : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.data*)
-        *(.got*)
-    }
-
-    . = ALIGN(4K);
-    PROVIDE(__bss_start_phys = . - KERNEL_VIRT_OFFSET);
-    .bss : AT(. - KERNEL_VIRT_OFFSET) {
-        *(COMMON)
-        *(.bss*)
-    }
-    . = ALIGN(4K);
-    PROVIDE(__bss_end_phys = . - KERNEL_VIRT_OFFSET);
-    PROVIDE(__bss_size = __bss_end_phys - __bss_start_phys);
-
-    PROVIDE(__kernel_end = .);
-};

etc/ld/riscv/riscv64-unknown-jh7110.ld

@@ -1,58 +0,0 @@
-ENTRY(__rv64_entry);
-
-KERNEL_PHYS_BASE = 0x40200000;
-KERNEL_VIRT_OFFSET = 0xFFFFFFF000000000;
-
-SECTIONS {
-    . = KERNEL_PHYS_BASE;
-    PROVIDE(__kernel_start = . + KERNEL_VIRT_OFFSET);
-
-    .text.entry : {
-        *(.text.entry)
-    }
-
-    . = ALIGN(16);
-    . = . + KERNEL_VIRT_OFFSET;
-
-    .text : AT(. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.text.vectors));
-        *(.text*)
-    }
-
-    . = ALIGN(4K);
-    .rodata : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.rodata*)
-        *(.eh_frame*)
-    }
-
-    . = ALIGN(4K);
-    .data.tables : AT (. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.data.tables))
-    }
-
-    . = ALIGN(4K);
-    .data : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.data*)
-        . = ALIGN(8);
-        /* PROVIDE(__global_pointer = . + 0x800 - KERNEL_VIRT_OFFSET); */
-
-        . = ALIGN(16);
-        PROVIDE(__init_array_start = .);
-        KEEP(*(.init_array*))
-        PROVIDE(__init_array_end = .);
-
-        *(.got*)
-    }
-
-    . = ALIGN(4K);
-    PROVIDE(__bss_start_phys = . - KERNEL_VIRT_OFFSET);
-    .bss : AT(. - KERNEL_VIRT_OFFSET) {
-        *(COMMON)
-        *(.bss*)
-    }
-    . = ALIGN(4K);
-    PROVIDE(__bss_end_phys = . - KERNEL_VIRT_OFFSET);
-    PROVIDE(__bss_size = __bss_end_phys - __bss_start_phys);
-
-    PROVIDE(__kernel_end = .);
-};

etc/ld/riscv/riscv64-unknown-qemu.ld

@@ -1,58 +0,0 @@
-ENTRY(__rv64_entry);
-
-KERNEL_PHYS_BASE = 0x80200000;
-KERNEL_VIRT_OFFSET = 0xFFFFFFF000000000;
-
-SECTIONS {
-    . = KERNEL_PHYS_BASE;
-    PROVIDE(__kernel_start = . + KERNEL_VIRT_OFFSET);
-
-    .text.entry : {
-        *(.text.entry)
-    }
-
-    . = ALIGN(16);
-    . = . + KERNEL_VIRT_OFFSET;
-
-    .text : AT(. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.text.vectors));
-        *(.text*)
-    }
-
-    . = ALIGN(4K);
-    .rodata : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.rodata*)
-        *(.eh_frame*)
-    }
-
-    . = ALIGN(4K);
-    .data.tables : AT (. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.data.tables))
-    }
-
-    . = ALIGN(4K);
-    .data : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.data*)
-        . = ALIGN(8);
-        /* PROVIDE(__global_pointer = . + 0x800 - KERNEL_VIRT_OFFSET); */
-
-        . = ALIGN(16);
-        PROVIDE(__init_array_start = .);
-        KEEP(*(.init_array*))
-        PROVIDE(__init_array_end = .);
-
-        *(.got*)
-    }
-
-    . = ALIGN(4K);
-    PROVIDE(__bss_start_phys = . - KERNEL_VIRT_OFFSET);
-    .bss : AT(. - KERNEL_VIRT_OFFSET) {
-        *(COMMON)
-        *(.bss*)
-    }
-    . = ALIGN(4K);
-    PROVIDE(__bss_end_phys = . - KERNEL_VIRT_OFFSET);
-    PROVIDE(__bss_size = __bss_end_phys - __bss_start_phys);
-
-    PROVIDE(__kernel_end = .);
-};

etc/ld/riscv64-unknown-none.ld

@@ -0,0 +1,75 @@
+ENTRY(__riscv64_entry);
+
+SECTIONS {
+    . = 0x0;
+
+    PROVIDE(__kernel_start = .);
+
+    .text : {
+        *(.text.entry)
+        *(.text*)
+    }
+
+    . = ALIGN(4K);
+
+    .rodata : {
+        *(.rodata*)
+        *(.eh_frame*)
+
+        . = ALIGN(16);
+        PROVIDE(__init_array_start = .);
+        KEEP(*(.init_array*));
+        PROVIDE(__init_array_end = .);
+    }
+
+    . = ALIGN(4K);
+
+    .rela : {
+        PROVIDE(__rela_start = .);
+        *(.rela*)
+        PROVIDE(__rela_end = .);
+    }
+
+    .got : {
+        *(.got*)
+    }
+
+    .dynamic : {
+        *(.dynamic)
+    }
+
+    . = ALIGN(4K);
+
+    .data : {
+        *(.data*)
+    }
+
+    . = ALIGN(4K);
+    PROVIDE(__bss_start = .);
+
+    .bss : {
+        *(COMMON)
+        *(.bss*)
+    }
+
+    . = ALIGN(4K);
+    PROVIDE(__bss_end = .);
+    PROVIDE(__kernel_end = .);
+    PROVIDE(__kernel_size = __kernel_end - __kernel_start);
+
+    .dynsym : {
+        *(.dynsym)
+    }
+
+    .gnu.hash : {
+        *(.gnu.hash)
+    }
+
+    .hash : {
+        *(.hash)
+    }
+
+    .dynstr : {
+        *(.dynstr)
+    }
+}

etc/ld/x86/i686-unknown-none.ld

@@ -1,53 +0,0 @@
-ENTRY(__i686_entry);
-
-KERNEL_PHYS_BASE = 0x100000;
-KERNEL_VIRT_OFFSET = 0xC0000000;
-
-SECTIONS {
-    . = KERNEL_PHYS_BASE;
-    PROVIDE(__kernel_start = . + KERNEL_VIRT_OFFSET);
-
-    .text.entry : {
-        KEEP(*(.multiboot))
-        *(.text.entry)
-    }
-
-    . = ALIGN(16);
-    . = . + KERNEL_VIRT_OFFSET;
-
-    .text : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.text*)
-    }
-
-    .export.text : AT(. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.export.text*))
-    }
-
-    . = ALIGN(4K);
-    .rodata : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.eh_frame*)
-        *(.rodata*)
-    }
-
-    . = ALIGN(4K);
-    .data.tables : AT (. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.data.tables))
-    }
-
-    .data : AT(. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.data.yboot))
-        *(.data*)
-        *(.got*)
-    }
-
-    . = ALIGN(4K);
-    PROVIDE(__bss_start_phys = . - KERNEL_VIRT_OFFSET);
-    .bss : AT(. - KERNEL_VIRT_OFFSET) {
-        *(COMMON)
-        *(.bss*)
-    }
-    . = ALIGN(4K);
-    PROVIDE(__bss_end_phys = . - KERNEL_VIRT_OFFSET);
-
-    PROVIDE(__kernel_end = .);
-};

etc/ld/x86/x86_64-unknown-none.ld

@@ -1,52 +0,0 @@
-ENTRY(__x86_64_entry);
-
-KERNEL_PHYS_BASE = 0x200000;
-KERNEL_VIRT_OFFSET = 0xFFFFFF8000000000;
-
-SECTIONS {
-    . = KERNEL_PHYS_BASE;
-    PROVIDE(__kernel_start = . + KERNEL_VIRT_OFFSET);
-
-    .text.entry : {
-        *(.text.entry)
-    }
-
-    . = ALIGN(16);
-    . = . + KERNEL_VIRT_OFFSET;
-
-    .text : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.text*)
-    }
-
-    .export.text : AT(. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.export.text*))
-    }
-
-    . = ALIGN(4K);
-    .rodata : AT(. - KERNEL_VIRT_OFFSET) {
-        *(.eh_frame*)
-        *(.rodata*)
-    }
-
-    . = ALIGN(4K);
-    .data.tables : AT (. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.data.tables))
-    }
-
-    .data : AT(. - KERNEL_VIRT_OFFSET) {
-        KEEP(*(.data.yboot))
-        *(.data*)
-        *(.got*)
-    }
-
-    . = ALIGN(4K);
-    PROVIDE(__bss_start_phys = . - KERNEL_VIRT_OFFSET);
-    .bss : AT(. - KERNEL_VIRT_OFFSET) {
-        *(COMMON)
-        *(.bss*)
-    }
-    . = ALIGN(4K);
-    PROVIDE(__bss_end_phys = . - KERNEL_VIRT_OFFSET);
-
-    PROVIDE(__kernel_end = .);
-};

etc/ld/x86_64-unknown-none.ld

@@ -0,0 +1,73 @@
+ENTRY(__x86_64_entry);
+
+SECTIONS {
+    . = 0x0;
+
+    PROVIDE(__kernel_start = .);
+
+    .text : {
+        *(.text.entry)
+        *(.text*)
+    }
+
+    . = ALIGN(4K);
+
+    .rodata : {
+        *(.rodata*)
+        *(.eh_frame*)
+
+        . = ALIGN(16);
+        PROVIDE(__init_array_start = .);
+        KEEP(*(.init_array*));
+        PROVIDE(__init_array_end = .);
+    }
+
+    . = ALIGN(4K);
+
+    .rela : {
+        PROVIDE(__rela_start = .);
+        *(.rela*)
+        PROVIDE(__rela_end = .);
+    }
+
+    .dynamic : {
+        *(.dynamic)
+    }
+
+    . = ALIGN(4K);
+
+    .data : {
+        KEEP(*(.data.yboot))
+        *(.data*)
+        *(.got*)
+    }
+
+    . = ALIGN(4K);
+    PROVIDE(__bss_start = .);
+
+    .bss : {
+        *(COMMON)
+        *(.bss*)
+    }
+
+    . = ALIGN(4K);
+    PROVIDE(__bss_end = .);
+    PROVIDE(__kernel_end = .);
+    PROVIDE(__kernel_size = __kernel_end - __kernel_start);
+
+    .dynsym : {
+        *(.dynsym)
+    }
+
+    .gnu.hash : {
+        *(.gnu.hash)
+    }
+
+    .hash : {
+        *(.hash)
+    }
+
+    .dynstr : {
+        *(.dynstr)
+    }
+}

etc/riscv64-unknown-none.json

@@ -14,6 +14,7 @@
   "panic-strategy": "abort",
   "dynamic-linking": true,
   "relocation-model": "pic",
+  "position-independent-executables": true,
   "code-model": "medium",
   "eh-frame-header": false,
 

etc/x86_64-unknown-none.json

@@ -15,6 +15,7 @@
   "panic-strategy": "abort",
   "dynamic-linking": true,
   "relocation-model": "pic",
+  "position-independent-executables": true,
 
   "has-thread-local": false,
 

kernel/Cargo.toml

@@ -19,23 +19,22 @@ chrono.workspace = true
 device-api = { workspace = true, features = ["derive"] }
 device-api-macros.workspace = true
 
-memtables.workspace = true
 vmalloc.workspace = true
 kernel-arch.workspace = true
 
 # Drivers
+ygg_driver_input = { path = "driver/input" }
 ygg_driver_pci = { path = "driver/bus/pci" }
 ygg_driver_usb = { path = "driver/bus/usb" }
 ygg_driver_net_core = { path = "driver/net/core" }
 ygg_driver_net_loopback = { path = "driver/net/loopback" }
-ygg_driver_virtio_net = { path = "driver/virtio/net", features = ["pci"] }
-ygg_driver_virtio_gpu = { path = "driver/virtio/gpu", features = ["pci"] }
-ygg_driver_virtio_blk = { path = "driver/virtio/blk", features = ["pci"] }
-ygg_driver_nvme = { path = "driver/block/nvme" }
-ygg_driver_ahci = { path = "driver/block/ahci" }
-ygg_driver_input = { path = "driver/input" }
-ygg_driver_usb_xhci.path = "driver/usb/xhci"
-ygg_driver_net_rtl81xx.path = "driver/net/rtl81xx"
+# ygg_driver_virtio_net = { path = "driver/virtio/net", features = ["pci"] }
+# ygg_driver_virtio_gpu = { path = "driver/virtio/gpu", features = ["pci"] }
+# ygg_driver_virtio_blk = { path = "driver/virtio/blk", features = ["pci"] }
+# ygg_driver_nvme = { path = "driver/block/nvme" }
+# ygg_driver_ahci = { path = "driver/block/ahci" }
+# ygg_driver_usb_xhci.path = "driver/usb/xhci"
+# ygg_driver_net_rtl81xx.path = "driver/net/rtl81xx"
 
 memfs = { path = "driver/fs/memfs" }
 ext2 = { path = "driver/fs/ext2" }
@@ -69,14 +68,10 @@ kernel-arch-x86_64.workspace = true
 kernel-arch-x86.workspace = true
 
 ygg_driver_acpi.path = "driver/acpi"
-ygg_driver_net_igbe.path = "driver/net/igbe"
+# ygg_driver_net_igbe.path = "driver/net/igbe"
 
 acpi.workspace = true
 
-[target.'cfg(target_arch = "x86")'.dependencies]
-kernel-arch-i686.workspace = true
-kernel-arch-x86.workspace = true
-
 [build-dependencies]
 abi-generator.workspace = true
 
@@ -87,7 +82,6 @@ prettyplease = "0.2.15"
 aarch64-cpu.workspace = true
 device-tree.workspace = true
 kernel-arch-x86_64.workspace = true
-kernel-arch-i686.workspace = true
 kernel-arch-x86.workspace = true
 kernel-arch-aarch64.workspace = true
 kernel-arch-riscv64.workspace = true
@@ -99,12 +93,5 @@ ygg_driver_net_stmmac.path = "driver/net/stmmac"
 default = ["fb_console"]
 fb_console = []
 
-# TODO replace this with a better configuration mechanism
-aarch64_board_virt = ["kernel-arch-aarch64/aarch64_board_virt"]
-aarch64_board_raspi4b = ["kernel-arch-aarch64/aarch64_board_raspi4b"]
-
-riscv64_board_virt = ["kernel-arch-riscv64/riscv64_board_virt"]
-riscv64_board_jh7110 = ["kernel-arch-riscv64/riscv64_board_jh7110"]
-
 [lints]
 workspace = true

kernel/arch/Cargo.toml

@@ -9,9 +9,6 @@ kernel-arch-x86_64.path = "x86_64"
 [target.'cfg(all(target_os = "none", target_arch = "aarch64"))'.dependencies]
 kernel-arch-aarch64.path = "aarch64"
 
-[target.'cfg(all(target_os = "none", target_arch = "x86"))'.dependencies]
-kernel-arch-i686.path = "i686"
-
 [target.'cfg(all(target_os = "none", target_arch = "riscv64"))'.dependencies]
 kernel-arch-riscv64.path = "riscv64"
 

kernel/arch/aarch64/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2021"
 yggdrasil-abi.workspace = true
 kernel-arch-interface.workspace = true
 libk-mm-interface.workspace = true
-memtables.workspace = true
 device-api = { workspace = true, features = ["derive"] }
 
 bitflags.workspace = true
@@ -18,10 +17,5 @@ tock-registers.workspace = true
 [build-dependencies]
 cc = "1.0"
 
-[features]
-default = []
-aarch64_board_virt = []
-aarch64_board_raspi4b = []
-
 [lints]
 workspace = true

kernel/arch/aarch64/build.rs

@@ -5,7 +5,7 @@ fn build_fp_context_obj() {
 
     let out_dir = env::var("OUT_DIR").unwrap();
 
-    println!("cargo:rerun-if-changed={}", FP_CONTEXT_S);
+    println!("cargo:rerun-if-changed={FP_CONTEXT_S}");
 
     cc::Build::new()
         .out_dir(&out_dir)

kernel/arch/aarch64/src/mem/fixed.rs

@@ -0,0 +1,124 @@
+use core::ops::Range;
+
+use aarch64_cpu::registers::{TTBR0_EL1, TTBR1_EL1};
+use kernel_arch_interface::{mem::DeviceMemoryAttributes, KERNEL_VIRT_OFFSET};
+use libk_mm_interface::{
+    address::PhysicalAddress,
+    device::{DevicePageManager, DevicePageTableLevel},
+    table::EntryLevel,
+};
+
+use crate::mem::{
+    auto_lower_address,
+    table::{PageAttributes, PageEntry, PageTable, L1, L2, L3},
+    tlb_flush_range_va,
+};
+
+pub const IDENTITY_SIZE_L1: usize = 8;
+pub const DEVICE_L1: usize = IDENTITY_SIZE_L1;
+pub const DEVICE_MAPPING_L3_COUNT: usize = 32;
+pub const DEVICE_MAPPING_OFFSET: usize = KERNEL_VIRT_OFFSET + (DEVICE_L1 << L1::SHIFT);
+
+#[repr(transparent)]
+pub struct L2DeviceMemory(pub PageTable<L2>);
+#[repr(transparent)]
+pub struct L3DeviceMemory(pub [PageTable<L3>; DEVICE_MAPPING_L3_COUNT]);
+
+static mut KERNEL_L1: PageTable<L1> = PageTable::zeroed();
+pub(super) static mut DEVICE_MEMORY: DevicePageManager<L3DeviceMemory, L2DeviceMemory> =
+    DevicePageManager::new(
+        L3DeviceMemory([PageTable::zeroed(); DEVICE_MAPPING_L3_COUNT]),
+        L2DeviceMemory(PageTable::zeroed()),
+    );
+
+impl DevicePageTableLevel for L2DeviceMemory {
+    type Level = L2;
+    const VIRTUAL_BASE: usize = DEVICE_MAPPING_OFFSET;
+    const INDEX_RANGE: Range<usize> = DEVICE_MAPPING_L3_COUNT..512;
+
+    fn map_page(
+        &mut self,
+        index: usize,
+        physical: PhysicalAddress,
+        attrs: &DeviceMemoryAttributes,
+    ) {
+        let _ = attrs;
+        self.0[index] = PageEntry::device_block(physical);
+    }
+
+    fn unmap_page(&mut self, index: usize) {
+        self.0[index] = PageEntry::INVALID;
+    }
+
+    fn is_mapped(&self, index: usize) -> bool {
+        self.0[index].is_present()
+    }
+
+    fn flush_range(range: Range<usize>) {
+        let start = range.start * L2::SIZE + Self::VIRTUAL_BASE;
+        let size = (range.end - range.start) * L2::SIZE;
+        tlb_flush_range_va(start, size);
+    }
+}
+
+impl DevicePageTableLevel for L3DeviceMemory {
+    type Level = L3;
+    const VIRTUAL_BASE: usize = DEVICE_MAPPING_OFFSET;
+    const INDEX_RANGE: Range<usize> = 0..512 * DEVICE_MAPPING_L3_COUNT;
+
+    fn map_page(
+        &mut self,
+        index: usize,
+        physical: PhysicalAddress,
+        attrs: &DeviceMemoryAttributes,
+    ) {
+        let _ = attrs;
+        let l2i = index / 512;
+        let l3i = index % 512;
+        self.0[l2i][l3i] = PageEntry::device_page(physical);
+    }
+
+    fn unmap_page(&mut self, index: usize) {
+        let l2i = index / 512;
+        let l3i = index % 512;
+        self.0[l2i][l3i] = PageEntry::INVALID;
+    }
+
+    fn is_mapped(&self, index: usize) -> bool {
+        let l2i = index / 512;
+        let l3i = index % 512;
+        self.0[l2i][l3i].is_present()
+    }
+
+    fn flush_range(range: Range<usize>) {
+        let start = range.start * L3::SIZE + Self::VIRTUAL_BASE;
+        let size = (range.end - range.start) * L3::SIZE;
+        tlb_flush_range_va(start, size);
+    }
+}
+
+pub unsafe fn setup() {
+    // 0..IDENTITY_SIZE_L1 -> lower RAM region
+    for i in 0..IDENTITY_SIZE_L1 {
+        let phys = PhysicalAddress::from_usize(i << L1::SHIFT);
+        KERNEL_L1[i] = PageEntry::normal_block(phys, PageAttributes::empty());
+    }
+
+    // DEVICE_L1 -> Device L2 table
+    //               0..DEVICE_MAPPING_L3_COUNT -> Device L3 tables -> Device L3 pages
+    //               ..512                      -> Device L2 pages
+    for i in 0..DEVICE_MAPPING_L3_COUNT {
+        let phys =
+            PhysicalAddress::from_usize(auto_lower_address(&raw const DEVICE_MEMORY.normal.0[i]));
+        DEVICE_MEMORY.large.0[i] = PageEntry::table(phys, PageAttributes::empty());
+    }
+    let phys = PhysicalAddress::from_usize(auto_lower_address(&raw const DEVICE_MEMORY.large.0));
+    KERNEL_L1[DEVICE_L1] = PageEntry::table(phys, PageAttributes::empty());
+}
+
+pub unsafe fn load() {
+    let ttbr_physical = auto_lower_address(&raw const KERNEL_L1) as u64;
+
+    TTBR0_EL1.set_baddr(ttbr_physical);
+    TTBR1_EL1.set_baddr(ttbr_physical);
+}

kernel/arch/aarch64/src/mem/intrinsics.rs

@@ -0,0 +1,141 @@
+use core::sync::atomic::{self, Ordering};
+
+use aarch64_cpu::{
+    asm::barrier,
+    registers::{PAR_EL1, SCTLR_EL1},
+};
+use libk_mm_interface::table::{EntryLevel, EntryLevelExt};
+use tock_registers::interfaces::{ReadWriteable, Readable};
+
+use crate::mem::table::L3;
+
+/// Enables data cache.
+///
+/// # Safety
+///
+/// Manipulates low-level machine state, use with care.
+pub unsafe fn enable_dcache() {
+    barrier::dsb(barrier::ISHST);
+    barrier::isb(barrier::SY);
+
+    SCTLR_EL1.modify(SCTLR_EL1::C::Cacheable);
+
+    barrier::dsb(barrier::ISH);
+    barrier::isb(barrier::SY);
+}
+
+/// Enables instruction cache.
+///
+/// # Safety
+///
+/// Manipulates low-level machine state, use with care.
+pub unsafe fn enable_icache() {
+    barrier::isb(barrier::SY);
+
+    SCTLR_EL1.modify(SCTLR_EL1::I::Cacheable);
+
+    barrier::dsb(barrier::ISH);
+    barrier::isb(barrier::SY);
+}
+
+/// Disables instruction cache.
+///
+/// # Safety
+///
+/// Manipulates low-level machine state, use with care. Might break some instructions.
+pub unsafe fn disable_icache() {
+    barrier::isb(barrier::SY);
+
+    ic_iallu();
+    SCTLR_EL1.modify(SCTLR_EL1::I::NonCacheable);
+
+    barrier::dsb(barrier::ISH);
+    barrier::isb(barrier::SY);
+}
+
+#[inline]
+pub fn tlb_flush_asid(asid: u8) {
+    barrier::dsb(barrier::ISHST);
+    let value = (asid as u64) << 48;
+    unsafe {
+        core::arch::asm!("tlbi aside1, {value}", value = in(reg) value);
+    }
+    barrier::dsb(barrier::ISH);
+    barrier::isb(barrier::SY);
+}
+
+#[inline]
+pub fn tlb_flush_all() {
+    barrier::dsb(barrier::ISHST);
+    unsafe {
+        core::arch::asm!("tlbi vmalle1is");
+    }
+    barrier::dsb(barrier::ISH);
+    barrier::isb(barrier::SY);
+}
+
+#[inline]
+pub fn tlb_flush_vaae1(page: usize) {
+    barrier::dsb(barrier::ISHST);
+    let argument = page >> 12;
+    unsafe {
+        core::arch::asm!("tlbi vaae1, {argument}", argument = in(reg) argument);
+    }
+    barrier::dsb(barrier::ISH);
+    barrier::isb(barrier::SY);
+}
+
+#[inline]
+pub fn tlb_flush_range_va(base: usize, size: usize) {
+    let end = (base + size).page_align_up::<L3>();
+    let base = base.page_align_down::<L3>();
+    let count = (end - base).page_count::<L3>();
+    for i in 0..count {
+        tlb_flush_vaae1(base + i * L3::SIZE);
+    }
+}
+
+pub fn at_s1e0r(input: usize) -> Option<u64> {
+    barrier::dsb(barrier::ISHST);
+    unsafe {
+        core::arch::asm!("at s1e0r, {address}", address = in(reg) input);
+    }
+    barrier::dsb(barrier::ISH);
+    barrier::isb(barrier::SY);
+    if PAR_EL1.matches_all(PAR_EL1::F::TranslationSuccessfull) {
+        Some(PAR_EL1.read(PAR_EL1::PA))
+    } else {
+        None
+    }
+}
+
+pub fn at_s1e1r(input: usize) -> Option<u64> {
+    barrier::dsb(barrier::ISHST);
+    unsafe {
+        core::arch::asm!("at s1e1r, {address}", address = in(reg) input);
+    }
+    barrier::dsb(barrier::ISH);
+    barrier::isb(barrier::SY);
+    if PAR_EL1.matches_all(PAR_EL1::F::TranslationSuccessfull) {
+        Some(PAR_EL1.read(PAR_EL1::PA))
+    } else {
+        None
+    }
+}
+
+pub fn ic_iallu() {
+    atomic::compiler_fence(Ordering::SeqCst);
+    barrier::dsb(barrier::ISH);
+    barrier::isb(barrier::SY);
+    unsafe {
+        core::arch::asm!("ic iallu");
+    }
+    barrier::isb(barrier::SY);
+}
+
+pub fn dc_cvac(input: usize) {
+    barrier::dsb(barrier::ISHST);
+    unsafe {
+        core::arch::asm!("dc cvac, {address}", address = in(reg) input);
+    }
+}

kernel/arch/aarch64/src/mem/mod.rs

@@ -1,108 +1,49 @@
-use core::{
-    alloc::Layout,
-    ops::{Deref, DerefMut},
-    sync::atomic::{self, AtomicUsize, Ordering},
-};
-
+#![allow(clippy::missing_safety_doc)]
 use aarch64_cpu::{
     asm::barrier,
-    registers::{MAIR_EL1, PAR_EL1, SCTLR_EL1, TTBR0_EL1, TTBR1_EL1},
+    registers::{MAIR_EL1, SCTLR_EL1, TCR_EL1},
 };
 use kernel_arch_interface::{
     mem::{DeviceMemoryAttributes, KernelTableManager, RawDeviceMemoryMapping},
-    split_spinlock, Architecture, KERNEL_VIRT_OFFSET,
+    sync::IrqSafeSpinlock,
+    KERNEL_VIRT_OFFSET,
 };
-use libk_mm_interface::{
-    address::PhysicalAddress,
-    table::{page_index, EntryLevel, EntryLevelExt},
-};
-use memtables::aarch64::{FixedTables, KERNEL_L3_COUNT};
-use static_assertions::const_assert_eq;
-use tock_registers::interfaces::{ReadWriteable, Readable, Writeable};
+use libk_mm_interface::{address::PhysicalAddress, table::EntryLevel};
+use tock_registers::interfaces::{ReadWriteable, Writeable};
 use yggdrasil_abi::error::Error;
 
-use crate::ArchitectureImpl;
+pub use intrinsics::*;
 
-use self::table::{PageAttributes, PageEntry, PageTable, L1, L2, L3};
+use crate::{mem::table::L1, ArchitectureImpl};
 
+pub mod fixed;
+pub mod intrinsics;
 pub mod process;
 pub mod table;
 
 #[derive(Debug)]
 pub struct KernelTableManagerImpl;
 
-// TODO eliminate this requirement by using precomputed indices
-const MAPPING_OFFSET: usize = KERNEL_VIRT_OFFSET;
-
-#[cfg(any(feature = "aarch64_board_virt", rust_analyzer))]
-const KERNEL_PHYS_BASE: usize = 0x40080000;
-#[cfg(any(feature = "aarch64_board_raspi4b", rust_analyzer))]
-const KERNEL_PHYS_BASE: usize = 0x80000;
-
-// Precomputed mappings
-const KERNEL_L1_INDEX: usize = page_index::<L1>(KERNEL_VIRT_OFFSET + KERNEL_PHYS_BASE);
-const KERNEL_START_L2_INDEX: usize = page_index::<L2>(KERNEL_VIRT_OFFSET + KERNEL_PHYS_BASE);
-const KERNEL_END_L2_INDEX: usize = KERNEL_START_L2_INDEX + KERNEL_L3_COUNT;
-
-// Must not be zero, should be at 4MiB
-const_assert_eq!(KERNEL_START_L2_INDEX, 0);
-// From static mapping
-#[cfg(any(feature = "aarch64_board_raspi4b", rust_analyzer))]
-const_assert_eq!(KERNEL_L1_INDEX, 0);
-#[cfg(any(feature = "aarch64_board_virt", rust_analyzer))]
-const_assert_eq!(KERNEL_L1_INDEX, 1);
-
-// Runtime mappings
-// 2MiB max
-const EARLY_MAPPING_L2I: usize = KERNEL_END_L2_INDEX + 1;
-// 1GiB max
-const DEVICE_MAPPING_L1I: usize = KERNEL_L1_INDEX + 2;
-const DEVICE_MAPPING_L3_COUNT: usize = 4;
-// 16GiB max
-const RAM_MAPPING_START_L1I: usize = KERNEL_L1_INDEX + 3;
-pub const RAM_MAPPING_L1_COUNT: usize = 16;
-
-// 2MiB for early mappings
-const EARLY_MAPPING_OFFSET: usize =
-    MAPPING_OFFSET | (KERNEL_L1_INDEX * L1::SIZE) | (EARLY_MAPPING_L2I * L2::SIZE);
-static mut EARLY_MAPPING_L3: PageTable<L3> = PageTable::zeroed();
-// 1GiB for device MMIO mapping
-const DEVICE_MAPPING_OFFSET: usize = MAPPING_OFFSET | (DEVICE_MAPPING_L1I * L1::SIZE);
-static mut DEVICE_MAPPING_L2: PageTable<L2> = PageTable::zeroed();
-static mut DEVICE_MAPPING_L3S: [PageTable<L3>; DEVICE_MAPPING_L3_COUNT] =
-    [PageTable::zeroed(); DEVICE_MAPPING_L3_COUNT];
-// 16GiB for RAM mapping
-pub const RAM_MAPPING_OFFSET: usize = MAPPING_OFFSET | (RAM_MAPPING_START_L1I * L1::SIZE);
-pub static MEMORY_LIMIT: AtomicUsize = AtomicUsize::new(0);
-
-split_spinlock! {
-    use crate::ArchitectureImpl;
-    use crate::mem::FixedTables;
-    use libk_mm_interface::KernelImageObject;
-
-    #[link_section = ".data.tables"]
-    static KERNEL_TABLES: KernelImageObject<FixedTables> =
-        unsafe { KernelImageObject::new(FixedTables::zeroed()) };
-}
+static KERNEL_MEMORY_LOCK: IrqSafeSpinlock<ArchitectureImpl, ()> = IrqSafeSpinlock::new(());
 
 impl KernelTableManager for KernelTableManagerImpl {
     fn virtualize(address: u64) -> usize {
         let address = address as usize;
-        if address < MEMORY_LIMIT.load(Ordering::Acquire) {
-            address + RAM_MAPPING_OFFSET
+        if address < fixed::IDENTITY_SIZE_L1 * L1::SIZE {
+            address + KERNEL_VIRT_OFFSET
         } else {
-            panic!("Invalid physical address: {:#x}", address);
+            panic!("Invalid physical address: {address:#x}");
         }
     }
 
     fn physicalize(address: usize) -> u64 {
-        if address < RAM_MAPPING_OFFSET
-            || address - RAM_MAPPING_OFFSET >= MEMORY_LIMIT.load(Ordering::Acquire)
+        if address < KERNEL_VIRT_OFFSET
+            || address - KERNEL_VIRT_OFFSET >= fixed::IDENTITY_SIZE_L1 * L1::SIZE
         {
-            panic!("Not a virtualized physical address: {:#x}", address);
+            panic!("Invalid virtual (-> physical) address {address:#x}");
         }
 
-        (address - RAM_MAPPING_OFFSET) as _
+        (address - KERNEL_VIRT_OFFSET) as u64
     }
 
     unsafe fn map_device_pages(
@@ -110,442 +51,96 @@ impl KernelTableManager for KernelTableManagerImpl {
         count: usize,
         attrs: DeviceMemoryAttributes,
     ) -> Result<RawDeviceMemoryMapping<Self>, Error> {
-        map_device_memory(PhysicalAddress::from_u64(base), count, attrs)
+        let _lock = KERNEL_MEMORY_LOCK.lock();
+        #[allow(static_mut_refs)]
+        fixed::DEVICE_MEMORY.map_device_pages(PhysicalAddress::from_u64(base), count, attrs)
     }
 
     unsafe fn unmap_device_pages(mapping: &RawDeviceMemoryMapping<Self>) {
-        unmap_device_memory(mapping)
-    }
-}
-
-/// Memory mapping which may be used for performing early kernel initialization
-pub struct EarlyMapping<'a, T: ?Sized> {
-    value: &'a mut T,
-    page_count: usize,
-}
-
-impl<'a, T: Sized> EarlyMapping<'a, T> {
-    /// # Safety
-    ///
-    /// `physical` address provided must be a valid non-NULL address actually containing `T`.
-    pub unsafe fn map_slice(
-        physical: PhysicalAddress,
-        len: usize,
-    ) -> Result<EarlyMapping<'a, [T]>, Error> {
-        let layout = Layout::array::<T>(len).unwrap();
-        let aligned = physical.page_align_down::<L3>();
-        let offset = physical.page_offset::<L3>();
-        let page_count = (offset + layout.size()).div_ceil(L3::SIZE);
-
-        let virt = map_early_pages(aligned, page_count)?;
-        let value = core::slice::from_raw_parts_mut((virt + offset) as *mut T, len);
-
-        Ok(EarlyMapping { value, page_count })
-    }
-}
-
-impl<T: ?Sized> Deref for EarlyMapping<'_, T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        self.value
-    }
-}
-
-impl<T: ?Sized> DerefMut for EarlyMapping<'_, T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.value
-    }
-}
-
-impl<T: ?Sized> Drop for EarlyMapping<'_, T> {
-    fn drop(&mut self) {
-        let address = (self.value as *mut T).addr() & !(L3::SIZE - 1);
-
-        for i in 0..self.page_count {
-            let page = address + i * L3::SIZE;
-
-            unsafe {
-                unmap_early_page(page);
-            }
-        }
-    }
-}
-
-fn kernel_table_flags() -> PageAttributes {
-    PageAttributes::TABLE
-        | PageAttributes::ACCESS
-        | PageAttributes::SH_INNER
-        | PageAttributes::PAGE_ATTR_NORMAL
-        | PageAttributes::PRESENT
-}
-
-fn ram_block_flags() -> PageAttributes {
-    // TODO UXN, PXN
-    PageAttributes::BLOCK
-        | PageAttributes::ACCESS
-        | PageAttributes::SH_OUTER
-        | PageAttributes::PAGE_ATTR_NORMAL
-        | PageAttributes::PRESENT
-}
-
-// Early mappings
-unsafe fn map_early_pages(physical: PhysicalAddress, count: usize) -> Result<usize, Error> {
-    for l3i in 0..512 {
-        let mut taken = false;
-        for i in 0..count {
-            if EARLY_MAPPING_L3[i + l3i].is_present() {
-                taken = true;
-                break;
-            }
-        }
-
-        if taken {
-            continue;
-        }
-
-        for i in 0..count {
-            let page = physical.add(i * L3::SIZE);
-            // TODO NX, NC
-            EARLY_MAPPING_L3[i + l3i] = PageEntry::normal_page(page, PageAttributes::empty());
-            tlb_flush_vaae1(EARLY_MAPPING_OFFSET + (l3i + i) * L3::SIZE);
-        }
-
-        return Ok(EARLY_MAPPING_OFFSET + l3i * L3::SIZE);
-    }
-
-    Err(Error::OutOfMemory)
-}
-
-unsafe fn unmap_early_page(address: usize) {
-    if !(EARLY_MAPPING_OFFSET..EARLY_MAPPING_OFFSET + L2::SIZE).contains(&address) {
-        panic!("Tried to unmap invalid early mapping: {:#x}", address);
-    }
-
-    let l3i = (address - EARLY_MAPPING_OFFSET).page_index::<L3>();
-
-    assert!(EARLY_MAPPING_L3[l3i].is_present());
-    EARLY_MAPPING_L3[l3i] = PageEntry::INVALID;
-}
-
-/// # Safety
-///
-/// Only meant to be used by the architecture initialization functions.
-pub unsafe fn map_ram_l1(index: usize) {
-    if index >= RAM_MAPPING_L1_COUNT {
-        ArchitectureImpl::halt();
-    }
-    let mut tables = KERNEL_TABLES.lock();
-    let table_index = index + RAM_MAPPING_START_L1I;
-
-    if tables.l1.data[table_index] != 0 {
-        ArchitectureImpl::halt();
-    }
-
-    tables.l1.data[table_index] = ((index * L1::SIZE) as u64) | ram_block_flags().bits();
-    tlb_flush_vaae1(RAM_MAPPING_OFFSET + index * L1::SIZE);
-}
-
-// Device mappings
-unsafe fn map_device_memory_l3(
-    base: PhysicalAddress,
-    count: usize,
-    _attrs: DeviceMemoryAttributes,
-) -> Result<usize, Error> {
-    // TODO don't map pages if already mapped
-
-    'l0: for i in 0..DEVICE_MAPPING_L3_COUNT * 512 {
-        for j in 0..count {
-            let l2i = (i + j) / 512;
-            let l3i = (i + j) % 512;
-
-            if DEVICE_MAPPING_L3S[l2i][l3i].is_present() {
-                continue 'l0;
-            }
-        }
-
-        for j in 0..count {
-            let l2i = (i + j) / 512;
-            let l3i = (i + j) % 512;
-
-            // TODO NX, NC
-            DEVICE_MAPPING_L3S[l2i][l3i] = PageEntry::device_page(base.add(j * L3::SIZE));
-            tlb_flush_vaae1(DEVICE_MAPPING_OFFSET + l2i * L2::SIZE + l3i * L3::SIZE);
-        }
-
-        return Ok(DEVICE_MAPPING_OFFSET + i * L3::SIZE);
-    }
-
-    Err(Error::OutOfMemory)
-}
-
-#[allow(unused)]
-unsafe fn map_device_memory_l2(
-    base: PhysicalAddress,
-    count: usize,
-    _attrs: DeviceMemoryAttributes,
-) -> Result<usize, Error> {
-    'l0: for i in DEVICE_MAPPING_L3_COUNT..512 {
-        for j in 0..count {
-            if DEVICE_MAPPING_L2[i + j].is_present() {
-                continue 'l0;
-            }
-        }
-
-        for j in 0..count {
-            DEVICE_MAPPING_L2[i + j] = PageEntry::<L2>::device_block(base.add(j * L2::SIZE));
-            tlb_flush_vaae1(DEVICE_MAPPING_OFFSET + (i + j) * L2::SIZE);
-        }
-
-        return Ok(DEVICE_MAPPING_OFFSET + i * L2::SIZE);
-    }
-
-    Err(Error::OutOfMemory)
-}
-
-pub(crate) unsafe fn map_device_memory(
-    base: PhysicalAddress,
-    size: usize,
-    attrs: DeviceMemoryAttributes,
-) -> Result<RawDeviceMemoryMapping<KernelTableManagerImpl>, Error> {
-    let l3_aligned = base.page_align_down::<L3>();
-    let l3_offset = base.page_offset::<L3>();
-    let page_count = (l3_offset + size).page_count::<L3>();
-
-    if page_count > 256 {
-        // Large mapping, use L2 mapping instead
-        let l2_aligned = base.page_align_down::<L2>();
-        let l2_offset = base.page_offset::<L2>();
-        let page_count = (l2_offset + size).page_count::<L2>();
-
-        let base_address = map_device_memory_l2(l2_aligned, page_count, attrs)?;
-        let address = base_address + l2_offset;
-
-        Ok(RawDeviceMemoryMapping::from_raw_parts(
-            l2_aligned.into_u64(),
-            address,
-            base_address,
-            page_count,
-            L2::SIZE,
-        ))
-    } else {
-        // Just map the pages directly
-        let base_address = map_device_memory_l3(l3_aligned, page_count, attrs)?;
-        let address = base_address + l3_offset;
-
-        Ok(RawDeviceMemoryMapping::from_raw_parts(
-            l3_aligned.into_u64(),
-            address,
-            base_address,
-            page_count,
-            L3::SIZE,
-        ))
-    }
-}
-
-pub(crate) unsafe fn unmap_device_memory(map: &RawDeviceMemoryMapping<KernelTableManagerImpl>) {
-    match map.page_size {
-        L3::SIZE => {
-            for i in 0..map.page_count {
-                let page = map.base_address + i * L3::SIZE;
-                let l2i = page.page_index::<L2>();
-                let l3i = page.page_index::<L3>();
-                assert!(DEVICE_MAPPING_L3S[l2i][l3i].is_present());
-                DEVICE_MAPPING_L3S[l2i][l3i] = PageEntry::INVALID;
-
-                tlb_flush_vaae1(page);
-            }
-        }
-        L2::SIZE => todo!(),
-        _ => unimplemented!(),
+        let _lock = KERNEL_MEMORY_LOCK.lock();
+        #[allow(static_mut_refs)]
+        fixed::DEVICE_MEMORY.unmap_device_pages(mapping);
     }
 }
 
 #[inline]
-pub fn tlb_flush_asid(asid: u8) {
-    barrier::dsb(barrier::ISHST);
-    let value = (asid as u64) << 48;
-    unsafe {
-        core::arch::asm!("tlbi aside1, {value}", value = in(reg) value);
+pub fn auto_lower_address<T>(ptr: *const T) -> usize {
+    let address = ptr.addr();
+    if address < KERNEL_VIRT_OFFSET {
+        address
+    } else {
+        address - KERNEL_VIRT_OFFSET
     }
-    barrier::dsb(barrier::ISH);
-    barrier::isb(barrier::SY);
 }
 
 #[inline]
-pub fn tlb_flush_all() {
-    barrier::dsb(barrier::ISHST);
-    unsafe {
-        core::arch::asm!("tlbi vmalle1is");
-    }
-    barrier::dsb(barrier::ISH);
-    barrier::isb(barrier::SY);
-}
-
-#[inline]
-pub fn tlb_flush_vaae1(page: usize) {
-    barrier::dsb(barrier::ISHST);
-    let argument = page >> 12;
-    unsafe {
-        core::arch::asm!("tlbi vaae1, {argument}", argument = in(reg) argument);
-    }
-    barrier::dsb(barrier::ISH);
-    barrier::isb(barrier::SY);
-}
-
-pub fn at_s1e0r(input: usize) -> Option<u64> {
-    barrier::dsb(barrier::ISHST);
-    unsafe {
-        core::arch::asm!("at s1e0r, {address}", address = in(reg) input);
-    }
-    barrier::dsb(barrier::ISH);
-    barrier::isb(barrier::SY);
-    if PAR_EL1.matches_all(PAR_EL1::F::TranslationSuccessfull) {
-        Some(PAR_EL1.read(PAR_EL1::PA))
+pub fn auto_upper_address<T>(ptr: *const T) -> usize {
+    let address = ptr.addr();
+    if address < KERNEL_VIRT_OFFSET {
+        address + KERNEL_VIRT_OFFSET
     } else {
-        None
+        address
     }
 }
 
-pub fn at_s1e1r(input: usize) -> Option<u64> {
-    barrier::dsb(barrier::ISHST);
-    unsafe {
-        core::arch::asm!("at s1e1r, {address}", address = in(reg) input);
-    }
-    barrier::dsb(barrier::ISH);
-    barrier::isb(barrier::SY);
-    if PAR_EL1.matches_all(PAR_EL1::F::TranslationSuccessfull) {
-        Some(PAR_EL1.read(PAR_EL1::PA))
-    } else {
-        None
-    }
-}
-
-pub fn ic_iallu() {
-    atomic::compiler_fence(Ordering::SeqCst);
-    barrier::dsb(barrier::ISH);
-    barrier::isb(barrier::SY);
-    unsafe {
-        core::arch::asm!("ic iallu");
-    }
-    barrier::isb(barrier::SY);
-}
-
-pub fn dc_cvac(input: usize) {
-    barrier::dsb(barrier::ISHST);
-    unsafe {
-        core::arch::asm!("dc cvac, {address}", address = in(reg) input);
-    }
-}
-
-fn auto_address<T>(value: *const T) -> usize {
-    let addr = value.addr();
-    if addr < KERNEL_VIRT_OFFSET {
-        // Called from lower half
-        addr
-    } else {
-        // Called from higher-half
-        addr - KERNEL_VIRT_OFFSET
-    }
-}
-
-/// (BSP-early init) loads precomputed kernel mapping tables for the kernel to jump to "higher-half"
-///
-/// # Safety
-///
-/// Unsafe, must only be called by BSP during its early init while still in "lower-half"
-pub unsafe fn load_fixed_tables() {
-    let ttbr0 = auto_address(&raw const KERNEL_TABLES) as u64;
-
-    TTBR0_EL1.set(ttbr0);
-    TTBR1_EL1.set(ttbr0);
-}
-
-/// Sets up additional translation tables for kernel usage
-///
-/// # Safety
-///
-/// Unsafe, must only be called by BSP during its early init, must already be in "higher-half"
-pub unsafe fn init_fixed_tables() {
-    // TODO this could be built in compile-time too?
-    let mut tables = KERNEL_TABLES.grab();
-    let early_mapping_l3_phys = auto_address(&raw const EARLY_MAPPING_L3);
-    let device_mapping_l2_phys = auto_address(&raw const DEVICE_MAPPING_L2);
-
-    for i in 0..DEVICE_MAPPING_L3_COUNT {
-        let device_mapping_l3_phys = PhysicalAddress::from_usize(
-            &DEVICE_MAPPING_L3S[i] as *const _ as usize - KERNEL_VIRT_OFFSET,
-        );
-        DEVICE_MAPPING_L2[i] = PageEntry::table(device_mapping_l3_phys, PageAttributes::empty());
-    }
-
-    assert_eq!(tables.l2.data[EARLY_MAPPING_L2I], 0);
-    tables.l2.data[EARLY_MAPPING_L2I] =
-        (early_mapping_l3_phys as u64) | kernel_table_flags().bits();
-    tlb_flush_vaae1(EARLY_MAPPING_OFFSET);
-
-    assert_eq!(tables.l1.data[DEVICE_MAPPING_L1I], 0);
-    tables.l1.data[DEVICE_MAPPING_L1I] =
-        (device_mapping_l2_phys as u64) | kernel_table_flags().bits();
-
-    tlb_flush_all();
-}
-
-pub fn setup_memory_attributes() {
+fn setup_memory_attributes() {
     // TODO: Figure out why WriteBack_NonTransient_ReadWriteAlloc doesn't work on Pi 4B
 
     MAIR_EL1.write(
         //// Attribute 0 -- normal memory
         MAIR_EL1::Attr0_Normal_Inner::WriteBack_NonTransient +
-        MAIR_EL1::Attr0_Normal_Outer::WriteBack_NonTransient +
-        //// Attribute 1 -- normal non-cacheable memory
-        MAIR_EL1::Attr0_Normal_Inner::NonCacheable +
-        MAIR_EL1::Attr0_Normal_Outer::NonCacheable +
-        //// Attribute 2 -- device memory
-        MAIR_EL1::Attr1_Device::nonGathering_nonReordering_EarlyWriteAck,
+         MAIR_EL1::Attr0_Normal_Outer::WriteBack_NonTransient +
+         //// Attribute 1 -- normal non-cacheable memory
+         MAIR_EL1::Attr0_Normal_Inner::NonCacheable +
+         MAIR_EL1::Attr0_Normal_Outer::NonCacheable +
+         //// Attribute 2 -- device memory
+         MAIR_EL1::Attr1_Device::nonGathering_nonReordering_EarlyWriteAck,
     );
 }
 
-/// Enables data cache.
-///
-/// # Safety
-///
-/// Manipulates low-level machine state, use with care.
-pub unsafe fn enable_dcache() {
+unsafe fn enable_mmu() {
+    TCR_EL1.write(
+        TCR_EL1::AS::ASID8Bits +
+         TCR_EL1::A1::TTBR0 +
+         TCR_EL1::HD::CLEAR +
+         // General
+         TCR_EL1::IPS::Bits_48 +
+         // TTBR0
+         TCR_EL1::TG0::KiB_4 + TCR_EL1::T0SZ.val(25) + TCR_EL1::SH0::Inner +
+         // TTBR1
+         TCR_EL1::TG1::KiB_4 + TCR_EL1::T1SZ.val(25) + TCR_EL1::SH1::Inner,
+    );
+
     barrier::dsb(barrier::ISHST);
     barrier::isb(barrier::SY);
 
-    SCTLR_EL1.modify(SCTLR_EL1::C::Cacheable);
+    SCTLR_EL1.modify(
+        SCTLR_EL1::E0E::LittleEndian
+            + SCTLR_EL1::EE::LittleEndian
+            + SCTLR_EL1::WXN::Disable
+            + SCTLR_EL1::SA0::Enable
+            + SCTLR_EL1::SA::Enable
+            + SCTLR_EL1::A::Enable
+            + SCTLR_EL1::I::NonCacheable
+            + SCTLR_EL1::C::NonCacheable,
+    );
 
     barrier::dsb(barrier::ISH);
     barrier::isb(barrier::SY);
+
+    // Enable translation
+    SCTLR_EL1.modify(SCTLR_EL1::M::Enable);
+
+    // Enable caches
+    enable_icache();
+    enable_dcache();
 }
 
-/// Enables instruction cache.
-///
-/// # Safety
-///
-/// Manipulates low-level machine state, use with care.
-pub unsafe fn enable_icache() {
-    barrier::isb(barrier::SY);
-
-    SCTLR_EL1.modify(SCTLR_EL1::I::Cacheable);
-
-    barrier::dsb(barrier::ISH);
-    barrier::isb(barrier::SY);
-}
-
-/// Disables instruction cache.
-///
-/// # Safety
-///
-/// Manipulates low-level machine state, use with care. Might break some instructions.
-pub unsafe fn disable_icache() {
-    barrier::isb(barrier::SY);
-
-    ic_iallu();
-    SCTLR_EL1.modify(SCTLR_EL1::I::NonCacheable);
-
-    barrier::dsb(barrier::ISH);
-    barrier::isb(barrier::SY);
+pub unsafe fn init_lower(bsp: bool) {
+    setup_memory_attributes();
+    if bsp {
+        fixed::setup();
+    }
+    fixed::load();
+    enable_mmu();
 }

kernel/arch/i686/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "kernel-arch-i686"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-yggdrasil-abi.workspace = true
-kernel-arch-interface.workspace = true
-libk-mm-interface.workspace = true
-device-api = { workspace = true, features = ["derive"] }
-kernel-arch-x86.workspace = true
-
-bitflags.workspace = true
-static_assertions.workspace = true
-tock-registers.workspace = true
-log.workspace = true

kernel/arch/i686/src/context.S

@@ -1,116 +0,0 @@
-// vi: set ft=asm :
-
-.macro SAVE_TASK_STATE
-    push %edi
-    push %esi
-    push %ebp
-    push %ebx
-.endm
-
-.macro LOAD_TASK_STATE
-    pop %ebx
-    pop %ebp
-    pop %esi
-    pop %edi
-.endm
-
-.section .text
-
-.global __i686_task_enter_kernel
-.global __i686_task_enter_user
-.global __i686_task_enter_from_fork
-.global __i686_switch_task
-.global __i686_enter_task
-.global __i686_switch_and_drop
-
-__i686_task_enter_kernel:
-    // %esp + 4: argument
-    // %esp + 0: entry
-    xor %ecx, %ecx
-    xchg (%esp), %ecx
-
-    // Enable IRQ in EFLAGS
-    pushfl
-    pop %edx
-    or $(1 << 9), %edx
-
-    // Setup iret
-    push %edx       // eflags
-    pushl $0x08     // cs
-    push %ecx       // eip
-
-    iret
-
-__i686_task_enter_user:
-    pop %edx // User %esp
-    pop %ecx // entry
-    pop %eax // flags
-
-    // Setup iret
-
-    // %ss:%esp
-    pushl $0x23
-    push %edx
-
-    // %eflags
-    push %eax
-
-    // %cs:%eip
-    pushl $0x1B
-    push %ecx
-
-    mov $0x23, %bx
-    mov %bx, %ds
-    mov %bx, %es
-    mov %bx, %fs
-
-    iret
-
-__i686_task_enter_from_fork:
-    jmp .
-
-__i686_switch_task:
-    // %esp + 0: return
-    // %esp + 4: destination
-    // %esp + 8: source
-    mov 4(%esp), %eax
-    mov 8(%esp), %ecx
-
-    SAVE_TASK_STATE
-
-    // Store stack to "from" context
-    mov %esp, (%ecx)
-
-    // Load stack from "to" context
-    mov (%eax), %esp
-
-    LOAD_TASK_STATE
-
-    ret
-
-__i686_enter_task:
-    // %esp + 0: return
-    // %esp + 4: destination
-
-    // Switch to destination stack
-    mov 4(%esp), %eax
-    mov (%eax), %esp
-
-    LOAD_TASK_STATE
-
-    ret
-
-__i686_switch_and_drop:
-    // %esp + 0: return
-    // %esp + 4: destination
-    // %esp + 8: thread to drop
-    mov 8(%esp), %ecx
-    mov 4(%esp), %eax
-    // Switch to stack
-    mov (%eax), %esp
-
-    LOAD_TASK_STATE
-
-    // TODO actually drop the thread
-
-    ret

kernel/arch/i686/src/context.rs

@@ -1,462 +0,0 @@
-use core::{arch::global_asm, cell::UnsafeCell, marker::PhantomData};
-
-use kernel_arch_interface::{
-    mem::{KernelTableManager, PhysicalMemoryAllocator},
-    task::{StackBuilder, TaskContext, TaskFrame, UserContextInfo},
-};
-use kernel_arch_x86::registers::{FpuContext, CR3};
-use libk_mm_interface::address::{AsPhysicalAddress, PhysicalAddress};
-use tock_registers::interfaces::Writeable;
-use yggdrasil_abi::{arch::SavedFrame, error::Error};
-
-use crate::{
-    gdt::{self, TSS},
-    mem::KERNEL_TABLES,
-};
-
-#[allow(unused)]
-#[repr(C)]
-pub struct ExceptionFrame {
-    pub eax: u32,
-    pub ecx: u32,
-    pub edx: u32,
-    pub ebx: u32,
-    pub ebp: u32,
-    pub esi: u32,
-    pub edi: u32,
-
-    pub exc_number: u32,
-    pub exc_code: u32,
-
-    pub eip: u32,
-    pub cs: u32,
-    pub eflags: u32,
-    pub esp: u32,
-    pub ss: u32,
-}
-
-#[allow(unused)]
-#[derive(Debug)]
-#[repr(C)]
-pub struct SyscallFrame {
-    pub eax: usize,
-    // ebx, ecx, edx, esi, edi, ebp
-    pub args: [usize; 6],
-
-    pub eip: u32,
-    pub cs: u32,
-    pub eflags: u32,
-    pub esp: u32,
-    pub ss: u32,
-}
-
-#[allow(unused)]
-#[repr(C)]
-pub struct InterruptFrame {
-    pub eax: u32,
-    pub ecx: u32,
-    pub edx: u32,
-    pub ebx: u32,
-    pub ebp: u32,
-    pub esi: u32,
-    pub edi: u32,
-
-    pub irq_number: u32,
-
-    pub eip: u32,
-    pub cs: u32,
-    pub eflags: u32,
-    esp: u32,
-    ss: u32,
-}
-
-#[repr(C, align(0x10))]
-struct Inner {
-    // 0x00
-    sp: usize,
-
-    gs_base: usize,
-}
-
-#[allow(dead_code)]
-pub struct TaskContextImpl<
-    K: KernelTableManager,
-    PA: PhysicalMemoryAllocator<Address = PhysicalAddress>,
-> {
-    inner: UnsafeCell<Inner>,
-    fpu_context: Option<UnsafeCell<FpuContext>>,
-    stack_base_phys: PhysicalAddress,
-    stack_size: usize,
-
-    cr3: u32,
-    tss_esp0: u32,
-
-    _pd: PhantomData<(K, PA)>,
-}
-
-impl<K: KernelTableManager, PA: PhysicalMemoryAllocator<Address = PhysicalAddress>>
-    TaskContextImpl<K, PA>
-{
-    unsafe fn store_state(&self) {
-        if let Some(fpu) = self.fpu_context.as_ref() {
-            FpuContext::store(fpu.get());
-        }
-    }
-
-    unsafe fn load_state(&self) {
-        if let Some(fpu) = self.fpu_context.as_ref() {
-            FpuContext::restore(fpu.get());
-        }
-        gdt::set_gs_base((*self.inner.get()).gs_base);
-        TSS.esp0 = self.tss_esp0;
-        CR3.set(self.cr3 as _);
-    }
-}
-
-impl<K: KernelTableManager, PA: PhysicalMemoryAllocator<Address = PhysicalAddress>>
-    TaskContext<K, PA> for TaskContextImpl<K, PA>
-{
-    const SIGNAL_STACK_EXTRA_ALIGN: usize = 0;
-    const USER_STACK_EXTRA_ALIGN: usize = 0;
-
-    fn user(context: UserContextInfo) -> Result<Self, Error> {
-        const USER_TASK_PAGES: usize = 16;
-
-        let stack_base_phys = PA::allocate_contiguous_pages(USER_TASK_PAGES)?;
-        let stack_base = stack_base_phys.raw_virtualize::<K>();
-
-        let mut stack = StackBuilder::new(stack_base, USER_TASK_PAGES * 0x1000);
-        let mut flags = 0x200;
-
-        if context.single_step {
-            flags |= 1 << 8;
-        }
-
-        stack.push(flags);
-        stack.push(context.entry as _);
-        stack.push(context.stack_pointer);
-
-        setup_common_context(&mut stack, __i686_task_enter_user as _);
-
-        let sp = stack.build();
-        let esp0 = stack_base + USER_TASK_PAGES * 0x1000;
-        let fpu_context = FpuContext::new(true);
-
-        Ok(Self {
-            inner: UnsafeCell::new(Inner {
-                sp,
-                gs_base: context.thread_pointer,
-            }),
-            fpu_context: Some(UnsafeCell::new(fpu_context)),
-            stack_base_phys,
-            stack_size: USER_TASK_PAGES * 0x1000,
-
-            tss_esp0: esp0 as _,
-            cr3: context.address_space.try_into().unwrap(),
-
-            _pd: PhantomData,
-        })
-    }
-
-    fn kernel(
-        entry: extern "C" fn(usize) -> !,
-        arg: usize,
-    ) -> Result<Self, yggdrasil_abi::error::Error> {
-        const KERNEL_TASK_PAGES: usize = 32;
-
-        let stack_base_phys = PA::allocate_contiguous_pages(KERNEL_TASK_PAGES)?;
-        let stack_base = stack_base_phys.raw_virtualize::<K>();
-
-        let mut stack = StackBuilder::new(stack_base, KERNEL_TASK_PAGES * 0x1000);
-
-        // Entry and argument
-        stack.push(arg);
-        stack.push(entry as _);
-
-        // XXX
-        setup_common_context(&mut stack, __i686_task_enter_kernel as _);
-
-        let sp = stack.build();
-        let cr3 = unsafe {
-            KERNEL_TABLES
-                .lock()
-                .as_physical_address()
-                .try_into_u32()
-                .unwrap()
-        };
-
-        // TODO stack is leaked
-
-        Ok(Self {
-            inner: UnsafeCell::new(Inner { sp, gs_base: 0 }),
-            fpu_context: None,
-            stack_base_phys,
-            stack_size: KERNEL_TASK_PAGES * 0x1000,
-
-            tss_esp0: 0,
-            cr3,
-
-            _pd: PhantomData,
-        })
-    }
-
-    unsafe fn switch(&self, from: &Self) {
-        if core::ptr::addr_eq(self, from) {
-            return;
-        }
-
-        from.store_state();
-        self.load_state();
-
-        __i686_switch_task(self.inner.get(), from.inner.get());
-    }
-
-    unsafe fn enter(&self) -> ! {
-        self.load_state();
-        __i686_enter_task(self.inner.get())
-    }
-
-    unsafe fn switch_and_drop(&self, thread: *const ()) {
-        self.load_state();
-        __i686_switch_and_drop(self.inner.get(), thread);
-    }
-
-    fn set_thread_pointer(&self, tp: usize) {
-        unsafe { (*self.inner.get()).gs_base = tp };
-        gdt::set_gs_base(tp);
-    }
-
-    fn align_stack_for_entry(sp: usize) -> usize {
-        (sp & !0xF) - 12
-    }
-}
-
-fn setup_common_context(builder: &mut StackBuilder, entry: usize) {
-    builder.push(entry);
-
-    builder.push(0); // %edi
-    builder.push(0); // %esi
-    builder.push(0); // %ebp
-    builder.push(0); // %ebx
-}
-
-extern "C" {
-    fn __i686_task_enter_kernel();
-    fn __i686_task_enter_user();
-    fn __i686_task_enter_from_fork();
-    fn __i686_enter_task(to: *mut Inner) -> !;
-    fn __i686_switch_task(to: *mut Inner, from: *mut Inner);
-    fn __i686_switch_and_drop(to: *mut Inner, from: *const ());
-}
-
-impl TaskFrame for SyscallFrame {
-    fn store(&self) -> SavedFrame {
-        SavedFrame {
-            eax: self.eax as _,
-            ecx: self.args[1] as _,
-            edx: self.args[2] as _,
-            ebx: self.args[0] as _,
-            ebp: self.args[5] as _,
-            esi: self.args[3] as _,
-            edi: self.args[4] as _,
-
-            user_ip: self.eip,
-            user_sp: self.esp,
-            eflags: self.eflags,
-        }
-    }
-
-    fn restore(&mut self, saved: &SavedFrame) {
-        self.eax = saved.eax as _;
-        self.args[0] = saved.ebx as _;
-        self.args[1] = saved.ecx as _;
-        self.args[2] = saved.edx as _;
-        self.args[3] = saved.esi as _;
-        self.args[4] = saved.edi as _;
-        self.args[5] = saved.ebp as _;
-
-        self.eip = saved.user_ip;
-        self.esp = saved.user_sp;
-        self.eflags = saved.eflags;
-    }
-
-    fn user_sp(&self) -> usize {
-        todo!()
-    }
-
-    fn user_ip(&self) -> usize {
-        todo!()
-    }
-
-    fn argument(&self) -> u64 {
-        self.args[0] as _
-    }
-
-    fn set_user_sp(&mut self, value: usize) {
-        self.esp = value as _;
-    }
-
-    fn set_user_ip(&mut self, value: usize) {
-        self.eip = value as _;
-    }
-
-    fn set_argument(&mut self, value: u64) {
-        // TODO implement ABI for passing 64-bit values via EAX/EDX
-        if value & (1 << 63) != 0 {
-            assert_eq!(value & 0xFFFFFFFF00000000, 0xFFFFFFFF00000000);
-        }
-
-        self.eax = value as usize;
-    }
-
-    fn set_single_step(&mut self, _step: bool) {
-        todo!()
-    }
-
-    fn set_return_value(&mut self, value: u64) {
-        // TODO implement ABI for returning 64-bit values via EAX/EDX
-        if value & (1 << 63) != 0 {
-            assert_eq!(value & 0xFFFFFFFF00000000, 0xFFFFFFFF00000000);
-        }
-
-        self.eax = value as usize;
-    }
-}
-
-impl TaskFrame for InterruptFrame {
-    fn store(&self) -> SavedFrame {
-        SavedFrame {
-            eax: self.eax,
-            ecx: self.ecx,
-            edx: self.edx,
-            ebx: self.ebx,
-            ebp: self.ebp,
-            esi: self.esi,
-            edi: self.edi,
-
-            user_ip: self.eip,
-            user_sp: self.esp,
-            eflags: self.eflags,
-        }
-    }
-
-    fn restore(&mut self, _saved: &SavedFrame) {
-        todo!()
-    }
-
-    fn user_sp(&self) -> usize {
-        todo!()
-    }
-
-    fn user_ip(&self) -> usize {
-        todo!()
-    }
-
-    fn argument(&self) -> u64 {
-        todo!()
-    }
-
-    fn set_user_sp(&mut self, value: usize) {
-        self.esp = value as u32;
-    }
-
-    fn set_user_ip(&mut self, value: usize) {
-        self.eip = value as u32;
-    }
-
-    fn set_argument(&mut self, value: u64) {
-        // TODO implement ABI for returning 64-bit values via EAX/EDX
-        if value & (1 << 63) != 0 {
-            assert_eq!(value & 0xFFFFFFFF00000000, 0xFFFFFFFF00000000);
-        }
-
-        self.eax = value as u32;
-    }
-
-    fn set_single_step(&mut self, step: bool) {
-        if step {
-            self.eflags |= 1 << 8;
-        } else {
-            self.eflags &= !(1 << 8);
-        }
-    }
-
-    fn set_return_value(&mut self, value: u64) {
-        // TODO implement ABI for returning 64-bit values via EAX/EDX
-        if value & (1 << 63) != 0 {
-            assert_eq!(value & 0xFFFFFFFF00000000, 0xFFFFFFFF00000000);
-        }
-
-        self.eax = value as u32;
-    }
-}
-
-impl TaskFrame for ExceptionFrame {
-    fn store(&self) -> SavedFrame {
-        SavedFrame {
-            eax: self.eax,
-            ecx: self.ecx,
-            edx: self.edx,
-            ebx: self.ebx,
-            ebp: self.ebp,
-            esi: self.esi,
-            edi: self.edi,
-
-            user_ip: self.eip,
-            user_sp: self.esp,
-            eflags: self.eflags,
-        }
-    }
-
-    fn restore(&mut self, _saved: &SavedFrame) {
-        todo!()
-    }
-
-    fn user_sp(&self) -> usize {
-        todo!()
-    }
-
-    fn user_ip(&self) -> usize {
-        self.eip as _
-    }
-
-    fn argument(&self) -> u64 {
-        todo!()
-    }
-
-    fn set_user_sp(&mut self, value: usize) {
-        self.esp = value as u32;
-    }
-
-    fn set_user_ip(&mut self, value: usize) {
-        self.eip = value as u32;
-    }
-
-    fn set_argument(&mut self, value: u64) {
-        // TODO implement ABI for returning 64-bit values via EAX/EDX
-        if value & (1 << 63) != 0 {
-            assert_eq!(value & 0xFFFFFFFF00000000, 0xFFFFFFFF00000000);
-        }
-
-        self.eax = value as u32;
-    }
-
-    fn set_single_step(&mut self, step: bool) {
-        if step {
-            self.eflags |= 1 << 8;
-        } else {
-            self.eflags &= !(1 << 8);
-        }
-    }
-
-    fn set_return_value(&mut self, value: u64) {
-        // TODO implement ABI for returning 64-bit values via EAX/EDX
-        if value & (1 << 63) != 0 {
-            assert_eq!(value & 0xFFFFFFFF00000000, 0xFFFFFFFF00000000);
-        }
-
-        self.eax = value as u32;
-    }
-}
-
-global_asm!(include_str!("context.S"), options(att_syntax));

kernel/arch/i686/src/gdt.rs

@@ -1,108 +0,0 @@
-use core::{cell::UnsafeCell, ptr::addr_of_mut};
-
-use kernel_arch_interface::guard::IrqGuard;
-pub use kernel_arch_x86::gdt::{Entry, Pointer};
-
-use crate::ArchitectureImpl;
-
-#[allow(dead_code)]
-#[repr(C, packed)]
-pub struct Tss {
-    prev_tss: u32,
-    pub esp0: u32,
-    pub ss0: u16,
-    _res0: u16,
-    esp1: u32,
-    ss1: u16,
-    _res1: u16,
-    esp2: u32,
-    ss2: u16,
-    _res2: u16,
-    cr3: u32,
-    eip: u32,
-    eflags: u32,
-    eax: u32,
-    ecx: u32,
-    edx: u32,
-    ebx: u32,
-    esp: u32,
-    ebp: u32,
-    esi: u32,
-    edi: u32,
-    es: u32,
-    cs: u32,
-    ss: u32,
-    ds: u32,
-    fs: u32,
-    gs: u32,
-    ldt: u32,
-    trap: u16,
-    iomap_base: u16,
-}
-
-impl Tss {
-    const NULL: Self = Self {
-        prev_tss: 0,
-        esp0: 0,
-        ss0: 0x10,
-        _res0: 0,
-        esp1: 0,
-        ss1: 0,
-        _res1: 0,
-        esp2: 0,
-        ss2: 0,
-        _res2: 0,
-        cr3: 0,
-        eip: 0,
-        eflags: 0,
-        eax: 0,
-        ecx: 0,
-        edx: 0,
-        ebx: 0,
-        esp: 0,
-        ebp: 0,
-        esi: 0,
-        edi: 0,
-        es: 0,
-        cs: 0,
-        ss: 0,
-        ds: 0,
-        fs: 0,
-        gs: 0,
-        ldt: 0,
-        trap: 0,
-        iomap_base: 0,
-    };
-}
-
-pub static mut TSS: Tss = Tss::NULL;
-pub static mut GDT: UnsafeCell<[Entry; 7]> = UnsafeCell::new([
-    Entry::NULL,       // 0x00
-    Entry::RING0_CS32, // 0x08
-    Entry::RING0_DS32, // 0x10
-    Entry::RING3_CS32, // 0x1B
-    Entry::RING3_DS32, // 0x23
-    Entry::NULL,       // 0x28, TSS
-    Entry::RING3_GS32, // 0x33, Task GS
-]);
-
-pub fn create_gdt() -> (&'static [Entry], &'static Tss) {
-    // Won't be deallocated, so leaks are not a concern
-    let tss = unsafe { &mut *addr_of_mut!(TSS) };
-    tss.ss0 = 0x10;
-    let tss_addr = (tss as *mut Tss).addr();
-    #[allow(static_mut_refs)]
-    let gdt = unsafe { GDT.get_mut() };
-    gdt[5] = Entry::tss(tss_addr as u32, (size_of::<Tss>() - 1) as u32);
-
-    (gdt, tss)
-}
-
-pub fn set_gs_base(gs_base: usize) {
-    let _guard = IrqGuard::<ArchitectureImpl>::acquire();
-    unsafe {
-        #[allow(static_mut_refs)]
-        GDT.get_mut()[6].set_base(gs_base);
-        core::arch::asm!("mov $0x33, %ax; mov %ax, %gs", out("ax") _, options(att_syntax, nostack));
-    }
-}

kernel/arch/i686/src/lib.rs

@@ -1,142 +0,0 @@
-#![feature(never_type, naked_functions, trace_macros)]
-#![no_std]
-
-extern crate alloc;
-
-use core::ptr::null_mut;
-
-use alloc::vec::Vec;
-use device_api::interrupt::{LocalInterruptController, MessageInterruptController};
-use kernel_arch_interface::{
-    cpu::{CpuData, CpuImpl, IpiQueue},
-    task::Scheduler,
-    Architecture,
-};
-
-pub mod context;
-pub mod gdt;
-pub mod mem;
-
-pub use context::TaskContextImpl;
-use kernel_arch_x86::cpuid::CpuFeatures;
-pub use mem::{KernelTableManagerImpl, ProcessAddressSpaceImpl};
-
-pub struct ArchitectureImpl;
-
-#[repr(C)]
-pub struct PerCpuData {
-    pub available_features: CpuFeatures,
-    pub enabled_features: CpuFeatures,
-}
-
-impl CpuData for PerCpuData {}
-
-static mut CPU: *mut () = null_mut();
-
-#[naked]
-extern "C" fn idle_task(_: usize) -> ! {
-    unsafe {
-        core::arch::naked_asm!(
-            r#"
-        1:
-            nop
-            jmp 1b
-        "#,
-            options(att_syntax)
-        );
-    }
-}
-
-impl Architecture for ArchitectureImpl {
-    type PerCpuData = PerCpuData;
-    type CpuFeatures = CpuFeatures;
-    type BreakpointType = u8;
-
-    const BREAKPOINT_VALUE: Self::BreakpointType = 0xCC;
-
-    unsafe fn init_local_cpu<S: Scheduler + 'static>(id: Option<u32>, data: Self::PerCpuData) {
-        use alloc::boxed::Box;
-
-        let cpu = Box::leak(Box::new(CpuImpl::<Self, S>::new(
-            id.expect("x86_64 required manual CPU ID set"),
-            data,
-        )));
-
-        cpu.set_local();
-    }
-
-    unsafe fn set_interrupt_mask(mask: bool) -> bool {
-        let old = Self::interrupt_mask();
-        if mask {
-            core::arch::asm!("cli");
-        } else {
-            core::arch::asm!("sti");
-        }
-        old
-    }
-
-    fn interrupt_mask() -> bool {
-        let mut flags: u32;
-        unsafe {
-            core::arch::asm!("pushfl; pop {0:e}", out(reg) flags, options(att_syntax));
-        }
-        // If IF is zero, interrupts are disabled (masked)
-        flags & (1 << 9) == 0
-    }
-
-    fn wait_for_interrupt() {
-        unsafe {
-            core::arch::asm!("hlt");
-        }
-    }
-
-    unsafe fn init_ipi_queues(_queues: Vec<IpiQueue<Self>>) {}
-
-    fn local_cpu() -> *mut () {
-        unsafe { CPU }
-    }
-
-    fn cpu_index<S: Scheduler + 'static>() -> u32 {
-        0
-    }
-
-    unsafe fn set_local_cpu(cpu: *mut ()) {
-        CPU = cpu;
-    }
-
-    fn cpu_count() -> usize {
-        1
-    }
-
-    fn local_interrupt_controller() -> Option<&'static dyn LocalInterruptController> {
-        None
-    }
-
-    fn message_interrupt_controller() -> Option<&'static dyn MessageInterruptController> {
-        None
-    }
-
-    fn ipi_queue(_cpu_id: u32) -> Option<&'static IpiQueue<Self>> {
-        None
-    }
-
-    fn idle_task() -> extern "C" fn(usize) -> ! {
-        idle_task
-    }
-
-    fn halt() -> ! {
-        loop {
-            unsafe {
-                core::arch::asm!("cli; hlt");
-            }
-        }
-    }
-
-    fn cpu_available_features<S: Scheduler>(cpu: &CpuImpl<Self, S>) -> Option<&Self::CpuFeatures> {
-        Some(&cpu.available_features)
-    }
-
-    fn cpu_enabled_features<S: Scheduler>(cpu: &CpuImpl<Self, S>) -> Option<&Self::CpuFeatures> {
-        Some(&cpu.enabled_features)
-    }
-}

kernel/arch/i686/src/mem/fixed.rs

@@ -1,141 +0,0 @@
-use kernel_arch_interface::{sync::IrqSafeSpinlock, KERNEL_VIRT_OFFSET};
-use libk_mm_interface::{address::PhysicalAddress, table::EntryLevel, KernelImageObject};
-use yggdrasil_abi::error::Error;
-
-use crate::{
-    mem::{flush_tlb_entry, table::PageAttributes},
-    ArchitectureImpl,
-};
-
-use super::{
-    table::{PageEntry, PageTable, L0, L3},
-    KERNEL_TABLES,
-};
-
-pub const KERNEL_SPLIT_L0: usize = KERNEL_VIRT_OFFSET >> 22;
-pub const DYNAMIC_MAP_COUNT: usize = 64;
-pub const FIXED_MAP_COUNT: usize = 1024 - (KERNEL_SPLIT_L0 + DYNAMIC_MAP_COUNT);
-pub const DYNAMIC_MAP_OFFSET: usize = (KERNEL_SPLIT_L0 + FIXED_MAP_COUNT) << L0::SHIFT;
-pub const MAX_FIXED_PHYSICAL: PhysicalAddress =
-    PhysicalAddress::from_u64((FIXED_MAP_COUNT as u64) << 22);
-
-#[repr(C)]
-pub struct FixedTables {
-    pub l0: KernelL0,
-    pub dynamic: IrqSafeSpinlock<ArchitectureImpl, KernelDynamic>,
-}
-
-#[repr(C, align(0x1000))]
-pub struct KernelL0 {
-    pub lower: [PageEntry<L0>; KERNEL_SPLIT_L0],
-    pub kernel: [PageEntry<L0>; FIXED_MAP_COUNT],
-    pub dynamic: [PageEntry<L0>; DYNAMIC_MAP_COUNT],
-}
-
-#[allow(unused)]
-pub struct KernelDynamic {
-    pub l3s: [KernelImageObject<PageTable<L3>>; DYNAMIC_MAP_COUNT],
-    free: usize,
-}
-
-impl FixedTables {
-    pub const fn zeroed() -> Self {
-        Self {
-            l0: KernelL0::zeroed(),
-            dynamic: IrqSafeSpinlock::new(KernelDynamic::zeroed()),
-        }
-    }
-
-    pub fn virtualize(&mut self, address: PhysicalAddress) -> usize {
-        if address < MAX_FIXED_PHYSICAL {
-            // It's a fixed address
-            address.into_u64() as usize + KERNEL_VIRT_OFFSET
-        } else {
-            todo!()
-        }
-    }
-
-    pub fn physicalize(&mut self, address: usize) -> Option<PhysicalAddress> {
-        if address < KERNEL_VIRT_OFFSET {
-            return None;
-        }
-
-        if address < KERNEL_VIRT_OFFSET + MAX_FIXED_PHYSICAL.into_u64() as usize {
-            // It's a fixed address
-            Some(PhysicalAddress::from_usize(address - KERNEL_VIRT_OFFSET))
-        } else {
-            todo!()
-        }
-    }
-
-    pub fn map_dynamic_memory(&mut self, base: u64, page_count: usize) -> Result<usize, Error> {
-        self.dynamic.lock().map(base, page_count)
-    }
-}
-
-impl KernelL0 {
-    pub const fn zeroed() -> Self {
-        Self {
-            lower: [PageEntry::INVALID; KERNEL_SPLIT_L0],
-            kernel: [PageEntry::INVALID; FIXED_MAP_COUNT],
-            dynamic: [PageEntry::INVALID; DYNAMIC_MAP_COUNT],
-        }
-    }
-}
-
-impl KernelDynamic {
-    pub const fn zeroed() -> Self {
-        Self {
-            l3s: [const { unsafe { KernelImageObject::new(PageTable::zeroed()) } };
-                DYNAMIC_MAP_COUNT],
-            free: DYNAMIC_MAP_COUNT * 1024,
-        }
-    }
-
-    fn map(&mut self, base: u64, page_count: usize) -> Result<usize, Error> {
-        if page_count > self.free {
-            return Err(Error::OutOfMemory);
-        }
-
-        'l0: for i in 0..DYNAMIC_MAP_COUNT * 1024 - page_count {
-            for j in 0..page_count {
-                let entry = self.entry(i + j);
-                if entry.is_present() {
-                    continue 'l0;
-                }
-            }
-
-            self.free -= page_count;
-            for j in 0..page_count {
-                let address = PhysicalAddress::from_u64(base + ((j as u64) << L3::SHIFT));
-                *self.entry_mut(i + j) = PageEntry::page(address, PageAttributes::WRITABLE);
-                unsafe {
-                    flush_tlb_entry(DYNAMIC_MAP_OFFSET + ((i + j) << L3::SHIFT));
-                }
-            }
-            let addr = DYNAMIC_MAP_OFFSET + (i << L3::SHIFT);
-            return Ok(addr);
-        }
-
-        Err(Error::OutOfMemory)
-    }
-
-    fn entry(&self, index: usize) -> &PageEntry<L3> {
-        &self.l3s[index / 1024][index % 1024]
-    }
-
-    fn entry_mut(&mut self, index: usize) -> &mut PageEntry<L3> {
-        &mut self.l3s[index / 1024][index % 1024]
-    }
-}
-
-pub fn clone_kernel_tables(dst: &mut PageTable<L0>) {
-    let tables = KERNEL_TABLES.lock();
-    for (i, entry) in tables.l0.kernel.iter().enumerate() {
-        dst[i + KERNEL_SPLIT_L0] = *entry;
-    }
-
-    for (i, entry) in tables.l0.dynamic.iter().enumerate() {
-        dst[i + KERNEL_SPLIT_L0 + FIXED_MAP_COUNT] = *entry;
-    }
-}

kernel/arch/i686/src/mem/mod.rs

@@ -1,131 +0,0 @@
-use fixed::FixedTables;
-use kernel_arch_interface::{
-    mem::{DeviceMemoryAttributes, KernelTableManager, RawDeviceMemoryMapping},
-    split_spinlock, KERNEL_VIRT_OFFSET,
-};
-use libk_mm_interface::{
-    address::{AsPhysicalAddress, PhysicalAddress},
-    table::{page_count, EntryLevel},
-};
-use table::{PageAttributes, PageEntry, L0, L3};
-use yggdrasil_abi::error::Error;
-
-pub mod fixed;
-pub mod process;
-pub mod table;
-
-pub use process::ProcessAddressSpaceImpl;
-
-#[derive(Debug)]
-pub struct KernelTableManagerImpl;
-
-split_spinlock! {
-    use libk_mm_interface::KernelImageObject;
-    use crate::mem::FixedTables;
-    use crate::ArchitectureImpl;
-
-    #[link_section = ".data.tables"]
-    static KERNEL_TABLES: KernelImageObject<FixedTables> = unsafe {
-        KernelImageObject::new(FixedTables::zeroed())
-    };
-}
-
-impl KernelTableManager for KernelTableManagerImpl {
-    unsafe fn map_device_pages(
-        base: u64,
-        count: usize,
-        _attrs: DeviceMemoryAttributes,
-    ) -> Result<RawDeviceMemoryMapping<Self>, Error> {
-        // TODO page align up
-
-        let offset = (base & 0xFFF) as usize;
-        let base = base & !0xFFF;
-        let end = (base + count as u64 + 0xFFF) & !0xFFF;
-
-        // assert_eq!(base & 0xFFF, 0);
-        if end < fixed::MAX_FIXED_PHYSICAL.into_u64() {
-            // 1:1
-            let address = Self::virtualize(base);
-            Ok(RawDeviceMemoryMapping::from_raw_parts(
-                address, address, 0, 0,
-            ))
-        } else {
-            assert_eq!(base & 0xFFF, 0);
-            log::info!("map_device_pages({:#x}, {})", base, count);
-            let page_count = page_count::<L3>(count);
-            let virt = KERNEL_TABLES.lock().map_dynamic_memory(base, page_count)?;
-
-            Ok(RawDeviceMemoryMapping::from_raw_parts(
-                virt + offset,
-                virt,
-                page_count,
-                0,
-            ))
-        }
-    }
-
-    unsafe fn unmap_device_pages(_mapping: &RawDeviceMemoryMapping<Self>) {
-        // todo!()
-    }
-
-    fn virtualize(phys: u64) -> usize {
-        KERNEL_TABLES
-            .lock()
-            .virtualize(PhysicalAddress::from_u64(phys))
-    }
-
-    fn physicalize(virt: usize) -> u64 {
-        KERNEL_TABLES
-            .lock()
-            .physicalize(virt)
-            .expect("Invalid virtual address")
-            .into_u64()
-    }
-
-    unsafe fn unmap_physical_address(virt: usize) {
-        if virt < KERNEL_VIRT_OFFSET {
-            panic!("Invalid 'virtualized' address: {:#x}", virt);
-        }
-        let virt = virt - KERNEL_VIRT_OFFSET;
-        if virt >= fixed::FIXED_MAP_COUNT << L0::SHIFT {
-            todo!()
-        }
-    }
-}
-
-/// Sets up fixed MMU translation tables.
-///
-/// # Safety
-///
-/// Only meant to be called once during early OS init.
-pub unsafe fn init_fixed_tables() {
-    let mut tables = KERNEL_TABLES.lock();
-
-    // Unmap lower stuff
-    for (i, entry) in tables.l0.lower.iter_mut().enumerate() {
-        *entry = PageEntry::INVALID;
-        flush_tlb_entry(i << 22);
-    }
-
-    // Map the rest of fixed translation
-    for (i, entry) in tables.l0.kernel.iter_mut().enumerate() {
-        let virt = KERNEL_VIRT_OFFSET + (i << L0::SHIFT);
-        let phys = (i << L0::SHIFT) as u32;
-        *entry = PageEntry::block(PhysicalAddress::from_u32(phys), PageAttributes::WRITABLE);
-        flush_tlb_entry(virt);
-    }
-
-    let dynamic_len = tables.l0.dynamic.len();
-    for i in 0..dynamic_len {
-        let phys = tables.dynamic.lock().l3s[i].as_physical_address();
-        tables.l0.dynamic[i] = PageEntry::table(phys, PageAttributes::WRITABLE);
-    }
-}
-
-/// # Safety
-///
-/// `address` must be page-aligned.
-#[inline]
-pub unsafe fn flush_tlb_entry(address: usize) {
-    core::arch::asm!("invlpg ({0})", in(reg) address, options(att_syntax));
-}

kernel/arch/i686/src/mem/process.rs

@@ -1,137 +0,0 @@
-use core::marker::PhantomData;
-
-use kernel_arch_interface::KERNEL_VIRT_OFFSET;
-use libk_mm_interface::{
-    address::{AsPhysicalAddress, PhysicalAddress},
-    pointer::PhysicalRefMut,
-    process::ProcessAddressSpaceManager,
-    table::{
-        EntryLevel, EntryLevelDrop, EntryLevelExt, MapAttributes, NextPageTable, TableAllocator,
-    },
-};
-use yggdrasil_abi::error::Error;
-
-use crate::{mem::flush_tlb_entry, KernelTableManagerImpl};
-
-use super::{
-    fixed::{clone_kernel_tables, KERNEL_SPLIT_L0},
-    table::{PageEntry, PageTable, L0, L3},
-};
-
-#[repr(C)]
-pub struct ProcessAddressSpaceImpl<TA: TableAllocator> {
-    l0: PhysicalRefMut<'static, PageTable<L0>, KernelTableManagerImpl>,
-    _alloc: PhantomData<TA>,
-}
-
-impl<TA: TableAllocator> ProcessAddressSpaceManager<TA> for ProcessAddressSpaceImpl<TA> {
-    const UPPER_LIMIT_PFN: usize = KERNEL_VIRT_OFFSET >> L3::SHIFT;
-    const LOWER_LIMIT_PFN: usize = 32;
-
-    fn new() -> Result<Self, Error> {
-        let mut l0 = unsafe {
-            PhysicalRefMut::<'static, PageTable<L0>, KernelTableManagerImpl>::map(
-                TA::allocate_page_table()?,
-            )
-        };
-
-        for i in 0..1024 {
-            l0[i] = PageEntry::INVALID;
-        }
-
-        clone_kernel_tables(&mut l0);
-
-        Ok(Self {
-            l0,
-            _alloc: PhantomData,
-        })
-    }
-
-    unsafe fn clear(&mut self) {
-        self.l0.drop_range::<TA>(0..KERNEL_SPLIT_L0);
-    }
-
-    fn translate(&self, address: usize) -> Result<(PhysicalAddress, MapAttributes), Error> {
-        self.read_l3_entry(address).ok_or(Error::DoesNotExist)
-    }
-
-    unsafe fn map_page(
-        &mut self,
-        address: usize,
-        physical: PhysicalAddress,
-        flags: MapAttributes,
-    ) -> Result<(), Error> {
-        self.write_l3_entry(address, PageEntry::page(physical, flags.into()), false)
-    }
-
-    unsafe fn unmap_page(&mut self, address: usize) -> Result<PhysicalAddress, Error> {
-        self.pop_l3_entry(address)
-    }
-
-    fn as_address_with_asid(&self) -> (u64, u64) {
-        (unsafe { self.l0.as_physical_address().into_u64() }, 0)
-    }
-}
-
-impl<TA: TableAllocator> ProcessAddressSpaceImpl<TA> {
-    // Write a single 4KiB entry
-    fn write_l3_entry(
-        &mut self,
-        virt: usize,
-        entry: PageEntry<L3>,
-        overwrite: bool,
-    ) -> Result<(), Error> {
-        let l0i = virt.page_index::<L0>();
-        let l3i = virt.page_index::<L3>();
-
-        let mut l3 = self.l0.get_mut_or_alloc::<TA>(l0i)?;
-
-        if l3[l3i].is_present() && !overwrite {
-            todo!();
-        }
-
-        l3[l3i] = entry;
-        unsafe {
-            flush_tlb_entry(virt);
-        }
-
-        Ok(())
-    }
-
-    fn pop_l3_entry(&mut self, virt: usize) -> Result<PhysicalAddress, Error> {
-        let l0i = virt.page_index::<L0>();
-        let l3i = virt.page_index::<L3>();
-
-        let mut l3 = self.l0.get_mut(l0i).ok_or(Error::DoesNotExist)?;
-        let page = l3[l3i].as_page().ok_or(Error::DoesNotExist)?;
-
-        l3[l3i] = PageEntry::INVALID;
-        unsafe {
-            flush_tlb_entry(virt);
-        }
-
-        Ok(page)
-    }
-
-    fn read_l3_entry(&self, virt: usize) -> Option<(PhysicalAddress, MapAttributes)> {
-        let l0i = virt.page_index::<L0>();
-        let l3i = virt.page_index::<L3>();
-
-        let l3 = self.l0.get(l0i)?;
-        let page = l3[l3i].as_page()?;
-
-        Some((page.add(virt & 0xFFF), l3[l3i].attributes().into()))
-    }
-}
-
-impl<TA: TableAllocator> Drop for ProcessAddressSpaceImpl<TA> {
-    fn drop(&mut self) {
-        // SAFETY: with safe usage of the ProcessAddressSpaceImpl, clearing and dropping
-        // is safe, no one refers to the memory
-        unsafe {
-            self.clear();
-            let l0_phys = self.l0.as_physical_address();
-            TA::free_page_table(l0_phys);
-        }
-    }
-}

kernel/arch/i686/src/mem/table.rs

@@ -1,256 +0,0 @@
-use core::{
-    marker::PhantomData,
-    ops::{Index, IndexMut, Range},
-};
-
-use bitflags::bitflags;
-use libk_mm_interface::{
-    address::{AsPhysicalAddress, PhysicalAddress},
-    pointer::{PhysicalRef, PhysicalRefMut},
-    table::{
-        EntryLevel, EntryLevelDrop, MapAttributes, NextPageTable, NonTerminalEntryLevel,
-        TableAllocator,
-    },
-};
-use yggdrasil_abi::error::Error;
-
-use crate::KernelTableManagerImpl;
-
-bitflags! {
-    /// Describes how each page table entry is mapped
-    pub struct PageAttributes: u32 {
-        /// When set, the mapping is considered valid and pointing somewhere
-        const PRESENT = 1 << 0;
-        /// For tables, allows writes to further translation levels, for pages/blocks, allows
-        /// writes to the region covered by the entry
-        const WRITABLE = 1 << 1;
-        /// When set for L2 entries, the mapping specifies a 2MiB page instead of a page table
-        /// reference
-        const BLOCK = 1 << 7;
-        /// For tables, allows user access to further translation levels, for pages/blocks, allows
-        /// user access to the region covered by the entry
-        const USER = 1 << 2;
-    }
-}
-// TODO stuff for PAE?
-
-#[derive(Debug, Clone, Copy)]
-pub struct L3;
-#[derive(Debug, Clone, Copy)]
-pub struct L0;
-
-#[derive(Clone, Copy, Debug)]
-pub struct PageEntry<L: EntryLevel>(u32, PhantomData<L>);
-
-#[derive(Clone, Copy, Debug)]
-#[repr(C, align(0x1000))]
-pub struct PageTable<L: EntryLevel> {
-    data: [PageEntry<L>; 1024],
-}
-
-impl EntryLevel for L3 {
-    const SHIFT: usize = 12;
-}
-
-impl EntryLevel for L0 {
-    const SHIFT: usize = 22;
-}
-
-impl NonTerminalEntryLevel for L0 {
-    type NextLevel = L3;
-}
-
-impl PageEntry<L3> {
-    pub fn page(address: PhysicalAddress, attrs: PageAttributes) -> Self {
-        Self(
-            address.try_into_u32().unwrap() | (PageAttributes::PRESENT | attrs).bits(),
-            PhantomData,
-        )
-    }
-
-    pub fn as_page(&self) -> Option<PhysicalAddress> {
-        if self.0 & PageAttributes::PRESENT.bits() != 0 {
-            Some(PhysicalAddress::from_u32(self.0 & !0xFFF))
-        } else {
-            None
-        }
-    }
-}
-
-impl PageEntry<L0> {
-    pub fn block(address: PhysicalAddress, attrs: PageAttributes) -> Self {
-        Self(
-            address.try_into_u32().unwrap()
-                | (PageAttributes::PRESENT | PageAttributes::BLOCK | attrs).bits(),
-            PhantomData,
-        )
-    }
-
-    pub fn table(address: PhysicalAddress, attrs: PageAttributes) -> Self {
-        Self(
-            address.try_into_u32().unwrap() | (PageAttributes::PRESENT | attrs).bits(),
-            PhantomData,
-        )
-    }
-
-    pub fn as_table(&self) -> Option<PhysicalAddress> {
-        if self.0 & PageAttributes::PRESENT.bits() != 0
-            && self.0 & PageAttributes::BLOCK.bits() == 0
-        {
-            Some(PhysicalAddress::from_u32(self.0 & !0xFFF))
-        } else {
-            None
-        }
-    }
-}
-
-impl<L: EntryLevel> PageEntry<L> {
-    pub const INVALID: Self = Self(0, PhantomData);
-
-    pub fn is_present(&self) -> bool {
-        self.0 & (1 << 0) != 0
-    }
-
-    pub fn attributes(&self) -> PageAttributes {
-        PageAttributes::from_bits_retain(self.0)
-    }
-}
-
-impl<L: EntryLevel> PageTable<L> {
-    pub const fn zeroed() -> Self {
-        Self {
-            data: [PageEntry::INVALID; 1024],
-        }
-    }
-
-    pub fn new_zeroed<'a, TA: TableAllocator>(
-    ) -> Result<PhysicalRefMut<'a, Self, KernelTableManagerImpl>, Error> {
-        let physical = TA::allocate_page_table()?;
-        let mut table =
-            unsafe { PhysicalRefMut::<'a, Self, KernelTableManagerImpl>::map(physical) };
-
-        for i in 0..1024 {
-            table[i] = PageEntry::INVALID;
-        }
-
-        Ok(table)
-    }
-
-    /// Recursively clears and deallocates the translation table.
-    ///
-    /// # Safety
-    ///
-    /// The caller must ensure the table is no longer in use and is not referenced anymore.
-    pub unsafe fn free<TA: TableAllocator>(this: PhysicalRefMut<Self, KernelTableManagerImpl>) {
-        let physical = this.as_physical_address();
-        TA::free_page_table(physical);
-    }
-}
-
-impl NextPageTable for PageTable<L0> {
-    type NextLevel = PageTable<L3>;
-    type TableRef = PhysicalRef<'static, Self::NextLevel, KernelTableManagerImpl>;
-    type TableRefMut = PhysicalRefMut<'static, Self::NextLevel, KernelTableManagerImpl>;
-
-    fn get(&self, index: usize) -> Option<Self::TableRef> {
-        self[index]
-            .as_table()
-            .map(|addr| unsafe { PhysicalRef::map(addr) })
-    }
-
-    fn get_mut(&mut self, index: usize) -> Option<Self::TableRefMut> {
-        self[index]
-            .as_table()
-            .map(|addr| unsafe { PhysicalRefMut::map(addr) })
-    }
-
-    fn get_mut_or_alloc<TA: TableAllocator>(
-        &mut self,
-        index: usize,
-    ) -> Result<Self::TableRefMut, Error> {
-        let entry = self[index];
-
-        if let Some(table) = entry.as_table() {
-            Ok(unsafe { PhysicalRefMut::map(table) })
-        } else {
-            let table = PageTable::new_zeroed::<TA>()?;
-            self[index] = PageEntry::<L0>::table(
-                unsafe { table.as_physical_address() },
-                PageAttributes::WRITABLE | PageAttributes::USER,
-            );
-            Ok(table)
-        }
-    }
-}
-
-impl<L: EntryLevel> Index<usize> for PageTable<L> {
-    type Output = PageEntry<L>;
-
-    fn index(&self, index: usize) -> &Self::Output {
-        &self.data[index]
-    }
-}
-
-impl<L: EntryLevel> IndexMut<usize> for PageTable<L> {
-    fn index_mut(&mut self, index: usize) -> &mut Self::Output {
-        &mut self.data[index]
-    }
-}
-
-impl EntryLevelDrop for PageTable<L3> {
-    const FULL_RANGE: Range<usize> = 0..1024;
-
-    unsafe fn drop_range<TA: TableAllocator>(&mut self, _range: Range<usize>) {}
-}
-
-impl EntryLevelDrop for PageTable<L0> {
-    const FULL_RANGE: Range<usize> = 0..1024;
-
-    unsafe fn drop_range<TA: TableAllocator>(&mut self, range: Range<usize>) {
-        for index in range {
-            let entry = self[index];
-
-            if let Some(table) = entry.as_table() {
-                let mut table_ref: PhysicalRefMut<PageTable<L3>, KernelTableManagerImpl> =
-                    PhysicalRefMut::map(table);
-
-                table_ref.drop_all::<TA>();
-
-                TA::free_page_table(table);
-            } else if entry.is_present() {
-                // Memory must've been cleared beforehand, so no non-table entries must be present
-                panic!(
-                    "Expected a table containing only tables, got table[{}] = {:#x?}",
-                    index, entry.0
-                );
-            }
-
-            self[index] = PageEntry::INVALID;
-        }
-    }
-}
-
-impl From<MapAttributes> for PageAttributes {
-    fn from(value: MapAttributes) -> Self {
-        let mut res = PageAttributes::WRITABLE;
-        if value.intersects(MapAttributes::USER_READ | MapAttributes::USER_WRITE) {
-            res |= PageAttributes::USER;
-        }
-        res
-    }
-}
-
-impl From<PageAttributes> for MapAttributes {
-    fn from(value: PageAttributes) -> Self {
-        let mut res = MapAttributes::empty();
-        if value.contains(PageAttributes::USER) {
-            res |= MapAttributes::USER_READ;
-            if value.contains(PageAttributes::WRITABLE) {
-                res |= MapAttributes::USER_WRITE;
-            }
-        }
-        // TODO ???
-        res |= MapAttributes::NON_GLOBAL;
-        res
-    }
-}

kernel/arch/interface/src/lib.rs

@@ -21,8 +21,6 @@ pub mod sync;
 pub mod task;
 pub mod util;
 
-#[cfg(any(target_arch = "x86", rust_analyzer))]
-pub const KERNEL_VIRT_OFFSET: usize = 0xC0000000;
 #[cfg(any(target_arch = "aarch64", target_arch = "x86_64", rust_analyzer))]
 pub const KERNEL_VIRT_OFFSET: usize = 0xFFFFFF8000000000;
 #[cfg(any(target_arch = "riscv64", rust_analyzer))]

kernel/arch/interface/src/mem/mod.rs

@@ -2,9 +2,6 @@ use core::{fmt, marker::PhantomData, mem::size_of, ptr::NonNull};
 
 use yggdrasil_abi::error::Error;
 
-pub mod address;
-pub mod table;
-
 pub trait PhysicalMemoryAllocator {
     type Address;
 

kernel/arch/interface/src/sync.rs

@@ -42,7 +42,7 @@ impl<A: Architecture, T> Spinlock<A, T> {
         }
     }
 
-    pub fn lock(&self) -> SpinlockGuard<A, T> {
+    pub fn lock(&self) -> SpinlockGuard<'_, A, T> {
         // Loop until the lock can be acquired
         if LOCK_HACK.load(Ordering::Acquire) {
             return SpinlockGuard { lock: self };
@@ -103,7 +103,7 @@ impl<A: Architecture, T> IrqSafeSpinlock<A, T> {
     }
 
     /// Attempts to acquire a lock. IRQs will be disabled until the lock is released.
-    pub fn lock(&self) -> IrqSafeSpinlockGuard<A, T> {
+    pub fn lock(&self) -> IrqSafeSpinlockGuard<'_, A, T> {
         // Disable IRQs to avoid IRQ handler trying to acquire the same lock
         let irq_guard = IrqGuard::acquire();
 

kernel/arch/riscv64/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2024"
 yggdrasil-abi.workspace = true
 kernel-arch-interface.workspace = true
 libk-mm-interface.workspace = true
-memtables.workspace = true
 device-api = { workspace = true, features = ["derive"] }
 
 tock-registers.workspace = true
@@ -16,11 +15,5 @@ static_assertions.workspace = true
 log.workspace = true
 cfg-if.workspace = true
 
-[features]
-default = []
-riscv64_board_virt = []
-riscv64_board_jh7110 = []
-
-
 [lints]
 workspace = true

kernel/arch/riscv64/src/context.rs

@@ -13,7 +13,7 @@ use tock_registers::{
 use yggdrasil_abi::error::Error;
 
 use crate::{
-    mem::{self, KERNEL_VIRT_OFFSET},
+    mem::{self},
     registers::SATP,
     ArchitectureImpl, PerCpuData,
 };
@@ -124,8 +124,7 @@ impl<K: KernelTableManager, PA: PhysicalMemoryAllocator<Address = PhysicalAddres
 
         // TODO stack is leaked
         let satp = InMemoryRegister::new(0);
-        let kernel_table_phys =
-            ((&raw const mem::KERNEL_TABLES).addr() - KERNEL_VIRT_OFFSET) as u64;
+        let kernel_table_phys = mem::fixed::table_physical_address().into_u64();
         satp.write(SATP::MODE::Sv39 + SATP::ASID.val(0) + SATP::PPN.val(kernel_table_phys >> 12));
 
         Ok(Self {

kernel/arch/riscv64/src/mem/fixed.rs

@@ -0,0 +1,32 @@
+use kernel_arch_interface::sync::IrqSafeSpinlock;
+use libk_mm_interface::{address::PhysicalAddress, table::EntryLevel};
+
+use crate::{
+    mem::{
+        auto_lower_address,
+        table::{PageEntry, PageTable, L1},
+        KERNEL_VIRT_OFFSET,
+    },
+    ArchitectureImpl,
+};
+
+pub const IDENTITY_SIZE_L1: usize = 64;
+
+pub(super) static mut KERNEL_L1: PageTable<L1> = const {
+    let mut table = PageTable::zeroed();
+
+    let mut index = 0;
+    while index < IDENTITY_SIZE_L1 {
+        let entry = PageEntry::identity_block(PhysicalAddress::from_usize(index << L1::SHIFT));
+        table.entries[index] = entry;
+        table.entries[index + ((KERNEL_VIRT_OFFSET >> L1::SHIFT) & 0x1FF)] = entry;
+        index += 1;
+    }
+
+    table
+};
+pub(super) static LOCK: IrqSafeSpinlock<ArchitectureImpl, ()> = IrqSafeSpinlock::new(());
+
+pub fn table_physical_address() -> PhysicalAddress {
+    PhysicalAddress::from_usize(auto_lower_address(&raw const KERNEL_L1))
+}

kernel/arch/riscv64/src/mem/intrinsics.rs

@@ -0,0 +1,51 @@
+use libk_mm_interface::table::{EntryLevel, EntryLevelExt};
+
+use crate::mem::table::L3;
+
+pub fn tlb_flush_global_full() {
+    tlb_flush_full();
+    // TODO send TLB shootdown IPI to other harts
+}
+
+pub fn tlb_flush_global_va(va: usize) {
+    tlb_flush_va(va);
+    // TODO send TLB shootdown IPI to other harts
+}
+
+pub fn tlb_flush_range_va(start: usize, size: usize) {
+    let end = (start + size).page_align_up::<L3>();
+    let start = start.page_align_down::<L3>();
+
+    for page in (start..end).step_by(L3::SIZE) {
+        tlb_flush_va(page);
+    }
+}
+
+pub fn tlb_flush_range_va_asid(asid: usize, start: usize, size: usize) {
+    let end = (start + size).page_align_up::<L3>();
+    let start = start.page_align_down::<L3>();
+
+    for page in (start..end).step_by(L3::SIZE) {
+        tlb_flush_va_asid(page, asid);
+    }
+}
+
+#[inline]
+pub fn tlb_flush_full() {
+    unsafe { core::arch::asm!("sfence.vma") };
+}
+
+#[inline]
+pub fn tlb_flush_va(va: usize) {
+    unsafe { core::arch::asm!("sfence.vma {0}, zero", in(reg) va) };
+}
+
+#[inline]
+pub fn tlb_flush_asid(asid: usize) {
+    unsafe { core::arch::asm!("sfence.vma zero, {0}", in(reg) asid) };
+}
+
+#[inline]
+pub fn tlb_flush_va_asid(va: usize, asid: usize) {
+    unsafe { core::arch::asm!("sfence.vma {0}, {1}", in(reg) va, in(reg) asid) };
+}

kernel/arch/riscv64/src/mem/mod.rs

@@ -1,70 +1,26 @@
-use cfg_if::cfg_if;
-use kernel_arch_interface::{
-    mem::{DeviceMemoryAttributes, KernelTableManager, RawDeviceMemoryMapping},
-    split_spinlock,
+use kernel_arch_interface::mem::{
+    DeviceMemoryAttributes, KernelTableManager, RawDeviceMemoryMapping,
 };
 use libk_mm_interface::{
     address::PhysicalAddress,
     table::{page_index, EntryLevel, EntryLevelExt},
 };
-use memtables::riscv64::PageAttributes;
-use static_assertions::{const_assert, const_assert_eq};
-use table::{PageEntry, PageTable, L1, L2, L3};
 use tock_registers::interfaces::Writeable;
 use yggdrasil_abi::error::Error;
 
-pub use memtables::riscv64::FixedTables;
+use crate::{
+    mem::table::{PageTable, L1, L3},
+    registers::SATP,
+};
 
-use crate::registers::SATP;
+pub use intrinsics::*;
 
+pub mod fixed;
+pub mod intrinsics;
 pub mod process;
 pub mod table;
 
-split_spinlock! {
-    use crate::ArchitectureImpl;
-    use crate::mem::FixedTables;
-    use libk_mm_interface::KernelImageObject;
-
-    #[link_section = ".data.tables"]
-    #[used]
-    static KERNEL_TABLES: KernelImageObject<FixedTables> =
-        unsafe { KernelImageObject::new(FixedTables::zeroed()) };
-}
-
-cfg_if! {
-    if #[cfg(feature = "riscv64_board_virt")] {
-        pub const KERNEL_PHYS_BASE: usize = 0x80200000;
-    } else if #[cfg(feature = "riscv64_board_jh7110")] {
-        pub const KERNEL_PHYS_BASE: usize = 0x40200000;
-    } else if #[cfg(rust_analyzer)] {
-        pub const KERNEL_PHYS_BASE: usize = 0x80200000;
-    }
-}
-
 pub const KERNEL_VIRT_OFFSET: usize = kernel_arch_interface::KERNEL_VIRT_OFFSET;
-pub const SIGN_EXTEND_MASK: usize = 0xFFFFFF80_00000000;
-
-pub const KERNEL_START_L1I: usize = page_index::<L1>(KERNEL_VIRT_OFFSET + KERNEL_PHYS_BASE);
-pub const KERNEL_L2I: usize = page_index::<L2>(KERNEL_VIRT_OFFSET + KERNEL_PHYS_BASE);
-const_assert_eq!(KERNEL_L2I, 1);
-
-// Runtime mappings
-// 1GiB of device memory space
-const DEVICE_MAPPING_L1I: usize = KERNEL_START_L1I + 1;
-const DEVICE_MAPPING_L3_COUNT: usize = 4;
-// 32GiB of RAM space
-const RAM_MAPPING_START_L1I: usize = KERNEL_START_L1I + 2;
-const RAM_MAPPING_L1_COUNT: usize = 32;
-const_assert!(RAM_MAPPING_START_L1I + RAM_MAPPING_L1_COUNT <= 512);
-const_assert!(DEVICE_MAPPING_L1I < 512);
-
-const DEVICE_MAPPING_OFFSET: usize = (DEVICE_MAPPING_L1I << L1::SHIFT) | SIGN_EXTEND_MASK;
-const RAM_MAPPING_OFFSET: usize = (RAM_MAPPING_START_L1I << L1::SHIFT) | SIGN_EXTEND_MASK;
-
-// Runtime tables
-static mut DEVICE_MAPPING_L2: PageTable<L2> = PageTable::zeroed();
-static mut DEVICE_MAPPING_L3S: [PageTable<L3>; DEVICE_MAPPING_L3_COUNT] =
-    [const { PageTable::zeroed() }; DEVICE_MAPPING_L3_COUNT];
 
 /// Any VAs above this one are sign-extended
 pub const USER_BOUNDARY: usize = 0x40_00000000;
@@ -75,17 +31,20 @@ pub struct KernelTableManagerImpl;
 impl KernelTableManager for KernelTableManagerImpl {
     fn virtualize(address: u64) -> usize {
         let address = address as usize;
-        if address >= RAM_MAPPING_OFFSET {
-            panic!("Invalid physical address: {address:#x}");
+        if address < fixed::IDENTITY_SIZE_L1 * L1::SIZE {
+            address + KERNEL_VIRT_OFFSET
+        } else {
+            panic!("Invalid physical address: {address:#x}")
         }
-        address + RAM_MAPPING_OFFSET
     }
 
     fn physicalize(address: usize) -> u64 {
-        if address < RAM_MAPPING_OFFSET {
-            panic!("Invalid \"physicalized\" virtual address {address:#x}");
+        if address < KERNEL_VIRT_OFFSET
+            || address - KERNEL_VIRT_OFFSET >= fixed::IDENTITY_SIZE_L1 * L1::SIZE
+        {
+            panic!("Invalid virtualized address: {address:#x}");
         }
-        (address - RAM_MAPPING_OFFSET) as u64
+        (address - KERNEL_VIRT_OFFSET) as u64
     }
 
     unsafe fn map_device_pages(
@@ -93,146 +52,32 @@ impl KernelTableManager for KernelTableManagerImpl {
         count: usize,
         attrs: DeviceMemoryAttributes,
     ) -> Result<RawDeviceMemoryMapping<Self>, Error> {
-        unsafe { map_device_memory(PhysicalAddress::from_u64(base), count, attrs) }
+        let _ = attrs;
+        let _lock = fixed::LOCK.lock();
+        let base = PhysicalAddress::from_u64(base);
+        let l3_aligned_base = base.page_align_down::<L3>();
+        let l3_aligned_end = base.add(count).page_align_up::<L3>();
+        let l3_offset = base - l3_aligned_base;
+        let l3_page_count = (l3_aligned_end - l3_aligned_base).page_count::<L3>();
+        let l3_aligned_virt = l3_aligned_base.add(KERNEL_VIRT_OFFSET).into_usize();
+
+        Ok(unsafe {
+            RawDeviceMemoryMapping::from_raw_parts(
+                l3_aligned_base.into_u64(),
+                l3_aligned_virt + l3_offset,
+                l3_aligned_virt,
+                l3_page_count,
+                L3::SIZE,
+            )
+        })
     }
 
     unsafe fn unmap_device_pages(mapping: &RawDeviceMemoryMapping<Self>) {
-        unsafe { unmap_device_memory(mapping) }
+        let _ = mapping;
     }
 }
 
-// Device mappings
-unsafe fn map_device_memory_l3(
-    base: PhysicalAddress,
-    count: usize,
-    _attrs: DeviceMemoryAttributes,
-) -> Result<usize, Error> {
-    // TODO don't map pages if already mapped
-
-    'l0: for i in 0..DEVICE_MAPPING_L3_COUNT * 512 {
-        for j in 0..count {
-            let l2i = (i + j) / 512;
-            let l3i = (i + j) % 512;
-
-            unsafe {
-                if DEVICE_MAPPING_L3S[l2i][l3i].is_present() {
-                    continue 'l0;
-                }
-            }
-        }
-
-        for j in 0..count {
-            let l2i = (i + j) / 512;
-            let l3i = (i + j) % 512;
-
-            unsafe {
-                DEVICE_MAPPING_L3S[l2i][l3i] =
-                    PageEntry::page(base.add(j * L3::SIZE), PageAttributes::W);
-            }
-        }
-
-        let start = DEVICE_MAPPING_OFFSET + i * L3::SIZE;
-        tlb_flush_range_va(start, count * L3::SIZE);
-        return Ok(start);
-    }
-
-    Err(Error::OutOfMemory)
-}
-
-#[allow(unused)]
-unsafe fn map_device_memory_l2(
-    base: PhysicalAddress,
-    count: usize,
-    _attrs: DeviceMemoryAttributes,
-) -> Result<usize, Error> {
-    'l0: for i in DEVICE_MAPPING_L3_COUNT..512 {
-        for j in 0..count {
-            unsafe {
-                if DEVICE_MAPPING_L2[i + j].is_present() {
-                    continue 'l0;
-                }
-            }
-        }
-
-        unsafe {
-            for j in 0..count {
-                DEVICE_MAPPING_L2[i + j] =
-                    PageEntry::<L2>::block(base.add(j * L2::SIZE), PageAttributes::W);
-            }
-        }
-
-        let start = DEVICE_MAPPING_OFFSET + i * L2::SIZE;
-        tlb_flush_range_va(start, count * L2::SIZE);
-        return Ok(start);
-    }
-
-    Err(Error::OutOfMemory)
-}
-
-pub(crate) unsafe fn map_device_memory(
-    base: PhysicalAddress,
-    size: usize,
-    attrs: DeviceMemoryAttributes,
-) -> Result<RawDeviceMemoryMapping<KernelTableManagerImpl>, Error> {
-    let l3_aligned = base.page_align_down::<L3>();
-    let l3_offset = base.page_offset::<L3>();
-    let page_count = (l3_offset + size).page_count::<L3>();
-
-    if page_count > 256 {
-        // Large mapping, use L2 mapping instead
-        let l2_aligned = base.page_align_down::<L2>();
-        let l2_offset = base.page_offset::<L2>();
-        let page_count = (l2_offset + size).page_count::<L2>();
-
-        unsafe {
-            let base_address = map_device_memory_l2(l2_aligned, page_count, attrs)?;
-            let address = base_address + l2_offset;
-
-            Ok(RawDeviceMemoryMapping::from_raw_parts(
-                l2_aligned.into_u64(),
-                address,
-                base_address,
-                page_count,
-                L2::SIZE,
-            ))
-        }
-    } else {
-        // Just map the pages directly
-        unsafe {
-            let base_address = map_device_memory_l3(l3_aligned, page_count, attrs)?;
-            let address = base_address + l3_offset;
-
-            Ok(RawDeviceMemoryMapping::from_raw_parts(
-                l3_aligned.into_u64(),
-                address,
-                base_address,
-                page_count,
-                L3::SIZE,
-            ))
-        }
-    }
-}
-
-pub(crate) unsafe fn unmap_device_memory(map: &RawDeviceMemoryMapping<KernelTableManagerImpl>) {
-    match map.page_size {
-        L3::SIZE => {
-            for i in 0..map.page_count {
-                let page = map.base_address + i * L3::SIZE;
-                let l2i = page.page_index::<L2>();
-                let l3i = page.page_index::<L3>();
-                unsafe {
-                    assert!(DEVICE_MAPPING_L3S[l2i][l3i].is_present());
-                    DEVICE_MAPPING_L3S[l2i][l3i] = PageEntry::INVALID;
-                }
-            }
-            tlb_flush_range_va(map.base_address, map.page_count * L3::SIZE);
-        }
-        L2::SIZE => todo!(),
-        _ => unimplemented!(),
-    }
-}
-
-pub fn auto_address<T>(x: *const T) -> usize {
+pub fn auto_lower_address<T>(x: *const T) -> usize {
     let x = x.addr();
     if x >= KERNEL_VIRT_OFFSET {
         x - KERNEL_VIRT_OFFSET
@@ -247,113 +92,14 @@ pub fn auto_address<T>(x: *const T) -> usize {
 ///
 /// Only meant to be called once per each HART during their early init.
 pub unsafe fn enable_mmu() {
-    let l1_phys = auto_address(&raw const KERNEL_TABLES) as u64;
+    let l1_phys = auto_lower_address(&raw const fixed::KERNEL_L1) as u64;
     tlb_flush_full();
     SATP.write(SATP::PPN.val(l1_phys >> 12) + SATP::MODE::Sv39);
 }
 
-/// Removes the lower half translation mappings.
-///
-/// # Safety
-///
-/// Needs to be called once after secondary HARTs are initialized.
-pub unsafe fn unmap_lower_half() {
-    let mut tables = KERNEL_TABLES.lock();
-    let kernel_l1i_lower = page_index::<L1>(KERNEL_PHYS_BASE);
-    tables.l1.data[kernel_l1i_lower] = 0;
-    tlb_flush_range_va(0x0, L1::SIZE);
-}
-
-/// Sets up run-time kernel translation tables.
-///
-/// # Safety
-///
-/// The caller must ensure MMU is already enabled.
-pub unsafe fn setup_fixed_tables() {
-    let mut tables = KERNEL_TABLES.lock();
-
-    let device_mapping_l2_phys = auto_address(&raw const DEVICE_MAPPING_L2);
-
-    // Set up static runtime mappings
-    for i in 0..DEVICE_MAPPING_L3_COUNT {
-        unsafe {
-            let device_mapping_l3_phys = PhysicalAddress::from_usize(
-                (&raw const DEVICE_MAPPING_L3S[i]).addr() - KERNEL_VIRT_OFFSET,
-            );
-            DEVICE_MAPPING_L2[i] =
-                PageEntry::table(device_mapping_l3_phys, PageAttributes::empty());
-        }
-    }
-
-    assert_eq!(tables.l1.data[DEVICE_MAPPING_L1I], 0);
-    tables.l1.data[DEVICE_MAPPING_L1I] =
-        ((device_mapping_l2_phys as u64) >> 2) | PageAttributes::V.bits();
-
-    for l1i in 0..RAM_MAPPING_L1_COUNT {
-        let physical = (l1i as u64) << L1::SHIFT;
-        tables.l1.data[l1i + RAM_MAPPING_START_L1I] = (physical >> 2)
-            | (PageAttributes::R
-                | PageAttributes::W
-                | PageAttributes::A
-                | PageAttributes::D
-                | PageAttributes::V)
-                .bits();
-    }
-
-    tlb_flush_full();
-}
-
-pub fn tlb_flush_global_full() {
-    tlb_flush_full();
-    // TODO send TLB shootdown IPI to other harts
-}
-
-pub fn tlb_flush_global_va(va: usize) {
-    tlb_flush_va(va);
-    // TODO send TLB shootdown IPI to other harts
-}
-
-pub fn tlb_flush_range_va(start: usize, size: usize) {
-    let end = (start + size).page_align_up::<L3>();
-    let start = start.page_align_down::<L3>();
-
-    for page in (start..end).step_by(L3::SIZE) {
-        tlb_flush_va(page);
-    }
-}
-
-pub fn tlb_flush_range_va_asid(asid: usize, start: usize, size: usize) {
-    let end = (start + size).page_align_up::<L3>();
-    let start = start.page_align_down::<L3>();
-
-    for page in (start..end).step_by(L3::SIZE) {
-        tlb_flush_va_asid(page, asid);
-    }
-}
-
-#[inline]
-pub fn tlb_flush_full() {
-    unsafe { core::arch::asm!("sfence.vma") };
-}
-
-#[inline]
-pub fn tlb_flush_va(va: usize) {
-    unsafe { core::arch::asm!("sfence.vma {0}, zero", in(reg) va) };
-}
-
-#[inline]
-pub fn tlb_flush_asid(asid: usize) {
-    unsafe { core::arch::asm!("sfence.vma zero, {0}", in(reg) asid) };
-}
-
-#[inline]
-pub fn tlb_flush_va_asid(va: usize, asid: usize) {
-    unsafe { core::arch::asm!("sfence.vma {0}, {1}", in(reg) va, in(reg) asid) };
-}
-
 pub fn clone_kernel_tables(dst: &mut PageTable<L1>) {
-    let tables = KERNEL_TABLES.lock();
+    let _lock = fixed::LOCK.lock();
     for l1i in page_index::<L1>(USER_BOUNDARY)..512 {
-        dst[l1i] = unsafe { PageEntry::from_raw(tables.l1.data[l1i]) };
+        dst[l1i] = unsafe { fixed::KERNEL_L1[l1i] };
     }
 }

kernel/arch/riscv64/src/mem/process.rs

@@ -11,10 +11,12 @@ use libk_mm_interface::{
         EntryLevel, EntryLevelDrop, EntryLevelExt, MapAttributes, NextPageTable, TableAllocator,
     },
 };
-use memtables::riscv64::PageAttributes;
 use yggdrasil_abi::error::Error;
 
-use crate::mem::{clone_kernel_tables, table::PageEntry};
+use crate::mem::{
+    clone_kernel_tables,
+    table::{PageAttributes, PageEntry},
+};
 
 use super::{
     table::{DroppableRange, PageTable, L1, L2, L3},

kernel/arch/riscv64/src/mem/table.rs

@@ -1,8 +1,10 @@
 use core::{
+    fmt,
     marker::PhantomData,
     ops::{Index, IndexMut, Range},
 };
 
+use bitflags::bitflags;
 use libk_mm_interface::{
     address::{AsPhysicalAddress, PhysicalAddress},
     pointer::{PhysicalRef, PhysicalRefMut},
@@ -16,7 +18,40 @@ use yggdrasil_abi::error::Error;
 
 use super::{KernelTableManagerImpl, USER_BOUNDARY};
 
-pub use memtables::riscv64::PageAttributes;
+bitflags! {
+    #[derive(Clone, Copy, PartialEq, Eq, Debug)]
+    pub struct PageAttributes: u64 {
+        const N = 1 << 63;
+        /// Software-tracked dirty bit (RSW[0])
+        const SW_DIRTY = 1 << 9;
+        /// Dirty bit
+        const D = 1 << 7;
+        /// Access bit
+        const A = 1 << 6;
+        /// Global mapping bit, implies all lower levels are also global
+        const G = 1 << 5;
+        /// U-mode access permission
+        const U = 1 << 4;
+        /// Execute permission
+        const X = 1 << 3;
+        /// Write permission
+        const W = 1 << 2;
+        /// Read-permission
+        const R = 1 << 1;
+        /// Valid bit
+        const V = 1 << 0;
+    }
+
+    // X W R    Meaning
+    // 0 0 0    Pointer to next level of page table
+    // 0 0 1    Read-only page
+    // 0 1 0    ---
+    // 0 1 1    Read-write page
+    // 1 0 0    Execute only
+    // 1 0 1    Read-execute page
+    // 1 1 0    ---
+    // 1 1 1    Read-write-execute page
+}
 
 /// L3 - entry is 4KiB
 #[derive(Debug, Clone, Copy)]
@@ -42,7 +77,7 @@ impl EntryLevel for L1 {
 
 #[repr(C, align(0x1000))]
 pub struct PageTable<L: EntryLevel> {
-    entries: [PageEntry<L>; 512],
+    pub(crate) entries: [PageEntry<L>; 512],
 }
 
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -204,6 +239,19 @@ impl<L: NonTerminalEntryLevel + 'static> NextPageTable for PageTable<L> {
 }
 
 impl<L: NonTerminalEntryLevel> PageEntry<L> {
+    pub const fn identity_block(address: PhysicalAddress) -> Self {
+        Self(
+            (address.into_u64() >> 2)
+                | PageAttributes::R.bits()
+                | PageAttributes::W.bits()
+                | PageAttributes::X.bits()
+                | PageAttributes::V.bits()
+                | PageAttributes::D.bits()
+                | PageAttributes::A.bits(),
+            PhantomData,
+        )
+    }
+
     pub fn block(address: PhysicalAddress, attrs: PageAttributes) -> Self {
         // TODO validate address alignment
         Self(
@@ -270,3 +318,26 @@ impl<L: EntryLevel> IndexMut<usize> for PageTable<L> {
         &mut self.entries[index]
     }
 }
+
+impl fmt::Display for PageAttributes {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use fmt::Write;
+
+        macro_rules! bit {
+            ($self:ident, $field:expr, $letter:literal) => {
+                if $self.contains($field) {
+                    f.write_char($letter)
+                } else {
+                    f.write_char('-')
+                }
+            };
+        }
+
+        bit!(self, Self::R, 'r')?;
+        bit!(self, Self::W, 'w')?;
+        bit!(self, Self::X, 'x')?;
+        bit!(self, Self::U, 'u')?;
+
+        Ok(())
+    }
+}

kernel/arch/src/lib.rs

@@ -26,8 +26,6 @@ cfg_if! {
         extern crate kernel_arch_aarch64 as imp;
     } else if #[cfg(target_arch = "x86_64")] {
         extern crate kernel_arch_x86_64 as imp;
-    } else if #[cfg(target_arch = "x86")] {
-        extern crate kernel_arch_i686 as imp;
     } else if #[cfg(target_arch = "riscv64")] {
         extern crate kernel_arch_riscv64 as imp;
     } else {

kernel/arch/x86/src/gdt.rs

@@ -1,5 +1,5 @@
 #[allow(dead_code)]
-#[repr(packed)]
+#[repr(C, packed)]
 pub struct Entry {
     pub limit_lo: u16,
     pub base_lo: u16,
@@ -10,7 +10,7 @@ pub struct Entry {
 }
 
 #[allow(dead_code)]
-#[repr(packed)]
+#[repr(C, packed)]
 pub struct Pointer {
     pub limit: u16,
     pub offset: usize,
@@ -121,7 +121,7 @@ mod imp {
     use super::{Entry, Pointer};
 
     #[allow(dead_code)]
-    #[repr(packed)]
+    #[repr(C, packed)]
     pub struct Tss {
         _0: u32,
         rsp0: u64,

kernel/arch/x86_64/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2021"
 yggdrasil-abi.workspace = true
 kernel-arch-interface.workspace = true
 libk-mm-interface.workspace = true
-memtables.workspace = true
 device-api = { workspace = true, features = ["derive"] }
 kernel-arch-x86.workspace = true
 

kernel/arch/x86_64/src/context.rs

@@ -5,11 +5,14 @@ use kernel_arch_interface::{
     task::{ForkFrame, StackBuilder, TaskContext, TaskFrame, UserContextInfo},
 };
 use kernel_arch_x86::registers::{FpuContext, CR3, MSR_IA32_FS_BASE};
-use libk_mm_interface::address::{AsPhysicalAddress, PhysicalAddress};
+use libk_mm_interface::address::PhysicalAddress;
 use tock_registers::interfaces::Writeable;
 use yggdrasil_abi::{arch::SavedFrame, error::Error};
 
-use crate::{mem::KERNEL_TABLES, ArchitectureImpl};
+use crate::{
+    mem::{auto_lower_address, fixed},
+    ArchitectureImpl,
+};
 
 /// Frame saved onto the stack when taking an IRQ
 #[derive(Debug)]
@@ -431,7 +434,7 @@ impl<K: KernelTableManager, PA: PhysicalMemoryAllocator<Address = PhysicalAddres
     fn kernel(entry: extern "C" fn(usize) -> !, arg: usize) -> Result<Self, Error> {
         const KERNEL_TASK_PAGES: usize = 32;
 
-        let cr3: usize = unsafe { KERNEL_TABLES.lock().as_physical_address() }.into();
+        let cr3: usize = auto_lower_address(&raw const fixed::KERNEL_PML4); // unsafe { KERNEL_TABLES.lock().as_physical_address() }.into();
 
         let stack_base_phys = PA::allocate_contiguous_pages(KERNEL_TASK_PAGES)?;
         let stack_base = stack_base_phys.raw_virtualize::<K>();

kernel/arch/x86_64/src/mem/fixed.rs

@@ -0,0 +1,131 @@
+use core::ops::Range;
+
+use kernel_arch_interface::{mem::DeviceMemoryAttributes, sync::IrqSafeSpinlock, Architecture};
+use kernel_arch_x86::registers::CR3;
+use libk_mm_interface::{
+    address::PhysicalAddress,
+    device::{DevicePageManager, DevicePageTableLevel},
+    table::{page_index, EntryLevel},
+};
+
+use crate::{
+    mem::{
+        auto_lower_address,
+        table::{PageAttributes, PageEntry, PageTable, L0, L1, L2, L3},
+    },
+    ArchitectureImpl, KERNEL_VIRT_OFFSET,
+};
+
+pub const IDENTITY_SIZE_L1: usize = 64;
+pub const KERNEL_L0I: usize = page_index::<L0>(KERNEL_VIRT_OFFSET);
+
+pub const DEVICE_L1: usize = IDENTITY_SIZE_L1;
+pub const DEVICE_MAPPING_L3_COUNT: usize = 32;
+pub const DEVICE_MAPPING_OFFSET: usize = KERNEL_VIRT_OFFSET + (DEVICE_L1 << L1::SHIFT);
+
+pub static LOCK: IrqSafeSpinlock<ArchitectureImpl, ()> = IrqSafeSpinlock::new(());
+pub static mut KERNEL_PDPT: PageTable<L1> = PageTable::zeroed();
+pub static mut KERNEL_PML4: PageTable<L0> = PageTable::zeroed();
+
+pub(super) static mut DEVICE_MEMORY: DevicePageManager<L3DeviceMemory, L2DeviceMemory> =
+    DevicePageManager::new(
+        L3DeviceMemory([PageTable::zeroed(); DEVICE_MAPPING_L3_COUNT]),
+        L2DeviceMemory(PageTable::zeroed()),
+    );
+
+#[repr(transparent)]
+pub struct L2DeviceMemory(pub PageTable<L2>);
+#[repr(transparent)]
+pub struct L3DeviceMemory(pub [PageTable<L3>; DEVICE_MAPPING_L3_COUNT]);
+
+impl DevicePageTableLevel for L2DeviceMemory {
+    type Level = L2;
+    const VIRTUAL_BASE: usize = DEVICE_MAPPING_OFFSET;
+    const INDEX_RANGE: Range<usize> = DEVICE_MAPPING_L3_COUNT..512;
+
+    fn map_page(
+        &mut self,
+        index: usize,
+        physical: PhysicalAddress,
+        attrs: &DeviceMemoryAttributes,
+    ) {
+        let _ = attrs;
+        self.0[index] = PageEntry::<L2>::block(physical, PageAttributes::WRITABLE);
+    }
+
+    fn unmap_page(&mut self, index: usize) {
+        self.0[index - DEVICE_MAPPING_L3_COUNT] = PageEntry::INVALID;
+    }
+
+    fn is_mapped(&self, index: usize) -> bool {
+        self.0[index - DEVICE_MAPPING_L3_COUNT].is_present()
+    }
+
+    fn flush_range(range: Range<usize>) {
+        let _ = range;
+    }
+}
+
+impl DevicePageTableLevel for L3DeviceMemory {
+    type Level = L3;
+    const VIRTUAL_BASE: usize = DEVICE_MAPPING_OFFSET;
+    const INDEX_RANGE: Range<usize> = 0..512 * DEVICE_MAPPING_L3_COUNT;
+
+    fn map_page(
+        &mut self,
+        index: usize,
+        physical: PhysicalAddress,
+        attrs: &DeviceMemoryAttributes,
+    ) {
+        let _ = attrs;
+        let l2i = index / 512;
+        let l3i = index % 512;
+        self.0[l2i][l3i] = PageEntry::page(physical, PageAttributes::WRITABLE);
+    }
+
+    fn unmap_page(&mut self, index: usize) {
+        let l2i = index / 512;
+        let l3i = index % 512;
+        self.0[l2i][l3i] = PageEntry::INVALID;
+    }
+
+    fn is_mapped(&self, index: usize) -> bool {
+        let l2i = index / 512;
+        let l3i = index % 512;
+        self.0[l2i][l3i].is_present()
+    }
+
+    fn flush_range(range: Range<usize>) {
+        let _ = range;
+    }
+}
+
+pub(super) unsafe fn setup(have_1gib_pages: bool) {
+    let phys = PhysicalAddress::from_usize(auto_lower_address(&raw const KERNEL_PDPT));
+    KERNEL_PML4[KERNEL_L0I] = PageEntry::table(phys, PageAttributes::WRITABLE);
+
+    if have_1gib_pages {
+        for i in 0..IDENTITY_SIZE_L1 {
+            let phys = PhysicalAddress::from_usize(i * L1::SIZE);
+            KERNEL_PDPT[i] = PageEntry::<L1>::block(phys, PageAttributes::WRITABLE);
+        }
+    } else {
+        // TODO
+        ArchitectureImpl::halt();
+    }
+
+    // DEVICE_L1 -> Device L2 table
+    //               0..DEVICE_MAPPING_L3_COUNT -> Device L3 tables -> Device L3 pages
+    //               ..512                      -> Device L2 pages
+    for i in 0..DEVICE_MAPPING_L3_COUNT {
+        let phys =
+            PhysicalAddress::from_usize(auto_lower_address(&raw const DEVICE_MEMORY.normal.0[i]));
+        DEVICE_MEMORY.large.0[i] = PageEntry::table(phys, PageAttributes::WRITABLE);
+    }
+    let phys = PhysicalAddress::from_usize(auto_lower_address(&raw const DEVICE_MEMORY.large.0));
+    KERNEL_PDPT[DEVICE_L1] = PageEntry::table(phys, PageAttributes::WRITABLE);
+}
+
+pub(super) unsafe fn load() {
+    CR3.set_address(auto_lower_address(&raw const KERNEL_PML4));
+}

kernel/arch/x86_64/src/mem/mod.rs

@@ -1,98 +1,37 @@
-use core::{
-    alloc::Layout,
-    ops::{Deref, DerefMut},
-    sync::atomic::{AtomicUsize, Ordering},
+use kernel_arch_interface::mem::{
+    DeviceMemoryAttributes, KernelTableManager, RawDeviceMemoryMapping,
 };
-
-use kernel_arch_interface::{
-    mem::{DeviceMemoryAttributes, KernelTableManager, RawDeviceMemoryMapping},
-    split_spinlock,
-};
-use kernel_arch_x86::registers::CR3;
-use libk_mm_interface::{
-    address::PhysicalAddress,
-    table::{page_index, EntryLevel, EntryLevelExt},
-};
-use static_assertions::{const_assert_eq, const_assert_ne};
+use libk_mm_interface::{address::PhysicalAddress, table::EntryLevel};
 use yggdrasil_abi::error::Error;
 
 use crate::KERNEL_VIRT_OFFSET;
 
-use self::table::{PageAttributes, PageEntry, PageTable, L0, L1, L2, L3};
+use self::table::{PageTable, L0, L1};
 
+pub mod fixed;
 pub mod process;
 pub mod table;
 
 #[derive(Debug)]
 pub struct KernelTableManagerImpl;
 
-const CANONICAL_ADDRESS_MASK: usize = 0xFFFF000000000000;
-const KERNEL_PHYS_BASE: usize = 0x200000;
-
-// Mapped at compile time
-const KERNEL_MAPPING_BASE: usize = KERNEL_VIRT_OFFSET + KERNEL_PHYS_BASE;
-const KERNEL_L0_INDEX: usize = page_index::<L0>(KERNEL_MAPPING_BASE);
-const KERNEL_L1_INDEX: usize = page_index::<L1>(KERNEL_MAPPING_BASE);
-const KERNEL_START_L2_INDEX: usize = page_index::<L2>(KERNEL_MAPPING_BASE);
-
-// Must not be zero, should be at 4MiB
-const_assert_ne!(KERNEL_START_L2_INDEX, 0);
-// From static mapping
-const_assert_eq!(KERNEL_L0_INDEX, 511);
-const_assert_eq!(KERNEL_L1_INDEX, 0);
-
-// Mapped at boot
-const EARLY_MAPPING_L2I: usize = KERNEL_START_L2_INDEX - 1;
-const DEVICE_MAPPING_L1I: usize = KERNEL_L1_INDEX + 2;
-const RAM_MAPPING_L0I: usize = KERNEL_L0_INDEX - 1;
-
-const DEVICE_MAPPING_L3_COUNT: usize = 4;
-
-split_spinlock! {
-    use libk_mm_interface::KernelImageObject;
-    use memtables::x86_64::FixedTables;
-    use crate::ArchitectureImpl;
-
-    #[link_section = ".data.tables"]
-    static KERNEL_TABLES: KernelImageObject<FixedTables> =
-        unsafe { KernelImageObject::new(FixedTables::zeroed()) };
-}
-
-// 2MiB for early mappings
-const EARLY_MAPPING_OFFSET: usize = CANONICAL_ADDRESS_MASK
-    | (KERNEL_L0_INDEX * L0::SIZE)
-    | (KERNEL_L1_INDEX * L1::SIZE)
-    | (EARLY_MAPPING_L2I * L2::SIZE);
-static mut EARLY_MAPPING_L3: PageTable<L3> = PageTable::zeroed();
-// 1GiB for device MMIO mapping
-const DEVICE_MAPPING_OFFSET: usize =
-    CANONICAL_ADDRESS_MASK | (KERNEL_L0_INDEX * L0::SIZE) | (DEVICE_MAPPING_L1I * L1::SIZE);
-static mut DEVICE_MAPPING_L2: PageTable<L2> = PageTable::zeroed();
-static mut DEVICE_MAPPING_L3S: [PageTable<L3>; DEVICE_MAPPING_L3_COUNT] =
-    [PageTable::zeroed(); DEVICE_MAPPING_L3_COUNT];
-// 512GiB for whole RAM mapping
-pub const RAM_MAPPING_OFFSET: usize = CANONICAL_ADDRESS_MASK | (RAM_MAPPING_L0I * L0::SIZE);
-pub static MEMORY_LIMIT: AtomicUsize = AtomicUsize::new(0);
-pub static mut RAM_MAPPING_L1: PageTable<L1> = PageTable::zeroed();
-
 impl KernelTableManager for KernelTableManagerImpl {
     fn virtualize(address: u64) -> usize {
         let address = address as usize;
-        if address < MEMORY_LIMIT.load(Ordering::Acquire) {
-            address + RAM_MAPPING_OFFSET
+        if address < fixed::IDENTITY_SIZE_L1 * L1::SIZE {
+            address + KERNEL_VIRT_OFFSET
         } else {
-            panic!("Invalid physical address: {:#x}", address);
+            panic!("Invalid physical address: {address:#x}");
         }
     }
 
     fn physicalize(address: usize) -> u64 {
-        if address < RAM_MAPPING_OFFSET
-            || address - RAM_MAPPING_OFFSET >= MEMORY_LIMIT.load(Ordering::Acquire)
+        if address < KERNEL_VIRT_OFFSET
+            || address - KERNEL_VIRT_OFFSET >= fixed::IDENTITY_SIZE_L1 * L1::SIZE
         {
-            panic!("Not a virtualized physical address: {:#x}", address);
+            panic!("Invalid virtualized address: {address:#x}");
         }
-
-        (address - RAM_MAPPING_OFFSET) as _
+        (address - KERNEL_VIRT_OFFSET) as u64
     }
 
     unsafe fn map_device_pages(
@@ -100,245 +39,25 @@ impl KernelTableManager for KernelTableManagerImpl {
         count: usize,
         attrs: DeviceMemoryAttributes,
     ) -> Result<RawDeviceMemoryMapping<Self>, Error> {
-        map_device_memory(PhysicalAddress::from_u64(base), count, attrs)
+        let _lock = fixed::LOCK.lock();
+        #[allow(static_mut_refs)]
+        fixed::DEVICE_MEMORY.map_device_pages(PhysicalAddress::from_u64(base), count, attrs)
     }
 
     unsafe fn unmap_device_pages(mapping: &RawDeviceMemoryMapping<Self>) {
-        unmap_device_memory(mapping)
-    }
-}
-
-// Early mappings
-unsafe fn map_early_pages(physical: PhysicalAddress, count: usize) -> Result<usize, Error> {
-    for l3i in 0..512 {
-        let mut taken = false;
-        for i in 0..count {
-            if EARLY_MAPPING_L3[i + l3i].is_present() {
-                taken = true;
-                break;
-            }
-        }
-
-        if taken {
-            continue;
-        }
-
-        for i in 0..count {
-            // TODO NX, NC
-            EARLY_MAPPING_L3[i + l3i] =
-                PageEntry::page(physical.add(i * L3::SIZE), PageAttributes::WRITABLE);
-            flush_tlb_entry(EARLY_MAPPING_OFFSET + (i + l3i) * L3::SIZE);
-        }
-
-        return Ok(EARLY_MAPPING_OFFSET + l3i * L3::SIZE);
-    }
-
-    Err(Error::OutOfMemory)
-}
-
-unsafe fn unmap_early_page(address: usize) {
-    if !(EARLY_MAPPING_OFFSET..EARLY_MAPPING_OFFSET + L2::SIZE).contains(&address) {
-        panic!("Tried to unmap invalid early mapping: {:#x}", address);
-    }
-
-    let l3i = (address - EARLY_MAPPING_OFFSET).page_index::<L3>();
-
-    assert!(EARLY_MAPPING_L3[l3i].is_present());
-    EARLY_MAPPING_L3[l3i] = PageEntry::INVALID;
-}
-
-// Device mappings
-unsafe fn map_device_memory_l3(
-    base: PhysicalAddress,
-    count: usize,
-    _attrs: DeviceMemoryAttributes,
-) -> Result<usize, Error> {
-    // TODO don't map pages if already mapped
-
-    'l0: for i in 0..DEVICE_MAPPING_L3_COUNT * 512 {
-        for j in 0..count {
-            let l2i = (i + j) / 512;
-            let l3i = (i + j) % 512;
-
-            if DEVICE_MAPPING_L3S[l2i][l3i].is_present() {
-                continue 'l0;
-            }
-        }
-
-        for j in 0..count {
-            let l2i = (i + j) / 512;
-            let l3i = (i + j) % 512;
-
-            // TODO NX, NC
-            DEVICE_MAPPING_L3S[l2i][l3i] =
-                PageEntry::page(base.add(j * L3::SIZE), PageAttributes::WRITABLE);
-        }
-
-        return Ok(DEVICE_MAPPING_OFFSET + i * L3::SIZE);
-    }
-
-    Err(Error::OutOfMemory)
-}
-
-unsafe fn map_device_memory_l2(
-    base: PhysicalAddress,
-    count: usize,
-    _attrs: DeviceMemoryAttributes,
-) -> Result<usize, Error> {
-    'l0: for i in DEVICE_MAPPING_L3_COUNT..512 {
-        for j in 0..count {
-            if DEVICE_MAPPING_L2[i + j].is_present() {
-                continue 'l0;
-            }
-        }
-
-        for j in 0..count {
-            DEVICE_MAPPING_L2[i + j] =
-                PageEntry::<L2>::block(base.add(j * L2::SIZE), PageAttributes::WRITABLE);
-        }
-
-        return Ok(DEVICE_MAPPING_OFFSET + i * L2::SIZE);
-    }
-
-    Err(Error::OutOfMemory)
-}
-
-unsafe fn map_device_memory(
-    base: PhysicalAddress,
-    size: usize,
-    attrs: DeviceMemoryAttributes,
-) -> Result<RawDeviceMemoryMapping<KernelTableManagerImpl>, Error> {
-    let l3_aligned = base.page_align_down::<L3>();
-    let l3_offset = base.page_offset::<L3>();
-    let page_count = (l3_offset + size).page_count::<L3>();
-
-    if page_count > 256 {
-        // Large mapping, use L2 mapping instead
-        let l2_aligned = base.page_align_down::<L2>();
-        let l2_offset = base.page_offset::<L2>();
-        let page_count = (l2_offset + size).page_count::<L2>();
-
-        let base_address = map_device_memory_l2(l2_aligned, page_count, attrs)?;
-        let address = base_address + l2_offset;
-
-        Ok(RawDeviceMemoryMapping::from_raw_parts(
-            l2_aligned.into_u64(),
-            address,
-            base_address,
-            page_count,
-            L2::SIZE,
-        ))
-    } else {
-        // Just map the pages directly
-        let base_address = map_device_memory_l3(l3_aligned, page_count, attrs)?;
-        let address = base_address + l3_offset;
-
-        Ok(RawDeviceMemoryMapping::from_raw_parts(
-            l3_aligned.into_u64(),
-            address,
-            base_address,
-            page_count,
-            L3::SIZE,
-        ))
-    }
-}
-
-unsafe fn unmap_device_memory(map: &RawDeviceMemoryMapping<KernelTableManagerImpl>) {
-    match map.page_size {
-        L3::SIZE => {
-            for i in 0..map.page_count {
-                let page = map.base_address + i * L3::SIZE;
-                let l2i = page.page_index::<L2>();
-                let l3i = page.page_index::<L3>();
-                assert!(DEVICE_MAPPING_L3S[l2i][l3i].is_present());
-                DEVICE_MAPPING_L3S[l2i][l3i] = PageEntry::INVALID;
-                flush_tlb_entry(page);
-            }
-        }
-        L2::SIZE => todo!(),
-        _ => unimplemented!(),
-    }
-}
-
-/// Memory mapping which may be used for performing early kernel initialization
-pub struct EarlyMapping<'a, T: ?Sized> {
-    value: &'a mut T,
-    page_count: usize,
-}
-
-impl<'a, T: Sized> EarlyMapping<'a, T> {
-    /// # Safety
-    ///
-    /// `physical` address provided must be a valid non-NULL address actually containing `T`.
-    pub unsafe fn map(physical: PhysicalAddress) -> Result<EarlyMapping<'a, T>, Error> {
-        let layout = Layout::new::<T>();
-        let aligned = physical.page_align_down::<L3>();
-        let offset = physical.page_offset::<L3>();
-        let page_count = (offset + layout.size()).div_ceil(L3::SIZE);
-
-        let virt = map_early_pages(aligned, page_count)?;
-        let value = &mut *((virt + offset) as *mut T);
-
-        Ok(EarlyMapping { value, page_count })
-    }
-
-    /// # Safety
-    ///
-    /// `physical` address provided must be a valid non-NULL address actually containing a `T`
-    /// slice of given `len`.
-    pub unsafe fn map_slice(
-        physical: PhysicalAddress,
-        len: usize,
-    ) -> Result<EarlyMapping<'a, [T]>, Error> {
-        let layout = Layout::array::<T>(len).unwrap();
-        let aligned = physical.page_align_down::<L3>();
-        let offset = physical.page_offset::<L3>();
-        let page_count = (offset + layout.size()).div_ceil(L3::SIZE);
-
-        let virt = map_early_pages(aligned, page_count)?;
-        let value = core::slice::from_raw_parts_mut((virt + offset) as *mut T, len);
-
-        Ok(EarlyMapping { value, page_count })
-    }
-}
-
-impl<T: ?Sized> Deref for EarlyMapping<'_, T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        self.value
-    }
-}
-
-impl<T: ?Sized> DerefMut for EarlyMapping<'_, T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.value
-    }
-}
-
-impl<T: ?Sized> Drop for EarlyMapping<'_, T> {
-    fn drop(&mut self) {
-        let address = (self.value as *mut T).addr() & !(L3::SIZE - 1);
-
-        for i in 0..self.page_count {
-            let page = address + i * L3::SIZE;
-
-            unsafe {
-                unmap_early_page(page);
-            }
-        }
+        let _lock = fixed::LOCK.lock();
+        #[allow(static_mut_refs)]
+        fixed::DEVICE_MEMORY.unmap_device_pages(mapping);
     }
 }
 
 pub fn clone_kernel_tables(dst: &mut PageTable<L0>) {
-    let tables = KERNEL_TABLES.lock();
     unsafe {
-        dst[KERNEL_L0_INDEX] = PageEntry::from_raw(tables.l0.data[KERNEL_L0_INDEX]);
-        dst[RAM_MAPPING_L0I] = PageEntry::from_raw(tables.l0.data[RAM_MAPPING_L0I]);
+        dst[fixed::KERNEL_L0I] = fixed::KERNEL_PML4[fixed::KERNEL_L0I];
     }
 }
 
-pub fn auto_address<T>(pointer: *const T) -> usize {
+pub fn auto_lower_address<T>(pointer: *const T) -> usize {
     let address = pointer.addr();
     if address < KERNEL_VIRT_OFFSET {
         address
@@ -363,35 +82,12 @@ pub fn auto_address<T>(pointer: *const T) -> usize {
 /// # Safety
 ///
 /// Unsafe, must only be called by BSP during its early init, must already be in "higher-half"
-pub unsafe fn init_fixed_tables() {
-    let mut tables = KERNEL_TABLES.lock();
-
-    // TODO this could be built in compile-time too?
-    let early_mapping_l3_phys = auto_address(&raw const EARLY_MAPPING_L3);
-    let device_mapping_l2_phys = auto_address(&raw const DEVICE_MAPPING_L2);
-    let ram_mapping_l1_phys = auto_address(&raw const RAM_MAPPING_L1);
-
-    for i in 0..DEVICE_MAPPING_L3_COUNT {
-        let device_mapping_l3_phys =
-            PhysicalAddress::from_usize(auto_address(&raw const DEVICE_MAPPING_L3S[i]));
-        DEVICE_MAPPING_L2[i] = PageEntry::table(device_mapping_l3_phys, PageAttributes::WRITABLE);
+#[inline(never)]
+pub unsafe fn init_fixed_tables(have_1gib_pages: bool, bsp: bool) {
+    fixed::setup(have_1gib_pages);
+    if bsp {
+        fixed::load();
     }
-
-    assert_eq!(tables.kernel_l2.data[EARLY_MAPPING_L2I], 0);
-    tables.kernel_l2.data[EARLY_MAPPING_L2I] = (early_mapping_l3_phys as u64)
-        | (PageAttributes::WRITABLE | PageAttributes::PRESENT).bits();
-
-    assert_eq!(tables.kernel_l1.data[DEVICE_MAPPING_L1I], 0);
-    tables.kernel_l1.data[DEVICE_MAPPING_L1I] = (device_mapping_l2_phys as u64)
-        | (PageAttributes::WRITABLE | PageAttributes::PRESENT).bits();
-
-    assert_eq!(tables.l0.data[RAM_MAPPING_L0I], 0);
-    tables.l0.data[RAM_MAPPING_L0I] =
-        (ram_mapping_l1_phys as u64) | (PageAttributes::WRITABLE | PageAttributes::PRESENT).bits();
-
-    // TODO ENABLE EFER.NXE
-    let cr3 = auto_address(&raw const tables.l0);
-    CR3.set_address(cr3);
 }
 
 /// # Safety

kernel/build.rs

@@ -15,7 +15,7 @@ fn build_x86_64() {
     const DEFAULT_8086_AS: &str = "nasm";
     const AP_BOOTSTRAP_S: &str = "src/arch/x86_64/boot/ap_boot.S";
 
-    println!("cargo:rerun-if-changed={}", AP_BOOTSTRAP_S);
+    println!("cargo:rerun-if-changed={AP_BOOTSTRAP_S}");
 
     let out_dir = env::var("OUT_DIR").unwrap();
     let assembler = env::var("AS8086").unwrap_or(DEFAULT_8086_AS.to_owned());
@@ -35,7 +35,7 @@ fn build_x86_64() {
 
     if !output.status.success() {
         io::stderr().write_all(&output.stderr).ok();
-        panic!("{}: could not assemble {}", assembler, AP_BOOTSTRAP_S);
+        panic!("{assembler}: could not assemble {AP_BOOTSTRAP_S}");
     }
 }
 
@@ -93,6 +93,6 @@ fn main() {
         "x86_64" => build_x86_64(),
         "aarch64" => (),
         "riscv64" => (),
-        _ => panic!("Unknown target arch: {:?}", arch),
+        _ => panic!("Unknown target arch: {arch:?}"),
     }
 }

kernel/driver/acpi/src/mem.rs

@@ -35,6 +35,9 @@ unsafe impl Allocator for AcpiAllocator {
 }
 
 // TODO don't map memory as device if not necessary
+/// # Safety
+///
+/// Allows direct reads from physical memory, unsafe
 pub unsafe fn read_memory<T>(address: PhysicalAddress) -> T {
     let io =
         unsafe { DeviceMemoryMapping::map(address, size_of::<T>(), Default::default()).unwrap() };
@@ -49,6 +52,9 @@ pub unsafe fn read_memory<T>(address: PhysicalAddress) -> T {
     }
 }
 
+/// # Safety
+///
+/// Allows direct writes to physical memory, unsafe
 pub unsafe fn write_memory<T>(address: PhysicalAddress, value: T) {
     let io =
         unsafe { DeviceMemoryMapping::map(address, size_of::<T>(), Default::default()).unwrap() };

kernel/driver/block/ahci/src/port.rs

@@ -235,7 +235,7 @@ impl AhciPort {
         .await
     }
 
-    async fn submit<C: AtaCommand>(&self, command: &C) -> Result<SubmittedCommand, AhciError> {
+    async fn submit<C: AtaCommand>(&self, command: &C) -> Result<SubmittedCommand<'_>, AhciError> {
         if command.prd_count() > 2 {
             log::warn!("TODO: AHCI doesn't like 3+ PRD transfers");
             return Err(AhciError::RegionTooLarge);

kernel/driver/block/nvme/src/queue.rs

@@ -129,7 +129,7 @@ impl PrpList {
                 list: None,
             }),
             _ => {
-                let count = (size + 0xFFF) / 0x1000;
+                let count = size.div_ceil(0x1000);
                 let list =
                     DmaBuffer::new_slice_with(dma, |i| base.add((i + 1) * 0x1000), count - 1)
                         .map_err(NvmeError::MemoryError)?;

kernel/driver/block/scsi/src/lib.rs

@@ -71,10 +71,10 @@ impl ScsiEnclosure {
 
         // Probe LUNs
         for i in 0..lun_count {
-            if this.probe_lun(i as u8).await {
-                if let Ok(unit) = ScsiUnit::setup(this.clone(), i as u8).await {
-                    *this.units[i].write() = Some(unit);
-                }
+            if this.probe_lun(i as u8).await
+                && let Ok(unit) = ScsiUnit::setup(this.clone(), i as u8).await
+            {
+                *this.units[i].write() = Some(unit);
             }
         }
 
@@ -117,11 +117,7 @@ impl ScsiEnclosure {
             attempts -= 1;
         }
 
-        if attempts == 0 {
-            false
-        } else {
-            true
-        }
+        attempts != 0
     }
 
     async fn poll(self: &Arc<Self>) {

kernel/driver/block/scsi/src/transport.rs

@@ -44,7 +44,7 @@ impl ScsiTransportWrapper {
             return Err(Error::InvalidArgument);
         }
         let lba_bytes = (lba as u32).to_be_bytes();
-        let lba_count = (lba_count as u16).to_be_bytes();
+        let lba_count = lba_count.to_be_bytes();
         // Issue a READ (10) command
         let request_buffer = [
             0x28,

kernel/driver/bus/pci/src/capability.rs

@@ -1,613 +0,0 @@
-//! PCI capability structures and queries
-
-use alloc::{sync::Arc, vec, vec::Vec};
-use bitflags::bitflags;
-use device_api::interrupt::{
-    InterruptAffinity, InterruptHandler, MessageInterruptController, MsiInfo,
-};
-use libk_mm::{address::PhysicalAddress, device::DeviceMemoryIoMut};
-use tock_registers::{
-    interfaces::{Readable, Writeable},
-    registers::{ReadWrite, WriteOnly},
-};
-use yggdrasil_abi::error::Error;
-
-use crate::PciBaseAddress;
-
-use super::{PciCapability, PciCapabilityId, PciConfigurationSpace};
-
-bitflags! {
-    pub struct PcieLinkControl: u16 {
-        const ASPM_DISABLE = 0 << 0;
-        // Active state power management control
-        const ASPM_MASK = 0x3 << 0;
-        // Enable clock power management
-        const ECPM = 1 << 8;
-    }
-}
-
-#[cfg(any(target_arch = "x86", target_arch = "x86_64", rust_analyzer))]
-use core::mem::offset_of;
-#[cfg(any(target_arch = "x86", target_arch = "x86_64", rust_analyzer))]
-use kernel_arch_x86::intrinsics;
-
-pub trait VirtioCapabilityData<'s, S: PciConfigurationSpace + ?Sized + 's>: Sized {
-    fn from_space_offset(space: &'s S, offset: usize) -> Self;
-
-    fn space(&self) -> &'s S;
-    fn offset(&self) -> usize;
-
-    fn bar_index(&self) -> Option<usize> {
-        let value = self.space().read_u8(self.offset() + 4);
-        (value <= 0x5).then_some(value as _)
-    }
-
-    fn bar_offset(&self) -> usize {
-        let value = self.space().read_u32(self.offset() + 8);
-        value as _
-    }
-
-    fn length(&self) -> usize {
-        let value = self.space().read_u32(self.offset() + 12);
-        value as _
-    }
-}
-
-pub trait VirtioCapability {
-    const CFG_TYPE: u8;
-    const MIN_LEN: usize = 0;
-    type Output<'a, S: PciConfigurationSpace + ?Sized + 'a>: VirtioCapabilityData<'a, S>;
-}
-
-/// Power management capability entry
-pub struct PowerManagementCapability;
-/// MSI-X capability query
-pub struct MsiXCapability;
-/// MSI capability query
-pub struct MsiCapability;
-/// PCIe capability
-pub struct PciExpressCapability;
-
-// VirtIO-over-PCI capabilities
-/// VirtIO PCI configuration access
-pub struct VirtioDeviceConfigCapability;
-/// VirtIO common configuration
-pub struct VirtioCommonConfigCapability;
-/// VirtIO notify configuration
-pub struct VirtioNotifyConfigCapability;
-/// VirtIO interrupt status
-pub struct VirtioInterruptStatusCapability;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum DevicePowerState {
-    D0,
-    D1,
-    D2,
-    D3Cold,
-    D3Hot,
-}
-
-/// Represents an entry in MSI-X vector table
-#[repr(C)]
-pub struct MsiXEntry {
-    /// Address to which the value is written on interrupt
-    pub address: WriteOnly<u64>,
-    /// Value which is written to trigger an interrupt
-    pub data: WriteOnly<u32>,
-    /// Vector control word
-    pub control: ReadWrite<u32>,
-}
-
-enum MsiXVectorTableAccess<'a> {
-    Memory(DeviceMemoryIoMut<'a, [MsiXEntry]>),
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64", rust_analyzer))]
-    Io(u16),
-}
-
-pub struct MsiXVectorTable<'a> {
-    access: MsiXVectorTableAccess<'a>,
-    len: usize,
-}
-
-/// PCI Power Management capability data structure
-pub struct PowerManagementData<'s, S: PciConfigurationSpace + ?Sized + 's> {
-    space: &'s S,
-    offset: usize,
-}
-
-/// MSI-X capability data structure
-pub struct MsiXData<'s, S: PciConfigurationSpace + ?Sized + 's> {
-    space: &'s S,
-    offset: usize,
-}
-
-/// MSI capability data structure
-pub struct MsiData<'s, S: PciConfigurationSpace + ?Sized + 's> {
-    space: &'s S,
-    offset: usize,
-}
-
-/// PCI Express capability data structure
-pub struct PcieData<'s, S: PciConfigurationSpace + ?Sized + 's> {
-    space: &'s S,
-    offset: usize,
-}
-
-pub struct VirtioDeviceConfigData<'s, S: PciConfigurationSpace + ?Sized + 's> {
-    space: &'s S,
-    offset: usize,
-}
-
-pub struct VirtioCommonConfigData<'s, S: PciConfigurationSpace + ?Sized + 's> {
-    space: &'s S,
-    offset: usize,
-}
-
-pub struct VirtioNotifyConfigData<'s, S: PciConfigurationSpace + ?Sized + 's> {
-    space: &'s S,
-    offset: usize,
-}
-
-pub struct VirtioInterruptStatusData<'s, S: PciConfigurationSpace + ?Sized + 's> {
-    space: &'s S,
-    offset: usize,
-}
-
-impl<T: VirtioCapability> PciCapability for T {
-    const ID: PciCapabilityId = PciCapabilityId::VendorSpecific;
-    type CapabilityData<'a, S: PciConfigurationSpace + ?Sized + 'a> = T::Output<'a, S>;
-
-    fn check<S: PciConfigurationSpace + ?Sized>(space: &S, offset: usize, len: usize) -> bool {
-        let cfg_type = space.read_u8(offset + 3);
-        cfg_type == T::CFG_TYPE && len >= T::MIN_LEN
-    }
-
-    fn data<'s, S: PciConfigurationSpace + ?Sized + 's>(
-        space: &'s S,
-        offset: usize,
-        _len: usize,
-    ) -> Self::CapabilityData<'s, S> {
-        T::Output::from_space_offset(space, offset)
-    }
-}
-
-impl PciCapability for PowerManagementCapability {
-    const ID: PciCapabilityId = PciCapabilityId::PowerManagement;
-    type CapabilityData<'a, S: PciConfigurationSpace + ?Sized + 'a> = PowerManagementData<'a, S>;
-
-    fn data<'s, S: PciConfigurationSpace + ?Sized + 's>(
-        space: &'s S,
-        offset: usize,
-        _len: usize,
-    ) -> Self::CapabilityData<'s, S> {
-        PowerManagementData { space, offset }
-    }
-}
-
-impl PciCapability for MsiXCapability {
-    const ID: PciCapabilityId = PciCapabilityId::MsiX;
-    type CapabilityData<'a, S: PciConfigurationSpace + ?Sized + 'a> = MsiXData<'a, S>;
-
-    fn data<'s, S: PciConfigurationSpace + ?Sized + 's>(
-        space: &'s S,
-        offset: usize,
-        _len: usize,
-    ) -> Self::CapabilityData<'s, S> {
-        MsiXData { space, offset }
-    }
-}
-
-impl PciCapability for MsiCapability {
-    const ID: PciCapabilityId = PciCapabilityId::Msi;
-    type CapabilityData<'a, S: PciConfigurationSpace + ?Sized + 'a> = MsiData<'a, S>;
-
-    fn data<'s, S: PciConfigurationSpace + ?Sized + 's>(
-        space: &'s S,
-        offset: usize,
-        _len: usize,
-    ) -> Self::CapabilityData<'s, S> {
-        MsiData { space, offset }
-    }
-}
-
-impl PciCapability for PciExpressCapability {
-    const ID: PciCapabilityId = PciCapabilityId::PciExpress;
-    type CapabilityData<'a, S: PciConfigurationSpace + ?Sized + 'a> = PcieData<'a, S>;
-
-    fn data<'s, S: PciConfigurationSpace + ?Sized + 's>(
-        space: &'s S,
-        offset: usize,
-        _len: usize,
-    ) -> Self::CapabilityData<'s, S> {
-        PcieData { space, offset }
-    }
-}
-
-impl VirtioCapability for VirtioDeviceConfigCapability {
-    const CFG_TYPE: u8 = 0x04;
-    type Output<'a, S: PciConfigurationSpace + ?Sized + 'a> = VirtioDeviceConfigData<'a, S>;
-}
-
-impl<'s, S: PciConfigurationSpace + ?Sized + 's> VirtioCapabilityData<'s, S>
-    for VirtioDeviceConfigData<'s, S>
-{
-    fn from_space_offset(space: &'s S, offset: usize) -> Self {
-        Self { space, offset }
-    }
-
-    fn space(&self) -> &'s S {
-        self.space
-    }
-
-    fn offset(&self) -> usize {
-        self.offset
-    }
-}
-
-impl VirtioCapability for VirtioCommonConfigCapability {
-    const CFG_TYPE: u8 = 0x01;
-    type Output<'a, S: PciConfigurationSpace + ?Sized + 'a> = VirtioCommonConfigData<'a, S>;
-}
-
-impl<'s, S: PciConfigurationSpace + ?Sized + 's> VirtioCapabilityData<'s, S>
-    for VirtioCommonConfigData<'s, S>
-{
-    fn from_space_offset(space: &'s S, offset: usize) -> Self {
-        Self { space, offset }
-    }
-
-    fn space(&self) -> &'s S {
-        self.space
-    }
-
-    fn offset(&self) -> usize {
-        self.offset
-    }
-}
-
-impl VirtioCapability for VirtioNotifyConfigCapability {
-    const CFG_TYPE: u8 = 0x02;
-    const MIN_LEN: usize = 0x14;
-    type Output<'a, S: PciConfigurationSpace + ?Sized + 'a> = VirtioNotifyConfigData<'a, S>;
-}
-
-impl<'s, S: PciConfigurationSpace + ?Sized + 's> VirtioNotifyConfigData<'s, S> {
-    pub fn offset_multiplier(&self) -> usize {
-        self.space.read_u32(self.offset + 16) as usize
-    }
-}
-
-impl<'s, S: PciConfigurationSpace + ?Sized + 's> VirtioCapabilityData<'s, S>
-    for VirtioNotifyConfigData<'s, S>
-{
-    fn from_space_offset(space: &'s S, offset: usize) -> Self {
-        Self { space, offset }
-    }
-
-    fn space(&self) -> &'s S {
-        self.space
-    }
-
-    fn offset(&self) -> usize {
-        self.offset
-    }
-}
-
-impl VirtioCapability for VirtioInterruptStatusCapability {
-    const CFG_TYPE: u8 = 0x03;
-    const MIN_LEN: usize = 1;
-    type Output<'a, S: PciConfigurationSpace + ?Sized + 'a> = VirtioInterruptStatusData<'a, S>;
-}
-
-impl<'s, S: PciConfigurationSpace + ?Sized + 's> VirtioInterruptStatusData<'s, S> {
-    pub fn read_status(&self) -> (bool, bool) {
-        todo!()
-    }
-}
-
-impl<'s, S: PciConfigurationSpace + ?Sized + 's> VirtioCapabilityData<'s, S>
-    for VirtioInterruptStatusData<'s, S>
-{
-    fn from_space_offset(space: &'s S, offset: usize) -> Self {
-        Self { space, offset }
-    }
-
-    fn space(&self) -> &'s S {
-        self.space
-    }
-
-    fn offset(&self) -> usize {
-        self.offset
-    }
-}
-
-impl<'s, S: PciConfigurationSpace + ?Sized + 's> PowerManagementData<'s, S> {
-    pub fn set_device_power_state(&self, state: DevicePowerState) {
-        let pmcsr = self.space.read_u16(self.offset + 4) & !0x3;
-        let current = self.get_device_power_state();
-
-        if state == current {
-            return;
-        }
-
-        log::info!("Set device power state: {state:?}");
-
-        match state {
-            DevicePowerState::D0 => {
-                // power = 0b00 | PME_EN
-                self.space.write_u16(self.offset + 4, pmcsr);
-            }
-            _ => {
-                log::warn!("TODO: {state:?} power state");
-            }
-        }
-    }
-
-    pub fn set_pme_en(&self, state: bool) {
-        let pmcsr = self.space.read_u16(self.offset + 4);
-        let new = if state {
-            pmcsr | (1 << 8)
-        } else {
-            pmcsr & !(1 << 8)
-        };
-        if pmcsr == new {
-            return;
-        }
-
-        log::info!("Set PMCSR.PME_En = {state}");
-
-        self.space.write_u16(self.offset + 4, new);
-    }
-
-    pub fn get_device_power_state(&self) -> DevicePowerState {
-        let pmcsr = self.space.read_u16(self.offset + 4);
-        match pmcsr & 0x3 {
-            0b00 => DevicePowerState::D0,
-            0b01 => DevicePowerState::D1,
-            0b10 => DevicePowerState::D2,
-            0b11 => DevicePowerState::D3Hot,
-            _ => unreachable!(),
-        }
-    }
-}
-
-impl<'s, S: PciConfigurationSpace + ?Sized + 's> MsiXData<'s, S> {
-    // TODO use pending bits as well
-    /// Maps and returns the vector table associated with the device's MSI-X capability
-    pub fn vector_table<'a>(&self) -> Result<MsiXVectorTable<'a>, Error> {
-        let w0 = self.space.read_u16(self.offset + 2);
-        let dw1 = self.space.read_u32(self.offset + 4);
-
-        let table_size = (w0 as usize & 0x3FF) + 1;
-        let bir = dw1 as usize & 0x3;
-        let table_offset = dw1 as usize & !0x3;
-
-        let Some(base) = self.space.bar(bir) else {
-            return Err(Error::DoesNotExist);
-        };
-
-        match base {
-            PciBaseAddress::Memory32(mem32) => unsafe {
-                log::info!("MSI-X table address: {:#x}", mem32 + table_offset as u32);
-                MsiXVectorTable::memory_from_raw_parts(
-                    PhysicalAddress::from_u32(mem32).add(table_offset),
-                    table_size,
-                )
-            },
-            PciBaseAddress::Memory64(mem64) => unsafe {
-                log::info!("MSI-X table address: {:#x}", mem64 + table_offset as u64);
-                MsiXVectorTable::memory_from_raw_parts(
-                    PhysicalAddress::from_u64(mem64).add(table_offset),
-                    table_size,
-                )
-            },
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64", rust_analyzer))]
-            PciBaseAddress::Io(io) => unsafe {
-                log::info!("MSI-X table I/O: {:#x}", io + table_offset as u16);
-                MsiXVectorTable::io_from_raw_parts(io + table_offset as u16, table_size)
-            },
-            #[cfg(any(not(any(target_arch = "x86", target_arch = "x86_64")), rust_analyzer))]
-            PciBaseAddress::Io(_) => Err(Error::DoesNotExist),
-        }
-    }
-
-    /// Changes the global enable status for the device's MSI-X capability. If set, regular IRQs
-    /// are not generated.
-    pub fn set_enabled(&mut self, enabled: bool) {
-        let mut w0 = self.space.read_u32(self.offset);
-        if enabled {
-            w0 |= 1 << 31;
-        } else {
-            w0 &= !(1 << 31);
-        }
-        self.space.write_u32(self.offset, w0);
-    }
-
-    pub fn set_function_mask(&mut self, masked: bool) {
-        let mut w0 = self.space.read_u32(self.offset);
-        if masked {
-            w0 |= 1 << 30;
-        } else {
-            w0 &= !(1 << 30);
-        }
-        self.space.write_u32(self.offset, w0);
-    }
-}
-
-impl MsiXVectorTableAccess<'_> {
-    fn set_vector_masked(&mut self, vector: usize, masked: bool) {
-        let old = self.read_control(vector);
-        let new = if masked { old | 1 } else { old & !1 };
-        if old != new {
-            self.write_control(vector, new);
-        }
-    }
-
-    fn read_control(&mut self, vector: usize) -> u32 {
-        match self {
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64", rust_analyzer))]
-            &mut Self::Io(base) => unsafe {
-                let a = base
-                    + (vector * size_of::<MsiXEntry>() + offset_of!(MsiXEntry, control)) as u16;
-                intrinsics::inl(a)
-            },
-
-            Self::Memory(vectors) => vectors[vector].control.get(),
-        }
-    }
-
-    fn write_address(&mut self, vector: usize, value: u64) {
-        match self {
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64", rust_analyzer))]
-            &mut Self::Io(base) => unsafe {
-                let a = base + (vector * size_of::<MsiXEntry>()) as u16;
-                intrinsics::outl(a, value as u32);
-                intrinsics::outl(a + 4, (value >> 32) as u32);
-            },
-
-            Self::Memory(vectors) => vectors[vector].address.set(value),
-        }
-    }
-
-    fn write_data(&mut self, vector: usize, value: u32) {
-        match self {
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64", rust_analyzer))]
-            &mut Self::Io(base) => unsafe {
-                let a =
-                    base + (vector * size_of::<MsiXEntry>() + offset_of!(MsiXEntry, data)) as u16;
-                intrinsics::outl(a, value)
-            },
-
-            Self::Memory(vectors) => vectors[vector].data.set(value),
-        }
-    }
-
-    fn write_control(&mut self, vector: usize, value: u32) {
-        match self {
-            #[cfg(any(target_arch = "x86", target_arch = "x86_64", rust_analyzer))]
-            &mut Self::Io(base) => unsafe {
-                let a = base
-                    + (vector * size_of::<MsiXEntry>() + offset_of!(MsiXEntry, control)) as u16;
-                intrinsics::outl(a, value)
-            },
-
-            Self::Memory(vectors) => vectors[vector].control.set(value),
-        }
-    }
-}
-
-impl MsiXVectorTable<'_> {
-    unsafe fn memory_from_raw_parts(base: PhysicalAddress, len: usize) -> Result<Self, Error> {
-        let vectors = DeviceMemoryIoMut::map_slice(base, len, Default::default())?;
-        Ok(Self {
-            access: MsiXVectorTableAccess::Memory(vectors),
-            len,
-        })
-    }
-
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64", rust_analyzer))]
-    unsafe fn io_from_raw_parts(base: u16, len: usize) -> Result<Self, Error> {
-        Ok(Self {
-            access: MsiXVectorTableAccess::Io(base),
-            len,
-        })
-    }
-
-    pub fn mask_all(&mut self) {
-        for i in 0..self.len {
-            self.access.set_vector_masked(i, true);
-        }
-    }
-
-    pub fn register_range(
-        &mut self,
-        start: usize,
-        end: usize,
-        ic: &Arc<dyn MessageInterruptController>,
-        affinity: InterruptAffinity,
-        handler: Arc<dyn InterruptHandler>,
-    ) -> Result<Vec<MsiInfo>, Error> {
-        assert!(end > start);
-        let mut range = vec![
-            MsiInfo {
-                affinity,
-                ..Default::default()
-            };
-            end - start
-        ];
-        ic.clone().register_msi_range(&mut range, handler)?;
-
-        for (i, info) in range.iter().enumerate() {
-            let index = i + start;
-            self.access.write_address(index, info.address as _);
-            self.access.write_data(index, info.value);
-            self.access.set_vector_masked(index, false);
-        }
-
-        Ok(range)
-    }
-}
-
-impl<'s, S: PciConfigurationSpace + ?Sized + 's> MsiData<'s, S> {
-    pub fn set_enabled(&mut self, enabled: bool) {
-        let mut w0 = self.space.read_u16(self.offset + 2);
-        if enabled {
-            w0 |= 1 << 0;
-        } else {
-            w0 &= !(1 << 0);
-        }
-        self.space.write_u16(self.offset + 2, w0);
-    }
-
-    pub fn register(
-        &mut self,
-        ic: &Arc<dyn MessageInterruptController>,
-        affinity: InterruptAffinity,
-        handler: Arc<dyn InterruptHandler>,
-    ) -> Result<MsiInfo, Error> {
-        let info = ic.clone().register_msi(affinity, handler)?;
-
-        let mut w0 = self.space.read_u16(self.offset + 2);
-        // Enable the vector first
-        w0 |= 1 << 0;
-
-        // Reset to one vector
-        w0 &= !(0x7 << 4);
-
-        self.space.write_u16(self.offset + 2, w0);
-
-        if info.value > u16::MAX as u32 {
-            log::warn!("Could not setup a MSI: value={:#x} > u16", info.value);
-            return Err(Error::InvalidOperation);
-        }
-
-        if info.address > u32::MAX as usize {
-            if w0 & (1 << 7) == 0 {
-                log::warn!(
-                    "Could not setup a MSI: address={:#x} and MSI is not 64 bit capable",
-                    info.address
-                );
-                return Err(Error::InvalidOperation);
-            }
-
-            todo!("FIXME: PCI 64-bit addresses");
-            // self.space
-            //     .write_u32(self.offset + 8, (info.address >> 32) as u32);
-        }
-        self.space.write_u32(self.offset + 4, info.address as u32);
-
-        self.space.write_u16(self.offset + 12, info.value as u16);
-
-        Ok(info)
-    }
-}
-
-impl<'s, S: PciConfigurationSpace + ?Sized + 's> PcieData<'s, S> {
-    pub fn link_control(&self) -> PcieLinkControl {
-        PcieLinkControl::from_bits_retain(self.space.read_u16(self.offset + 0x10))
-    }
-
-    pub fn set_link_control(&mut self, value: PcieLinkControl) {
-        self.space.write_u16(self.offset + 0x10, value.bits());
-    }
-}

kernel/driver/bus/pci/src/device.rs

@@ -1,325 +0,0 @@
-use core::ops::Range;
-
-use alloc::{sync::Arc, vec::Vec};
-use device_api::{
-    device::Device,
-    interrupt::{
-        ExternalInterruptController, InterruptAffinity, InterruptHandler, Irq, IrqOptions,
-        MessageInterruptController, MsiInfo,
-    },
-};
-use libk::device::external_interrupt_controller;
-use libk_util::{sync::spin_rwlock::IrqSafeRwLock, OneTimeInit};
-use yggdrasil_abi::error::Error;
-
-use crate::{
-    capability::{MsiCapability, MsiXCapability, MsiXVectorTable},
-    driver::PciDriver,
-    PciAddress, PciCommandRegister, PciConfigSpace, PciConfigurationSpace, PciSegmentInfo,
-};
-
-/// Describes a PCI device
-#[derive(Clone)]
-pub struct PciDeviceInfo {
-    /// Address of the device
-    pub address: PciAddress,
-    /// Class field of the configuration space
-    pub class: u8,
-    /// Subclass field of the configuration space
-    pub subclass: u8,
-    /// Prog IF field of the configuration space
-    pub prog_if: u8,
-    /// Vendor ID field of the configuration space
-    pub vendor_id: u16,
-    /// Device ID field of the configuration space
-    pub device_id: u16,
-    /// Configuration space access method
-    pub config_space: PciConfigSpace,
-    /// Describes the PCI segment this device is a part of
-    pub segment: Arc<PciSegmentInfo>,
-
-    pub(crate) interrupt_config: Arc<OneTimeInit<IrqSafeRwLock<InterruptConfig>>>,
-}
-
-pub struct InterruptConfig {
-    #[allow(unused)]
-    preferred_mode: PreferredInterruptMode,
-    configured_mode: ConfiguredInterruptMode,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
-pub enum PciInterruptPin {
-    A,
-    B,
-    C,
-    D,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, Debug)]
-pub enum PreferredInterruptMode {
-    Msi(bool),
-    Legacy,
-}
-
-enum ConfiguredInterruptMode {
-    MsiX(
-        Arc<dyn MessageInterruptController>,
-        MsiXVectorTable<'static>,
-    ),
-    Msi(Arc<dyn MessageInterruptController>),
-    LegacyPin(Arc<dyn ExternalInterruptController>, PciInterruptPin),
-    #[cfg_attr(not(target_arch = "x86"), allow(unused))]
-    LegacyLine(Arc<dyn ExternalInterruptController>, u8),
-    None,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
-pub struct PciInterrupt {
-    pub address: PciAddress,
-    pub pin: PciInterruptPin,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct PciInterruptRoute {
-    pub number: u32,
-    pub options: IrqOptions,
-}
-
-#[derive(Clone)]
-pub struct PciMsiRoute {
-    // TODO `msi-base`
-    pub controller: Arc<dyn MessageInterruptController>,
-}
-
-#[derive(Clone, Copy, PartialEq, Debug)]
-pub enum PciDeviceState {
-    None,
-    Probed,
-    Initialized,
-    Failed,
-}
-
-/// Used to store PCI bus devices which were enumerated by the kernel
-pub struct PciBusDevice {
-    pub(crate) info: PciDeviceInfo,
-    pub(crate) device: Option<Arc<dyn Device>>,
-    pub(crate) driver: Option<&'static dyn PciDriver>,
-    pub(crate) state: PciDeviceState,
-}
-
-impl PciDeviceInfo {
-    pub fn set_command(
-        &self,
-        enable_irq: bool,
-        enable_mem: bool,
-        enable_io: bool,
-        enable_bus_master: bool,
-    ) {
-        let command = PciCommandRegister::from_bits_retain(self.config_space.command());
-        let mut new = command;
-        if enable_irq {
-            new &= !PciCommandRegister::DISABLE_INTERRUPTS;
-        } else {
-            new |= PciCommandRegister::DISABLE_INTERRUPTS;
-        }
-        if enable_mem {
-            new |= PciCommandRegister::ENABLE_MEMORY;
-        } else {
-            new &= !PciCommandRegister::ENABLE_MEMORY;
-        }
-        if enable_io {
-            new |= PciCommandRegister::ENABLE_IO;
-        } else {
-            new &= !PciCommandRegister::ENABLE_IO;
-        }
-        if enable_bus_master {
-            new |= PciCommandRegister::BUS_MASTER;
-        } else {
-            new &= !PciCommandRegister::BUS_MASTER;
-        }
-        if new != command {
-            self.config_space.set_command(new.bits());
-        }
-    }
-
-    pub fn init_interrupts(&self, preferred_mode: PreferredInterruptMode) -> Result<(), Error> {
-        self.interrupt_config
-            .try_init_with(|| {
-                let configured_mode = if let PreferredInterruptMode::Msi(want_msix) = preferred_mode
-                    && let Some(msi_route) = self.segment.msi_translation_map.map_msi(self.address)
-                {
-                    // Try to setup MSI (or MSI-x, if requested)
-                    let mut result = None;
-                    if want_msix
-                        && let Some(mut msix) = self.config_space.capability::<MsiXCapability>()
-                    {
-                        if let Ok(mut vt) = msix.vector_table() {
-                            if let Some(mut msi) = self.config_space.capability::<MsiCapability>() {
-                                msi.set_enabled(false);
-                            }
-
-                            vt.mask_all();
-
-                            msix.set_function_mask(false);
-                            msix.set_enabled(true);
-
-                            result = Some(ConfiguredInterruptMode::MsiX(
-                                msi_route.controller.clone(),
-                                vt,
-                            ));
-                        }
-                    }
-
-                    // Fall back to MSI if MSI-x is not available or not requested
-                    if result.is_none() && self.config_space.capability::<MsiCapability>().is_some()
-                    {
-                        result = Some(ConfiguredInterruptMode::Msi(msi_route.controller));
-                    }
-
-                    // Fall back to legacy IRQ if nothing else works
-                    if let Some(result) = result {
-                        result
-                    } else {
-                        self.legacy_interrupt_mode()
-                    }
-                } else {
-                    // MSI not requested or segment does not have MSI functionality
-                    self.legacy_interrupt_mode()
-                };
-
-                IrqSafeRwLock::new(InterruptConfig {
-                    preferred_mode,
-                    configured_mode,
-                })
-            })
-            .expect("Possible bug: double-initialization of PCI(e) interrupt config");
-
-        Ok(())
-    }
-
-    fn legacy_interrupt_mode(&self) -> ConfiguredInterruptMode {
-        let Ok(intc) = external_interrupt_controller() else {
-            return ConfiguredInterruptMode::None;
-        };
-
-        // TODO this should be retrieved from interrupt map
-        #[cfg(any(target_arch = "x86", rust_analyzer))]
-        {
-            if let Some(irq) = self.config_space.interrupt_line() {
-                return ConfiguredInterruptMode::LegacyLine(intc.clone(), irq);
-            }
-        }
-
-        match self.config_space.interrupt_pin() {
-            Some(pin) => ConfiguredInterruptMode::LegacyPin(intc.clone(), pin),
-            None => ConfiguredInterruptMode::None,
-        }
-    }
-
-    pub fn map_interrupt(
-        &self,
-        affinity: InterruptAffinity,
-        handler: Arc<dyn InterruptHandler>,
-    ) -> Result<Option<MsiInfo>, Error> {
-        let mut irq = self.interrupt_config.get().write();
-
-        match &mut irq.configured_mode {
-            ConfiguredInterruptMode::Msi(controller) => {
-                let mut msi = self
-                    .config_space
-                    .capability::<MsiCapability>()
-                    .ok_or(Error::InvalidOperation)?;
-
-                let info = msi.register(controller, affinity, handler)?;
-
-                Ok(Some(info))
-            }
-            ConfiguredInterruptMode::MsiX(controller, msix) => {
-                let info = msix.register_range(0, 1, controller, affinity, handler)?;
-                Ok(Some(info[0]))
-            }
-            ConfiguredInterruptMode::LegacyPin(intc, pin) => {
-                self.try_map_legacy(intc.as_ref(), *pin, handler)?;
-                Ok(None)
-            }
-            ConfiguredInterruptMode::LegacyLine(intc, irq) => {
-                self.try_map_legacy_line(intc.as_ref(), *irq, handler)?;
-                Ok(None)
-            }
-            ConfiguredInterruptMode::None => Err(Error::InvalidOperation),
-        }
-    }
-
-    pub fn map_interrupt_multiple(
-        &self,
-        vector_range: Range<usize>,
-        affinity: InterruptAffinity,
-        handler: Arc<dyn InterruptHandler>,
-    ) -> Result<Vec<MsiInfo>, Error> {
-        let mut irq = self.interrupt_config.get().write();
-        let start = vector_range.start;
-        let end = vector_range.end;
-
-        match &mut irq.configured_mode {
-            ConfiguredInterruptMode::MsiX(controller, msix) => {
-                msix.register_range(start, end, controller, affinity, handler)
-            }
-            _ => Err(Error::InvalidOperation),
-        }
-    }
-
-    fn try_map_legacy(
-        &self,
-        intc: &dyn ExternalInterruptController,
-        pin: PciInterruptPin,
-        handler: Arc<dyn InterruptHandler>,
-    ) -> Result<(), Error> {
-        let src = PciInterrupt {
-            address: self.address,
-            pin,
-        };
-        let route = self
-            .segment
-            .irq_translation_map
-            .map_interrupt(&src)
-            .inspect_err(|e| log::warn!("Could not map PCI IRQ {pin:?}: {e:?}"))?;
-
-        log::debug!(
-            "PCI {} pin {:?} -> system IRQ #{}",
-            src.address,
-            src.pin,
-            route.number
-        );
-
-        let irq = Irq::External(route.number);
-        intc.register_irq(irq, route.options, handler)?;
-        intc.enable_irq(irq)
-    }
-
-    fn try_map_legacy_line(
-        &self,
-        intc: &dyn ExternalInterruptController,
-        line: u8,
-        handler: Arc<dyn InterruptHandler>,
-    ) -> Result<(), Error> {
-        log::debug!("PCI {} -> IRQ#{}", self.address, line);
-
-        let irq = Irq::External(line as u32);
-        intc.register_irq(irq, Default::default(), handler)?;
-        intc.enable_irq(irq)
-    }
-}
-
-impl TryFrom<u32> for PciInterruptPin {
-    type Error = ();
-
-    fn try_from(value: u32) -> Result<Self, Self::Error> {
-        match value {
-            1 => Ok(Self::A),
-            2 => Ok(Self::B),
-            3 => Ok(Self::C),
-            4 => Ok(Self::D),
-            _ => Err(()),
-        }
-    }
-}

kernel/driver/bus/pci/src/driver.rs

@@ -1,63 +0,0 @@
-use alloc::{sync::Arc, vec::Vec};
-use device_api::{device::Device, dma::DmaAllocator};
-use libk::error::Error;
-use libk_util::sync::spin_rwlock::IrqSafeRwLock;
-
-use crate::device::PciDeviceInfo;
-
-pub enum PciMatch {
-    Generic(fn(&PciDeviceInfo) -> bool),
-    Vendor(u16, u16),
-    Class(u8, Option<u8>, Option<u8>),
-}
-
-pub struct PciDriverMatch {
-    pub driver: &'static dyn PciDriver,
-    pub check: PciMatch,
-}
-
-pub trait PciDriver: Sync {
-    fn probe(
-        &self,
-        info: &PciDeviceInfo,
-        dma: &Arc<dyn DmaAllocator>,
-    ) -> Result<Arc<dyn Device>, Error>;
-    fn driver_name(&self) -> &str;
-}
-
-impl PciMatch {
-    pub fn check_device(&self, info: &PciDeviceInfo) -> bool {
-        match self {
-            Self::Generic(f) => f(info),
-            &Self::Vendor(vendor_, device_) => {
-                info.vendor_id == vendor_ && info.device_id == device_
-            }
-            &Self::Class(class_, Some(subclass_), Some(prog_if_)) => {
-                class_ == info.class && subclass_ == info.subclass && prog_if_ == info.prog_if
-            }
-            &Self::Class(class_, Some(subclass_), _) => {
-                class_ == info.class && subclass_ == info.subclass
-            }
-            &Self::Class(class_, _, _) => class_ == info.class,
-        }
-    }
-}
-
-pub fn register_match(pmatch: PciMatch, driver: &'static dyn PciDriver) {
-    DRIVERS.write().push(PciDriverMatch {
-        check: pmatch,
-        driver,
-    });
-}
-
-pub fn lookup_driver(info: &PciDeviceInfo) -> Option<&'static dyn PciDriver> {
-    DRIVERS.read().iter().find_map(|pmatch| {
-        if pmatch.check.check_device(info) {
-            Some(pmatch.driver)
-        } else {
-            None
-        }
-    })
-}
-
-static DRIVERS: IrqSafeRwLock<Vec<PciDriverMatch>> = IrqSafeRwLock::new(Vec::new());

kernel/driver/bus/pci/src/interrupt.rs

@@ -1,141 +0,0 @@
-use core::fmt;
-
-use alloc::{collections::btree_map::BTreeMap, sync::Arc, vec::Vec};
-use device_api::interrupt::MessageInterruptController;
-use libk::error::Error;
-
-use crate::{
-    device::{PciInterrupt, PciInterruptRoute, PciMsiRoute},
-    PciAddress,
-};
-
-#[derive(Debug)]
-pub enum PciInterruptMap {
-    Fixed(BTreeMap<PciInterrupt, PciInterruptRoute>),
-    #[cfg(any(target_arch = "x86_64", rust_analyzer))]
-    Acpi(alloc::string::String),
-    Legacy,
-}
-
-// TODO device-tree also provides a "msi-base" value, which is ignored and assumed to be zero for
-//      now
-pub struct PciFixedMsiMapping {
-    pub start_address: PciAddress,
-    pub end_address: PciAddress,
-    pub controller: Arc<dyn MessageInterruptController>,
-}
-
-pub struct PciFixedMsiMap {
-    pub entries: Vec<PciFixedMsiMapping>,
-}
-
-pub enum PciMsiMap {
-    Fixed(PciFixedMsiMap),
-    Identity(Arc<dyn MessageInterruptController>),
-    Legacy,
-}
-
-impl PciInterruptMap {
-    pub fn map_interrupt(&self, interrupt: &PciInterrupt) -> Result<PciInterruptRoute, Error> {
-        match self {
-            Self::Fixed(map) => map.get(interrupt).cloned().ok_or(Error::DoesNotExist),
-            #[cfg(any(target_arch = "x86_64", rust_analyzer))]
-            Self::Acpi(aml_object_name) => {
-                use device_api::interrupt::{IrqLevel, IrqOptions, IrqTrigger};
-
-                use crate::device::PciInterruptPin;
-
-                let aml_pin = match interrupt.pin {
-                    PciInterruptPin::A => ygg_driver_acpi::PciPin::IntA,
-                    PciInterruptPin::B => ygg_driver_acpi::PciPin::IntB,
-                    PciInterruptPin::C => ygg_driver_acpi::PciPin::IntC,
-                    PciInterruptPin::D => ygg_driver_acpi::PciPin::IntD,
-                };
-                let aml_route = ygg_driver_acpi::get_pci_route(
-                    aml_object_name.as_str(),
-                    interrupt.address.device as u16,
-                    interrupt.address.function as u16,
-                    aml_pin,
-                )
-                .or_else(|| {
-                    ygg_driver_acpi::get_pci_route(
-                        aml_object_name.as_str(),
-                        interrupt.address.device as u16,
-                        0xFFFF,
-                        aml_pin,
-                    )
-                })
-                .ok_or(Error::DoesNotExist)?;
-
-                let trigger = match aml_route.trigger {
-                    ygg_driver_acpi::InterruptTrigger::Edge => IrqTrigger::Edge,
-                    ygg_driver_acpi::InterruptTrigger::Level => IrqTrigger::Level,
-                };
-                let level = match aml_route.polarity {
-                    ygg_driver_acpi::InterruptPolarity::ActiveLow => IrqLevel::ActiveLow,
-                    ygg_driver_acpi::InterruptPolarity::ActiveHigh => IrqLevel::ActiveHigh,
-                };
-
-                Ok(PciInterruptRoute {
-                    options: IrqOptions { trigger, level },
-                    number: aml_route.irq,
-                })
-            }
-            Self::Legacy => todo!(),
-        }
-    }
-}
-
-impl PciMsiMap {
-    pub fn map_msi(&self, address: PciAddress) -> Option<PciMsiRoute> {
-        match self {
-            Self::Fixed(map) => map.map_msi(address),
-            Self::Identity(controller) => Some(PciMsiRoute {
-                controller: controller.clone(),
-            }),
-            Self::Legacy => None,
-        }
-    }
-}
-
-impl fmt::Debug for PciMsiMap {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Legacy => f.debug_struct("Legacy").finish(),
-            Self::Fixed(map) => f
-                .debug_struct("Fixed")
-                .field("entries", &map.entries)
-                .finish(),
-            Self::Identity(_) => f.debug_struct("Identity").finish(),
-        }
-    }
-}
-
-impl PciFixedMsiMap {
-    pub fn map_msi(&self, address: PciAddress) -> Option<PciMsiRoute> {
-        for entry in self.entries.iter() {
-            if entry.contains(address) {
-                let route = PciMsiRoute {
-                    controller: entry.controller.clone(),
-                };
-                return Some(route);
-            }
-        }
-        None
-    }
-}
-
-impl PciFixedMsiMapping {
-    pub fn contains(&self, address: PciAddress) -> bool {
-        self.start_address <= address && self.end_address > address
-    }
-}
-
-impl fmt::Debug for PciFixedMsiMapping {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("PciFixedMsiMapping")
-            .field("start_address", &self.start_address)
-            .field("end_address", &self.end_address)
-            .finish()
-    }
-}

kernel/driver/bus/pci/src/lib.rs

@@ -1,684 +1,20 @@
-//! PCI/PCIe bus interfaces
 #![no_std]
-#![feature(let_chains, decl_macro)]
-#![allow(clippy::missing_transmute_annotations)]
 
 extern crate alloc;
 
-use core::fmt;
+use alloc::sync::Arc;
+use device_api::device::Device;
+use libk_util::OneTimeInit;
 
-#[cfg(any(target_arch = "x86_64", rust_analyzer))]
-use acpi::mcfg::McfgEntry;
-use alloc::{format, sync::Arc, vec::Vec};
+pub struct PciEndpointDevice {}
 
-use bitflags::bitflags;
-use device::{PciBusDevice, PciDeviceInfo, PciDeviceState};
-use device_api::{device::DeviceInitContext, dma::DmaAllocator};
-use interrupt::{PciInterruptMap, PciMsiMap};
-use libk::{
-    dma::DummyDmaAllocator,
-    fs::sysfs::{self, object::KObject},
-};
-use libk_mm::address::PhysicalAddress;
-use libk_util::{sync::IrqSafeSpinlock, OneTimeInit};
-use space::legacy;
-use yggdrasil_abi::{error::Error, primitive_enum};
-
-#[cfg(target_arch = "x86_64")]
-use device_api::interrupt::MessageInterruptController;
-
-pub mod capability;
-pub mod device;
-pub mod driver;
-pub mod interrupt;
-pub mod macros;
-mod nodes;
-mod space;
-
-pub use space::{
-    ecam::PciEcam,
-    legacy::{LegacyPciAccess, PciLegacyConfigurationSpace},
-    PciConfigSpace, PciConfigurationSpace,
-};
-
-bitflags! {
-    /// Command register of the PCI configuration space
-    #[derive(PartialEq, Clone, Copy)]
-    pub struct PciCommandRegister: u16 {
-        /// If set, I/O access to the device is enabled
-        const ENABLE_IO = 1 << 0;
-        /// If set, memory-mapped access to the device is enabled
-        const ENABLE_MEMORY = 1 << 1;
-        /// If set, the device can generate PCI bus accesses on its own
-        const BUS_MASTER = 1 << 2;
-        /// If set, interrupts are masked from being raised
-        const DISABLE_INTERRUPTS = 1 << 10;
-    }
+pub enum PciEndpointImpl {
+    Device(OneTimeInit<PciEndpointDevice>),
+    Bridge(PciBridge),
 }
 
-bitflags! {
-    /// Status register of the PCI configuration space
-    pub struct PciStatusRegister: u16 {
-        /// Read-only. If set, the configuration space has a pointer to the capabilities list.
-        const CAPABILITIES_LIST = 1 << 4;
-    }
+pub struct PciBridge {}
+
+pub struct PciEndpoint {
+    pub imp: PciEndpointImpl,
 }
-
-/// Represents the address of a single object on a bus (or the bus itself)
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
-pub struct PciAddress {
-    /// PCIe segment group, ignored (?) with PCI
-    pub segment: u8,
-    /// Bus number
-    pub bus: u8,
-    /// Slot/device number
-    pub device: u8,
-    /// Function number
-    pub function: u8,
-}
-
-/// Address provided by PCI configuration space Base Address Register
-#[derive(Debug, Clone, Copy)]
-pub enum PciBaseAddress {
-    /// 32-bit memory address
-    Memory32(u32),
-    /// 64-bit memory address
-    Memory64(u64),
-    /// I/O space address
-    Io(u16),
-}
-
-primitive_enum! {
-    pub enum PciCapabilityId: u8 {
-        PowerManagement = 0x01,
-        Msi = 0x05,
-        VendorSpecific = 0x09,
-        PciExpress = 0x10,
-        MsiX = 0x11,
-    }
-}
-
-/// Interface used for querying PCI capabilities
-#[allow(unused)]
-pub trait PciCapability {
-    /// Capability ID
-    const ID: PciCapabilityId;
-    /// Wrapper for accessing the capability data structure
-    type CapabilityData<'a, S: PciConfigurationSpace + ?Sized + 'a>;
-
-    fn check<S: PciConfigurationSpace + ?Sized>(space: &S, offset: usize, len: usize) -> bool {
-        true
-    }
-
-    /// Constructs an access wrapper for this capability with given offset
-    fn data<'s, S: PciConfigurationSpace + ?Sized + 's>(
-        space: &'s S,
-        offset: usize,
-        len: usize,
-    ) -> Self::CapabilityData<'s, S>;
-}
-
-struct BusAddressAllocator {
-    pci_base_64: u64,
-    pci_base_32: u32,
-    // pci_base_io: u16,
-    host_base_64: PhysicalAddress,
-    host_base_32: PhysicalAddress,
-    // host_base_io: PhysicalAddress,
-    size_64: usize,
-    size_32: usize,
-    // size_io: usize,
-    offset_64: u64,
-    offset_32: u32,
-}
-
-#[derive(Debug)]
-pub struct PciSegmentInfo {
-    pub segment_number: u8,
-    pub bus_number_start: u8,
-    pub bus_number_end: u8,
-    pub ecam_phys_base: Option<PhysicalAddress>,
-
-    pub irq_translation_map: PciInterruptMap,
-    pub msi_translation_map: PciMsiMap,
-}
-
-/// Represents a single PCIe bus segment
-pub struct PciBusSegment {
-    allocator: Option<BusAddressAllocator>,
-    info: Arc<PciSegmentInfo>,
-    devices: Vec<Arc<KObject<IrqSafeSpinlock<PciBusDevice>>>>,
-}
-
-#[derive(Debug)]
-pub enum PciRangeType {
-    Configuration,
-    Io,
-    Memory32,
-    Memory64,
-}
-
-pub struct PciAddressRange {
-    pub ty: PciRangeType,
-    pub bus_number: u8,
-    pub pci_base: u64,
-    pub host_base: PhysicalAddress,
-    pub size: usize,
-}
-
-/// Manager struct to store and control all PCI devices in the system
-pub struct PciBusManager {
-    segments: Vec<PciBusSegment>,
-}
-
-#[cfg_attr(
-    any(target_arch = "x86_64", target_arch = "x86", target_arch = "riscv64"),
-    allow(dead_code)
-)]
-impl BusAddressAllocator {
-    pub fn from_ranges(ranges: &[PciAddressRange]) -> Self {
-        let mut range_32 = None;
-        let mut range_64 = None;
-        // let mut range_io = None;
-
-        for range in ranges {
-            let range_val = (range.pci_base, range.host_base, range.size);
-            match range.ty {
-                // PciRangeType::Io if range_io.is_none() => {
-                //     range_io.replace(range_val);
-                // }
-                PciRangeType::Memory32 if range_32.is_none() => {
-                    range_32.replace(range_val);
-                }
-                PciRangeType::Memory64 if range_64.is_none() => {
-                    range_64.replace(range_val);
-                }
-                _ => (),
-            }
-        }
-
-        let (pci_base_32, host_base_32, size_32) = range_32.unwrap();
-        let (pci_base_64, host_base_64, size_64) = range_64.unwrap();
-        // let (pci_base_io, host_base_io, size_io) = range_io.unwrap();
-
-        Self {
-            pci_base_64,
-            pci_base_32: pci_base_32.try_into().unwrap(),
-            // pci_base_io: pci_base_io.try_into().unwrap(),
-            host_base_64,
-            host_base_32,
-            // host_base_io,
-            size_64,
-            size_32,
-            // size_io,
-            offset_64: 0,
-            offset_32: 0,
-        }
-    }
-
-    pub fn allocate(&mut self, ty: PciRangeType, size: usize) -> (PciBaseAddress, PhysicalAddress) {
-        match ty {
-            PciRangeType::Io => todo!(),
-            PciRangeType::Memory32 => {
-                if self.offset_32 as usize + size >= self.size_32 {
-                    todo!();
-                }
-                let bar = PciBaseAddress::Memory32(self.pci_base_32 + self.offset_32);
-                let host = self.host_base_32.add(self.offset_32 as usize);
-                self.offset_32 += size as u32;
-                (bar, host)
-            }
-            PciRangeType::Memory64 => {
-                if self.offset_64 as usize + size >= self.size_64 {
-                    todo!();
-                }
-                let bar = PciBaseAddress::Memory64(self.pci_base_64 + self.offset_64);
-                let host = self.host_base_64.add(self.offset_64 as usize);
-                self.offset_64 += size as u64;
-                (bar, host)
-            }
-            PciRangeType::Configuration => unimplemented!(),
-        }
-    }
-}
-
-impl PciBaseAddress {
-    pub fn as_memory(self) -> Option<PhysicalAddress> {
-        match self {
-            Self::Memory32(address) => Some(PhysicalAddress::from_u64(address as u64)),
-            Self::Memory64(address) => Some(PhysicalAddress::from_u64(address)),
-            _ => None,
-        }
-    }
-
-    pub fn is_zero(&self) -> bool {
-        match *self {
-            Self::Memory32(base) => base == 0,
-            Self::Memory64(base) => base == 0,
-            Self::Io(base) => base == 0,
-        }
-    }
-}
-
-impl PciBusSegment {
-    fn probe_config_space(&self, address: PciAddress) -> Result<Option<PciConfigSpace>, Error> {
-        match self.info.ecam_phys_base {
-            Some(ecam_phys_base) => Ok(unsafe {
-                PciEcam::probe_raw_parts(ecam_phys_base, self.info.bus_number_start, address)?
-            }
-            .map(PciConfigSpace::Ecam)),
-            None => Ok(PciLegacyConfigurationSpace::probe(address)?.map(PciConfigSpace::Legacy)),
-        }
-    }
-
-    fn enumerate_function(&mut self, address: PciAddress) -> Result<(), Error> {
-        let Some(config) = self.probe_config_space(address)? else {
-            return Ok(());
-        };
-
-        let header_type = config.header_type();
-
-        // Enumerate multi-function devices
-        if address.function == 0 && header_type & 0x80 != 0 {
-            for function in 1..8 {
-                self.enumerate_function(address.with_function(function))?;
-            }
-        }
-
-        // PCI-to-PCI bridge
-        // if config.class_code() == 0x06 && config.subclass() == 0x04 {
-        //     let secondary_bus = config.secondary_bus();
-        //     // TODO
-        // }
-
-        if let Some(allocator) = self.allocator.as_mut() {
-            log::debug!("Remapping BARs for {}", address);
-
-            // Find valid BARs
-            let mut i = 0;
-            let mut bar_mask = 0;
-
-            while i < 6 {
-                let w0 = config.read_u32(0x10 + i * 4);
-
-                let bar_width = match w0 & 1 == 0 {
-                    // Memory BAR
-                    true => match (w0 >> 1) & 3 {
-                        // 32-bit BAR
-                        0 => 1,
-                        // Reserved
-                        1 => unimplemented!(),
-                        // 64-bit BAR
-                        2 => 2,
-                        // Unknown
-                        _ => unreachable!(),
-                    },
-                    false => 1,
-                };
-
-                bar_mask |= 1 << i;
-                i += bar_width;
-            }
-
-            for i in 0..6 {
-                if (1 << i) & bar_mask != 0 {
-                    let Some(orig_value) = config.bar(i) else {
-                        continue;
-                    };
-                    let size = unsafe { config.bar_size(i) };
-
-                    if size != 0 {
-                        log::debug!("BAR{}: size={:#x}", i, size);
-
-                        match orig_value {
-                            PciBaseAddress::Io(_) => (),
-                            PciBaseAddress::Memory64(_) => {
-                                let (bar, host) = allocator.allocate(PciRangeType::Memory64, size);
-                                let bar_address = bar.as_memory().unwrap();
-                                unsafe {
-                                    config.set_bar(i, bar);
-                                }
-                                log::debug!(
-                                    "Mapped BAR{} -> pci {:#x} host {:#x}",
-                                    i,
-                                    bar_address,
-                                    host
-                                );
-                                // TODO Don't yet differentiate between Host/PCI addresses, lol
-                                assert_eq!(bar_address, host);
-                            }
-                            PciBaseAddress::Memory32(_) => {
-                                let (bar, host) = allocator.allocate(PciRangeType::Memory32, size);
-                                let bar_address = bar.as_memory().unwrap();
-                                unsafe {
-                                    config.set_bar(i, bar);
-                                }
-                                log::debug!(
-                                    "Mapped BAR{} -> pci {:#x} host {:#x}",
-                                    i,
-                                    bar_address,
-                                    host
-                                );
-                                // TODO Don't yet differentiate between Host/PCI addresses, lol
-                                assert_eq!(bar_address, host);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        let vendor_id = config.vendor_id();
-        let device_id = config.device_id();
-        let class = config.class_code();
-        let subclass = config.subclass();
-        let prog_if = config.prog_if();
-
-        let info = PciDeviceInfo {
-            address,
-            vendor_id,
-            device_id,
-            class,
-            subclass,
-            prog_if,
-            segment: self.info.clone(),
-            config_space: config,
-            interrupt_config: Arc::new(OneTimeInit::new()),
-        };
-
-        let object = nodes::make_sysfs_object(PciBusDevice {
-            info,
-            driver: None,
-            device: None,
-            state: PciDeviceState::None,
-        });
-        let pci_object = PCI_SYSFS_NODE.or_init_with(|| {
-            let bus_object = sysfs::bus().unwrap();
-            let pci_object = KObject::new(());
-            bus_object.add_object("pci", pci_object.clone()).ok();
-            pci_object
-        });
-
-        let name = format!("{address}");
-        pci_object.add_object(name, object.clone()).ok();
-        self.devices.push(object);
-
-        Ok(())
-    }
-
-    fn enumerate_bus(&mut self, bus: u8) -> Result<(), Error> {
-        let address = PciAddress::for_bus(self.info.segment_number, bus);
-
-        for i in 0..32 {
-            let device_address = address.with_device(i);
-
-            self.enumerate_function(device_address)?;
-        }
-
-        Ok(())
-    }
-
-    /// Enumerates the bus segment, placing found devices into the manager
-    pub fn enumerate(&mut self) -> Result<(), Error> {
-        for bus in self.info.bus_number_start..self.info.bus_number_end {
-            self.enumerate_bus(bus)?;
-        }
-        Ok(())
-    }
-}
-
-impl PciSegmentInfo {
-    pub fn has_msi(&self) -> bool {
-        !matches!(self.msi_translation_map, PciMsiMap::Legacy)
-    }
-}
-
-impl PciBusManager {
-    const fn new() -> Self {
-        Self {
-            segments: Vec::new(),
-        }
-    }
-
-    /// Walks the bus device list and calls init/init_irq functions on any devices with associated
-    /// drivers
-    pub fn probe_bus_devices() -> Result<(), Error> {
-        Self::walk_bus_devices(|device| {
-            probe_bus_device(device, false)?;
-            Ok(true)
-        })
-    }
-
-    pub fn setup_bus_devices(rescan: bool) -> Result<(), Error> {
-        Self::walk_bus_devices(|device| {
-            setup_bus_device(device, rescan)?;
-            Ok(true)
-        })
-    }
-
-    /// Iterates over the bus devices, calling the function on each of them until either an error
-    /// or `Ok(false)` is returned
-    pub fn walk_bus_devices<F: FnMut(&mut PciBusDevice) -> Result<bool, Error>>(
-        mut f: F,
-    ) -> Result<(), Error> {
-        let mut this = PCI_MANAGER.lock();
-
-        for segment in this.segments.iter_mut() {
-            for device in segment.devices.iter_mut() {
-                let mut device = device.lock();
-                if !f(&mut *device)? {
-                    return Ok(());
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    pub fn add_legacy_segment(access: &'static dyn LegacyPciAccess) -> Result<(), Error> {
-        legacy::PCI.init(access);
-
-        let mut bus_segment = PciBusSegment {
-            info: Arc::new(PciSegmentInfo {
-                segment_number: 0,
-                bus_number_start: 0,
-                bus_number_end: 255,
-                ecam_phys_base: None,
-                irq_translation_map: PciInterruptMap::Legacy,
-                msi_translation_map: PciMsiMap::Legacy,
-            }),
-            allocator: None,
-            devices: Vec::new(),
-        };
-
-        let mut this = PCI_MANAGER.lock();
-        bus_segment.enumerate()?;
-        this.segments.push(bus_segment);
-
-        Ok(())
-    }
-
-    /// Enumerates a bus segment provided by ACPI MCFG table entry
-    #[cfg(target_arch = "x86_64")]
-    pub fn add_segment_from_mcfg(
-        entry: &McfgEntry,
-        msi_controller: Arc<dyn MessageInterruptController>,
-    ) -> Result<(), Error> {
-        let msi_translation_map = PciMsiMap::Identity(msi_controller);
-
-        let mut bus_segment = PciBusSegment {
-            info: Arc::new(PciSegmentInfo {
-                segment_number: entry.pci_segment_group as u8,
-                bus_number_start: entry.bus_number_start,
-                bus_number_end: entry.bus_number_end,
-                ecam_phys_base: Some(PhysicalAddress::from_u64(entry.base_address)),
-
-                // TODO get the segment's PCI root bridge AML name
-                irq_translation_map: PciInterruptMap::Acpi("\\_SB.PCI0._PRT".into()),
-                msi_translation_map,
-            }),
-            // Firmware done this for us
-            allocator: None,
-
-            devices: Vec::new(),
-        };
-
-        let mut this = PCI_MANAGER.lock();
-        bus_segment.enumerate()?;
-        this.segments.push(bus_segment);
-
-        Ok(())
-    }
-
-    #[cfg(any(target_arch = "aarch64", target_arch = "riscv64", rust_analyzer))]
-    pub fn add_segment_from_device_tree(
-        cfg_base: PhysicalAddress,
-        bus_range: core::ops::Range<u8>,
-        ranges: Vec<PciAddressRange>,
-        irq_translation_map: PciInterruptMap,
-        msi_translation_map: PciMsiMap,
-    ) -> Result<(), Error> {
-        let mut bus_segment = PciBusSegment {
-            info: Arc::new(PciSegmentInfo {
-                segment_number: 0,
-                bus_number_start: bus_range.start,
-                bus_number_end: bus_range.end,
-                ecam_phys_base: Some(cfg_base),
-
-                irq_translation_map,
-                msi_translation_map,
-            }),
-            allocator: Some(BusAddressAllocator::from_ranges(&ranges)),
-
-            devices: Vec::new(),
-        };
-
-        let mut this = PCI_MANAGER.lock();
-        bus_segment.enumerate()?;
-        this.segments.push(bus_segment);
-
-        Ok(())
-    }
-}
-
-impl fmt::Display for PciAddress {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}:{}:{}", self.bus, self.device, self.function)
-    }
-}
-
-impl PciAddress {
-    /// Constructs a [PciAddress] representing a bus
-    pub const fn for_bus(segment: u8, bus: u8) -> Self {
-        Self {
-            segment,
-            bus,
-            device: 0,
-            function: 0,
-        }
-    }
-
-    /// Constructs a [PciAddress] representing a specific function
-    pub const fn for_function(segment: u8, bus: u8, device: u8, function: u8) -> Self {
-        Self {
-            segment,
-            bus,
-            device,
-            function,
-        }
-    }
-
-    /// Constructs a [PciAddress] representing a device on a given bus
-    pub const fn with_device(self, device: u8) -> Self {
-        Self {
-            device,
-            function: 0,
-            ..self
-        }
-    }
-
-    /// Constructs a [PciAddress] representing a function of a given bus device
-    pub const fn with_function(self, function: u8) -> Self {
-        Self { function, ..self }
-    }
-}
-
-impl PciConfigurationSpace for PciConfigSpace {
-    fn read_u32(&self, offset: usize) -> u32 {
-        match self {
-            Self::Ecam(ecam) => ecam.read_u32(offset),
-            Self::Legacy(legacy) => legacy.read_u32(offset),
-        }
-    }
-
-    fn write_u32(&self, offset: usize, value: u32) {
-        match self {
-            Self::Ecam(ecam) => ecam.write_u32(offset, value),
-            Self::Legacy(legacy) => legacy.write_u32(offset, value),
-        }
-    }
-}
-
-fn probe_bus_device(device: &mut PciBusDevice, _rescan: bool) -> Result<(), Error> {
-    // Already has a driver/device set up
-    if device.device.is_some() || device.state != PciDeviceState::None {
-        return Ok(());
-    }
-
-    if let Some(driver) = driver::lookup_driver(&device.info) {
-        let dma: Arc<dyn DmaAllocator> = Arc::new(DummyDmaAllocator);
-
-        match driver.probe(&device.info, &dma) {
-            Ok(instance) => {
-                log::info!("{} -> {}", device.info.address, driver.driver_name());
-                device.device.replace(instance);
-                device.driver.replace(driver);
-                device.state = PciDeviceState::Probed;
-            }
-            Err(error) => {
-                log::error!(
-                    "{} ({}) probe error: {error:?}",
-                    device.info.address,
-                    driver.driver_name()
-                );
-            }
-        }
-    }
-
-    Ok(())
-}
-
-fn setup_bus_device(device: &mut PciBusDevice, _rescan: bool) -> Result<(), Error> {
-    // No driver yet (TODO probe if rescan is asked)
-    let (Some(dev), Some(driver)) = (device.device.as_ref(), device.driver) else {
-        return Ok(());
-    };
-    // Already initialized/failed
-    if device.state != PciDeviceState::Probed {
-        return Ok(());
-    }
-
-    let dma: Arc<dyn DmaAllocator> = Arc::new(DummyDmaAllocator);
-    let cx = DeviceInitContext {
-        dma_allocator: dma.clone(),
-    };
-
-    match unsafe { dev.clone().init(cx) } {
-        Ok(()) => {
-            device.state = PciDeviceState::Initialized;
-        }
-        Err(error) => {
-            log::error!(
-                "{} ({}) setup error: {error:?}",
-                device.info.address,
-                driver.driver_name()
-            );
-            device.state = PciDeviceState::Failed;
-        }
-    }
-
-    Ok(())
-}
-
-static PCI_MANAGER: IrqSafeSpinlock<PciBusManager> = IrqSafeSpinlock::new(PciBusManager::new());
-static PCI_SYSFS_NODE: OneTimeInit<Arc<KObject<()>>> = OneTimeInit::new();

kernel/driver/bus/pci/src/macros.rs

@@ -1,35 +0,0 @@
-pub macro pci_driver_match {
-    (class ($class:literal:$subclass:literal:$prog_if:literal)) => {
-        $crate::driver::PciMatch::Class($class, Some($subclass), Some($prog_if))
-    },
-    (class ($class:literal:$subclass:literal)) => {
-        $crate::driver::PciMatch::Class($class, Some($subclass), None)
-    },
-    (class $class:literal) => {
-        $crate::driver::PciMatch::Class($class, None, None)
-    },
-    (device ($vendor:literal:$device:literal)) => {
-        $crate::driver::PciMatch::Vendor($vendor, $device)
-    }
-}
-
-pub macro pci_driver(
-    matches: [$($kind:ident $match:tt),+ $(,)?],
-    driver: $driver:tt
-) {
-    #[link_section = ".init_array"]
-    #[used]
-    static __REGISTER_FN: extern "C" fn() = __register_fn;
-
-    extern "C" fn __register_fn() {
-        struct Driver;
-        impl $crate::driver::PciDriver for Driver $driver
-        static DRIVER: Driver = Driver;
-
-        log::info!("register pci driver: {:?}", $crate::driver::PciDriver::driver_name(&Driver));
-        $(
-            let pmatch = $crate::macros::pci_driver_match!($kind $match);
-            $crate::driver::register_match(pmatch, &DRIVER);
-        )+
-    }
-}

kernel/driver/bus/pci/src/nodes.rs

@@ -1,139 +0,0 @@
-use alloc::{format, string::String, sync::Arc};
-use libk::{
-    error::Error,
-    fs::sysfs::{
-        attribute::{StringAttribute, StringAttributeOps},
-        object::KObject,
-    },
-};
-use libk_util::sync::IrqSafeSpinlock;
-
-use crate::{device::PciBusDevice, PciBaseAddress, PciCapabilityId, PciConfigurationSpace};
-
-pub(crate) fn make_sysfs_object(
-    device: PciBusDevice,
-) -> Arc<KObject<IrqSafeSpinlock<PciBusDevice>>> {
-    struct Resources;
-    struct Capabilities;
-    struct Driver;
-    struct Class;
-    struct Id;
-
-    impl StringAttributeOps for Driver {
-        type Data = IrqSafeSpinlock<PciBusDevice>;
-        const NAME: &'static str = "driver";
-
-        fn read(state: &Self::Data) -> Result<String, Error> {
-            let state = state.lock();
-            if let Some(driver) = state.driver.map(|driver| driver.driver_name()) {
-                Ok(driver.into())
-            } else {
-                Ok("".into())
-            }
-        }
-    }
-
-    impl StringAttributeOps for Id {
-        type Data = IrqSafeSpinlock<PciBusDevice>;
-        const NAME: &'static str = "id";
-
-        fn read(state: &Self::Data) -> Result<String, Error> {
-            let state = state.lock();
-            Ok(format!(
-                "{:04x}:{:04x}",
-                state.info.vendor_id, state.info.device_id
-            ))
-        }
-    }
-
-    impl StringAttributeOps for Class {
-        type Data = IrqSafeSpinlock<PciBusDevice>;
-        const NAME: &'static str = "class";
-
-        fn read(state: &Self::Data) -> Result<String, Error> {
-            let state = state.lock();
-            Ok(format!(
-                "{:02x}:{:02x}:{:02x}",
-                state.info.class, state.info.subclass, state.info.prog_if
-            ))
-        }
-    }
-
-    impl StringAttributeOps for Resources {
-        type Data = IrqSafeSpinlock<PciBusDevice>;
-        const NAME: &'static str = "resources";
-        const NEWLINE: bool = false;
-
-        fn read(state: &Self::Data) -> Result<String, Error> {
-            use core::fmt::Write;
-
-            let state = state.lock();
-            let mut output = String::new();
-            for i in 0..6 {
-                if let Some(bar) = state.info.config_space.bar(i) {
-                    if bar.is_zero() {
-                        continue;
-                    }
-
-                    match bar {
-                        PciBaseAddress::Io(base) => {
-                            writeln!(output, "{i}:pio:{base:#06x}").ok();
-                        }
-                        PciBaseAddress::Memory32(base) => {
-                            writeln!(output, "{i}:m32:{base:#010x}").ok();
-                        }
-                        PciBaseAddress::Memory64(base) => {
-                            writeln!(output, "{i}:m64:{base:#018x}").ok();
-                        }
-                    }
-                }
-            }
-            if output.is_empty() {
-                output.push('\n');
-            }
-            Ok(output)
-        }
-    }
-
-    impl StringAttributeOps for Capabilities {
-        type Data = IrqSafeSpinlock<PciBusDevice>;
-        const NAME: &'static str = "capabilities";
-        const NEWLINE: bool = false;
-
-        fn read(state: &Self::Data) -> Result<String, Error> {
-            use core::fmt::Write;
-            let state = state.lock();
-            let mut output = String::new();
-            for (capability, offset, _) in state.info.config_space.capability_iter() {
-                write!(output, "{offset:04x}:").ok();
-                match capability {
-                    Some(PciCapabilityId::Msi) => write!(output, "msi").ok(),
-                    Some(PciCapabilityId::MsiX) => write!(output, "msix").ok(),
-                    Some(PciCapabilityId::VendorSpecific) => write!(output, "vendor-specific").ok(),
-                    Some(PciCapabilityId::PciExpress) => write!(output, "pcie").ok(),
-                    Some(PciCapabilityId::PowerManagement) => {
-                        write!(output, "power-management").ok()
-                    }
-                    None => write!(output, "unknown").ok(),
-                };
-                writeln!(output).ok();
-            }
-            if output.is_empty() {
-                output.push('\n');
-            }
-            Ok(output)
-        }
-    }
-
-    let object = KObject::new(IrqSafeSpinlock::new(device));
-
-    object
-        .add_attribute(StringAttribute::from(Capabilities))
-        .ok();
-    object.add_attribute(StringAttribute::from(Resources)).ok();
-    object.add_attribute(StringAttribute::from(Driver)).ok();
-    object.add_attribute(StringAttribute::from(Class)).ok();
-    object.add_attribute(StringAttribute::from(Id)).ok();
-
-    object
-}

kernel/driver/bus/pci/src/space/ecam.rs

@@ -1,60 +0,0 @@
-//! PCI Express ECAM interface
-use libk_mm::{address::PhysicalAddress, device::DeviceMemoryMapping};
-use yggdrasil_abi::error::Error;
-
-use super::{PciAddress, PciConfigurationSpace};
-
-/// PCI Express Enhanced Configuration Access Mechanism
-#[derive(Debug, Clone)]
-#[repr(transparent)]
-pub struct PciEcam {
-    mapping: DeviceMemoryMapping,
-}
-
-impl PciConfigurationSpace for PciEcam {
-    fn read_u32(&self, offset: usize) -> u32 {
-        assert_eq!(offset & 3, 0);
-        unsafe { ((self.mapping.address() + offset) as *const u32).read_volatile() }
-    }
-
-    fn write_u32(&self, offset: usize, value: u32) {
-        assert_eq!(offset & 3, 0);
-        unsafe { ((self.mapping.address() + offset) as *mut u32).write_volatile(value) }
-    }
-}
-
-impl PciEcam {
-    /// Maps the physical address of a ECAM space for kernel access.
-    ///
-    /// # Safety
-    ///
-    /// The `phys_addr` must be a valid ECAM address. The address must not alias any other mapped
-    /// regions. The address must be aligned to a 4KiB boundary and be valid for accesses within a
-    /// 4KiB-sized range.
-    pub unsafe fn map(phys_addr: PhysicalAddress) -> Result<Self, Error> {
-        let mapping = DeviceMemoryMapping::map(phys_addr, 0x1000, Default::default())?;
-        Ok(Self { mapping })
-    }
-
-    /// Checks if the ECAM contains a valid device configuration space, mapping and returning a
-    /// [PciEcam] if it does.
-    ///
-    /// # Safety
-    ///
-    /// See [PciEcam::map].
-    pub unsafe fn probe_raw_parts(
-        segment_phys_addr: PhysicalAddress,
-        bus_offset: u8,
-        address: PciAddress,
-    ) -> Result<Option<Self>, Error> {
-        let phys_addr = segment_phys_addr.add(
-            ((address.bus - bus_offset) as usize * 256
-                + address.device as usize * 8
-                + address.function as usize)
-                * 0x1000,
-        );
-        let this = Self::map(phys_addr)?;
-
-        Ok(if this.is_valid() { Some(this) } else { None })
-    }
-}

kernel/driver/bus/pci/src/space/legacy.rs

@@ -1,46 +0,0 @@
-use libk_util::OneTimeInit;
-use yggdrasil_abi::error::Error;
-
-use crate::{PciAddress, PciConfigurationSpace};
-
-/// Provides access to the legacy (port I/O-driven) PCI configuration space
-#[derive(Clone, Debug)]
-#[repr(transparent)]
-pub struct PciLegacyConfigurationSpace {
-    address: PciAddress,
-}
-
-pub trait LegacyPciAccess {
-    fn read_u32(&self, bus: u8, slot: u8, func: u8, offset: u8) -> u32;
-    fn write_u32(&self, bus: u8, slot: u8, func: u8, offset: u8, value: u32);
-}
-
-impl PciConfigurationSpace for PciLegacyConfigurationSpace {
-    fn read_u32(&self, offset: usize) -> u32 {
-        PCI.get().read_u32(
-            self.address.bus,
-            self.address.device,
-            self.address.function,
-            offset as _,
-        )
-    }
-
-    fn write_u32(&self, offset: usize, value: u32) {
-        PCI.get().write_u32(
-            self.address.bus,
-            self.address.device,
-            self.address.function,
-            offset as _,
-            value,
-        )
-    }
-}
-
-impl PciLegacyConfigurationSpace {
-    pub fn probe(address: PciAddress) -> Result<Option<Self>, Error> {
-        let this = PciLegacyConfigurationSpace { address };
-        Ok(if this.is_valid() { Some(this) } else { None })
-    }
-}
-
-pub(crate) static PCI: OneTimeInit<&'static dyn LegacyPciAccess> = OneTimeInit::new();

kernel/driver/bus/pci/src/space/mod.rs

@@ -1,394 +0,0 @@
-use alloc::sync::Arc;
-use legacy::PciLegacyConfigurationSpace;
-
-use super::{PciAddress, PciBaseAddress, PciCapability, PciCapabilityId, PciEcam};
-use crate::{device::PciInterruptPin, PciCommandRegister, PciStatusRegister};
-
-pub(super) mod ecam;
-pub(super) mod legacy;
-
-macro_rules! pci_config_field_getter {
-    ($self:ident, u32, $offset:expr) => {
-        $self.read_u32($offset)
-    };
-
-    ($self:ident, u16, $offset:expr) => {
-        $self.read_u16($offset)
-    };
-
-    ($self:ident, u8, $offset:expr) => {
-        $self.read_u8($offset)
-    };
-}
-
-macro_rules! pci_config_field_setter {
-    ($self:ident, u32, $offset:expr, $value:expr) => {
-        $self.write_u32($offset, $value)
-    };
-
-    ($self:ident, u16, $offset:expr, $value:expr) => {{
-        $self.write_u16($offset, $value)
-    }};
-
-    ($self:ident, u8, $offset:expr, $value:expr) => {
-        $self.write_u8($offset, $value)
-    };
-}
-
-macro_rules! pci_config_field {
-    (
-        $offset:expr => $ty:ident,
-        $(#[$getter_meta:meta])* $getter:ident
-        $(, $(#[$setter_meta:meta])* $setter:ident)?
-    ) => {
-        $(#[$getter_meta])*
-        fn $getter(&self) -> $ty {
-            pci_config_field_getter!(self, $ty, $offset)
-        }
-
-        $(
-            $(#[$setter_meta])*
-            fn $setter(&self, value: $ty) {
-                pci_config_field_setter!(self, $ty, $offset, value)
-            }
-        )?
-    };
-}
-
-/// Describes a configuration space access method for a PCI device
-#[derive(Debug, Clone)]
-pub enum PciConfigSpace {
-    /// Legacy configuration space.
-    ///
-    /// See [PciLegacyConfigurationSpace].
-    Legacy(PciLegacyConfigurationSpace),
-
-    /// Enhanced Configuration Access Mechanism (PCIe).
-    ///
-    /// See [PciEcam].
-    Ecam(PciEcam),
-}
-
-pub struct CapabilityIterator<'s, S: PciConfigurationSpace + ?Sized> {
-    space: &'s S,
-    current: Option<usize>,
-}
-
-impl<S: PciConfigurationSpace + ?Sized> Iterator for CapabilityIterator<'_, S> {
-    type Item = (Option<PciCapabilityId>, usize, usize);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let offset = self.current? & !0x3;
-
-        let id = PciCapabilityId::try_from(self.space.read_u8(offset)).ok();
-        let len = self.space.read_u8(offset + 2);
-        let next_pointer = self.space.read_u8(offset + 1);
-
-        self.current = if next_pointer != 0 {
-            Some(next_pointer as usize)
-        } else {
-            None
-        };
-
-        Some((id, offset, len as usize))
-    }
-}
-
-/// Interface for accessing the configuration space of a device
-pub trait PciConfigurationSpace {
-    /// Reads a 32-bit value from the device configuration space.
-    ///
-    /// # Note
-    ///
-    /// The `offset` must be u32-aligned.
-    fn read_u32(&self, offset: usize) -> u32;
-
-    /// Writes a 32-bit value to the device configuration space.
-    ///
-    /// # Note
-    ///
-    /// The `offset` must be u32-aligned.
-    fn write_u32(&self, offset: usize, value: u32);
-
-    /// Reads a 16-bit value from the device configuration space.
-    ///
-    /// # Note
-    ///
-    /// The `offset` must be u16-aligned.
-    fn read_u16(&self, offset: usize) -> u16 {
-        assert_eq!(offset & 1, 0);
-        let value = self.read_u32(offset & !3);
-        (value >> ((offset & 3) * 8)) as u16
-    }
-
-    /// Reads a byte from the device configuration space
-    fn read_u8(&self, offset: usize) -> u8 {
-        let value = self.read_u32(offset & !3);
-        (value >> ((offset & 3) * 8)) as u8
-    }
-
-    /// Writes a 16-bit value to the device configuration space.
-    ///
-    /// # Note
-    ///
-    /// The `offset` must be u16-aligned.
-    fn write_u16(&self, offset: usize, value: u16) {
-        let shift = ((offset >> 1) & 1) << 4;
-        assert_eq!(offset & 1, 0);
-        let mut tmp = self.read_u32(offset & !3);
-        tmp &= !(0xFFFF << shift);
-        tmp |= (value as u32) << shift;
-        self.write_u32(offset & !3, tmp);
-    }
-
-    /// Writes a byte to the device configuration space
-    fn write_u8(&self, _offset: usize, _value: u16) {
-        todo!()
-    }
-
-    /// Returns `true` if the device is present on the bus (i.e. configuration space is not filled
-    /// with only 1's)
-    fn is_valid(&self) -> bool {
-        self.vendor_id() != 0xFFFF && self.device_id() != 0xFFFF
-    }
-
-    pci_config_field!(
-        0x00 => u16,
-        #[doc = "Returns the Vendor ID"] vendor_id
-    );
-    pci_config_field!(0x02 => u16,
-        #[doc = "Returns the Device ID"] device_id
-    );
-    pci_config_field!(
-        0x04 => u16,
-        #[doc = "Returns the value of the command register"] command,
-        #[doc = "Writes to the command word register"] set_command
-    );
-    pci_config_field!(
-        0x06 => u16,
-        #[doc = "Returns the value of the status register"] status
-    );
-
-    pci_config_field!(
-        0x08 => u8,
-        #[doc = "Returns the device Revision ID"]
-        rev_id
-    );
-    pci_config_field!(
-        0x09 => u8,
-        #[doc = "Returns the device Prog IF field"]
-        prog_if
-    );
-    pci_config_field!(
-        0x0A => u8,
-        #[doc = "Returns the device Subclass field"]
-        subclass
-    );
-    pci_config_field!(
-        0x0B => u8,
-        #[doc = "Returns the device Class Code field"]
-        class_code
-    );
-
-    // ...
-    pci_config_field!(
-        0x0E => u8,
-        #[doc = "Returns the header type of the device"]
-        header_type
-    );
-    pci_config_field!(
-        0x19 => u8,
-        #[doc = r#"
-            Returns the secondary bus number associated with this device
-
-            # Note
-
-            The function is only valid for devices with `header_type() == 1`
-        "#]
-        secondary_bus
-    );
-    pci_config_field!(
-        0x34 => u8,
-        #[doc =
-            r"Returns the offset within the configuration space where the Capabilities List
-            is located. Only valid if the corresponding Status Register bit is set"
-        ]
-        capability_pointer
-    );
-
-    fn interrupt_pin(&self) -> Option<PciInterruptPin> {
-        PciInterruptPin::try_from(self.read_u8(0x3D) as u32).ok()
-    }
-
-    fn interrupt_line(&self) -> Option<u8> {
-        let value = self.read_u8(0x3C);
-        if value < 16 {
-            Some(value)
-        } else {
-            None
-        }
-    }
-
-    /// # Safety
-    ///
-    /// This function is only meant to be called before the device has seen any use by the OS,
-    /// it has not been tested outside of this use case.
-    unsafe fn bar_size(&self, index: usize) -> usize {
-        let cmd = self.command();
-
-        // Disable I/O and memory
-        self.set_command(
-            cmd & !(PciCommandRegister::ENABLE_IO | PciCommandRegister::ENABLE_MEMORY).bits(),
-        );
-
-        let orig_value = self.bar(index).unwrap();
-        // TODO preserve prefetch bit
-        let mask_value = match orig_value {
-            PciBaseAddress::Io(_) => PciBaseAddress::Io(0xFFFC),
-            PciBaseAddress::Memory32(_) => PciBaseAddress::Memory32(0xFFFFFFF0),
-            PciBaseAddress::Memory64(_) => PciBaseAddress::Memory64(0xFFFFFFFFFFFFFFF0),
-        };
-        self.set_bar(index, mask_value);
-        let new_value = self.bar(index).unwrap();
-
-        let size = match new_value {
-            PciBaseAddress::Io(address) if address != 0 => ((!address) + 1) as usize,
-            PciBaseAddress::Memory32(address) if address != 0 => ((!address) + 1) as usize,
-            PciBaseAddress::Memory64(address) if address != 0 => ((!address) + 1) as usize,
-            _ => 0,
-        };
-
-        self.set_bar(index, orig_value);
-        self.set_command(cmd);
-
-        size
-    }
-
-    /// Updates the value of the Base Address Register with given index.
-    ///
-    /// # Note
-    ///
-    /// The function is only valid for devices with `header_type() == 0`
-    ///
-    /// The `index` corresponds to the actual configuration space BAR index.
-    ///
-    /// # Safety
-    ///
-    /// Precondition: the device must have memory access disabled through its command register
-    /// prior to setting a BAR.
-    unsafe fn set_bar(&self, index: usize, value: PciBaseAddress) {
-        assert!(index < 6);
-
-        match value {
-            PciBaseAddress::Io(value) => {
-                self.write_u32(0x10 + index * 4, ((value as u32) & !0x3) | 1)
-            }
-            PciBaseAddress::Memory32(address) => self.write_u32(0x10 + index * 4, address & !0xF),
-            PciBaseAddress::Memory64(address) => {
-                self.write_u32(0x10 + index * 4, ((address as u32) & !0xF) | (2 << 1));
-                self.write_u32(0x10 + (index + 1) * 4, (address >> 32) as u32);
-            }
-        }
-    }
-
-    /// Returns the value of the Base Address Register with given index.
-    ///
-    /// # Note
-    ///
-    /// The function is only valid for devices with `header_type() == 0`
-    ///
-    /// The `index` corresponds to the actual configuration space BAR index, i.e. if a 64-bit
-    /// address occupies [BAR0, BAR1] and BAR 1 is requested, the function will return [None].
-    fn bar(&self, index: usize) -> Option<PciBaseAddress> {
-        assert!(index < 6);
-
-        if index % 2 == 0 {
-            let w0 = self.read_u32(0x10 + index * 4);
-
-            match w0 & 1 {
-                0 => match (w0 >> 1) & 3 {
-                    0 => {
-                        // 32-bit memory BAR
-                        Some(PciBaseAddress::Memory32(w0 & !0xF))
-                    }
-                    2 => {
-                        // 64-bit memory BAR
-                        let w1 = self.read_u32(0x10 + (index + 1) * 4);
-                        Some(PciBaseAddress::Memory64(
-                            ((w1 as u64) << 32) | ((w0 as u64) & !0xF),
-                        ))
-                    }
-                    _ => unimplemented!(),
-                },
-                1 => Some(PciBaseAddress::Io((w0 as u16) & !0x3)),
-                _ => unreachable!(),
-            }
-        } else {
-            let prev_w0 = self.read_u32(0x10 + (index - 1) * 4);
-            if prev_w0 & 0x7 == 0x4 {
-                // Previous BAR is 64-bit memory and this one is its continuation
-                return None;
-            }
-
-            let w0 = self.read_u32(0x10 + index * 4);
-
-            match w0 & 1 {
-                0 => match (w0 >> 1) & 3 {
-                    0 => {
-                        // 32-bit memory BAR
-                        Some(PciBaseAddress::Memory32(w0 & !0xF))
-                    }
-                    // TODO can 64-bit BARs not be on a 64-bit boundary?
-                    2 => None,
-                    _ => unimplemented!(),
-                },
-                1 => todo!(),
-                _ => unreachable!(),
-            }
-        }
-    }
-
-    /// Returns an iterator over the PCI capabilities
-    fn capability_iter(&self) -> CapabilityIterator<Self> {
-        let status = PciStatusRegister::from_bits_retain(self.status());
-
-        let current = if status.contains(PciStatusRegister::CAPABILITIES_LIST) {
-            let ptr = self.capability_pointer() as usize;
-
-            if ptr != 0 {
-                Some(self.capability_pointer() as usize)
-            } else {
-                None
-            }
-        } else {
-            // Return an empty iterator
-            None
-        };
-
-        CapabilityIterator {
-            space: self,
-            current,
-        }
-    }
-
-    /// Locates a capability within this configuration space
-    fn capability<C: PciCapability>(&self) -> Option<C::CapabilityData<'_, Self>> {
-        self.capability_iter().find_map(|(id, offset, len)| {
-            if id.map_or(false, |id| id == C::ID) && C::check(self, offset, len) {
-                Some(C::data(self, offset, len))
-            } else {
-                None
-            }
-        })
-    }
-}
-
-impl<T: PciConfigurationSpace> PciConfigurationSpace for Arc<T> {
-    fn read_u32(&self, offset: usize) -> u32 {
-        T::read_u32(self.as_ref(), offset)
-    }
-
-    fn write_u32(&self, offset: usize, value: u32) {
-        T::write_u32(self.as_ref(), offset, value);
-    }
-}

kernel/driver/bus/usb/src/class_driver/mass_storage.rs

@@ -131,7 +131,7 @@ impl Bbb {
         &mut self,
         buffer: DmaSliceMut<'_, MaybeUninit<u8>>,
     ) -> Result<usize, Error> {
-        if buffer.len() == 0 {
+        if buffer.is_empty() {
             return Ok(0);
         }
         let len = self

kernel/driver/bus/usb/src/class_driver/mod.rs

@@ -36,7 +36,7 @@ async fn extract_class_info(device: &UsbDeviceAccess) -> Result<Option<UsbClassI
     let device_info = &device.info;
     let config_info = device.query_configuration_info(0).await?;
 
-    if config_info.interfaces.len() >= 1 {
+    if !config_info.interfaces.is_empty() {
         let if_info = &config_info.interfaces[0];
 
         let class = if device_info.device_class == UsbDeviceClass::FromInterface {

kernel/driver/bus/usb/src/device.rs

@@ -166,7 +166,7 @@ impl UsbDeviceAccess {
 
     pub fn read_current_configuration(
         &self,
-    ) -> IrqSafeRwLockReadGuard<Option<UsbConfigurationInfo>> {
+    ) -> IrqSafeRwLockReadGuard<'_, Option<UsbConfigurationInfo>> {
         self.current_configuration.read()
     }
 

kernel/driver/fs/ext2/src/dir/walk.rs

@@ -127,7 +127,7 @@ impl<'a> DirentIter<'a> {
         self.offset
     }
 
-    pub fn next_record(&mut self) -> Option<Record<&[u8]>> {
+    pub fn next_record(&mut self) -> Option<Record<'_, &[u8]>> {
         if self.offset + size_of::<Dirent>() > self.block.len() {
             return None;
         }
@@ -183,7 +183,7 @@ impl<'a> DirentIterMut<'a> {
         Self { fs, block, offset }
     }
 
-    pub fn next_record(&mut self) -> Option<Record<&mut [u8]>> {
+    pub fn next_record(&mut self) -> Option<Record<'_, &mut [u8]>> {
         if self.offset + size_of::<Dirent>() > self.block.len() {
             return None;
         }

kernel/driver/fs/ext2/src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(if_let_guard, async_drop, impl_trait_in_assoc_type)]
+#![feature(if_let_guard, impl_trait_in_assoc_type)]
 #![cfg_attr(not(test), no_std)]
 #![allow(clippy::new_ret_no_self)]
 

kernel/driver/fs/fat32/src/data.rs

@@ -160,8 +160,7 @@ impl Fat32FsInfo {
         let signature0 = &self.bytes[0..4];
         let signature1 = &self.bytes[484..488];
 
-        signature0 == &Self::SIGNATURE0.to_le_bytes()
-            && signature1 == &Self::SIGNATURE1.to_le_bytes()
+        signature0 == Self::SIGNATURE0.to_le_bytes() && signature1 == Self::SIGNATURE1.to_le_bytes()
     }
 }
 

kernel/driver/fs/fat32/src/directory.rs

@@ -303,7 +303,7 @@ impl CommonImpl for DirectoryNode {
     }
 
     fn metadata(&self, _node: &NodeRef) -> Result<Metadata, Error> {
-        Ok(self.metadata.clone())
+        Ok(self.metadata)
     }
 
     fn set_metadata(&self, _node: &NodeRef, _metadata: &Metadata) -> Result<(), Error> {
@@ -357,7 +357,7 @@ impl DirectoryImpl for DirectoryNode {
     }
 
     fn len(&self, _node: &NodeRef) -> Result<usize, Error> {
-        Ok((self.size_bytes.unwrap_or(0) as u32 / DIRENT_SIZE as u32) as usize)
+        Ok((self.size_bytes.unwrap_or(0) / DIRENT_SIZE as u32) as usize)
     }
 }
 

kernel/driver/fs/fat32/src/lib.rs

@@ -54,6 +54,7 @@ impl Fat32Fs {
     ) -> Result<NodeRef, Error> {
         let mut cached = true;
         for option in options {
+            #[allow(clippy::single_match)]
             match option {
                 FilesystemMountOption::Sync => cached = false,
                 _ => (),

kernel/driver/fs/memfs/src/tar.rs

@@ -16,7 +16,7 @@ pub(crate) struct TarIterator<'a> {
     zero_blocks: usize,
 }
 
-#[repr(packed)]
+#[repr(C, packed)]
 pub(crate) struct TarEntry {
     pub name: TarString<100>,
     pub mode: OctalField<8>,

kernel/driver/net/core/src/ephy.rs

@@ -125,24 +125,31 @@ impl<'a, M: MdioBus> PhyAccess<'a, M> {
         })
     }
 
-    pub fn setup_link(&self, have_pause: bool, force_gbesr: GBESR) -> Result<(), Error> {
+    pub fn setup_link(&self, have_pause: bool, force_gbesr: Option<GBESR>) -> Result<(), Error> {
         let bmsr = BMSR::from(self.read_reg(REG_BMSR)?);
-        let mut gbesr = if bmsr.contains(BMSR::EXT_STATUS_1000BASET) {
-            GBESR::from(self.read_reg(REG_GBESR)?)
+        let gbesr = if let Some(force_gbesr) = force_gbesr {
+            let mut gbesr = if bmsr.contains(BMSR::EXT_STATUS_1000BASET) {
+                GBESR::from(self.read_reg(REG_GBESR)?)
+            } else {
+                GBESR::empty()
+            };
+            gbesr |= force_gbesr;
+            Some(gbesr)
         } else {
-            GBESR::empty()
+            None
         };
-        gbesr |= force_gbesr;
         let mut anar = ANAR::from_capabilities(bmsr);
         if have_pause {
             anar |= ANAR::HAVE_PAUSE | ANAR::ASM_DIR;
         }
         let mut gbcr = GBCR::empty();
-        if gbesr.contains(GBESR::HAVE_1000BASET_HALF) {
-            gbcr |= GBCR::HAVE_1000BASET_HALF;
-        }
-        if gbesr.contains(GBESR::HAVE_1000BASET_FULL) {
-            gbcr |= GBCR::HAVE_1000BASET_FULL;
+        if let Some(gbesr) = gbesr {
+            if gbesr.contains(GBESR::HAVE_1000BASET_HALF) {
+                gbcr |= GBCR::HAVE_1000BASET_HALF;
+            }
+            if gbesr.contains(GBESR::HAVE_1000BASET_FULL) {
+                gbcr |= GBCR::HAVE_1000BASET_FULL;
+            }
         }
 
         self.write_reg(REG_ANAR, anar.bits())?;

kernel/driver/net/core/src/interface.rs

@@ -127,7 +127,7 @@ pub fn register_interface(
         NetworkInterfaceType::Ethernet => {
             static LAST_ETHERNET_ID: AtomicUsize = AtomicUsize::new(0);
             let eth_id = LAST_ETHERNET_ID.fetch_add(1, Ordering::SeqCst);
-            format!("eth{}", eth_id).into_boxed_str()
+            format!("eth{eth_id}").into_boxed_str()
         }
         NetworkInterfaceType::Loopback => "lo".into(),
     };

kernel/driver/net/core/src/l3/mod.rs

@@ -133,7 +133,7 @@ impl Route {
 
     pub fn insert(route: Self) -> Result<(), Error> {
         // TODO check for conflicts
-        log::debug!("Add route: {}", route);
+        log::debug!("Add route: {route}");
         ROUTES.write().push(route);
         Ok(())
     }
@@ -143,7 +143,7 @@ impl fmt::Display for Route {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{} ", self.subnet)?;
         if let Some(gw) = self.gateway {
-            write!(f, " via {}", gw)?;
+            write!(f, " via {gw}")?;
         }
         Ok(())
     }

kernel/driver/net/core/src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(map_try_insert, let_chains, result_flattening)]
+#![feature(map_try_insert, let_chains)]
 #![allow(clippy::type_complexity, clippy::new_without_default)]
 #![no_std]
 

kernel/driver/net/core/src/socket/config.rs

@@ -262,7 +262,7 @@ fn describe_route(route: &Route) -> RouteInfo {
         interface_name: interface.name.clone(),
         interface_id: route.interface,
         subnet: route.subnet,
-        gateway: route.gateway.map(Into::into),
+        gateway: route.gateway,
     }
 }
 

kernel/driver/net/core/src/socket/local/mod.rs

@@ -15,7 +15,7 @@ enum OwnedAddress {
     Anonymous(u64),
 }
 
-pub fn load_address(bytes: &[u8]) -> Result<LocalSocketAddress, Error> {
+pub fn load_address(bytes: &[u8]) -> Result<LocalSocketAddress<'_>, Error> {
     Ok(wire::from_slice(bytes)?)
 }
 
@@ -76,7 +76,7 @@ pub fn write_ancillary(
 }
 
 impl OwnedAddress {
-    fn to_borrowed(&self) -> LocalSocketAddress {
+    fn to_borrowed(&self) -> LocalSocketAddress<'_> {
         match self {
             Self::Path(path) => LocalSocketAddress::Path(path.as_ref()),
             Self::Anonymous(anon) => LocalSocketAddress::Anonymous(*anon),

kernel/driver/net/core/src/socket/local/packet.rs

@@ -110,9 +110,9 @@ impl LocalPacketSocket {
     ///
     /// 1. If this socket is bound to a name, the name will be used
     /// 2. Otherwise:
-    ///      2.1. If `remote` is "known" by this socket, the address in the table will be used
-    ///      2.2. Otherwise, this socket is "paired" with the remote by generating a new anonymous
-    ///        address unique to that socket
+    ///    2.1. If `remote` is "known" by this socket, the address in the table will be used
+    ///    2.2. Otherwise, this socket is "paired" with the remote by generating a new anonymous
+    ///    address unique to that socket
     fn get_send_info(
         self: &Arc<Self>,
         remote: &OwnedAddress,

kernel/driver/net/core/src/socket/raw.rs

@@ -81,7 +81,7 @@ impl RawSocket {
             };
 
             for id in ids {
-                if except.map_or(false, |i| i == *id) {
+                if except == Some(*id) {
                     continue;
                 }
 
@@ -210,7 +210,7 @@ impl Socket for RawSocket {
         if message.payload.len() > 1024 {
             return Err(Error::InvalidArgument);
         }
-        let mut builder = TxPacketBuilder::new(&*interface, message.payload.len())?;
+        let mut builder = TxPacketBuilder::new(&interface, message.payload.len())?;
         builder.push_bytes(message.payload)?;
         // false to prevent loopback
         builder.transmit(Some(self.id))?;

kernel/driver/net/core/src/socket/tcp/listener.rs

@@ -70,7 +70,7 @@ impl TcpListener {
     pub(super) fn poll_accept(
         &self,
         cx: &mut Context<'_>,
-    ) -> Poll<IrqSafeSpinlockGuard<Vec<Arc<TcpStream>>>> {
+    ) -> Poll<IrqSafeSpinlockGuard<'_, Vec<Arc<TcpStream>>>> {
         let lock = self.pending_accept.lock();
         self.accept_notify.register(cx.waker());
         if !lock.is_empty() {

kernel/driver/net/core/src/socket/tcp/stream.rs

@@ -214,7 +214,7 @@ impl TcpStream {
     pub(super) fn poll_receive(
         &self,
         cx: &mut Context<'_>,
-    ) -> Poll<Result<IrqSafeRwLockWriteGuard<TcpConnection>, Error>> {
+    ) -> Poll<Result<IrqSafeRwLockWriteGuard<'_, TcpConnection>, Error>> {
         let lock = self.connection.write();
         match lock.poll_receive(cx) {
             Poll::Ready(Ok(())) => Poll::Ready(Ok(lock)),

kernel/driver/net/igbe/src/lib.rs

@@ -26,12 +26,15 @@ use ygg_driver_pci::{
 };
 use yggdrasil_abi::net::{link::LinkState, MacAddress};
 
+use crate::regs::Revision;
+
 extern crate alloc;
 
 mod regs;
 mod ring;
 
 struct Igbe {
+    chip: Revision,
     regs: IrqSafeSpinlock<Regs>,
     dma: Arc<dyn DmaAllocator>,
     pci: PciDeviceInfo,
@@ -43,8 +46,9 @@ struct Igbe {
 }
 
 impl Igbe {
-    pub fn new(dma: Arc<dyn DmaAllocator>, regs: Regs, pci: PciDeviceInfo) -> Self {
+    pub fn new(dma: Arc<dyn DmaAllocator>, regs: Regs, chip: Revision, pci: PciDeviceInfo) -> Self {
         Self {
+            chip,
             dma,
             pci,
             mac: OneTimeInit::new(),
@@ -74,7 +78,7 @@ impl Device for Igbe {
         regs.reset(Duration::from_millis(200))?;
         // Intel 8257x manuals say an additional interrupt disable is needed after a global reset
         regs.disable_interrupts();
-        regs.set_link_up()?;
+        regs.set_link_up(self.chip)?;
 
         // Initialize Rx
         regs.initialize_receiver(&rx_ring);
@@ -175,6 +179,10 @@ impl NetworkDevice for Igbe {
 
 pci_driver! {
     matches: [
+        device (0x8086:0x100E), // 82540EM (E1000)
+        device (0x8086:0x100C), // 82544GC (E1000)
+        device (0x8086:0x100F), // 82545EM (E1000)
+        device (0x8086:0x10D3), // 82574L (E1000E) [[BROKEN]]
         device (0x8086:0x10C9), // 82576 GbE
         device (0x8086:0x1502), // 82579LM GbE (Lewisville)
     ],
@@ -197,11 +205,22 @@ pci_driver! {
                 }
             };
 
+            let chip = match info.device_id {
+                0x100E | 0x100C | 0x100F => Revision::I8254x,
+                0x10D3 => Revision::I82574L,
+                0x10C9 => Revision::I82576,
+                0x1502 => Revision::I82579LM,
+                id => {
+                    log::error!("Invalid igbe chip variant: {id:#04x}");
+                    return Err(Error::InvalidOperation)
+                },
+            };
+
             info.init_interrupts(PreferredInterruptMode::Msi(true))?;
             info.set_command(true, use_mmio, !use_mmio, true);
 
             let regs = unsafe { Regs::map(base) }?;
-            let device = Igbe::new(dma.clone(), regs, info.clone());
+            let device = Igbe::new(dma.clone(), regs, chip, info.clone());
             Ok(Arc::new(device))
         }
 

kernel/driver/net/igbe/src/regs.rs

@@ -42,6 +42,14 @@ pub trait Reg {
     const OFFSET: u16;
 }
 
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Revision {
+    I8254x,
+    I82574L,
+    I82576,
+    I82579LM,
+}
+
 register_bitfields! {
     u32,
     pub CTRL [
@@ -329,6 +337,7 @@ impl MdioBus for Regs {
 
         let mdic = self.inner.extract();
         if mdic.matches_all(MDIC::E::SET) {
+            log::warn!("MDIO read error: phyaddr={phyaddr:#x}, regaddr={regaddr:#x}");
             return Err(Error::InvalidOperation);
         }
 
@@ -350,6 +359,9 @@ impl MdioBus for Regs {
         )?;
 
         if self.inner.matches_all(MDIC::E::SET) {
+            log::warn!(
+                "MDIO write error: phyaddr={phyaddr:#x}, regaddr={regaddr:#x}, value={value:#x}"
+            );
             return Err(Error::InvalidOperation);
         }
 
@@ -403,7 +415,7 @@ impl Regs {
         })
     }
 
-    pub fn set_link_up(&mut self) -> Result<(), Error> {
+    pub fn set_link_up(&mut self, chip: Revision) -> Result<(), Error> {
         self.inner
             .modify(CTRL::SLU::SET + CTRL::RFCE::SET + CTRL::TFCE::SET);
 
@@ -412,8 +424,14 @@ impl Regs {
         let (id0, id1) = phy.id()?;
         log::info!("PHY {:04x}:{:04x}", id0, id1);
 
-        phy.reset(Duration::from_millis(200))?;
-        phy.setup_link(true, GBESR::empty())?;
+        phy.reset(Duration::from_millis(200))
+            .inspect_err(|e| log::error!("PHY reset error {e:?}"))?;
+        let force_gbesr = match chip {
+            Revision::I82576 | Revision::I82579LM => Some(GBESR::empty()),
+            _ => None,
+        };
+        phy.setup_link(true, force_gbesr)
+            .inspect_err(|e| log::error!("PHY setup error: {e:?}"))?;
 
         Ok(())
     }

kernel/driver/net/rtl81xx/src/rtl8139.rs

@@ -320,14 +320,14 @@ impl InterruptHandler for Rtl8139 {
                 let rx_len_1 = unsafe { rx.buffer[rx_pos + 3].assume_init() };
                 let rx_len = u16::from_le_bytes([rx_len_0, rx_len_1]) as usize;
 
-                if rx_len >= 16 {
-                    if let Ok(mut packet_buf) = DmaBuffer::new_uninit_slice(&*self.dma, rx_len) {
-                        packet_buf.copy_from_slice(&rx.buffer[rx_pos + 4..rx_pos + rx_len + 4]);
-                        let packet_buf = unsafe { DmaBuffer::assume_init_slice(packet_buf) };
-                        // let packet_buf = unsafe { packet_buf.assume_init_slice() };
-                        let packet = RxPacket::new(packet_buf, 0, nic);
-                        ygg_driver_net_core::receive_packet(packet).ok();
-                    }
+                if rx_len >= 16
+                    && let Ok(mut packet_buf) = DmaBuffer::new_uninit_slice(&*self.dma, rx_len)
+                {
+                    packet_buf.copy_from_slice(&rx.buffer[rx_pos + 4..rx_pos + rx_len + 4]);
+                    let packet_buf = unsafe { DmaBuffer::assume_init_slice(packet_buf) };
+                    // let packet_buf = unsafe { packet_buf.assume_init_slice() };
+                    let packet = RxPacket::new(packet_buf, 0, nic);
+                    ygg_driver_net_core::receive_packet(packet).ok();
                 }
 
                 // rx_len + 4, aligned to 4 bytes