From 8e763cd1a73960baeb2618a7425751b41a4c8704 Mon Sep 17 00:00:00 2001 From: jmatthew Date: Wed, 18 Sep 2024 00:03:19 +0000 Subject: [PATCH] Remove the MSI blacklist. Now that we use MSI-X interrupts for nvme(4), the one device we ever found that needed this treatment, the obsolete Intel Optane Memory series, doesn't need it any more. ok kettenis@ dlg@ --- sys/dev/pci/nvme_pci.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sys/dev/pci/nvme_pci.c b/sys/dev/pci/nvme_pci.c index 5e0ba65cb6b..d827b5405da 100644 --- a/sys/dev/pci/nvme_pci.c +++ b/sys/dev/pci/nvme_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvme_pci.c,v 1.11 2024/05/24 06:02:58 jsg Exp $ */ +/* $OpenBSD: nvme_pci.c,v 1.12 2024/09/18 00:03:19 jmatthew Exp $ */ /* * Copyright (c) 2014 David Gwynne @@ -73,10 +73,6 @@ nvme_pci_match(struct device *parent, void *match, void *aux) return (0); } -static const struct pci_matchid nvme_msi_blacklist[] = { - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_OPTANE }, -}; - void nvme_pci_attach(struct device *parent, struct device *self, void *aux) { @@ -92,9 +88,6 @@ nvme_pci_attach(struct device *parent, struct device *self, void *aux) printf(": "); - if (pci_matchbyid(pa, nvme_msi_blacklist, nitems(nvme_msi_blacklist))) - CLR(pa->pa_flags, PCI_FLAGS_MSI_ENABLED); - maptype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, NVME_PCI_BAR); if (pci_mapreg_map(pa, NVME_PCI_BAR, maptype, 0, &sc->sc_iot, &sc->sc_ioh, NULL, &sc->sc_ios, 0) != 0) { -- 2.20.1