RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 07:17:43 +00:00
Code Issues Activity Actions

Kernel/PCI: Split Access::rescan_hardware method

Browse source 
To ensure clarity, this method is essentially splitted to two methods to
be called according to the access type being determined beforehand.
This commit is contained in:
Liav A 2021-10-22 20:02:02 +03:00 • committed by Andreas Kling
parent d395ac8f59
commit 40b1e6376b
2 changed files with 48 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Kernel/Bus/PCI/Access.cpp
View file

@ -44,7 +44,7 @@ UNMAP_AFTER_INIT bool Access::initialize_for_memory_access(PhysicalAddress mcfg_
auto* access = new Access(Access::AccessType::Memory); auto* access = new Access(Access::AccessType::Memory);
if (!access->search_pci_domains_from_acpi_mcfg_table(mcfg_table)) if (!access->search_pci_domains_from_acpi_mcfg_table(mcfg_table))
return false; return false;
access->rescan_hardware(); access->rescan_hardware_with_memory_addressing();
dbgln_if(PCI_DEBUG, "PCI: MMIO access initialised."); dbgln_if(PCI_DEBUG, "PCI: MMIO access initialised.");
return true; return true;
} }
@ -86,7 +86,7 @@ UNMAP_AFTER_INIT bool Access::initialize_for_io_access()
return false; return false;
} }
auto* access = new Access(Access::AccessType::IO); auto* access = new Access(Access::AccessType::IO);
access->rescan_hardware(); access->rescan_hardware_with_io_addressing();
dbgln_if(PCI_DEBUG, "PCI: IO access initialised."); dbgln_if(PCI_DEBUG, "PCI: IO access initialised.");
return true; return true;
} }
@ -305,11 +305,33 @@ u32 Access::read32_field(Address address, u32 field)
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
UNMAP_AFTER_INIT void Access::rescan_hardware() UNMAP_AFTER_INIT void Access::rescan_hardware_with_memory_addressing()
{ {
MutexLocker locker(m_scan_lock); MutexLocker locker(m_scan_lock);
VERIFY(m_device_identifiers.is_empty()); VERIFY(m_device_identifiers.is_empty());
if (m_access_type == AccessType::IO) { VERIFY(m_access_type == AccessType::Memory);
for (u32 domain = 0; domain < m_domains.size(); domain++) {
dbgln_if(PCI_DEBUG, "PCI: Scan memory mapped domain {}", domain);
// Single PCI host controller.
if ((read8_field(Address(domain), PCI::RegisterOffset::HEADER_TYPE) & 0x80) == 0) {
enumerate_bus(-1, 0, true);
return;
}
// Multiple PCI host controllers.
for (u8 function = 0; function < 8; ++function) {
if (read16_field(Address(domain, 0, 0, function), PCI::RegisterOffset::VENDOR_ID) == PCI::none_value)
break;
enumerate_bus(-1, function, false);
}
}
}
UNMAP_AFTER_INIT void Access::rescan_hardware_with_io_addressing()
{
MutexLocker locker(m_scan_lock);
VERIFY(m_device_identifiers.is_empty());
VERIFY(m_access_type == AccessType::IO);
dbgln_if(PCI_DEBUG, "PCI: IO enumerating hardware"); dbgln_if(PCI_DEBUG, "PCI: IO enumerating hardware");
// First scan bus 0. Find any device on that bus, and if it's a PCI-to-PCI // First scan bus 0. Find any device on that bus, and if it's a PCI-to-PCI
@ -332,24 +354,19 @@ UNMAP_AFTER_INIT void Access::rescan_hardware()
m_enumerated_buses.set(bus, true); m_enumerated_buses.set(bus, true);
} }
} }
return;
}
VERIFY(m_access_type == AccessType::Memory);
for (u32 domain = 0; domain < m_domains.size(); domain++) {
dbgln_if(PCI_DEBUG, "PCI: Scan memory mapped domain {}", domain);
// Single PCI host controller.
if ((read8_field(Address(domain), PCI::RegisterOffset::HEADER_TYPE) & 0x80) == 0) {
enumerate_bus(-1, 0, true);
return;
} }
// Multiple PCI host controllers. UNMAP_AFTER_INIT void Access::rescan_hardware()
for (u8 function = 0; function < 8; ++function) { {
if (read16_field(Address(domain, 0, 0, function), PCI::RegisterOffset::VENDOR_ID) == PCI::none_value) switch (m_access_type) {
case AccessType::IO:
rescan_hardware_with_io_addressing();
break; break;
enumerate_bus(-1, function, false); case AccessType::Memory:
} rescan_hardware_with_memory_addressing();
break;
default:
VERIFY_NOT_REACHED();
} }
} }

2
Kernel/Bus/PCI/Access.h
View file

@ -27,6 +27,8 @@ public:
void fast_enumerate(Function<void(DeviceIdentifier const&)>&) const; void fast_enumerate(Function<void(DeviceIdentifier const&)>&) const;
void rescan_hardware(); void rescan_hardware();
void rescan_hardware_with_memory_addressing();
void rescan_hardware_with_io_addressing();
static Access& the(); static Access& the();
static bool is_initialized(); static bool is_initialized();