add interface to determine the name of a device driver

src/arch/riscv64/kernel/interrupts.rs

@@ -50,10 +50,7 @@ pub fn enable() {
  }
 }
 
-#[cfg(all(feature = "pci", feature = "tcp"))]
-pub fn add_irq_name(irq_number: u8, name: &'static str) {
- warn!("add_irq_name({irq_number}, {name}) called but not implemented");
-}
+pub(crate) fn add_irq_name(_irq_number: u8, _name: &'static str) {}
 
 /// Waits for the next interrupt (Only Supervisor-level software/timer interrupt for now)
 /// and calls the specific handler

src/drivers/fs/virtio_fs.rs

@@ -200,6 +200,10 @@ impl Driver for VirtioFsDriver {
  fn get_interrupt_number(&self) -> InterruptLine {
  self.irq
  }
+
+ fn get_name(&self) -> &str {
+ "virtio"
+ }
 }
 
 /// Error module of virtios filesystem driver.

src/drivers/mod.rs

@@ -112,6 +112,9 @@ pub mod error {
 pub(crate) trait Driver {
  /// Returns the interrupt number of the device
  fn get_interrupt_number(&self) -> InterruptLine;
+
+ /// Returns the device driver name
+ fn get_name(&self) -> &str;
 }
 
 pub(crate) fn init() {

src/drivers/net/gem.rs

@@ -406,6 +406,10 @@ impl Driver for GEMDriver {
  fn get_interrupt_number(&self) -> InterruptLine {
  self.irq
  }
+
+ fn get_name(&self) -> &str {
+ "gem"
+ }
 }
 
 impl GEMDriver {

src/drivers/net/rtl8139.rs

@@ -349,6 +349,10 @@ impl Driver for RTL8139Driver {
  fn get_interrupt_number(&self) -> InterruptLine {
  self.irq
  }
+
+ fn get_name(&self) -> &str {
+ "rtl8139"
+ }
 }
 
 impl RTL8139Driver {
@@ -571,9 +575,8 @@ pub(crate) fn init_device(
  );
  }
 
- // Install interrupt handler for RTL8139
- debug!("Install interrupt handler for RTL8139 at {}", irq);
- add_irq_name(irq, "rtl8139_net");
+ info!("RTL8139 use interrupt line {}", irq);
+ add_irq_name(irq, "rtl8139");
 
  Ok(RTL8139Driver {
  iobase,

src/drivers/net/virtio/mod.rs

@@ -414,6 +414,10 @@ impl Driver for VirtioNetDriver {
  fn get_interrupt_number(&self) -> InterruptLine {
  self.irq
  }
+
+ fn get_name(&self) -> &str {
+ "virtio"
+ }
 }
 
 // Backend-independent interface for Virtio network driver

src/drivers/virtio/transport/mmio.rs

@@ -369,8 +369,9 @@ pub(crate) fn init_device(
  virtio::Id::Net => match VirtioNetDriver::init(dev_id, registers, irq_no) {
  Ok(virt_net_drv) => {
  info!("Virtio network driver initialized.");
- #[cfg(not(target_arch = "riscv64"))]
+
  crate::arch::interrupts::add_irq_name(irq_no, "virtio");
+ info!("Virtio interrupt handler at line {}", irq_no);
 
  Ok(VirtioDriver::Network(virt_net_drv))
  }
@@ -383,8 +384,9 @@ pub(crate) fn init_device(
  virtio::Id::Vsock => match VirtioVsockDriver::init(dev_id, registers, irq_no) {
  Ok(virt_net_drv) => {
  info!("Virtio sock driver initialized.");
- #[cfg(not(target_arch = "riscv64"))]
+
  crate::arch::interrupts::add_irq_name(irq_no, "virtio");
+ info!("Virtio interrupt handler at line {}", irq_no);
 
  Ok(VirtioDriver::Vsock(virt_vsock_drv))
  }

src/drivers/virtio/transport/pci.rs

@@ -888,11 +888,16 @@ pub(crate) fn init_device(
 
  let id = virtio::Id::from(u8::try_from(device_id - 0x1040).unwrap());
 
- let virt_drv = match id {
+ match id {
  #[cfg(all(not(feature = "rtl8139"), any(feature = "tcp", feature = "udp")))]
  virtio::Id::Net => match VirtioNetDriver::init(device) {
  Ok(virt_net_drv) => {
  info!("Virtio network driver initialized.");
+
+ let irq = device.get_irq().unwrap();
+ crate::arch::interrupts::add_irq_name(irq, "virtio");
+ info!("Virtio interrupt handler at line {}", irq);
+
  Ok(VirtioDriver::Network(virt_net_drv))
  }
  Err(virtio_error) => {
@@ -907,6 +912,11 @@ pub(crate) fn init_device(
  virtio::Id::Vsock => match VirtioVsockDriver::init(device) {
  Ok(virt_sock_drv) => {
  info!("Virtio sock driver initialized.");
+
+ let irq = device.get_irq().unwrap();
+ crate::arch::interrupts::add_irq_name(irq, "virtio");
+ info!("Virtio interrupt handler at line {}", irq);
+
  Ok(VirtioDriver::Vsock(virt_sock_drv))
  }
  Err(virtio_error) => {
@@ -943,32 +953,6 @@ pub(crate) fn init_device(
  VirtioError::DevNotSupported(device_id),
  ))
  }
- };
-
- match virt_drv {
- Ok(drv) => match &drv {
- #[cfg(all(not(feature = "rtl8139"), any(feature = "tcp", feature = "udp")))]
- VirtioDriver::Network(_) => {
- let irq = device.get_irq().unwrap();
-
- info!("Install virtio interrupt handler at line {}", irq);
- crate::arch::interrupts::add_irq_name(irq, "virtio");
-
- Ok(drv)
- }
- #[cfg(feature = "vsock")]
- VirtioDriver::Vsock(_) => {
- let irq = device.get_irq().unwrap();
-
- info!("Install virtio interrupt handler at line {}", irq);
- crate::arch::interrupts::add_irq_name(irq, "virtio");
-
- Ok(drv)
- }
- #[cfg(feature = "fuse")]
- VirtioDriver::FileSystem(_) => Ok(drv),
- },
- Err(virt_err) => Err(virt_err),
  }
 }
 

src/drivers/vsock/mod.rs

@@ -296,6 +296,10 @@ impl Driver for VirtioVsockDriver {
  fn get_interrupt_number(&self) -> InterruptLine {
  self.irq
  }
+
+ fn get_name(&self) -> &str {
+ "virtio"
+ }
 }
 
 impl VirtioVsockDriver {