kernel/include/kernel/PIC.h

@@ -29,7 +29,7 @@ namespace Kernel
 
 	private:
 		SpinLock m_lock;
-		uint16_t m_reserved_irqs { 1u << 2 };
+		uint16_t m_reserved_irqs { 0 };
 
 		friend class InterruptController;
 	};

kernel/kernel/PCI.cpp

@@ -362,16 +362,7 @@ namespace Kernel::PCI
 
 	BAN::ErrorOr<void> PCI::Device::reserve_irqs(uint8_t count)
 	{
-		if (!InterruptController::get().is_using_apic())
+		if (m_offset_msi_x.has_value())
-		{
-			if (count > 1)
-			{
-				dwarnln("PIC: could not allocate {} interrupts, (currently) only {} supported", count, 1);
-				return BAN::Error::from_errno(EFAULT);
-			}
-			enable_pin_interrupts();
-		}
-		else if (m_offset_msi_x.has_value())
 		{
 			uint16_t msg_ctrl = read_word(*m_offset_msi_x + 0x02);
 			if (count > (msg_ctrl & 0x7FF) + 1)
@@ -396,6 +387,15 @@ namespace Kernel::PCI
 			write_word(*m_offset_msi + 0x02, msg_ctrl);
 			disable_pin_interrupts();
 		}
+		else if (!InterruptController::get().is_using_apic())
+		{
+			if (count > 1)
+			{
+				dwarnln("PIC: could not allocate {} interrupts, (currently) only {} supported", count, 1);
+				return BAN::Error::from_errno(EFAULT);
+			}
+			enable_pin_interrupts();
+		}
 		else
 		{
 			dwarnln("Could not reserve interrupt for PCI device. No MSI, MSI-X or interrupt line is used");

kernel/kernel/USB/XHCI/Controller.cpp

@@ -75,7 +75,7 @@ namespace Kernel
 
 	BAN::ErrorOr<void> XHCIController::initialize_impl()
 	{
-		dprintln("XHCI controller at PCI {2H}:{2H}:{2H}", m_pci_device.bus(), m_pci_device.dev(), m_pci_device.func());
+		dprintln_if(DEBUG_XHCI, "XHCI controller at PCI {2H}:{2H}:{2H}", m_pci_device.bus(), m_pci_device.dev(), m_pci_device.func());
 
 		m_pci_device.enable_bus_mastering();
 		m_pci_device.enable_memory_space();
@@ -94,14 +94,14 @@ namespace Kernel
 		}
 
 		auto& capabilities = capability_regs();
-		dprintln("  version {H}.{H}.{H}",
+		dprintln_if(DEBUG_XHCI, "  version {H}.{H}.{H}",
 			+capabilities.major_revision,
 			capabilities.minor_revision >> 4,
 			capabilities.minor_revision & 0x0F
 		);
-		dprintln("  max slots {}", +capabilities.hcsparams1.max_slots);
+		dprintln_if(DEBUG_XHCI, "  max slots {}", +capabilities.hcsparams1.max_slots);
-		dprintln("  max intrs {}", +capabilities.hcsparams1.max_interrupters);
+		dprintln_if(DEBUG_XHCI, "  max intrs {}", +capabilities.hcsparams1.max_interrupters);
-		dprintln("  max ports {}", +capabilities.hcsparams1.max_ports);
+		dprintln_if(DEBUG_XHCI, "  max ports {}", +capabilities.hcsparams1.max_ports);
 
 		TRY(m_slots.resize(capabilities.hcsparams1.max_slots));
 		TRY(m_ports.resize(capabilities.hcsparams1.max_ports));