summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2020-12-12 11:29:59 +0000
committerjsg <jsg@openbsd.org>2020-12-12 11:29:59 +0000
commitabfb4c874ef5a05e691e910d2e728a4ba0d49532 (patch)
treec516be0ffc984dd02a675acf4c19a4e84a971971
parentThe asmc sensor update task currently consumes ~50ms on each refresh cycle (diff)
downloadwireguard-openbsd-abfb4c874ef5a05e691e910d2e728a4ba0d49532.tar.xz
wireguard-openbsd-abfb4c874ef5a05e691e910d2e728a4ba0d49532.zip
avoid uninitialised var by using dma tag from attach args
ok kettenis@
-rw-r--r--sys/dev/acpi/acpidmar.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpidmar.c b/sys/dev/acpi/acpidmar.c
index 29fdfb32ae4..be4c68732dd 100644
--- a/sys/dev/acpi/acpidmar.c
+++ b/sys/dev/acpi/acpidmar.c
@@ -245,7 +245,7 @@ struct acpidmar_softc {
bus_space_tag_t sc_memt;
int sc_haw;
int sc_flags;
- struct bus_dma_tag sc_dmat;
+ bus_dma_tag_t sc_dmat;
struct ivhd_dte *sc_hwdte;
paddr_t sc_hwdtep;
@@ -875,7 +875,7 @@ iommu_alloc_hwdte(struct acpidmar_softc *sc, size_t size, paddr_t *paddr)
caddr_t vaddr;
bus_dmamap_t map;
bus_dma_segment_t seg;
- bus_dma_tag_t dmat;
+ bus_dma_tag_t dmat = sc->sc_dmat;
int rc, nsegs;
rc = _bus_dmamap_create(dmat, size, 1, size, 0,
@@ -2634,6 +2634,7 @@ acpidmar_attach(struct device *parent, struct device *self, void *aux)
hdr = (struct acpi_table_header *)aaa->aaa_table;
sc->sc_memt = aaa->aaa_memt;
+ sc->sc_dmat = aaa->aaa_dmat;
if (memcmp(hdr->signature, DMAR_SIG, sizeof(DMAR_SIG) - 1) == 0) {
acpidmar_sc = sc;
acpidmar_init(sc, dmar);