[src/trunk]: src/sys/dev/pci Back out previous - it causes panics.

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

details:   https://anonhg.NetBSD.org/src/rev/e3db23f13eed
branches:  trunk
changeset: 515947:e3db23f13eed
user:      ad <ad%NetBSD.org@localhost>
date:      Wed Oct 10 09:33:36 2001 +0000

description:
Back out previous - it causes panics.

diffstat:

 sys/dev/pci/twe.c    |  55 +++++++++++++++++++--------------------------------
 sys/dev/pci/twevar.h |  11 +--------
 2 files changed, 23 insertions(+), 43 deletions(-)

diffs (137 lines):

diff -r 28a832188795 -r e3db23f13eed sys/dev/pci/twe.c
--- a/sys/dev/pci/twe.c Wed Oct 10 06:58:56 2001 +0000
+++ b/sys/dev/pci/twe.c Wed Oct 10 09:33:36 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: twe.c,v 1.19 2001/09/20 22:09:44 ad Exp $      */
+/*     $NetBSD: twe.c,v 1.20 2001/10/10 09:33:36 ad Exp $      */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -810,37 +810,24 @@
 int
 twe_ccb_map(struct twe_softc *sc, struct twe_ccb *ccb)
 {
-       struct twe_buf *tb;
        struct twe_cmd *tc;
-       int flags, nsegs, i, rv;
+       int flags, nsegs, i, s, rv;
        void *data;
 
        /*
         * The data as a whole must be 512-byte aligned.
         */
        if (((u_long)ccb->ccb_data & (TWE_ALIGNMENT - 1)) != 0) {
-               tb = malloc(sizeof(*ccb->ccb_buf), M_DEVBUF, M_NOWAIT);
-
-               rv = bus_dmamem_alloc(sc->sc_dmat, ccb->ccb_datasize,
-                   PAGE_SIZE, 0, tb->tb_segs, TWE_MAX_SEGS, &tb->tb_rseg,
-                   BUS_DMA_NOWAIT);
-               if (rv != 0)
-                       return (rv);
-
-               rv = bus_dmamem_map(sc->sc_dmat, tb->tb_segs, tb->tb_rseg,
-                   ccb->ccb_datasize, &tb->tb_vaddr, BUS_DMA_NOWAIT);
-               if (rv != 0) {
-                       bus_dmamem_free(sc->sc_dmat, tb->tb_segs, tb->tb_rseg);
-                       return (rv);
-               }
-
-               ccb->ccb_buf = tb;
-               data = tb->tb_vaddr;
+               s = splvm();
+               /* XXX */
+               ccb->ccb_abuf = uvm_km_kmemalloc(kmem_map, NULL,
+                   ccb->ccb_datasize, UVM_KMF_NOWAIT);
+               splx(s);
+               data = (void *)ccb->ccb_abuf;
                if ((ccb->ccb_flags & TWE_CCB_DATA_OUT) != 0)
                        memcpy(data, ccb->ccb_data, ccb->ccb_datasize);
        } else {
-               tb = NULL;
-               ccb->ccb_buf = NULL;
+               ccb->ccb_abuf = (vaddr_t)0;
                data = ccb->ccb_data;
        }
 
@@ -852,10 +839,12 @@
            ((ccb->ccb_flags & TWE_CCB_DATA_IN) ?
             BUS_DMA_READ : BUS_DMA_WRITE));
        if (rv != 0) {
-               if (tb != NULL) {
-                       bus_dmamem_unmap(sc->sc_dmat, tb->tb_vaddr,
+               if (ccb->ccb_abuf != (vaddr_t)0) {
+                       s = splvm();
+                       /* XXX */
+                       uvm_km_free(kmem_map, ccb->ccb_abuf,
                            ccb->ccb_datasize);
-                       bus_dmamem_free(sc->sc_dmat, tb->tb_segs, tb->tb_rseg);
+                       splx(s);
                }
                return (rv);
        }
@@ -917,8 +906,7 @@
 void
 twe_ccb_unmap(struct twe_softc *sc, struct twe_ccb *ccb)
 {
-       struct twe_buf *tb;
-       int flags;
+       int flags, s;
 
        if ((ccb->ccb_flags & TWE_CCB_DATA_IN) != 0)
                flags = BUS_DMASYNC_POSTREAD;
@@ -931,15 +919,14 @@
            ccb->ccb_datasize, flags);
        bus_dmamap_unload(sc->sc_dmat, ccb->ccb_dmamap_xfer);
 
-       if (ccb->ccb_buf != NULL) {
-               tb = ccb->ccb_buf;
-
+       if (ccb->ccb_abuf != (vaddr_t)0) {
                if ((ccb->ccb_flags & TWE_CCB_DATA_IN) != 0)
-                       memcpy(ccb->ccb_data, tb->tb_vaddr,
+                       memcpy(ccb->ccb_data, (void *)ccb->ccb_abuf,
                            ccb->ccb_datasize);
-
-               bus_dmamem_unmap(sc->sc_dmat, tb->tb_vaddr, ccb->ccb_datasize);
-               bus_dmamem_free(sc->sc_dmat, tb->tb_segs, tb->tb_rseg);
+               s = splvm();
+               /* XXX */
+               uvm_km_free(kmem_map, ccb->ccb_abuf, ccb->ccb_datasize);
+               splx(s);
        }
 }
 
diff -r 28a832188795 -r e3db23f13eed sys/dev/pci/twevar.h
--- a/sys/dev/pci/twevar.h      Wed Oct 10 06:58:56 2001 +0000
+++ b/sys/dev/pci/twevar.h      Wed Oct 10 09:33:36 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: twevar.h,v 1.8 2001/09/20 22:09:44 ad Exp $    */
+/*     $NetBSD: twevar.h,v 1.9 2001/10/10 09:33:36 ad Exp $    */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,13 +78,6 @@
        struct  device  *tx_dv;
 };
 
-/* Temporary buffer. */
-struct twe_buf {
-       bus_dma_segment_t       tb_segs[TWE_MAX_SEGS];
-       int                     tb_rseg;
-       caddr_t                 tb_vaddr;
-};
-
 /* Command control block. */
 struct twe_ccb {
        union {
@@ -96,9 +89,9 @@
        int             ccb_flags;
        void            *ccb_data;
        int             ccb_datasize;
+       vaddr_t         ccb_abuf;
        bus_dmamap_t    ccb_dmamap_xfer;
        struct twe_context ccb_tx;
-       struct twe_buf *ccb_buf;
 };
 #define        TWE_CCB_DATA_IN         0x01    /* Map describes inbound xfer */
 #define        TWE_CCB_DATA_OUT        0x02    /* Map describes outbound xfer */