Paul/tiny_os
1
0
Fork 0
mirror of https://github.com/panpaul/tiny_os synced 2024-09-20 09:45:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: drop riscv32

Browse Source
This commit is contained in:
Paul Pan 2024-04-12 23:11:21 +08:00
parent 1d672b4ff8
commit 32759ef037
9 changed files with 39 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/Cargo.toml
View File

@ -6,22 +6,18 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[features] [features]
default = ["riscv.board.virt", "riscv.riscv64"] default = ["riscv.board.virt"]
legacy = ["utils/legacy", "vspace/legacy"]
riscv = [] riscv = []
"riscv.pagetable.sv32" = []
"riscv.pagetable.sv39" = [] "riscv.pagetable.sv39" = []
"riscv.pagetable.sv48" = [] "riscv.pagetable.sv48" = []
"riscv.pagetable.sv57" = [] "riscv.pagetable.sv57" = []
"riscv.riscv64" = ["riscv", "riscv.pagetable.sv39"] "riscv.riscv64" = ["riscv", "riscv.pagetable.sv39"]
"riscv.riscv32" = ["riscv", "riscv.pagetable.sv32", "legacy"]
"riscv.board.default" = [] "riscv.board.default" = ["riscv.riscv64"]
"riscv.board.virt" = [] "riscv.board.virt" = ["riscv.riscv64"]
[dependencies] [dependencies]
allocator = { path = "../lib/allocator" } allocator = { path = "../lib/allocator" }
@ -39,6 +35,6 @@ spin = "0.9"
static_assertions = "1.1" static_assertions = "1.1"
uart_16550 = "0.3" uart_16550 = "0.3"
[target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies] [target.'cfg(target_arch = "riscv64")'.dependencies]
riscv = { version = "0.11", features = ["s-mode"] } riscv = { version = "0.11", features = ["s-mode"] }
sbi-rt = { version = "0.0" } sbi-rt = { version = "0.0" }

68
kernel/src/arch/riscv/board/default/boot.rs
View File

@ -1,41 +1,31 @@
use cfg_if::cfg_if;
use core::arch::global_asm; use core::arch::global_asm;
cfg_if! { global_asm!(
if #[cfg(target_arch = "riscv32")] { "
global_asm!(" .section .text
.section .text .global boot_setup_early_paging
boot_setup_early_paging: boot_setup_early_paging:
jr ra lla t1, boot_page_table
" srli t1, t1, 12
); li t2, 8 << 60
} else if #[cfg(target_arch = "riscv64")]{ or t1, t1, t2
global_asm!(" csrw satp, t1
.section .text sfence.vma
boot_setup_early_paging: jr ra
lla t1, boot_page_table
srli t1, t1, 12 .section .temp.boot_page_table
li t2, 8 << 60 .align 12
or t1, t1, t2 boot_page_table:
csrw satp, t1 # sv39 page table
sfence.vma # 0x00000000_00000000 -> 0x00000000 [ 0x00000000_00000000 -> 0x00000000_40000000 ]
jr ra # 0x00000000_40000000 -> 0x40000000 [ 0x00000000_40000000 -> 0x00000000_80000000 ]
# 0x00000000_80000000 -> 0x80000000 [ 0x00000000_80000000 -> 0x00000001_00000000 ]
.section .temp.boot_page_table # 0xFFFFFFD0_00000000 -> 0x80000000 [ 0xFFFFFFD0_00000000 -> 0xFFFFFFD0_40000000 ]
.align 12 .quad (0x00000 << 10) | 0xf
boot_page_table: .quad (0x40000 << 10) | 0xf
# sv39 page table .quad (0x80000 << 10) | 0xf
# 0x00000000_00000000 -> 0x00000000 [ 0x00000000_00000000 -> 0x00000000_40000000 ] .zero 8 * 317
# 0x00000000_40000000 -> 0x40000000 [ 0x00000000_40000000 -> 0x00000000_80000000 ] .quad (0x80000 << 10) | 0xf
# 0x00000000_80000000 -> 0x80000000 [ 0x00000000_80000000 -> 0x00000001_00000000 ] .zero 8 * 191
# 0xFFFFFFD0_00000000 -> 0x80000000 [ 0xFFFFFFD0_00000000 -> 0xFFFFFFD0_40000000 ] "
.quad (0x00000 << 10) | 0xf );
.quad (0x40000 << 10) | 0xf
.quad (0x80000 << 10) | 0xf
.zero 8 * 317
.quad (0x80000 << 10) | 0xf
.zero 8 * 191
"
);
}
}

26
kernel/src/arch/riscv/entry.rs
View File

@ -1,5 +1,5 @@
use crate::arch::init_early_console; use crate::arch::init_early_console;
use crate::arch::layout::{mmap_phys_to_virt, zero_bss}; use crate::arch::layout::{mmap_phys_to_virt, zero_bss, KERNEL_OFFSET};
use crate::arch::vspace::{setup_kernel_paging, setup_memory}; use crate::arch::vspace::{setup_kernel_paging, setup_memory};
use crate::entry::{rust_main, HART_ID}; use crate::entry::{rust_main, HART_ID};
use crate::plat::console::mute_console; use crate::plat::console::mute_console;
@ -39,14 +39,8 @@ unsafe extern "C" fn _start(hart_id: usize, device_tree_addr: usize) -> ! {
add tp, tp, t0 add tp, tp, t0
add sp, sp, t0 add sp, sp, t0
# TODO: riscv32 do not need it, add a function in board/ and call it
# setup early paging # setup early paging
lla t1, boot_page_table call boot_setup_early_paging
srli t1, t1, 12
li t2, 8 << 60
or t1, t1, t2
csrw satp, t1
sfence.vma
# jump to absolute address # jump to absolute address
lla t1, {main} lla t1, {main}
@ -58,22 +52,6 @@ unsafe extern "C" fn _start(hart_id: usize, device_tree_addr: usize) -> ! {
KERNEL_OFFSET: .quad __kernel_offset KERNEL_OFFSET: .quad __kernel_offset
.global MMAP_OFFSET .global MMAP_OFFSET
MMAP_OFFSET: .quad MMAP_BASE_ADDRESS MMAP_OFFSET: .quad MMAP_BASE_ADDRESS
# TODO: move this into board/
.section .temp.boot_page_table
.align 12
boot_page_table:
# sv39 page table
# 0x00000000_00000000 -> 0x00000000 [ 0x00000000_00000000 -> 0x00000000_40000000 ]
# 0x00000000_40000000 -> 0x40000000 [ 0x00000000_40000000 -> 0x00000000_80000000 ]
# 0x00000000_80000000 -> 0x80000000 [ 0x00000000_80000000 -> 0x00000001_00000000 ]
# 0xFFFFFFD0_00000000 -> 0x80000000 [ 0xFFFFFFD0_00000000 -> 0xFFFFFFD0_40000000 ]
.quad (0x00000 << 10) | 0xf
.quad (0x40000 << 10) | 0xf
.quad (0x80000 << 10) | 0xf
.zero 8 * 317
.quad (0x80000 << 10) | 0xf
.zero 8 * 191
", ",
stack_size = const STACK_SIZE, stack_size = const STACK_SIZE,
stack = sym STACK, stack = sym STACK,

9
kernel/src/arch/riscv/trap.rs
View File

@ -8,14 +8,7 @@ use riscv::register::stvec::TrapMode;
use crate::plat::timer::{Timer, TimerOps}; use crate::plat::timer::{Timer, TimerOps};
use crate::plat::trap::{Trap, TrapContextOps, TrapOps}; use crate::plat::trap::{Trap, TrapContextOps, TrapOps};
cfg_if! { core::arch::global_asm!(include_str!("./asm/trap64.S"));
if #[cfg(feature = "riscv.riscv64")] {
core::arch::global_asm!(include_str!("./asm/trap64.S"));
} else if #[cfg(feature = "riscv.riscv32")] {
core::arch::global_asm!(include_str!("./asm/trap32.S"));
}
}
core::arch::global_asm!(include_str!("./asm/trap_common.S")); core::arch::global_asm!(include_str!("./asm/trap_common.S"));
extern "C" { extern "C" {

4
kernel/src/arch/riscv/vspace/entry.rs
View File

@ -73,12 +73,8 @@ impl From<MapAttr> for PTEFlags {
} }
} }
#[cfg(not(feature = "riscv.pagetable.sv32"))]
assert_eq_size!(Entry, u64); assert_eq_size!(Entry, u64);
#[cfg(feature = "riscv.pagetable.sv32")]
assert_eq_size!(Entry, u32);
#[derive(Clone, Copy, Default)] #[derive(Clone, Copy, Default)]
pub struct Entry(usize); pub struct Entry(usize);

4
kernel/src/arch/riscv/vspace/table.rs
View File

@ -32,8 +32,6 @@ impl Table {
} }
pub fn mode() -> riscv::register::satp::Mode { pub fn mode() -> riscv::register::satp::Mode {
#[cfg(feature = "riscv.pagetable.sv32")]
return riscv::register::satp::Mode::Sv32;
#[cfg(feature = "riscv.pagetable.sv39")] #[cfg(feature = "riscv.pagetable.sv39")]
return riscv::register::satp::Mode::Sv39; return riscv::register::satp::Mode::Sv39;
#[cfg(feature = "riscv.pagetable.sv48")] #[cfg(feature = "riscv.pagetable.sv48")]
@ -46,8 +44,6 @@ impl Table {
impl TableOps for Table { impl TableOps for Table {
type Entry = Entry; type Entry = Entry;
#[cfg(feature = "riscv.pagetable.sv32")]
const MAX_PAGE_SIZE: TableLevel = TableLevel::Level1;
#[cfg(feature = "riscv.pagetable.sv39")] #[cfg(feature = "riscv.pagetable.sv39")]
const MAX_PAGE_SIZE: TableLevel = TableLevel::Level2; const MAX_PAGE_SIZE: TableLevel = TableLevel::Level2;

18
kernel/src/arch/riscv/vspace/traits.rs
View File

@ -34,13 +34,6 @@ pub trait PhysAddrPaging {
} }
} }
#[cfg(feature = "riscv.pagetable.sv32")]
impl PhysAddrPaging for PhysAddr {
const PG_OFFSET: usize = 12;
const PPN_BITS: usize = 22;
const PPN_OFFSET: usize = 10;
}
#[cfg(feature = "riscv.pagetable.sv39")] #[cfg(feature = "riscv.pagetable.sv39")]
impl PhysAddrPaging for PhysAddr { impl PhysAddrPaging for PhysAddr {
const PG_OFFSET: usize = 12; const PG_OFFSET: usize = 12;
@ -72,12 +65,6 @@ pub trait VirtAddrPaging {
} }
} }
#[cfg(feature = "riscv.pagetable.sv32")]
impl VirtAddrPaging for VirtAddr {
const PG_OFFSET: usize = 12;
const VPN_BITS: usize = 10;
}
#[cfg(feature = "riscv.pagetable.sv39")] #[cfg(feature = "riscv.pagetable.sv39")]
impl VirtAddrPaging for VirtAddr { impl VirtAddrPaging for VirtAddr {
const PG_OFFSET: usize = 12; const PG_OFFSET: usize = 12;
@ -98,14 +85,9 @@ impl TableLevelSize for TableLevel {
fn level_size(&self) -> usize { fn level_size(&self) -> usize {
match self { match self {
Self::Level0 => 4 * KIB, Self::Level0 => 4 * KIB,
#[cfg(feature = "riscv.pagetable.sv32")]
Self::Level1 => 4 * MIB,
#[cfg(not(feature = "riscv.pagetable.sv32"))]
Self::Level1 => 2 * MIB, Self::Level1 => 2 * MIB,
Self::Level2 => 1 * GIB, Self::Level2 => 1 * GIB,
#[cfg(not(feature = "legacy"))]
Self::Level3 => 512 * GIB, Self::Level3 => 512 * GIB,
#[cfg(not(feature = "legacy"))]
Self::Level4 => 256 * TIB, Self::Level4 => 256 * TIB,
} }
} }

6
lib/vspace/src/paging/table.rs
View File

@ -7,9 +7,7 @@ pub enum TableLevel {
Level0 = 0, // KiloPage Level0 = 0, // KiloPage
Level1 = 1, // MegaPage Level1 = 1, // MegaPage
Level2 = 2, // GigaPage Level2 = 2, // GigaPage
#[cfg(not(feature = "legacy"))]
Level3 = 3, // TeraPage Level3 = 3, // TeraPage
#[cfg(not(feature = "legacy"))]
Level4 = 4, // PetaPage Level4 = 4, // PetaPage
} }
@ -19,9 +17,7 @@ impl TableLevel {
Self::Level0 => None, Self::Level0 => None,
Self::Level1 => Some(Self::Level0), Self::Level1 => Some(Self::Level0),
Self::Level2 => Some(Self::Level1), Self::Level2 => Some(Self::Level1),
#[cfg(not(feature = "legacy"))]
Self::Level3 => Some(Self::Level2), Self::Level3 => Some(Self::Level2),
#[cfg(not(feature = "legacy"))]
Self::Level4 => Some(Self::Level3), Self::Level4 => Some(Self::Level3),
} }
} }
@ -31,9 +27,7 @@ impl TableLevel {
Self::Level0 => Some(Self::Level1), Self::Level0 => Some(Self::Level1),
Self::Level1 => Some(Self::Level2), Self::Level1 => Some(Self::Level2),
Self::Level2 => Some(Self::Level3), Self::Level2 => Some(Self::Level3),
#[cfg(not(feature = "legacy"))]
Self::Level3 => Some(Self::Level4), Self::Level3 => Some(Self::Level4),
#[cfg(not(feature = "legacy"))]
Self::Level4 => None, Self::Level4 => None,
} }
} }

8
xtask/src/artifact.rs
View File

@ -11,7 +11,6 @@ pub enum Profile {
#[derive(ValueEnum, Copy, Clone)] #[derive(ValueEnum, Copy, Clone)]
#[value(rename_all = "snake_case")] #[value(rename_all = "snake_case")]
pub enum Arch { pub enum Arch {
RISCV32,
RISCV64, RISCV64,
} }
@ -32,8 +31,8 @@ impl Arch {
pub fn rust_flags(&self) -> Vec<String> { pub fn rust_flags(&self) -> Vec<String> {
let mut flags = Self::FLAGS_RELOCATION.iter().map(|s| s.to_string()).collect::<Vec<_>>(); let mut flags = Self::FLAGS_RELOCATION.iter().map(|s| s.to_string()).collect::<Vec<_>>();
match self { match self {
Arch::RISCV32 | Arch::RISCV64 => { Arch::RISCV64 => {
flags.push(format!("-Clink-arg=-Tkernel/src/arch/riscv/linker{}.ld", self.bits())); flags.push("-Clink-arg=-Tkernel/src/arch/riscv/linker64.ld".to_string());
flags flags
}, },
} }
@ -41,13 +40,12 @@ impl Arch {
pub fn triple(&self) -> String { pub fn triple(&self) -> String {
match self { match self {
Arch::RISCV32 | Arch::RISCV64 => format!("riscv{}imac-unknown-none-elf", self.bits()), Arch::RISCV64 => "riscv64imac-unknown-none-elf".to_string(),
} }
} }
pub fn bits(&self) -> u32 { pub fn bits(&self) -> u32 {
match self { match self {
Arch::RISCV32 => 32,
Arch::RISCV64 => 64, Arch::RISCV64 => 64,
} }
} }