Module Name: src
Committed By: snj
Date: Fri May 22 16:53:32 UTC 2015
Modified Files:
src/sys/arch/x86/x86 [netbsd-7]: lapic.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #795):
sys/arch/x86/x86/lapic.c: revision 1.48
Workaround for "lapic_set_lvt: bad pin value %d" panic on some (broken?) BIOS
system. Don't panic when a local APIC's interrput input pin number (LINTx) > 1.
Instead, print warning message and continue. The default is pin 1.
Same as Linux (and perhaps FreeBSD). Tested with Shuttle DS57U.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.47.4.1 src/sys/arch/x86/x86/lapic.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/x86/lapic.c
diff -u src/sys/arch/x86/x86/lapic.c:1.47 src/sys/arch/x86/x86/lapic.c:1.47.4.1
--- src/sys/arch/x86/x86/lapic.c:1.47 Fri Nov 15 08:47:55 2013
+++ src/sys/arch/x86/x86/lapic.c Fri May 22 16:53:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lapic.c,v 1.47 2013/11/15 08:47:55 msaitoh Exp $ */
+/* $NetBSD: lapic.c,v 1.47.4.1 2015/05/22 16:53:32 snj Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.47 2013/11/15 08:47:55 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.47.4.1 2015/05/22 16:53:32 snj Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -182,11 +182,10 @@ lapic_set_lvt(void)
mpi = &mp_intrs[i];
if (mpi->ioapic == NULL && (mpi->cpu_id == MPS_ALL_APICS ||
mpi->cpu_id == ci->ci_cpuid)) {
-#ifdef DIAGNOSTIC
if (mpi->ioapic_pin > 1)
- panic("lapic_set_lvt: bad pin value %d",
- mpi->ioapic_pin);
-#endif
+ aprint_error_dev(ci->ci_dev,
+ "%s: WARNING: bad pin value %d\n",
+ __func__, mpi->ioapic_pin);
if (mpi->ioapic_pin == 0)
i82489_writereg(LAPIC_LVINT0, mpi->redir);
else
