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

Kernel/PCI: Fix support of multiple PCI host controllers enumeration

Browse source 
First scan PCI bus 0. Find any device on that bus, and if it's a
PCI-to-PCI bridge, recursively scan it too.

Then try to handle Multiple PCI host bridges on slot 0, device 0.
If we happen to miss some PCI buses because they are not reachable
through recursive PCI-to-PCI bridges scanning starting from bus 0, we
might find them in this scanning.
This commit is contained in:
Liav A 2021-05-21 12:06:20 +03:00 • committed by Linus Groh
parent c6ffee7f18
commit 07474b4349
3 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/PCI/Access.cpp
View file

@ -35,6 +35,7 @@ bool Access::is_initialized()
} }
UNMAP_AFTER_INIT Access::Access() UNMAP_AFTER_INIT Access::Access()
: m_enumerated_buses(256, false)
{ {
s_access = this; s_access = this;
} }
@ -85,10 +86,11 @@ void Access::enumerate_functions(int type, u8 bus, u8 device, u8 function, Funct
Address address(0, bus, device, function); Address address(0, bus, device, function);
if (type == -1 || type == early_read_type(address)) if (type == -1 || type == early_read_type(address))
callback(address, { early_read16_field(address, PCI_VENDOR_ID), early_read16_field(address, PCI_DEVICE_ID) }); callback(address, { early_read16_field(address, PCI_VENDOR_ID), early_read16_field(address, PCI_DEVICE_ID) });
if (early_read_type(address) == PCI_TYPE_BRIDGE && recursive) { if (early_read_type(address) == PCI_TYPE_BRIDGE && recursive && (!m_enumerated_buses.get(early_read8_field(address, PCI_SECONDARY_BUS)))) {
u8 secondary_bus = early_read8_field(address, PCI_SECONDARY_BUS); u8 secondary_bus = early_read8_field(address, PCI_SECONDARY_BUS);
dbgln_if(PCI_DEBUG, "PCI: Found secondary bus: {}", secondary_bus); dbgln_if(PCI_DEBUG, "PCI: Found secondary bus: {}", secondary_bus);
VERIFY(secondary_bus != bus); VERIFY(secondary_bus != bus);
m_enumerated_buses.set(secondary_bus, true);
enumerate_bus(type, secondary_bus, callback, recursive); enumerate_bus(type, secondary_bus, callback, recursive);
} }
} }

2
Kernel/PCI/Access.h
View file

@ -6,6 +6,7 @@
#pragma once #pragma once
#include <AK/Bitmap.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <Kernel/PCI/Definitions.h> #include <Kernel/PCI/Definitions.h>
@ -49,6 +50,7 @@ protected:
virtual ~Access() = default; virtual ~Access() = default;
Vector<PhysicalID> m_physical_ids; Vector<PhysicalID> m_physical_ids;
Bitmap m_enumerated_buses;
}; };
} }

29
Kernel/PCI/IOAccess.cpp
View file

@ -67,17 +67,26 @@ void IOAccess::write32_field(Address address, u32 field, u32 value)
void IOAccess::enumerate_hardware(Function<void(Address, ID)> callback) void IOAccess::enumerate_hardware(Function<void(Address, ID)> callback)
{ {
dbgln_if(PCI_DEBUG, "PCI: IO enumerating hardware"); dbgln_if(PCI_DEBUG, "PCI: IO enumerating hardware");
// Single PCI host controller.
if ((read8_field(Address(), PCI_HEADER_TYPE) & 0x80) == 0) {
enumerate_bus(-1, 0, callback, true);
return;
}
// Multiple PCI host controllers. // First scan bus 0. Find any device on that bus, and if it's a PCI-to-PCI
for (int bus = 0; bus < 256; ++bus) { // bridge, recursively scan it too.
if (read16_field(Address(0, 0, 0, bus), PCI_VENDOR_ID) == PCI_NONE) m_enumerated_buses.set(0, true);
break; enumerate_bus(-1, 0, callback, true);
enumerate_bus(-1, bus, callback, false);
// Handle Multiple PCI host bridges on slot 0, device 0.
// If we happen to miss some PCI buses because they are not reachable through
// recursive PCI-to-PCI bridges starting from bus 0, we might find them here.
if ((read8_field(Address(), PCI_HEADER_TYPE) & 0x80) != 0) {
for (int bus = 1; bus < 256; ++bus) {
if (read16_field(Address(0, 0, 0, bus), PCI_VENDOR_ID) == PCI_NONE)
continue;
if (read16_field(Address(0, 0, 0, bus), PCI_CLASS) != 0x6)
continue;
if (m_enumerated_buses.get(bus))
continue;
enumerate_bus(-1, bus, callback, false);
m_enumerated_buses.set(bus, true);
}
} }
} }