From b69c9008dd9bdb7dcb30fb4273a53540599970ee Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 26 Oct 2021 14:17:43 -0400 Subject: [PATCH] nvme_disk: Re-enable MSI-X. It now works in QEMU, probably following the addition of 64-bit address support in hrev55542. --- src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp index 289117e5d1..d6113052da 100644 --- a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp +++ b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp @@ -256,7 +256,6 @@ nvme_disk_init_device(void* _info, void** _cookie) uint8 irq = info->info.u.h0.interrupt_line; if (sPCIx86Module != NULL) { -#if 0 if (sPCIx86Module->get_msix_count(info->info.bus, info->info.device, info->info.function)) { uint8 msixVector = 0; @@ -267,9 +266,7 @@ nvme_disk_init_device(void* _info, void** _cookie) TRACE_ALWAYS("using MSI-X\n"); irq = msixVector; } - } else -#endif - if (sPCIx86Module->get_msi_count(info->info.bus, + } else if (sPCIx86Module->get_msi_count(info->info.bus, info->info.device, info->info.function) >= 1) { uint8 msiVector = 0; if (sPCIx86Module->configure_msi(info->info.bus, info->info.device,