Module Name: src
Committed By: gson
Date: Sat Oct 5 11:20:35 UTC 2013
Modified Files:
src/sys/arch/x86/pci: pci_machdep.c
Log Message:
Force PCI mode 1 when running under QEMU, to work around QEMU bug 897771.
This should also make it possible to boot NetBSD under versions of KVM
that have inherited said QEMU bug. Fixes PR kern/45671.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 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.60 src/sys/arch/x86/pci/pci_machdep.c:1.61
--- src/sys/arch/x86/pci/pci_machdep.c:1.60 Wed Jul 31 19:27:51 2013
+++ src/sys/arch/x86/pci/pci_machdep.c Sat Oct 5 11:20:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.60 2013/07/31 19:27:51 macallan Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.61 2013/10/05 11:20:34 gson 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.60 2013/07/31 19:27:51 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.61 2013/10/05 11:20:34 gson Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -526,6 +526,7 @@ pci_mode_detect(void)
uint32_t sav, val;
int i;
pcireg_t idreg;
+ extern char cpu_brand_string[];
if (pci_mode != -1)
return pci_mode;
@@ -555,6 +556,13 @@ pci_mode_detect(void)
return (pci_mode);
}
}
+ if (memcmp(cpu_brand_string, "QEMU", 4) == 0) {
+ /* PR 45671, https://bugs.launchpad.net/qemu/+bug/897771 */
+#ifdef DEBUG
+ printf("forcing PCI mode 1 for QEMU\n");
+#endif
+ return (pci_mode);
+ }
/*
* Strong check for standard compliant mode 1:
