feat: impl symlink

Author: yfblock

Cargo.lock

@@ -49,9 +49,9 @@ logging = { path = "crates/logging" }
 signal = { path = "crates/signal" }
 sync = { path = "crates/sync" }
 
-polyhal = { version = "0.2.3", features = ["logger", "trap"] }
-polyhal-boot = { version = "0.2.3" }
-polyhal-trap = { version = "0.2.3" }
+polyhal = { version = "0.2.4", features = ["logger", "trap"] }
+polyhal-boot = { version = "0.2.4" }
+polyhal-trap = { version = "0.2.4" }
 fdt-parser = { version = "0.4.12" }
 
 syscalls = { git = "https://github.com/jasonwhite/syscalls.git", default-features = false }

Cargo.toml

@@ -2,12 +2,6 @@
 
 ## How to use this project
 
-Install build package.
-
-```shell
-cargo install --git https://github.com/Byte-OS/cargo-byteos
-```
-
 Run with make file.
 
 ```shell
@@ -21,18 +15,6 @@ make PLATFORM=x86_64-qemu run
 make PLATFORM=loongarch64-qemu run
 ```
 
-You can find available modules using the following command.
-
-```shell
-byteos patch list
-
-# Download and patch in Cargo.toml
-byteos patch add arch
-
-# remove patch and delete folder
-byteos patch remove arch
-```
-
 ## byteos.yaml
 
 > byteos.yaml is a configuration file for the ByteOS.

README.md

@@ -12,7 +12,7 @@ bin:
   riscv64-qemu:
     target: "riscv64gc-unknown-none-elf"
     configs:
-      driver: "kramdisk"
+      driver: "kvirtio"
   riscv64-vf2:
     target: "riscv64imac-unknown-none-elf"
     configs:
@@ -21,7 +21,7 @@ bin:
   x86_64-qemu:
     target: "x86_64-unknown-none"
     configs:
-      driver: "kvirtio,kramdisk"
+      driver: "kvirtio"
   x86_64-generic:
     target: "x86_64-unknown-none"
     configs:

byteos.yaml

@@ -13,6 +13,5 @@ fdt-parser = { workspace = true }
 linkme = { version = "0.3.22", features = ["used_linker"] }
 log = "0.4"
 sync = { workspace = true }
-virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "61ece50" }
 timestamp = { git = "https://github.com/Byte-OS/timestamp.git" }
 runtime = { workspace = true }

crates/devices/Cargo.toml

@@ -7,5 +7,4 @@ edition = "2021"
 
 [dependencies]
 log = "0.4"
-virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "61ece50" }
 devices = { workspace = true }

driver/kramdisk/Cargo.toml

@@ -7,5 +7,6 @@ edition = "2021"
 
 [dependencies]
 log = "0.4"
-virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "61ece50" }
+# virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "61ece50" }
+virtio-drivers = { version = "0.8" }
 devices = { workspace = true }

driver/kvirtio/Cargo.toml

@@ -27,6 +27,8 @@ use virtio_drivers::transport::{
 
 #[cfg(any(target_arch = "x86_64"))]
 use devices::ALL_DEVICES;
+#[cfg(any(target_arch = "x86_64"))]
+use virtio_drivers::transport::pci::bus::MmioCam;
 
 #[cfg(any(target_arch = "x86_64"))]
 use virtio_drivers::transport::pci::{
@@ -79,7 +81,7 @@ fn virtio_device(transport: MmioTransport, node: &Node) -> Arc<dyn Driver> {
 fn enumerate_pci(mmconfig_base: *mut u8) {
     info!("mmconfig_base = {:#x}", mmconfig_base as usize);
 
-    let mut pci_root = unsafe { PciRoot::new(mmconfig_base, Cam::Ecam) };
+    let mut pci_root = unsafe { PciRoot::<MmioCam>::new(MmioCam::new(mmconfig_base, Cam::Ecam)) };
     for (device_function, info) in pci_root.enumerate_bus(0) {
         let (status, command) = pci_root.get_status_command(device_function);
         info!(
@@ -97,7 +99,7 @@ fn enumerate_pci(mmconfig_base: *mut u8) {
             dump_bar_contents(&mut pci_root, device_function, 4);
 
             let mut transport =
-                PciTransport::new::<HalImpl>(&mut pci_root, device_function).unwrap();
+                PciTransport::new::<HalImpl, MmioCam>(&mut pci_root, device_function).unwrap();
             info!(
                 "Detected virtio PCI device with device type {:?}, features {:#018x}",
                 transport.device_type(),
@@ -127,7 +129,7 @@ fn virtio_device_probe(transport: impl Transport + 'static) {
 }
 
 #[cfg(any(target_arch = "x86_64"))]
-fn dump_bar_contents(root: &mut PciRoot, device_function: DeviceFunction, bar_index: u8) {
+fn dump_bar_contents(root: &mut PciRoot<MmioCam>, device_function: DeviceFunction, bar_index: u8) {
     let bar_info = root.bar_info(device_function, bar_index).unwrap();
     trace!("Dumping bar {}: {:#x?}", bar_index, bar_info);
     if let BarInfo::Memory { address, size, .. } = bar_info {

driver/kvirtio/src/lib.rs

@@ -36,7 +36,6 @@ unsafe impl Hal for HalImpl {
     }
 
     unsafe fn mmio_phys_to_virt(paddr: PhysAddr, _size: usize) -> NonNull<u8> {
-        warn!("phys to virt");
         NonNull::new((usize::from(paddr) | VIRT_ADDR_START) as *mut u8).unwrap()
     }
 

driver/kvirtio/src/virtio_impl.rs

@@ -37,7 +37,6 @@ impl INodeInterface for Tty {
             }
             Ok(rlen)
         } else {
-            // VfsError::Blocking
             if let Some(c) = get_char() {
                 buffer[0] = c as u8;
                 Ok(1)