[src/netbsd-2]: src/sys/arch/x86/x86 Pull up revision 1.32 (requested by fvdl...

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

details:   https://anonhg.NetBSD.org/src/rev/c2c0ef6c0e48
branches:  netbsd-2
changeset: 563386:c2c0ef6c0e48
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Apr 15 22:16:00 2005 +0000

description:
Pull up revision 1.32 (requested by fvdl in ticket #1073):
Use fixed mode, not lopri, for delivering IO interrupts. Suggested by
Peter O'Kane. Fixes interrupt problems on some Xeon systems.

diffstat:

 sys/arch/x86/x86/mpacpi.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 0df93ed88754 -r c2c0ef6c0e48 sys/arch/x86/x86/mpacpi.c
--- a/sys/arch/x86/x86/mpacpi.c Thu Apr 14 22:20:45 2005 +0000
+++ b/sys/arch/x86/x86/mpacpi.c Fri Apr 15 22:16:00 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpacpi.c,v 1.19.2.1 2004/06/01 04:30:44 jmc Exp $      */
+/*     $NetBSD: mpacpi.c,v 1.19.2.1.2.1 2005/04/15 22:16:00 tron Exp $ */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.19.2.1 2004/06/01 04:30:44 jmc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.19.2.1.2.1 2005/04/15 22:16:00 tron Exp $");
 
 #include "opt_acpi.h"
 #include "opt_mpbios.h"
@@ -232,7 +232,7 @@
                        mpi->redir |= IOAPIC_REDLO_ACTLO;
                        break;
                }
-               mpi->redir |= (IOAPIC_REDLO_DEL_LOPRI<<IOAPIC_REDLO_DEL_SHIFT);
+               mpi->redir |= (IOAPIC_REDLO_DEL_FIXED<<IOAPIC_REDLO_DEL_SHIFT);
                switch (isa_ovr->TriggerMode) {
                case MPS_INTTR_DEF:
                case MPS_INTTR_LEVEL:
@@ -635,7 +635,7 @@
                mpi->type = MPS_INTTYPE_INT;
 
                /* Defaults for PCI (active low, level triggered) */
-               mpi->redir = (IOAPIC_REDLO_DEL_LOPRI<<IOAPIC_REDLO_DEL_SHIFT) |
+               mpi->redir = (IOAPIC_REDLO_DEL_FIXED<<IOAPIC_REDLO_DEL_SHIFT) |
                    IOAPIC_REDLO_LEVEL | IOAPIC_REDLO_ACTLO;
                mpi->flags = MPS_INTPO_ACTLO | (MPS_INTTR_LEVEL << 2);
                mpi->cpu_id = 0;
@@ -749,7 +749,7 @@
                mpi->ioapic_ih = APIC_INT_VIA_APIC |
                    (ioapic->sc_apicid << APIC_INT_APIC_SHIFT) |
                    (i << APIC_INT_PIN_SHIFT);
-               mpi->redir = (IOAPIC_REDLO_DEL_LOPRI<<IOAPIC_REDLO_DEL_SHIFT);
+               mpi->redir = (IOAPIC_REDLO_DEL_FIXED<<IOAPIC_REDLO_DEL_SHIFT);
                mpi->flags = MPS_INTPO_DEF | (MPS_INTTR_DEF << 2);
                mpi->global_int = i;
                ioapic->sc_pins[i].ip_map = mpi;