Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/acpi Use bus_dmatag_subregion to get a 32-bit tag



details:   https://anonhg.NetBSD.org/src/rev/d62ca2b6c0fa
branches:  trunk
changeset: 999891:d62ca2b6c0fa
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Jun 22 19:35:40 2019 +0000

description:
Use bus_dmatag_subregion to get a 32-bit tag

diffstat:

 sys/dev/acpi/xhci_acpi.c |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r fbec4a38e931 -r d62ca2b6c0fa sys/dev/acpi/xhci_acpi.c
--- a/sys/dev/acpi/xhci_acpi.c  Sat Jun 22 17:57:10 2019 +0000
+++ b/sys/dev/acpi/xhci_acpi.c  Sat Jun 22 19:35:40 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci_acpi.c,v 1.4 2019/06/19 13:40:23 jmcneill Exp $ */
+/* $NetBSD: xhci_acpi.c,v 1.5 2019/06/22 19:35:40 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci_acpi.c,v 1.4 2019/06/19 13:40:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_acpi.c,v 1.5 2019/06/22 19:35:40 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -130,10 +130,16 @@
        hccparams = bus_space_read_4(sc->sc_iot, sc->sc_ioh, XHCI_HCCPARAMS);
        if (XHCI_HCC_AC64(hccparams)) {
                aprint_verbose_dev(self, "using 64-bit DMA\n");
-               sc->sc_bus.ub_dmatag = aa->aa_dmat64;
+               sc->sc_bus.ub_dmatag = aa->aa_dmat;
        } else {
                aprint_verbose_dev(self, "using 32-bit DMA\n");
-               sc->sc_bus.ub_dmatag = aa->aa_dmat;
+               error = bus_dmatag_subregion(aa->aa_dmat, 0, 0xffffffff,
+                   &sc->sc_bus.ub_dmatag, BUS_DMA_WAITOK);
+               if (error != 0) {
+                       aprint_error_dev(self, "couldn't create DMA tag: %d\n",
+                           error);
+                       return;
+               }
        }
 
         ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,



Home | Main Index | Thread Index | Old Index