device/pci: Misc fixes

Author: marv7000

kernel/src/device/acpi/uacpi.rs

@@ -78,7 +78,7 @@ extern "C" fn uacpi_kernel_pci_device_open(
 
 #[unsafe(no_mangle)]
 extern "C" fn uacpi_kernel_pci_device_close(arg1: uacpi_handle) {
-    // This function intentionally left blank.
+    drop(unsafe { Box::from_raw(arg1 as *mut Address) });
 }
 
 fn pci_access_from_address(address: Address) -> Option<&'static dyn Access> {

kernel/src/device/pci/device.rs

@@ -1,22 +1,7 @@
 use super::config::Address;
-use crate::{posix::errno::EResult, util::mutex::spin::SpinMutex};
+use crate::util::mutex::spin::SpinMutex;
 use alloc::vec::Vec;
 
-pub trait Device {
-    /// Returns the PCI address of this device.
-    fn address(&self) -> Address;
-
-    /// Called when a device is put to sleep.
-    fn suspend(&self) -> EResult<()> {
-        Ok(())
-    }
-
-    /// Called when a device is woken up.
-    fn resume(&self) -> EResult<()> {
-        Ok(())
-    }
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum PciBar {
     Mmio32 {

kernel/src/device/pci/driver.rs

@@ -1,5 +1,6 @@
-use super::{ACCESS, DeviceView, config, device::PCI_DEVICES};
+use super::{DeviceView, config, device::PCI_DEVICES};
 use crate::{
+    device::pci::ACCESS,
     memory::view::MemoryView,
     posix::errno::{EResult, Errno},
     util::mutex::spin::SpinMutex,
@@ -83,22 +84,24 @@ static DRIVERS: SpinMutex<BTreeMap<&'static str, Driver>> = SpinMutex::new(BTree
 
 impl Driver {
     pub fn register(self) -> EResult<()> {
-        let mut drivers = DRIVERS.lock();
+        {
+            let mut drivers = DRIVERS.lock();
 
-        if drivers.contains_key(self.name) {
-            warn!("Driver {} is already registered", self.name);
-            return Err(Errno::EEXIST);
-        }
+            if drivers.contains_key(self.name) {
+                warn!("Driver {} is already registered", self.name);
+                return Err(Errno::EEXIST);
+            }
 
-        if self.variants.is_empty() {
-            warn!(
-                "PCI Driver \"{}\" does not define any variants, ignoring",
-                self.name
-            );
-            return Ok(());
-        }
+            if self.variants.is_empty() {
+                warn!(
+                    "PCI Driver \"{}\" does not define any variants, ignoring",
+                    self.name
+                );
+                return Ok(());
+            }
 
-        drivers.insert(self.name, self);
+            drivers.insert(self.name, self);
+        }
 
         log!(
             "Registered new PCI driver \"{}\" with {} variant(s)",
@@ -132,7 +135,9 @@ impl Driver {
                     && v.sub_class.is_none_or(|x| x == sub_class)
                     && v.class.is_none_or(|x| x == class)
             }) {
-                (self.probe)(variant, view)?;
+                if let Err(e) = (self.probe)(variant, view) {
+                    warn!("{}: {} failed to probe: {:?}", addr, self.name, e);
+                }
             }
         }