From de4d79e69e5793079447cb83b2207a7cbfeeca50 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sun, 16 Jun 2024 13:23:27 +0200
Subject: [PATCH] pcid: Inline PciEndpointHeader::bars

---
 pcid/src/main.rs       | 44 ++++++++++++++++++++++++++++++++++----
 pcid/src/pci_header.rs | 48 +++---------------------------------------
 2 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/pcid/src/main.rs b/pcid/src/main.rs
index c5870f3b0a..e0d9c44ff5 100644
--- a/pcid/src/main.rs
+++ b/pcid/src/main.rs
@@ -4,13 +4,14 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 
 use log::{debug, info, trace, warn};
-use pci_types::{CommandRegister, PciAddress};
+use pci_types::{Bar as TyBar, CommandRegister, PciAddress};
 use redox_log::{OutputBuilder, RedoxLogger};
 use structopt::StructOpt;
 
 use crate::cfg_access::Pcie;
 use crate::config::Config;
 use crate::driver_interface::LegacyInterruptLine;
+use crate::pci::PciBar;
 use crate::pci_header::{PciEndpointHeader, PciHeader, PciHeaderError};
 
 mod cfg_access;
@@ -43,6 +44,8 @@ pub struct State {
 }
 
 fn handle_parsed_header(state: Arc<State>, config: &Config, header: PciEndpointHeader) {
+    let mut endpoint_header = header.endpoint_header(&state.pcie);
+
     for driver in config.drivers.iter() {
         if !driver.match_function(header.full_device_id()) {
             continue;
@@ -52,8 +55,43 @@ fn handle_parsed_header(state: Arc<State>, config: &Config, header: PciEndpointH
             continue;
         };
 
+        let mut bars = [PciBar::None; 6];
+        let mut skip = false;
+        for i in 0..6 {
+            if skip {
+                skip = false;
+                continue;
+            }
+            match endpoint_header.bar(i, &state.pcie) {
+                Some(TyBar::Io { port }) => {
+                    bars[i as usize] = PciBar::Port(port.try_into().unwrap())
+                }
+                Some(TyBar::Memory32 {
+                    address,
+                    size,
+                    prefetchable: _,
+                }) => {
+                    bars[i as usize] = PciBar::Memory32 {
+                        addr: address,
+                        size,
+                    }
+                }
+                Some(TyBar::Memory64 {
+                    address,
+                    size,
+                    prefetchable: _,
+                }) => {
+                    bars[i as usize] = PciBar::Memory64 {
+                        addr: address,
+                        size,
+                    };
+                    skip = true; // Each 64bit memory BAR occupies two slots
+                }
+                None => bars[i as usize] = PciBar::None,
+            }
+        }
+
         let mut string = String::new();
-        let bars = header.bars(&state.pcie);
         for (i, bar) in bars.iter().enumerate() {
             if !bar.is_none() {
                 string.push_str(&format!(" {i}={}", bar.display()));
@@ -64,8 +102,6 @@ fn handle_parsed_header(state: Arc<State>, config: &Config, header: PciEndpointH
             info!("    BAR{}", string);
         }
 
-        let mut endpoint_header = header.endpoint_header(&state.pcie);
-
         // Enable bus mastering, memory space, and I/O space
         endpoint_header.update_command(&state.pcie, |cmd| {
             cmd | CommandRegister::BUS_MASTER_ENABLE
diff --git a/pcid/src/pci_header.rs b/pcid/src/pci_header.rs
index 376aa42bdd..e777689696 100644
--- a/pcid/src/pci_header.rs
+++ b/pcid/src/pci_header.rs
@@ -1,9 +1,9 @@
 use pci_types::{
-    Bar as TyBar, ConfigRegionAccess, EndpointHeader, HeaderType, PciAddress,
-    PciHeader as TyPciHeader, PciPciBridgeHeader,
+    ConfigRegionAccess, EndpointHeader, HeaderType, PciAddress, PciHeader as TyPciHeader,
+    PciPciBridgeHeader,
 };
 
-use crate::pci::{FullDeviceId, PciBar};
+use crate::pci::FullDeviceId;
 
 #[derive(Debug, PartialEq)]
 pub enum PciHeaderError {
@@ -108,48 +108,6 @@ impl PciEndpointHeader {
     pub fn full_device_id(&self) -> &FullDeviceId {
         &self.shared.full_device_id
     }
-
-    /// Return the Headers BARs.
-    pub fn bars(&self, access: &impl ConfigRegionAccess) -> [PciBar; 6] {
-        let endpoint_header = self.endpoint_header(access);
-
-        let mut bars = [PciBar::None; 6];
-        let mut skip = false;
-        for i in 0..6 {
-            if skip {
-                skip = false;
-                continue;
-            }
-            match endpoint_header.bar(i, access) {
-                Some(TyBar::Io { port }) => {
-                    bars[i as usize] = PciBar::Port(port.try_into().unwrap())
-                }
-                Some(TyBar::Memory32 {
-                    address,
-                    size,
-                    prefetchable: _,
-                }) => {
-                    bars[i as usize] = PciBar::Memory32 {
-                        addr: address,
-                        size,
-                    }
-                }
-                Some(TyBar::Memory64 {
-                    address,
-                    size,
-                    prefetchable: _,
-                }) => {
-                    bars[i as usize] = PciBar::Memory64 {
-                        addr: address,
-                        size,
-                    };
-                    skip = true; // Each 64bit memory BAR occupies two slots
-                }
-                None => bars[i as usize] = PciBar::None,
-            }
-        }
-        bars
-    }
 }
 
 #[cfg(test)]