From 62571f5eb4f543cb0e7aca9a604e0b38a00afbfc Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 18 Oct 2021 16:27:48 -0400 Subject: [PATCH] nvme_disk: Disable MSI-X support for now. It is broken under QEMU, and it may well be on real hardware, too. More investigation is required. --- src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 5477d80ba1..df6f4d2a48 100644 --- a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp +++ b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp @@ -301,6 +301,7 @@ 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; @@ -311,7 +312,9 @@ nvme_disk_init_device(void* _info, void** _cookie) TRACE_ALWAYS("using MSI-X\n"); irq = msixVector; } - } else if (sPCIx86Module->get_msi_count(info->info.bus, + } else +#endif + 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,