summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authornonaka <nonaka@NetBSD.org>2016-06-21 11:33:32 +0000
committernonaka <nonaka@NetBSD.org>2016-06-21 11:33:32 +0000
commit37082fdac815e913044fe0a2a7ce8f5f14de3363 (patch)
tree73464e591ef96e67a983c2f2c29a0aea6a156d8f /sys/dev
parentc1b41db7c5b34352bdcd8c7a3425cbecabb1cd1d (diff)
Pass bus_dma(9) tag to allow for porting sdhc(4) at acpi.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi.c10
-rw-r--r--sys/dev/acpi/acpivar.h8
2 files changed, 15 insertions, 3 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index d55896a8f6a..7d49f80970c 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.261 2015/10/02 05:22:52 msaitoh Exp $ */
+/* $NetBSD: acpi.c,v 1.262 2016/06/21 11:33:33 nonaka Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.261 2015/10/02 05:22:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.262 2016/06/21 11:33:33 nonaka Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -452,6 +452,8 @@ acpi_attach(device_t parent, device_t self, void *aux)
sc->sc_pc = aa->aa_pc;
sc->sc_pciflags = aa->aa_pciflags;
sc->sc_ic = aa->aa_ic;
+ sc->sc_dmat = aa->aa_dmat;
+ sc->sc_dmat64 = aa->aa_dmat64;
SIMPLEQ_INIT(&sc->ad_head);
@@ -863,6 +865,8 @@ acpi_rescan_early(struct acpi_softc *sc)
aa.aa_pc = sc->sc_pc;
aa.aa_pciflags = sc->sc_pciflags;
aa.aa_ic = sc->sc_ic;
+ aa.aa_dmat = sc->sc_dmat;
+ aa.aa_dmat64 = sc->sc_dmat64;
ad->ad_device = config_found_ia(sc->sc_dev,
"acpinodebus", &aa, acpi_print);
@@ -927,6 +931,8 @@ acpi_rescan_nodes(struct acpi_softc *sc)
aa.aa_pc = sc->sc_pc;
aa.aa_pciflags = sc->sc_pciflags;
aa.aa_ic = sc->sc_ic;
+ aa.aa_dmat = sc->sc_dmat;
+ aa.aa_dmat64 = sc->sc_dmat64;
ad->ad_device = config_found_ia(sc->sc_dev,
"acpinodebus", &aa, acpi_print);
diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h
index be1f3e22f2c..ccc3416acfa 100644
--- a/sys/dev/acpi/acpivar.h
+++ b/sys/dev/acpi/acpivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.73 2011/08/01 11:25:59 jmcneill Exp $ */
+/* $NetBSD: acpivar.h,v 1.74 2016/06/21 11:33:33 nonaka Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -62,6 +62,8 @@ struct acpibus_attach_args {
pci_chipset_tag_t aa_pc; /* PCI chipset */
int aa_pciflags; /* PCI bus flags */
isa_chipset_tag_t aa_ic; /* ISA chipset */
+ bus_dma_tag_t aa_dmat; /* PCI DMA tag */
+ bus_dma_tag_t aa_dmat64; /* PCI 64bit DMA tag */
};
/*
@@ -160,6 +162,8 @@ struct acpi_softc {
int sc_pciflags; /* PCI bus flags */
int sc_pci_bus; /* internal PCI fixup */
isa_chipset_tag_t sc_ic; /* ISA chipset tag */
+ bus_dma_tag_t sc_dmat; /* PCI DMA tag */
+ bus_dma_tag_t sc_dmat64; /* PCI 64bit DMA tag */
void *sc_sdhook; /* shutdown hook */
@@ -185,6 +189,8 @@ struct acpi_attach_args {
pci_chipset_tag_t aa_pc; /* PCI chipset tag */
int aa_pciflags; /* PCI bus flags */
isa_chipset_tag_t aa_ic; /* ISA chipset */
+ bus_dma_tag_t aa_dmat; /* PCI DMA tag */
+ bus_dma_tag_t aa_dmat64; /* PCI 64bit DMA tag */
};
/*