fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2026-02-22 23:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kernel/riscv: Use new DeviceTree helpers in PCI initializations

Browse Source 
This also changes the PCI interface slightly to be a bit nicer to work
with.
This commit is contained in:
Hendiadyoin1
2024-04-28 17:36:11 +02:00
committed by Andrew Kaster
parent 8ea8b7a6e5
commit b17f080dcc
5 changed files with 167 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Kernel/Bus/PCI/Controller/HostController.cpp
View File

@@ -245,7 +245,13 @@ void HostController::configure_attached_devices(PCIConfiguration& config)
write16_field(device_identifier.address().bus(), device_identifier.address().device(), device_identifier.address().function(), PCI::RegisterOffset::COMMAND, command_value);
// assign interrupt number
auto interrupt_pin = read8_field(device_identifier.address().bus(), device_identifier.address().device(), device_identifier.address().function(), PCI::RegisterOffset::INTERRUPT_PIN);
auto masked_identifier = (((u32)device_identifier.address().bus() << 16) | ((u32)device_identifier.address().device() << 11) | ((u32)device_identifier.address().function() << 8) | interrupt_pin) & config.interrupt_mask;
auto masked_identifier = PCIInterruptSpecifier{
.interrupt_pin = interrupt_pin,
.function = device_identifier.address().function(),
.device = device_identifier.address().device(),
.bus = device_identifier.address().bus()
};
masked_identifier &= config.interrupt_mask;
auto interrupt_number = config.masked_interrupt_mapping.get(masked_identifier);
if (interrupt_number.has_value())
write8_field(device_identifier.address().bus(), device_identifier.address().device(), device_identifier.address().function(), PCI::RegisterOffset::INTERRUPT_LINE, interrupt_number.value());