[src/trunk]: src/sys/dev/usb Use the correct dmatag for all control structure...

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

details:   https://anonhg.NetBSD.org/src/rev/656fb2e96cfb
branches:  trunk
changeset: 1029144:656fb2e96cfb
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Dec 23 11:03:48 2021 +0000

description:
Use the correct dmatag for all control structures. Also, don't KASSERT that
we're using the low 4GB for them and simply error out.

kern/56570: ehci panic on boot

diffstat:

 sys/dev/usb/ehci.c |  32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diffs (104 lines):

diff -r 3f39447bb59e -r 656fb2e96cfb sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Thu Dec 23 04:06:51 2021 +0000
+++ b/sys/dev/usb/ehci.c        Thu Dec 23 11:03:48 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.297 2021/12/22 21:45:02 skrll Exp $ */
+/*     $NetBSD: ehci.c,v 1.298 2021/12/23 11:03:48 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.297 2021/12/22 21:45:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.298 2021/12/23 11:03:48 skrll Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -539,7 +539,7 @@
                err = EIO;
                goto fail1;
        }
-       err = usb_allocmem(sc->sc_bus.ub_dmatag,
+       err = usb_allocmem(sc->sc_dmatag,
            sc->sc_flsize * sizeof(ehci_link_t),
            EHCI_FLALIGN_ALIGN, USBMALLOC_COHERENT, &sc->sc_fldma);
        if (err) {
@@ -553,9 +553,15 @@
                sc->sc_flist[i] = EHCI_NULL;
        }
 
-       KASSERT(BUS_ADDR_HI32(DMAADDR(&sc->sc_fldma, 0)) == 0);
-       uint32_t lo32 = BUS_ADDR_LO32(DMAADDR(&sc->sc_fldma, 0));
-
+       const bus_addr_t flba = DMAADDR(&sc->sc_fldma, 0);
+       const uint32_t hi32 = BUS_ADDR_HI32(flba);
+       if (hi32 != 0) {
+               aprint_error_dev(sc->sc_dev, "DMA memory segment error (%08x)\n",
+                   hi32);
+               goto fail2;
+       }
+
+       const uint32_t lo32 = BUS_ADDR_LO32(flba);
        EOWRITE4(sc, EHCI_PERIODICLISTBASE, lo32);
 
        sc->sc_softitds = kmem_zalloc(sc->sc_flsize * sizeof(ehci_soft_itd_t *),
@@ -579,7 +585,7 @@
                sqh = ehci_alloc_sqh(sc);
                if (sqh == NULL) {
                        err = ENOMEM;
-                       goto fail2;
+                       goto fail3;
                }
                sc->sc_islots[i].sqh = sqh;
        }
@@ -622,7 +628,7 @@
        sqh = ehci_alloc_sqh(sc);
        if (sqh == NULL) {
                err = ENOMEM;
-               goto fail2;
+               goto fail3;
        }
        /* Fill the QH */
        sqh->qh.qh_endp =
@@ -670,7 +676,7 @@
        if (hcr) {
                aprint_error("%s: run timeout\n", device_xname(sc->sc_dev));
                err = EIO;
-               goto fail3;
+               goto fail4;
        }
 
        /* Enable interrupts */
@@ -679,10 +685,10 @@
 
        return 0;
 
-fail3:
+fail4:
        ehci_free_sqh(sc, sc->sc_async_head);
 
-fail2:
+fail3:
        for (i = 0; i < EHCI_INTRQHS; i++) {
                sqh = sc->sc_islots[i].sqh;
                if (sqh)
@@ -690,6 +696,8 @@
        }
 
        kmem_free(sc->sc_softitds, sc->sc_flsize * sizeof(ehci_soft_itd_t *));
+
+fail2:
        usb_freemem(&sc->sc_fldma);
 
 fail1:
@@ -3210,7 +3218,7 @@
                mutex_exit(&sc->sc_lock);
 
                usb_dma_t dma;
-               int err = usb_allocmem(sc->sc_bus.ub_dmatag,
+               int err = usb_allocmem(sc->sc_dmatag,
                    EHCI_SITD_SIZE * EHCI_SITD_CHUNK,
                    EHCI_PAGE_SIZE, USBMALLOC_COHERENT, &dma);