[src/trunk]: src/sys/arch/x86 Fix ioapic_dump_raw() to dump whole ioapic area.

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

details:   https://anonhg.NetBSD.org/src/rev/310745b0580d
branches:  trunk
changeset: 457303:310745b0580d
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Jun 19 06:32:46 2019 +0000

description:
Fix ioapic_dump_raw() to dump whole ioapic area.

diffstat:

 sys/arch/x86/include/i82093reg.h |  7 ++++---
 sys/arch/x86/x86/ioapic.c        |  6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 9adda9d65fbb -r 310745b0580d sys/arch/x86/include/i82093reg.h
--- a/sys/arch/x86/include/i82093reg.h  Wed Jun 19 05:33:14 2019 +0000
+++ b/sys/arch/x86/include/i82093reg.h  Wed Jun 19 06:32:46 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82093reg.h,v 1.5 2017/04/22 04:25:09 nonaka Exp $ */
+/*     $NetBSD: i82093reg.h,v 1.6 2019/06/19 06:32:46 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -81,8 +81,9 @@
  * Redirection table registers.
  */
 
-#define IOAPIC_REDHI(pin)      (0x11 + ((pin)<<1))
-#define IOAPIC_REDLO(pin)      (0x10 + ((pin)<<1))
+#define IOAPIC_REDTBL          0x10
+#define IOAPIC_REDHI(pin)      (IOAPIC_REDTBL + ((pin) << 1) + 1)
+#define IOAPIC_REDLO(pin)      (IOAPIC_REDTBL + ((pin) << 1))
 
 #define IOAPIC_REDHI_DEST_SHIFT                24         /* destination. */
 #define IOAPIC_REDHI_DEST_MASK         0xff000000
diff -r 9adda9d65fbb -r 310745b0580d sys/arch/x86/x86/ioapic.c
--- a/sys/arch/x86/x86/ioapic.c Wed Jun 19 05:33:14 2019 +0000
+++ b/sys/arch/x86/x86/ioapic.c Wed Jun 19 06:32:46 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ioapic.c,v 1.62 2019/06/17 06:38:30 msaitoh Exp $      */
+/*     $NetBSD: ioapic.c,v 1.63 2019/06/19 06:32:46 msaitoh Exp $      */
 
 /*-
  * Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.62 2019/06/17 06:38:30 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.63 2019/06/19 06:32:46 msaitoh Exp $");
 
 #include "opt_ddb.h"
 
@@ -611,7 +611,7 @@
                        printf(" %08x", (u_int)reg);
                        if (++i % 0x08 == 0)
                                printf("\n");
-               } while (i < 0x40);
+               } while (i < IOAPIC_REDTBL + (sc->sc_apic_sz * 2));
        }
 }
 #endif