drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Revert "[Zion][Yellowstone] First pass at adding PCI ioport access."

Browse source 
This reverts commit b677633248.
This commit is contained in:
Drew 2025-05-08 00:33:58 -07:00
parent b51d5966d4
commit bddf26b645
16 changed files with 199 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rust/sys/yellowstone/src/main.rs
View file

@ -36,14 +36,13 @@ fn spawn_from_vmmo(vmmo_cap: z_cap_t, server_cap: Capability) -> Result<(), ZErr
#[no_mangle]
extern "C" fn main() -> z_err_t {
let pci_region = MemoryRegion::from_cap(Capability::take(unsafe { BOOT_PCI_VMMO }))
.expect("Failed to create PCI region");
let fb_region = MemoryRegion::from_cap(Capability::take(unsafe { BOOT_FRAMEBUFFER_INFO_VMMO }))
.expect("Failed to create Framebuffer region");
let context = Arc::new(
server::YellowstoneServerContext::new(
Capability::take(unsafe { BOOT_PCI_VMMO }),
fb_region,
)
.expect("Failed to create yellowstone context"),
server::YellowstoneServerContext::new(pci_region, fb_region)
.expect("Failed to create yellowstone context"),
);
let handler = server::YellowstoneServerImpl::new(context.clone());
let server = YellowstoneServer::new(handler).expect("Couldn't create yellowstone server");

103
rust/sys/yellowstone/src/pci.rs
View file

@ -1,29 +1,14 @@
use mammoth::{
cap::Capability,
mem::MemoryRegion,
syscall,
zion::{kZionPerm_All, ZError},
};
enum PciType {
Port(Capability),
Memory(MemoryRegion),
}
use mammoth::{cap::Capability, mem::MemoryRegion, zion::ZError};
pub struct PciReader {
internal_type: PciType,
memory_region: MemoryRegion,
}
type DevPredicate = fn(u8, u8, u8) -> bool;
impl PciReader {
pub fn new(capability: Capability) -> Self {
let internal_type =
match MemoryRegion::from_cap(capability.duplicate(kZionPerm_All).unwrap()) {
Ok(mem) => PciType::Memory(mem),
Err(_) => PciType::Port(capability),
};
Self { internal_type }
pub fn new(memory_region: MemoryRegion) -> Self {
Self { memory_region }
}
pub fn get_ahci_region(&self) -> Result<Capability, ZError> {
@ -43,13 +28,15 @@ impl PciReader {
}
fn probe_pci(&self, pred: DevPredicate) -> Option<Capability> {
if (self.header_type(0, 0, 0) & 0x80) == 0 {
let base_header = self.pci_header(0, 0, 0);
if (base_header.header_type & 0x80) == 0 {
if let Some(dev) = self.probe_bus(pred, 0) {
return Some(dev);
}
} else {
for fun in 0..8 {
if self.vendor_id(0, 0, fun) != 0xFFFF {
let fun_hdr = self.pci_header(0, 0, fun);
if fun_hdr.vendor_id != 0xFFFF {
if let Some(dev) = self.probe_bus(pred, fun) {
return Some(dev);
}
@ -69,7 +56,8 @@ impl PciReader {
}
fn probe_device(&self, pred: DevPredicate, bus: u8, dev: u8) -> Option<Capability> {
if self.vendor_id(bus, dev, 0) == 0xFFFF {
let device_base_header = self.pci_header(bus, dev, 0);
if device_base_header.vendor_id == 0xFFFF {
return None;
}
@ -77,7 +65,7 @@ impl PciReader {
return Some(dev);
}
if (self.header_type(bus, dev, 0) & 0x80) != 0 {
if (device_base_header.header_type & 0x80) != 0 {
for fun in 1..8 {
if let Some(dev) = self.probe_function(pred, bus, dev, fun) {
return Some(dev);
@ -88,66 +76,37 @@ impl PciReader {
}
fn probe_function(&self, pred: DevPredicate, bus: u8, dev: u8, fun: u8) -> Option<Capability> {
let (class, subclass, prog_interface) = self.class_codes(bus, dev, fun);
let function_header = self.pci_header(bus, dev, fun);
mammoth::debug!(
"PCI Function: {:#x} {:#x} {:#x}",
class,
subclass,
prog_interface
function_header.class_code,
function_header.subclass,
function_header.prog_interface
);
if pred(class, subclass, prog_interface) {
if pred(
function_header.class_code,
function_header.subclass,
function_header.prog_interface,
) {
mammoth::debug!("Found!");
Some(self.create_cap(bus, dev, fun))
let offset = pci_header_offset(bus, dev, fun);
Some(
self.memory_region
.duplicate(offset as u64, 0x1000)
.expect("Failed to duplicate PCI cap"),
)
} else {
None
}
}
fn header_type(&self, bus: u8, dev: u8, fun: u8) -> u8 {
let data = self.read_at(bus, dev, fun, 0xC);
((data >> 16) & 0xFF) as u8
}
fn vendor_id(&self, bus: u8, dev: u8, fun: u8) -> u16 {
let data = self.read_at(bus, dev, fun, 0);
(data & 0xFFFF) as u16
}
fn class_codes(&self, bus: u8, dev: u8, fun: u8) -> (u8, u8, u8) {
let data = self.read_at(bus, dev, fun, 0x8);
let class = (data >> 24) as u8;
let subclass = ((data >> 16) & 0xFF) as u8;
let prog_if = ((data >> 8) & 0xFF) as u8;
(class, subclass, prog_if)
}
fn read_at(&self, bus: u8, dev: u8, fun: u8, off: u8) -> u32 {
match &self.internal_type {
PciType::Memory(region) => {
let offset = pci_header_offset(bus, dev, fun);
let header_slice: &[u32] = &region.slice()[offset..offset + size_of::<PciHeader>()];
header_slice[(off >> 2) as usize]
}
PciType::Port(pci_cap) => syscall::pci_read(pci_cap, bus, dev, fun, off).unwrap(),
}
}
fn create_cap(&self, bus: u8, dev: u8, fun: u8) -> Capability {
match &self.internal_type {
PciType::Memory(region) => {
let offset = pci_header_offset(bus, dev, fun);
region
.duplicate(offset as u64, 0x1000)
.expect("Failed to duplicate PCI cap")
}
PciType::Port(_pci_cap) => todo!(),
}
fn pci_header(&self, bus: u8, dev: u8, fun: u8) -> &PciHeader {
let offset = pci_header_offset(bus, dev, fun);
let header_slice: &[u8] =
&self.memory_region.slice()[offset..offset + size_of::<PciHeader>()];
unsafe { header_slice.as_ptr().cast::<PciHeader>().as_ref().unwrap() }
}
}

6
rust/sys/yellowstone/src/server.rs
View file

@ -43,11 +43,13 @@ impl YellowstoneServerContext {
green_mask_shift: fb_info.green_mask_shift as u64,
}
}
}
pub fn new(pci_cap: Capability, fb_region: MemoryRegion) -> Result<Self, ZError> {
impl YellowstoneServerContext {
pub fn new(pci_region: MemoryRegion, fb_region: MemoryRegion) -> Result<Self, ZError> {
Ok(Self {
registration_semaphore: mammoth::sync::Semaphore::new()?,
pci_reader: PciReader::new(pci_cap),
pci_reader: PciReader::new(pci_region),
framebuffer_info_region: fb_region,
service_map: Mutex::new(BTreeMap::new()),
})