[src/trunk]: src/sys/arch/x86/pci Disable all contemporary mode 1 quirks.

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/79c24b801dc8
branches:  trunk
changeset: 323635:79c24b801dc8
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Jun 23 16:09:53 2018 +0000

description:
Disable all contemporary mode 1 quirks.

diffstat:

 sys/arch/x86/pci/pci_machdep.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r ff1bee2eb657 -r 79c24b801dc8 sys/arch/x86/pci/pci_machdep.c
--- a/sys/arch/x86/pci/pci_machdep.c    Sat Jun 23 16:05:05 2018 +0000
+++ b/sys/arch/x86/pci/pci_machdep.c    Sat Jun 23 16:09:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.81 2018/06/23 16:05:05 jakllsch Exp $        */
+/*     $NetBSD: pci_machdep.c,v 1.82 2018/06/23 16:09:53 jakllsch 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.81 2018/06/23 16:05:05 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.82 2018/06/23 16:09:53 jakllsch Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -204,6 +204,7 @@
        /* XXX Triflex2 not tested */
        _qe(0, 0, 0, PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_TRIFLEX2),
        _qe(0, 0, 0, PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_TRIFLEX4),
+#if 0
        /* Triton needed for Connectix Virtual PC */
        _qe(0, 0, 0, PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82437FX),
        /* Connectix Virtual PC 5 has a 440BX */
@@ -217,6 +218,7 @@
        _qe(0, 0, 0, PCI_VENDOR_SIS, PCI_PRODUCT_SIS_741),
        /* VIA Technologies VX900 */
        _qe(0, 0, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VX900_HB)
+#endif
 };
 #undef _tag
 #undef _qe
@@ -730,7 +732,6 @@
        uint32_t sav, val;
        int i;
        pcireg_t idreg;
-       extern char cpu_brand_string[];
 
        if (pci_mode != -1)
                return pci_mode;
@@ -761,6 +762,8 @@
                }
        }
 
+#if 0
+       extern char cpu_brand_string[];
        const char *reason, *system_vendor, *system_product;
        if (memcmp(cpu_brand_string, "QEMU", 4) == 0)
                /* PR 45671, https://bugs.launchpad.net/qemu/+bug/897771 */
@@ -779,7 +782,7 @@
 #endif
                return (pci_mode);
        }
-
+#endif
        /*
         * Strong check for standard compliant mode 1:
         * 1. bit 31 ("enable") can be set