vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce a FullDeviceId type and pass it in pcid_interface

Browse Source
This commit is contained in:
bjorn3
2024-01-21 15:18:56 +01:00
parent 92914e808c
commit 1890293e86
11 changed files with 72 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ihdad/src/main.rs
+2 -1
View File
@@ -185,7 +185,8 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
let mut irq_file = get_int_method(&mut pcid_handle).expect("ihdad: no interrupt file");
{
let vend_prod:u32 = ((pci_config.func.venid as u32) << 16) | (pci_config.func.devid as u32);
let vend_prod: u32 = ((pci_config.func.full_device_id.vendor_id as u32) << 16)
| (pci_config.func.full_device_id.device_id as u32);
let device = Arc::new(RefCell::new(unsafe { hda::IntelHDA::new(address, vend_prod).expect("ihdad: failed to allocate device") }));
let socket_fd = syscall::open(":audiohw", syscall::O_RDWR | syscall::O_CREAT | syscall::O_NONBLOCK).expect("ihdad: failed to create hda scheme");
pcid/src/config.rs
+10 -12
View File
@@ -3,7 +3,7 @@ use std::ops::Range;
use serde::Deserialize;
use crate::pci::PciHeader;
use crate::pci::FullDeviceId;
#[derive(Clone, Debug, Default, Deserialize)]
pub struct Config {
@@ -24,21 +24,21 @@ pub struct DriverConfig {
}
impl DriverConfig {
pub fn match_function(&self, header: &PciHeader) -> bool {
pub fn match_function(&self, id: &FullDeviceId) -> bool {
if let Some(class) = self.class {
if class != header.class().into() {
if class != id.class {
return false;
}
}
if let Some(subclass) = self.subclass {
if subclass != header.subclass() {
if subclass != id.subclass {
return false;
}
}
if let Some(interface) = self.interface {
if interface != header.interface() {
if interface != id.interface {
return false;
}
}
@@ -49,12 +49,12 @@ impl DriverConfig {
let vendor_without_prefix = vendor.trim_start_matches("0x");
let vendor = i64::from_str_radix(vendor_without_prefix, 16).unwrap() as u16;
if vendor != header.vendor_id() {
if vendor != id.vendor_id {
continue;
}
for device in devices {
if *device == header.device_id() {
if *device == id.device_id {
device_found = true;
break;
}
@@ -65,22 +65,20 @@ impl DriverConfig {
}
} else {
if let Some(vendor) = self.vendor {
if vendor != header.vendor_id() {
if vendor != id.vendor_id {
return false;
}
}
if let Some(device) = self.device {
if device != header.device_id() {
if device != id.device_id {
return false;
}
}
}
if let Some(ref device_id_range) = self.device_id_range {
if header.device_id() < device_id_range.start
|| device_id_range.end <= header.device_id()
{
if id.device_id < device_id_range.start || device_id_range.end <= id.device_id {
return false;
}
}
pcid/src/driver_interface/mod.rs
+3 -5
View File
@@ -9,7 +9,7 @@ use thiserror::Error;
pub use crate::pci::cap::Capability;
pub use crate::pci::msi;
pub use crate::pci::{PciAddress, PciBar, PciHeader};
pub use crate::pci::{FullDeviceId, PciAddress, PciBar, PciHeader};
pub mod irq_helpers;
@@ -45,10 +45,8 @@ pub struct PciFunction {
/// Legacy interrupt pin (INTx#), none if INTx# interrupts aren't supported at all.
pub legacy_interrupt_pin: Option<LegacyInterruptPin>,
/// Vendor ID
pub venid: u16,
/// Device ID
pub devid: u16,
/// All identifying information of the PCI function.
pub full_device_id: FullDeviceId,
}
impl PciFunction {
pub fn name(&self) -> String {
pcid/src/main.rs
+2 -3
View File
@@ -265,7 +265,7 @@ fn handle_parsed_header(state: Arc<State>, config: &Config, addr: PciAddress, he
info!("{}", string);
for driver in config.drivers.iter() {
if !driver.match_function(&header) {
if !driver.match_function(header.full_device_id()) {
continue;
}
@@ -362,10 +362,9 @@ fn handle_parsed_header(state: Arc<State>, config: &Config, addr: PciAddress, he
bars,
bar_sizes,
addr,
devid: header.device_id(),
legacy_interrupt_line: irq,
legacy_interrupt_pin,
venid: header.vendor_id(),
full_device_id: header.full_device_id().clone(),
};
let subdriver_args = driver_interface::SubdriverArguments {
pcid/src/pci/header.rs
+37 -71
View File
@@ -5,6 +5,7 @@ use serde::{Deserialize, Serialize};
use super::bar::PciBar;
use super::class::PciClass;
use super::func::ConfigReader;
use super::id::FullDeviceId;
#[derive(Debug, PartialEq)]
pub enum PciHeaderError {
@@ -31,14 +32,9 @@ bitflags! {
#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
pub struct SharedPciHeader {
vendor_id: u16,
device_id: u16,
full_device_id: FullDeviceId,
command: u16,
status: u16,
revision: u8,
interface: u8,
subclass: u8,
class: PciClass,
cache_line_size: u8,
latency_timer: u8,
header_type: PciHeaderType,
@@ -127,20 +123,22 @@ impl PciHeader {
let revision = bytes[8];
let interface = bytes[9];
let subclass = bytes[10];
let class = PciClass::from(bytes[11]);
let class = bytes[11];
let cache_line_size = bytes[12];
let latency_timer = bytes[13];
let header_type = PciHeaderType::from_bits_truncate(bytes[14]);
let bist = bytes[15];
let shared = SharedPciHeader {
full_device_id: FullDeviceId {
vendor_id,
device_id,
class,
subclass,
interface,
revision,
},
command,
status,
revision,
interface,
subclass,
class,
cache_line_size,
latency_timer,
header_type,
@@ -245,88 +243,56 @@ impl PciHeader {
}
}
/// Return the Vendor ID field.
pub fn vendor_id(&self) -> u16 {
/// Return all identifying information of the PCI function.
pub fn full_device_id(&self) -> &FullDeviceId {
match self {
&PciHeader::General {
shared: SharedPciHeader { vendor_id, .. },
PciHeader::General {
shared:
SharedPciHeader {
full_device_id: device_id,
..
},
..
}
| &PciHeader::PciToPci {
shared: SharedPciHeader { vendor_id, .. },
..
} => vendor_id,
}
}
/// Return the Device ID field.
pub fn device_id(&self) -> u16 {
match self {
&PciHeader::General {
shared: SharedPciHeader { device_id, .. },
..
}
| &PciHeader::PciToPci {
shared: SharedPciHeader { device_id, .. },
| PciHeader::PciToPci {
shared:
SharedPciHeader {
full_device_id: device_id,
..
},
..
} => device_id,
}
}
/// Return the Vendor ID field.
pub fn vendor_id(&self) -> u16 {
self.full_device_id().vendor_id
}
/// Return the Device ID field.
pub fn device_id(&self) -> u16 {
self.full_device_id().device_id
}
/// Return the Revision field.
pub fn revision(&self) -> u8 {
match self {
&PciHeader::General {
shared: SharedPciHeader { revision, .. },
..
}
| &PciHeader::PciToPci {
shared: SharedPciHeader { revision, .. },
..
} => revision,
}
self.full_device_id().revision
}
/// Return the Interface field.
pub fn interface(&self) -> u8 {
match self {
&PciHeader::General {
shared: SharedPciHeader { interface, .. },
..
}
| &PciHeader::PciToPci {
shared: SharedPciHeader { interface, .. },
..
} => interface,
}
self.full_device_id().interface
}
/// Return the Subclass field.
pub fn subclass(&self) -> u8 {
match self {
&PciHeader::General {
shared: SharedPciHeader { subclass, .. },
..
}
| &PciHeader::PciToPci {
shared: SharedPciHeader { subclass, .. },
..
} => subclass,
}
self.full_device_id().subclass
}
/// Return the Class field.
pub fn class(&self) -> PciClass {
match self {
&PciHeader::General {
shared: SharedPciHeader { class, .. },
..
}
| &PciHeader::PciToPci {
shared: SharedPciHeader { class, .. },
..
} => class,
}
PciClass::from(self.full_device_id().class)
}
/// Return the Headers BARs.
pcid/src/pci/id.rs
+12
View File
@@ -0,0 +1,12 @@
use serde::{Deserialize, Serialize};
/// All identifying information of a PCI function.
#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
pub struct FullDeviceId {
pub vendor_id: u16,
pub device_id: u16,
pub class: u8,
pub subclass: u8,
pub interface: u8,
pub revision: u8,
}
pcid/src/pci/mod.rs
+2
View File
@@ -7,12 +7,14 @@ pub use self::bar::PciBar;
pub use self::class::PciClass;
pub use self::func::PciFunc;
pub use self::header::{PciHeader, PciHeaderError, PciHeaderType};
pub use self::id::FullDeviceId;
mod bar;
pub mod cap;
mod class;
pub mod func;
pub mod header;
mod id;
pub mod msi;
pub trait CfgAccess {
virtio-blkd/src/main.rs
+1 -1
View File
@@ -116,7 +116,7 @@ fn deamon(deamon: redox_daemon::Daemon) -> anyhow::Result<()> {
// 0x1001 - virtio-blk
let pci_config = pcid_handle.fetch_config()?;
assert_eq!(pci_config.func.devid, 0x1001);
assert_eq!(pci_config.func.full_device_id.device_id, 0x1001);
log::info!("virtio-blk: initiating startup sequence :^)");
let device = virtio_core::probe_device(&mut pcid_handle)?;
virtio-core/src/probe.rs
+1 -1
View File
@@ -64,7 +64,7 @@ pub fn probe_device(pcid_handle: &mut PcidServerHandle) -> Result<Device, Error>
let pci_header = pcid_handle.fetch_header()?;
assert_eq!(
pci_config.func.venid, 6900,
pci_config.func.full_device_id.vendor_id, 6900,
"virtio_core::probe_device: not a virtio device"
);
virtio-gpud/src/main.rs
+1 -1
View File
@@ -416,7 +416,7 @@ fn deamon(deamon: redox_daemon::Daemon) -> anyhow::Result<()> {
// 0x1050 - virtio-gpu
let pci_config = pcid_handle.fetch_config()?;
assert_eq!(pci_config.func.devid, 0x1050);
assert_eq!(pci_config.func.full_device_id.device_id, 0x1050);
log::info!("virtio-gpu: initiating startup sequence :^)");
let device = DEVICE.try_call_once(|| virtio_core::probe_device(&mut pcid_handle))?;
virtio-netd/src/main.rs
+1 -1
View File
@@ -38,7 +38,7 @@ fn deamon(deamon: redox_daemon::Daemon) -> Result<(), Error> {
// 0x1000 - virtio-net
let pci_config = pcid_handle.fetch_config()?;
assert_eq!(pci_config.func.devid, 0x1000);
assert_eq!(pci_config.func.full_device_id.device_id, 0x1000);
log::info!("virtio-net: initiating startup sequence :^)");
let device = virtio_core::probe_device(&mut pcid_handle)?;