Merge pull request #1 from fslongjin/wuyujian-patch-virtio-net

bugfix: 初始化BAR之后，未正确设置command register的问题

Author: YJwu2023

kernel/src/driver/pci/pci.rs

@@ -47,7 +47,7 @@ bitflags! {
 
 bitflags! {
     /// The command register in PCI configuration space.
-    pub struct Command: u16 {
+    pub struct CommandRegister: u16 {
         /// The device can respond to I/O Space accesses.
         const IO_SPACE = 1 << 0;
         /// The device can respond to Memory Space accesses.
@@ -311,6 +311,7 @@ impl Default for PciDeviceBar {
 pub fn pci_bar_init(device_function: DeviceFunction) -> Result<PciDeviceBar, PciError> {
     let mut device_bar: PciDeviceBar = PciDeviceBar::default();
     let mut bar_index_ignore: u8 = 255;
+
     for bar_index in 0..6 {
         if bar_index == bar_index_ignore {
             continue;
@@ -435,6 +436,12 @@ pub fn pci_bar_init(device_function: DeviceFunction) -> Result<PciDeviceBar, Pci
             _ => {}
         }
     }
+
+    // 设置command register，使得设备能够使用它的BAR
+    set_command_register(
+        &device_function,
+        CommandRegister::IO_SPACE | CommandRegister::MEMORY_SPACE | CommandRegister::BUS_MASTER,
+    );
     kdebug!("pci_device_bar:{}", device_bar);
     return Ok(device_bar);
 }
@@ -493,3 +500,19 @@ impl Iterator for CapabilityIterator {
         })
     }
 }
+
+/// @brief 设置PCI Config Space里面的Command Register
+///
+/// @param device_function 设备
+/// @param value command register要被设置成的值
+pub fn set_command_register(device_function: &DeviceFunction, value: CommandRegister) {
+    unsafe {
+        pci_write_config(
+            device_function.bus,
+            device_function.device,
+            device_function.function,
+            STATUS_COMMAND_OFFSET,
+            value.bits().into(),
+        );
+    }
+}

kernel/src/driver/virtio/transport_pci.rs

@@ -6,7 +6,7 @@ use crate::driver::pci::pci::{
     capabilities_offset, pci_bar_init, CapabilityIterator, DeviceFunction, PciDeviceBar, PciError,
     PCI_CAP_ID_VNDR,
 };
-use crate::include::bindings::bindings::pci_read_config;
+use crate::include::bindings::bindings::{pci_read_config, pci_write_config};
 use core::{
     fmt::{self, Display, Formatter},
     mem::{align_of, size_of},
@@ -122,6 +122,7 @@ impl PciTransport {
             device_function: device_function,
             next_capability_offset: capabilities_offset(device_function),
         };
+        
         let device_bar = pci_bar_init(device_function)?;
 
         for capability in device_capability {

kernel/src/driver/virtio/virtio.rs

@@ -1,7 +1,7 @@
 use super::transport_pci::PciTransport;
 use super::virtio_impl::HalImpl;
 use crate::driver::pci::pci::DeviceFunction;
-use crate::include::bindings::bindings::{get_virtio_net_device, false_};
+use crate::include::bindings::bindings::get_virtio_net_device;
 use crate::{kdebug, kerror, kwarn};
 use alloc::{boxed::Box, collections::LinkedList};
 use virtio_drivers::device::net::VirtIONet;
@@ -90,29 +90,42 @@ fn virtio_net<T: Transport>(transport: T) {
             return;
         }
     };
+
     let mut buf = [0u8; 0x100];
     // let len = match driver_net.recv(&mut buf)
     // {
     //     Ok(len) =>{len},
     //     Err(_) =>{kerror!("virtio_net recv failed");return;}
     // };
-    match driver_net.can_send()
-    {
-        true=>{    kdebug!("can send");},
-        false=>{   kdebug!("can not send");},
+    match driver_net.can_send() {
+        true => {
+            kdebug!("can send");
+        }
+        false => {
+            kdebug!("can not send");
+        }
     }
-    match driver_net.can_recv()
-    {
-        true=>{ kdebug!("can recv")},
-        false=>{ kdebug!("can not recv");}
+    match driver_net.can_recv() {
+        true => {
+            kdebug!("can recv")
+        }
+        false => {
+            kdebug!("can not recv");
+        }
     }
-    let len=100;
+
+    let len = 100;
     kdebug!("recv: {:?}", &buf[..len]);
-    match driver_net.send(&buf[..len])
-    {
-        Ok(_) =>{kdebug!("virtio_net send success");},
-        Err(_) =>{kerror!("virtio_net send failed");return;},
+    match driver_net.send(&buf[..len]) {
+        Ok(_) => {
+            kdebug!("virtio_net send success");
+        }
+        Err(_) => {
+            kerror!("virtio_net send failed");
+            return;
+        }
     }
+
     let mac = driver_net.mac();
     kdebug!("virtio_net MAC={:?}", mac);
     kdebug!("virtio-net test finished");