[src/trunk]: src/sys/arch/i386/i386 Handle per-CPU local apic redir entries a...

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

details:   https://anonhg.NetBSD.org/src/rev/608bac4023b1
branches:  trunk
changeset: 537856:608bac4023b1
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Sun Oct 06 20:38:37 2002 +0000

description:
Handle per-CPU local apic redir entries a little better. My previous
solution relied on CPU entries coming first in the table, which
isn't guaranteed. Instead, export mp_intrs to lapic.c, and scan
it for entries that match the current CPU in lapic_set_lvt().

Also, do not try to up intr_cnt by the number of IO APICs or CPUs in
the case of MPS_ALL_APICS; it isn't needed, and it also relies on
CPU and IO APIC entries being earlier in the table.

diffstat:

 sys/arch/i386/i386/lapic.c  |  28 ++++++++++++++++++++--------
 sys/arch/i386/i386/mpbios.c |  24 ++++++------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diffs (126 lines):

diff -r a6aaf8c12bb7 -r 608bac4023b1 sys/arch/i386/i386/lapic.c
--- a/sys/arch/i386/i386/lapic.c        Sun Oct 06 18:49:12 2002 +0000
+++ b/sys/arch/i386/i386/lapic.c        Sun Oct 06 20:38:37 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lapic.c,v 1.3 2002/10/06 14:28:55 fvdl Exp $ */
+/* $NetBSD: lapic.c,v 1.4 2002/10/06 20:38:38 fvdl Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -58,6 +58,7 @@
 #include <machine/cpuvar.h>
 #include <machine/pmap.h>
 #include <machine/vmparam.h>
+#include <machine/mpbiosreg.h>
 #include <machine/mpbiosvar.h>
 #include <machine/pcb.h>
 #include <machine/specialreg.h>
@@ -114,12 +115,12 @@
        i82489_writereg(LAPIC_SVR, LAPIC_SVR_ENABLE | LAPIC_SPURIOUS_VECTOR);
 }
 
-extern struct mp_intr_map *lapic_ints[]; /* XXX header file? */
-
 void
 lapic_set_lvt ()
 {
        struct cpu_info *ci = curcpu();
+       int i;
+       struct mp_intr_map *mpi;
 
 #ifdef MULTIPROCESSOR
        if (mp_verbose) {
@@ -129,11 +130,22 @@
                    i82489_readreg(LAPIC_LVINT1));
        }
 #endif
-       if (ci->ci_lapic_ints[0])
-               i82489_writereg(LAPIC_LVINT0, ci->ci_lapic_ints[0]->redir);
-       if (ci->ci_lapic_ints[1])
-               i82489_writereg(LAPIC_LVINT1, ci->ci_lapic_ints[1]->redir);
-
+       for (i = 0; i < mp_nintr; i++) {
+               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
+                       if (mpi->ioapic_pin == 0)
+                               i82489_writereg(LAPIC_LVINT0, mpi->redir);
+                       else
+                               i82489_writereg(LAPIC_LVINT1, mpi->redir);
+               }
+       }
+                       
 #ifdef MULTIPROCESSOR
        if (mp_verbose) {
                apic_format_redir (ci->ci_dev->dv_xname, "timer", 0, 0,
diff -r a6aaf8c12bb7 -r 608bac4023b1 sys/arch/i386/i386/mpbios.c
--- a/sys/arch/i386/i386/mpbios.c       Sun Oct 06 18:49:12 2002 +0000
+++ b/sys/arch/i386/i386/mpbios.c       Sun Oct 06 20:38:37 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpbios.c,v 1.4 2002/10/06 14:28:55 fvdl Exp $  */
+/*     $NetBSD: mpbios.c,v 1.5 2002/10/06 20:38:37 fvdl Exp $  */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -454,6 +454,7 @@
 struct mp_bus *mp_busses;
 int mp_nbus;
 struct mp_intr_map *mp_intrs;
+int mp_nintr;
 
 int mp_isa_bus = -1;           /* XXX */
 int mp_eisa_bus = -1;          /* XXX */
@@ -599,16 +600,8 @@
                         * apics of this type".
                         */
                        if ((type == MPS_MCT_IOINT) ||
-                           (type == MPS_MCT_LINT)) {
-                               const struct mpbios_int *ie =
-                                   (const struct mpbios_int *)position;
-                               if (ie->dst_apic_id != MPS_ALL_APICS)
-                                       intr_cnt++;
-                               else if (type == MPS_MCT_IOINT)
-                                       intr_cnt += mp_conf[MPS_MCT_IOAPIC].count;
-                               else
-                                       intr_cnt += mp_conf[MPS_MCT_CPU].count;
-                       }
+                           (type == MPS_MCT_LINT))
+                               intr_cnt++;
                        position += mp_conf[type].length;
                }
 
@@ -617,6 +610,7 @@
                memset(mp_busses, 0, sizeof(struct mp_bus) * mp_nbus);
                mp_intrs = malloc(sizeof(struct mp_intr_map)*intr_cnt,
                    M_DEVBUF, M_NOWAIT);
+               mp_nintr = intr_cnt;
 
                /* re-walk the table, recording info of interest */
                position = (const u_int8_t *) mp_cth + sizeof(*mp_cth);
@@ -999,9 +993,6 @@
        u_int32_t type = entry->int_type;
        u_int32_t flags = entry->int_flags;
 
-       struct cpu_info *ci;
-       CPU_INFO_ITERATOR cii;
-
        switch (type) {
        case MPS_INTTYPE_INT:
                mpb = &(mp_busses[bus]);
@@ -1062,10 +1053,7 @@
                else {
                        mpi->ioapic = NULL;
                        mpi->ioapic_pin = pin;
-                       for (CPU_INFO_FOREACH(cii, ci)) {
-                               if (id == MPS_ALL_APICS || ci->ci_cpuid == id)
-                                       ci->ci_lapic_ints[pin] = mpi;
-                       }
+                       mpi->cpu_id = id;
                }
        }
        if (mp_verbose) {