[src/trunk]: src/sys/arch/sparc64/dev - add some psycho interrupt debugging s...

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

details:   https://anonhg.NetBSD.org/src/rev/980d5c4c7ebb
branches:  trunk
changeset: 486265:980d5c4c7ebb
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed May 17 10:17:01 2000 +0000

description:
- add some psycho interrupt debugging stuff (#if 0'ed out)
- fix arguments passed in psycho_dmamap_load_raw()'s declaration, and
  what it passes to it's parent bus.

diffstat:

 sys/arch/sparc64/dev/psycho.c |  63 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 57 insertions(+), 6 deletions(-)

diffs (116 lines):

diff -r 5a3d86a9a486 -r 980d5c4c7ebb sys/arch/sparc64/dev/psycho.c
--- a/sys/arch/sparc64/dev/psycho.c     Wed May 17 10:09:35 2000 +0000
+++ b/sys/arch/sparc64/dev/psycho.c     Wed May 17 10:17:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: psycho.c,v 1.9 2000/05/17 02:31:12 eeh Exp $   */
+/*     $NetBSD: psycho.c,v 1.10 2000/05/17 10:17:01 mrg Exp $  */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -365,7 +365,7 @@
                          0,
                          &bh))
                panic("could not map sabre PCI configuration space");
-       sc->sc_configaddr = (paddr_t)bh;
+       sc->sc_configaddr = bh;
 }
 
 /*
@@ -836,6 +836,10 @@
        14,             /* power management */
 };
 
+#ifdef NOT_DEBUG
+static struct psycho_pbm *ppbm;
+#endif
+
 int
 psycho_intr_map(tag, pin, line, ihp)
        pcitag_t tag;
@@ -869,6 +873,10 @@
        int ino;
        long vec = level; 
 
+#ifdef NOT_DEBUG
+       if (!ppbm)
+               ppbm = pp;
+#endif
        ih = (struct intrhand *)
                malloc(sizeof(struct intrhand), M_DEVBUF, M_NOWAIT);
        if (ih == NULL)
@@ -928,7 +936,7 @@
                DPRINTF(PDB_INTR, ("; reread intrmap = %016qx",
                    (intrmap = *intrmapptr)));
        }
-#ifdef DEBUG
+#ifdef NOT_DEBUG
        if (psycho_debug & PDB_INTR) {
                long i;
 
@@ -977,8 +985,8 @@
 }
 
 int
-psycho_dmamap_load_raw(tag, map, segs, nsegs, size, flags)
-       bus_dma_tag_t tag;
+psycho_dmamap_load_raw(t, map, segs, nsegs, size, flags)
+       bus_dma_tag_t t;
        bus_dmamap_t map;
        bus_dma_segment_t *segs;
        int nsegs;
@@ -988,7 +996,7 @@
        struct psycho_pbm *pp = (struct psycho_pbm *)t->_cookie;
        struct psycho_softc *sc = pp->pp_sc;
 
-       return (iommu_dvmamap_load_raw(tag, &sc->sc_is, segs, nsegs, size, flags));
+       return (iommu_dvmamap_load_raw(t, &sc->sc_is, map, segs, nsegs, size, flags));
 }
 
 void
@@ -1062,3 +1070,46 @@
 
        iommu_dvmamem_unmap(t, &sc->sc_is, kva, size);
 }
+
+#if NOT_DEBUG
+void
+psycho_print_intr_state(void)
+{
+       pcitag_t tag;
+       bus_space_handle_t bh;
+       u_int64_t data, diag;
+       struct psycho_softc *sc = ppbm->pp_sc;
+
+       if (!ppbm) {
+               printf("psycho_print_intr_state: no ppbm configured\n");
+               return;
+       }
+       printf("psycho_print_intr_state: ");
+
+       bh = sc->sc_basepaddr;
+       bh = (bus_space_handle_t)(u_long)sc->sc_regs;
+       diag = bus_space_read_8(sc->sc_configtag, bh, 0xa800);
+       printf("all PCI diags is %qx\n", diag);
+#if 0
+       for (tag = 0xc00; tag < 0xc40; tag += 0x8) {
+               data = bus_space_read_8(sc->sc_configtag, bh, tag);
+               
+               printf(" - PCI slot at %qx reads as %qx", bh + tag, data);
+               printf(": diag %x\n", (int)(diag & 0xff));
+               diag >>= 8;
+       }
+#endif
+
+       diag = bus_space_read_8(sc->sc_configtag, bh, 0xa808);
+       printf("\t\tall OBIO diags is %qx\n", diag);
+#define START_TAG      0x1000  /* 0x1000 */
+#define END_TAG                0x1018  /* 0x1088 */
+       for (tag = START_TAG; tag < END_TAG; tag += 0x8) {
+               data = bus_space_read_8(sc->sc_configtag, bh + tag, 0);
+               
+               printf(" - OBIO slot at %qx reads as %qx", bh + tag, data);
+               printf(": diag %x\n", (int)(diag & 0x3));
+               diag >>= 2;
+       }
+}
+#endif