Skip to content

fix(axdriver): pass PCI config accessor to VirtIO PCI probe #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sunhaosheng wants to merge 1 commit into from
Closed

fix(axdriver): pass PCI config accessor to VirtIO PCI probe #354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions modules/axdriver/src/virtio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{AxDeviceEnum, drivers::DriverProbe};

cfg_if! {
if #[cfg(bus = "pci")] {
use axdriver_pci::{PciRoot, DeviceFunction, DeviceFunctionInfo};
use axdriver_pci::{Cam, DeviceFunction, DeviceFunctionInfo, PciConfigAccess, PciRoot};
type VirtIoTransport = axdriver_virtio::PciTransport;
} else if #[cfg(bus = "mmio")] {
type VirtIoTransport = axdriver_virtio::MmioTransport;
Expand Down Expand Up @@ -135,6 +135,9 @@ impl<D: VirtIoDevMeta> DriverProbe for VirtIoDriver<D> {
bdf: DeviceFunction,
dev_info: &DeviceFunctionInfo,
) -> Option<AxDeviceEnum> {
let base_vaddr = phys_to_virt(axconfig::devices::PCI_ECAM_BASE.into());
let mut config = unsafe { PciConfigAccess::new(base_vaddr.as_mut_ptr(), Cam::Ecam) };

if dev_info.vendor_id != 0x1af4 {
return None;
}
Expand All @@ -148,7 +151,7 @@ impl<D: VirtIoDevMeta> DriverProbe for VirtIoDriver<D> {
}

if let Some((ty, transport, irq)) =
axdriver_virtio::probe_pci_device::<VirtIoHalImpl>(root, bdf, dev_info)
axdriver_virtio::probe_pci_device::<VirtIoHalImpl>(root, bdf, dev_info, &mut config)
&& ty == D::DEVICE_TYPE
{
match D::try_new(transport, Some(irq)) {
Expand Down
Loading