[src/netbsd-7]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/77526e723159
branches:  netbsd-7
changeset: 799361:77526e723159
user:      snj <snj%NetBSD.org@localhost>
date:      Fri May 22 16:53:32 2015 +0000

description:
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.

diffstat:

 sys/arch/x86/x86/lapic.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r b494e39a33a4 -r 77526e723159 sys/arch/x86/x86/lapic.c
--- a/sys/arch/x86/x86/lapic.c  Wed May 20 02:47:17 2015 +0000
+++ b/sys/arch/x86/x86/lapic.c  Fri May 22 16:53:32 2015 +0000
@@ -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 @@
                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