Module Name:    src
Committed By:   jmcneill
Date:           Fri Oct 15 18:51:39 UTC 2021

Modified Files:
        src/sys/arch/x86/pci: pci_machdep.c

Log Message:
Disable MSI and MSI-X support if IAPC_BOOT_ARCH reports that MSI is not
supported.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/x86/pci/pci_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.88 src/sys/arch/x86/pci/pci_machdep.c:1.89
--- src/sys/arch/x86/pci/pci_machdep.c:1.88	Thu Jan 28 01:57:31 2021
+++ src/sys/arch/x86/pci/pci_machdep.c	Fri Oct 15 18:51:38 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.88 2021/01/28 01:57:31 jmcneill Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.89 2021/10/15 18:51:38 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.88 2021/01/28 01:57:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.89 2021/10/15 18:51:38 jmcneill Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -534,6 +534,16 @@ pci_attach_hook(device_t parent, device_
 		aprint_verbose("\n");
 		aprint_verbose_dev(self,
 		    "This pci host does not support MSI-X.");
+#if NACPICA > 0
+	} else if (acpi_active &&
+		   AcpiGbl_FADT.Header.Revision >= 4 &&
+		   (AcpiGbl_FADT.BootFlags & ACPI_FADT_NO_MSI) != 0) {
+		pba->pba_flags &= ~PCI_FLAGS_MSI_OKAY;
+		pba->pba_flags &= ~PCI_FLAGS_MSIX_OKAY;
+		aprint_verbose("\n");
+		aprint_verbose_dev(self,
+		    "MSI support disabled via ACPI IAPC_BOOT_ARCH flag.\n");
+#endif
 	} else {
 		pba->pba_flags |= PCI_FLAGS_MSI_OKAY;
 		pba->pba_flags |= PCI_FLAGS_MSIX_OKAY;

Reply via email to