diff --git a/awkernel_drivers/src/pcie.rs b/awkernel_drivers/src/pcie.rs index b24167f70..35600f2e3 100644 --- a/awkernel_drivers/src/pcie.rs +++ b/awkernel_drivers/src/pcie.rs @@ -318,13 +318,13 @@ struct UnknownDevice { impl PCIeDevice for UnknownDevice { fn device_name(&self) -> Cow<'static, str> { - let bfd = format!( + let bdf = format!( "{:04x}:{:02x}:{:02x}.{:01x}", self.segment_group, self.bus_number, self.device_number, self.function_number ); let name = format!( - "{bfd}: Vendor ID = {:04x}, Device ID = {:04x}, PCIe Class = {:?}", + "{bdf}: Vendor ID = {:04x}, Device ID = {:04x}, PCIe Class = {:?}", self.vendor, self.id, self.pcie_class, ); name.into() @@ -503,8 +503,8 @@ impl PCIeBus { impl PCIeDevice for PCIeBus { fn device_name(&self) -> Cow<'static, str> { if let Some(info) = self.info.as_ref() { - let bfd = info.get_bfd(); - let name = format!("{bfd}: Bridge, Bus #{:02x}", self.bus_number); + let bdf = info.get_bdf(); + let name = format!("{bdf}: Bridge, Bus #{:02x}", self.bus_number); name.into() } else { let name = format!("Bus #{:02x}", self.bus_number); @@ -549,7 +549,7 @@ fn print_pcie_devices(device: &dyn PCIeDevice, f: &mut fmt::Formatter, indent: u ChildDevice::Unattached(info) => { let name = format!( "{}: Vendor ID = {:04x}, Device ID = {:04x}, PCIe Class = {:?}, bridge = {:?}-{:?}-{:?}", - info.get_bfd(), + info.get_bdf(), info.vendor, info.id, info.pcie_class, @@ -925,8 +925,8 @@ impl PCIeInfo { } } - /// Get the information for PCIe device as BFD format. - pub fn get_bfd(&self) -> String { + /// Get the information for PCIe device as BDF format. + pub fn get_bdf(&self) -> String { format!( "{:04x}:{:02x}:{:02x}.{:01x}", self.segment_group, self.bus_number, self.device_number, self.function_number diff --git a/awkernel_drivers/src/pcie/intel/igb.rs b/awkernel_drivers/src/pcie/intel/igb.rs index aaac69760..2f0902667 100644 --- a/awkernel_drivers/src/pcie/intel/igb.rs +++ b/awkernel_drivers/src/pcie/intel/igb.rs @@ -1774,7 +1774,7 @@ fn allocate_msix( que: &[Queue], ) -> Result { let segment_number = info.segment_group as usize; - let bfd = info.get_bfd(); + let bdf = info.get_bdf(); let msix = info .get_msix_mut() @@ -1790,7 +1790,7 @@ fn allocate_msix( } for q in que.iter() { - let irq_name_rxtx = format!("{}-{}-RxTx{}", DEVICE_SHORT_NAME, bfd, q.me); + let irq_name_rxtx = format!("{}-{}-RxTx{}", DEVICE_SHORT_NAME, bdf, q.me); let mut irq_rxtx = msix .register_handler( irq_name_rxtx.into(), @@ -1806,7 +1806,7 @@ fn allocate_msix( irqs.push((irq_rxtx, IRQRxTxLink::RxTx(q.me))); } - let irq_name_tx = format!("{DEVICE_SHORT_NAME}-{bfd}-Other"); + let irq_name_tx = format!("{DEVICE_SHORT_NAME}-{bdf}-Other"); let mut irq_other = msix .register_handler( irq_name_tx.into(), @@ -1839,7 +1839,7 @@ fn allocate_msi(info: &mut PCIeInfo) -> Result { } let segment_number = info.get_segment_group() as usize; - let irq_name = format!("{}-{}", DEVICE_SHORT_NAME, info.get_bfd()); + let irq_name = format!("{}-{}", DEVICE_SHORT_NAME, info.get_bdf()); if let Some(msi) = info.get_msi_mut() { msi.disable(); @@ -1990,12 +1990,12 @@ fn disable_aspm(hw: &mut igb_hw::IgbHw, info: &mut PCIeInfo) { //=========================================================================== impl PCIeDevice for Igb { fn device_name(&self) -> Cow<'static, str> { - let (mac_type, bfd) = { + let (mac_type, bdf) = { let inner = self.inner.read(); - (inner.hw.get_mac_type(), inner.info.get_bfd()) + (inner.hw.get_mac_type(), inner.info.get_bdf()) }; - let name = format!("{bfd}: {DEVICE_NAME} ({mac_type:?})"); + let name = format!("{bdf}: {DEVICE_NAME} ({mac_type:?})"); name.into() } @@ -2017,8 +2017,8 @@ impl NetDevice for Igb { } fn device_short_name(&self) -> Cow<'static, str> { - let bfd = self.inner.read().info.get_bfd(); - let name = format!("{DEVICE_SHORT_NAME}-{bfd}"); + let bdf = self.inner.read().info.get_bdf(); + let name = format!("{DEVICE_SHORT_NAME}-{bdf}"); name.into() } diff --git a/awkernel_drivers/src/pcie/intel/igc.rs b/awkernel_drivers/src/pcie/intel/igc.rs index 23724ef88..3322f7951 100644 --- a/awkernel_drivers/src/pcie/intel/igc.rs +++ b/awkernel_drivers/src/pcie/intel/igc.rs @@ -280,12 +280,12 @@ impl Igc { impl PCIeDevice for Igc { fn device_name(&self) -> Cow<'static, str> { - let bfd = { + let bdf = { let inner = self.inner.read(); - inner.info.get_bfd() + inner.info.get_bdf() }; - let name = format!("{bfd}: {DEVICE_NAME}"); + let name = format!("{bdf}: {DEVICE_NAME}"); name.into() } @@ -1012,7 +1012,7 @@ fn igc_is_valid_ether_addr(addr: &[u8; 6]) -> bool { /// This function initialize IRQs for the IGC device, /// and returns IRQs for the Rx/Tx queues and an IRQ for events. fn igc_allocate_pci_resources(info: &mut PCIeInfo) -> Result<(Vec, IRQ), PCIeDeviceErr> { - let bfd = info.get_bfd(); + let bdf = info.get_bdf(); let segment_number = info.segment_group as usize; let msix = info.get_msix_mut().ok_or(PCIeDeviceErr::InitFailure)?; @@ -1036,7 +1036,7 @@ fn igc_allocate_pci_resources(info: &mut PCIeInfo) -> Result<(Vec, IRQ), PC let mut irqs_queues = Vec::with_capacity(nqueues as usize); for q in 0..nqueues { - let irq_name_rxtx = format!("{DEVICE_SHORT_NAME}-{bfd}-RxTx{q}"); + let irq_name_rxtx = format!("{DEVICE_SHORT_NAME}-{bdf}-RxTx{q}"); let mut irq_rxtx = msix .register_handler( irq_name_rxtx.into(), @@ -1053,7 +1053,7 @@ fn igc_allocate_pci_resources(info: &mut PCIeInfo) -> Result<(Vec, IRQ), PC } // Initialize the IRQs for the events. - let irq_name_other = format!("{DEVICE_SHORT_NAME}-{bfd}-Other"); + let irq_name_other = format!("{DEVICE_SHORT_NAME}-{bdf}-Other"); let mut irq_other = msix .register_handler( irq_name_other.into(), diff --git a/awkernel_drivers/src/pcie/intel/ixgbe.rs b/awkernel_drivers/src/pcie/intel/ixgbe.rs index 0fa2ed04f..185e8aafe 100644 --- a/awkernel_drivers/src/pcie/intel/ixgbe.rs +++ b/awkernel_drivers/src/pcie/intel/ixgbe.rs @@ -1918,7 +1918,7 @@ fn allocate_msix( que: &[Queue], ) -> Result { let segment_number = info.segment_group as usize; - let bfd = info.get_bfd(); + let bdf = info.get_bdf(); let msix = info .get_msix_mut() @@ -1927,7 +1927,7 @@ fn allocate_msix( let mut irqs = Vec::new(); for q in que.iter() { - let irq_name_rxtx = format!("{}-{}-RxTx{}", DEVICE_SHORT_NAME, bfd, q.me); + let irq_name_rxtx = format!("{}-{}-RxTx{}", DEVICE_SHORT_NAME, bdf, q.me); let mut irq_rxtx = msix .register_handler( irq_name_rxtx.into(), @@ -1943,7 +1943,7 @@ fn allocate_msix( irqs.push((irq_rxtx, IRQRxTxLink::RxTx(q.me))); } - let irq_name_tx = format!("{DEVICE_SHORT_NAME}-{bfd}-Other"); + let irq_name_tx = format!("{DEVICE_SHORT_NAME}-{bdf}-Other"); let mut irq_other = msix .register_handler( irq_name_tx.into(), @@ -1976,7 +1976,7 @@ fn allocate_msi(info: &mut PCIeInfo) -> Result { } let segment_number = info.get_segment_group() as usize; - let irq_name = format!("{}-{}", DEVICE_SHORT_NAME, info.get_bfd()); + let irq_name = format!("{}-{}", DEVICE_SHORT_NAME, info.get_bdf()); if let Some(msi) = info.get_msi_mut() { msi.disable(); @@ -2046,12 +2046,12 @@ fn allocate_queue(info: &PCIeInfo, que_id: usize) -> Result Cow<'static, str> { - let (mac_type, bfd) = { + let (mac_type, bdf) = { let inner = self.inner.read(); - (inner.hw.get_mac_type(), inner.info.get_bfd()) + (inner.hw.get_mac_type(), inner.info.get_bdf()) }; - let name = format!("{bfd}: {DEVICE_NAME} ({mac_type:?})"); + let name = format!("{bdf}: {DEVICE_NAME} ({mac_type:?})"); name.into() } @@ -2072,8 +2072,8 @@ impl NetDevice for Ixgbe { } fn device_short_name(&self) -> Cow<'static, str> { - let bfd = self.inner.read().info.get_bfd(); - let name = format!("{DEVICE_SHORT_NAME}-{bfd}"); + let bdf = self.inner.read().info.get_bdf(); + let name = format!("{DEVICE_SHORT_NAME}-{bdf}"); name.into() } diff --git a/awkernel_drivers/src/pcie/nvme.rs b/awkernel_drivers/src/pcie/nvme.rs index 859b3cb5a..97c8691a2 100644 --- a/awkernel_drivers/src/pcie/nvme.rs +++ b/awkernel_drivers/src/pcie/nvme.rs @@ -776,11 +776,11 @@ impl NvmeInner { fn allocate_msix(&mut self) -> Result { let segment_group = self.info.get_segment_group(); - let bfd = self.info.get_bfd(); + let bdf = self.info.get_bdf(); let msix = self.info.get_msix_mut().ok_or(NvmeDriverErr::InitFailure)?; - let irq_name = format!("{DEVICE_SHORT_NAME}-{bfd}-0"); + let irq_name = format!("{DEVICE_SHORT_NAME}-{bdf}-0"); // Register single interrupt for both admin and I/O queues (like OpenBSD) // ENHANCE: It better to use a separate interrupt vector for I/O queues let mut irq = msix @@ -820,13 +820,13 @@ impl NvmeInner { } let segment_group = self.info.get_segment_group(); - let bfd = self.info.get_bfd(); + let bdf = self.info.get_bdf(); let msi = self.info.get_msi_mut().ok_or(NvmeDriverErr::InitFailure)?; msi.disable(); - let irq_name = format!("{DEVICE_SHORT_NAME}-{bfd}-0"); + let irq_name = format!("{DEVICE_SHORT_NAME}-{bdf}-0"); let mut irq = msi .register_handler( irq_name.into(), @@ -989,8 +989,8 @@ impl Nvme { impl PCIeDevice for Nvme { fn device_name(&self) -> alloc::borrow::Cow<'static, str> { let inner = self.inner.read(); - let bfd = inner.info.get_bfd(); - let name = format!("{bfd}:{DEVICE_NAME}"); + let bdf = inner.info.get_bdf(); + let name = format!("{bdf}:{DEVICE_NAME}"); name.into() } } diff --git a/awkernel_drivers/src/pcie/virtio/virtio_net.rs b/awkernel_drivers/src/pcie/virtio/virtio_net.rs index c9398a47e..95b1ad4a7 100644 --- a/awkernel_drivers/src/pcie/virtio/virtio_net.rs +++ b/awkernel_drivers/src/pcie/virtio/virtio_net.rs @@ -883,12 +883,12 @@ impl VirtioNetInner { irq_type: IRQType, ) -> Result { let segment_number = self.info.segment_group as usize; - let bfd = self.info.get_bfd(); + let bdf = self.info.get_bdf(); let msix = self .info .get_msix_mut() .ok_or(VirtioDriverErr::InitFailure)?; - let irq_name = format!("{DEVICE_SHORT_NAME}-{bfd}-{idx}"); + let irq_name = format!("{DEVICE_SHORT_NAME}-{bdf}-{idx}"); let mut irq_new = msix .register_handler( irq_name.into(), diff --git a/docs/internal/PCIe.html b/docs/internal/PCIe.html index dc2fc795c..d1a9aab14 100644 --- a/docs/internal/PCIe.html +++ b/docs/internal/PCIe.html @@ -235,8 +235,8 @@

PCIeBus

impl PCIeDevice for PCIeBus { fn device_name(&self) -> Cow<'static, str> { if let Some(info) = self.info.as_ref() { - let bfd = info.get_bfd(); - let name = format!("{bfd}: Bridge, Bus #{:02x}", self.bus_number); + let bdf = info.get_bdf(); + let name = format!("{bdf}: Bridge, Bus #{:02x}", self.bus_number); name.into() } else { let name = format!("Bus #{:02x}", self.bus_number); @@ -295,7 +295,7 @@

PCIeInfo

fn from_addr(...)Construct the PCIeInfo structure using virtual address. fn new(...)Construct the PCIeInfo structure. fn init_base_address(&mut self, ranges: &mut [PCIeRange])Initialize the base address of the PCIeInfo based on the PCIe memory range. -pub fn get_bfd(&self)Get PCIe information in BDF (Bus, Device, Function) format. +pub fn get_bdf(&self)Get PCIe information in BDF (Bus, Device, Function) format. pub fn get_secondary_bus(&self)Get the number of the PCIe secondary bus. pub fn get_device_name(&self)Get the name of the PCIe device. pub fn get_class(&self)Get the PCIe device classification. @@ -375,13 +375,13 @@

UnknownDevice fn main() { impl PCIeDevice for PCIeBus { fn device_name(&self) -> Cow<'static, str> { - let bfd = format!( + let bdf = format!( "{:04x}:{:02x}:{:02x}.{:01x}", self.segment_group, self.bus_number, self.device_number, self.function_number ); let name = format!( - "{bfd}: Vendor ID = {:04x}, Device ID = {:04x}, PCIe Class = {:?}", + "{bdf}: Vendor ID = {:04x}, Device ID = {:04x}, PCIe Class = {:?}", self.vendor, self.id, self.pcie_class, ); name.into() @@ -650,7 +650,7 @@

PCIeInfo

fn from_addr(...)Construct the PCIeInfo structure using virtual address. fn new(...)Construct the PCIeInfo structure. fn init_base_address(&mut self, ranges: &mut [PCIeRange])Initialize the base address of the PCIeInfo based on the PCIe memory range. -pub fn get_bfd(&self)Get PCIe information in BDF (Bus, Device, Function) format. +pub fn get_bdf(&self)Get PCIe information in BDF (Bus, Device, Function) format. pub fn get_secondary_bus(&self)Get the number of the PCIe secondary bus. pub fn get_device_name(&self)Get the name of the PCIe device. pub fn get_class(&self)Get the PCIe device classification. @@ -1852,13 +1852,13 @@

UnknownDevice fn main() { impl PCIeDevice for PCIeBus { fn device_name(&self) -> Cow<'static, str> { - let bfd = format!( + let bdf = format!( "{:04x}:{:02x}:{:02x}.{:01x}", self.segment_group, self.bus_number, self.device_number, self.function_number ); let name = format!( - "{bfd}: Vendor ID = {:04x}, Device ID = {:04x}, PCIe Class = {:?}", + "{bdf}: Vendor ID = {:04x}, Device ID = {:04x}, PCIe Class = {:?}", self.vendor, self.id, self.pcie_class, ); name.into() @@ -2127,7 +2127,7 @@