K210

.cargo/linker-k210.ld

@@ -0,0 +1,52 @@
+OUTPUT_ARCH(riscv)
+ENTRY(_start)
+
+BASE_ADDRESS = 0xffffffc080020000;
+
+__ENTRY_ADDR = 0x80020000;
+
+SECTIONS
+{
+    /* Load the kernel at this address: "." means the current address */
+    . = BASE_ADDRESS;
+    start = .;
+
+    .text ALIGN(4K): AT(__ENTRY_ADDR) {
+        stext = .;
+        *(.text.entry)
+        *(.text .text.*)
+        . = ALIGN(4K);
+        etext = .;
+    }
+
+    .rodata ALIGN(4K): {
+        srodata = .;
+        *(.rodata .rodata.*)
+        . = ALIGN(4K);
+        erodata = .;
+    }
+
+    .data ALIGN(4K): {
+        . = ALIGN(4K);
+        *(.data.prepage)
+        . = ALIGN(4K);
+        sdata = .;
+        *(.data .data.*)
+        *(.sdata .sdata.*)
+        edata = .;
+    }
+
+    .stack : {
+        *(.bss.stack)
+    }
+
+    .bss : {
+        *(.bss.stack)
+        sbss = .;
+        *(.bss .bss.*)
+        *(.sbss .sbss.*)
+        ebss = .;
+    }
+
+    PROVIDE(end = .);
+}

.cargo/linker-qemu.ld

@@ -0,0 +1,52 @@
+OUTPUT_ARCH(riscv)
+ENTRY(_start)
+
+BASE_ADDRESS = 0xffffffc080200000;
+
+__ENTRY_ADDR = 0x80200000;
+
+SECTIONS
+{
+    /* Load the kernel at this address: "." means the current address */
+    . = BASE_ADDRESS;
+    start = .;
+
+    .text ALIGN(4K): AT(__ENTRY_ADDR) {
+        stext = .;
+        *(.text.entry)
+        *(.text .text.*)
+        . = ALIGN(4K);
+        etext = .;
+    }
+
+    .rodata ALIGN(4K): {
+        srodata = .;
+        *(.rodata .rodata.*)
+        . = ALIGN(4K);
+        erodata = .;
+    }
+
+    .data ALIGN(4K): {
+        . = ALIGN(4K);
+        *(.data.prepage)
+        . = ALIGN(4K);
+        sdata = .;
+        *(.data .data.*)
+        *(.sdata .sdata.*)
+        edata = .;
+    }
+
+    .stack : {
+        *(.bss.stack)
+    }
+
+    .bss : {
+        *(.bss.stack)
+        sbss = .;
+        *(.bss .bss.*)
+        *(.sbss .sbss.*)
+        ebss = .;
+    }
+
+    PROVIDE(end = .);
+}

.cargo/linker-riscv.ld

@@ -1,9 +1,9 @@
 OUTPUT_ARCH(riscv)
 ENTRY(_start)
 
-BASE_ADDRESS = 0xffffffc080200000;
+BASE_ADDRESS = 0xffffffc080020000;
 
-__ENTRY_ADDR = 0x80200000;
+__ENTRY_ADDR = 0x80020000;
 
 SECTIONS
 {

Makefile

@@ -4,7 +4,7 @@ RELEASE := release
 KERNEL_ELF = target/$(ARCH)-unknown-none-elf/$(RELEASE)/kernel
 # SBI	:= tools/rustsbi-qemu.bin
 FS_IMG  := mount.img
-SBI := tools/opensbi-qemu.bin
+SBI := tools/rustsbi-k210.bin
 QEMU_EXEC := qemu-system-riscv64 \
 				-machine virt \
 				-kernel $(KERNEL_ELF) \
@@ -15,6 +15,9 @@ QEMU_EXEC := qemu-system-riscv64 \
 				-nographic \
 				-smp 2
 RUST_BUILD_OPTIONS := 
+K210-SERIALPORT	= /dev/ttyUSB0
+K210-BURNER	= tools/k210/kflash.py
+BIN_FILE = byteos.bin
 
 ifeq ($(RELEASE), release)
 	RUST_BUILD_OPTIONS += --release
@@ -34,8 +37,17 @@ fs-img:
 	sudo umount $(FS_IMG)
 
 build: fs-img
+	cp .cargo/linker-qemu.ld .cargo/linker-riscv.ld
 	RUST_BACKTRACE=1 LOG=$(LOG) cargo build $(RUST_BUILD_OPTIONS) $(OFFLINE)
 
+k210-build: 
+	cp .cargo/linker-k210.ld .cargo/linker-riscv.ld
+	RUST_BACKTRACE=1 LOG=$(LOG) cargo build $(RUST_BUILD_OPTIONS) $(OFFLINE)
+	rust-objcopy --binary-architecture=riscv64 $(KERNEL_ELF) --strip-all -O binary $(BIN_FILE)
+	@cp $(SBI) $(SBI).copy
+	@dd if=$(BIN_FILE) of=$(SBI).copy bs=131072 seek=1
+	@mv $(SBI).copy $(BIN_FILE)
+
 run: build
 	$(QEMU_EXEC)
 
@@ -54,6 +66,12 @@ gdb:
         -ex 'set arch riscv:rv64' \
         -ex 'target remote localhost:1234'
 
+flash: k210-build
+	(which $(K210-BURNER)) || (cd tools && git clone https://github.com/sipeed/kflash.py.git k210)
+	@sudo chmod 777 $(K210-SERIALPORT)
+	python3 $(K210-BURNER) -p $(K210-SERIALPORT) -b 1500000 $(BIN_FILE)
+	python3 -m serial.tools.miniterm --eol LF --dtr 0 --rts 0 --filter direct $(K210-SERIALPORT) 115200
+
 addr2line:
 	addr2line -sfipe $(KERNEL_ELF) | rustfilt
 

arch/src/riscv64/mod.rs

@@ -34,7 +34,8 @@ extern "C" fn rust_main(hartid: usize, device_tree: usize) {
         // 开启SUM位 让内核可以访问用户空间  踩坑：
         // only in qemu. eg: qemu is riscv 1.10  NOTE: k210 is riscv 1.9.1
         // in 1.10 is SUM but in 1.9.1 is PUM which is the opposite meaning with SUM
-        sstatus::set_sum();
+        // use default @ k210
+        // sstatus::set_sum();
 
         main(hartid, device_tree);
     }

kernel/src/main.rs

@@ -17,11 +17,26 @@ use hal;
 use kalloc;
 use panic_handler as _;
 
+
+fn clear_bss() {
+    extern "C" {
+        fn sbss();
+        fn ebss();
+    }
+    unsafe {
+        core::slice::from_raw_parts_mut(sbss as usize as *mut u8, ebss as usize - sbss as usize)
+            .fill(0);
+    }
+}
+
+
 #[no_mangle]
 fn main(hart_id: usize, device_tree: usize) {
-    // if hart_id != 0 {
-    //     loop {}
-    // }
+    if hart_id != 0 {
+        loop {}
+    }
+
+    clear_bss();
 
     let str = include_str!("banner.txt");
     println!("{}", str);
@@ -33,7 +48,7 @@ fn main(hart_id: usize, device_tree: usize) {
     hal::interrupt::init();
 
     // print boot info
-    info!("booting at kernel {}", hart_id);
+    println!("booting at kernel {}", hart_id);
 
     // initialize kernel alloc module
     kalloc::init();
@@ -48,7 +63,7 @@ fn main(hart_id: usize, device_tree: usize) {
     devices::prepare_devices();
 
     // initialize filesystem
-    fs::init();
+    // fs::init();
 
     // init kernel threads and async executor
     tasks::init();

kernel/src/tasks/initproc.rs

@@ -227,10 +227,10 @@ pub async fn initproc() {
 
     // command("busybox sh").await;
     // command("busybox sh busybox_testcode.sh").await;
-    run_libc_test().await;
+    // run_libc_test().await;
     // run_all().await;
 
-    // simple_shell().await;
+    simple_shell().await;
     // command("helloworld").await;
     // command("filelist").await;
 }

modules/logging/src/lib.rs

@@ -35,7 +35,10 @@ impl Write for Logger {
 }
 
 pub fn init() {
-    log::set_logger(&Logger).unwrap();
+    if let Err(e) = log::set_logger(&Logger) {
+        println!("log error: {:?}", e);
+        return;
+    }
     log::set_max_level(match option_env!("LOG") {
         Some("error") => LevelFilter::Error,
         Some("warn") => LevelFilter::Warn,