diff options
| author |   ratchov <ratchov@openbsd.org> | 2010-10-06 21:02:59 +0000 |
|---|---|---|
| committer | ratchov <ratchov@openbsd.org> | 2010-10-06 21:02:59 +0000 |
| commit | a5de448d26d71e2d4af17ce0e77bf2d6b124ce3f (patch) | |
| tree | 6580532a28566f9ed04a4722f899765a2b4ceec5 | |
| parent | Save and restore the lapic Task Priority register accross suspend/resume, (diff) | |
| download | wireguard-openbsd-a5de448d26d71e2d4af17ce0e77bf2d6b124ce3f.tar.xz wireguard-openbsd-a5de448d26d71e2d4af17ce0e77bf2d6b124ce3f.zip | |
Give the device the physical address obtained from the DMA mapping
instead of the actual physical address of the DMA-safe memory.
On i386 the driver used to work because both addresses are the
same.
spotted by damien@
| -rw-r--r-- | sys/dev/pci/envy.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/pci/envy.c b/sys/dev/pci/envy.c index 0a5f3a00bb6..40c3995d0dd 100644 --- a/sys/dev/pci/envy.c +++ b/sys/dev/pci/envy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: envy.c,v 1.42 2010/10/04 09:32:43 ratchov Exp $ */ +/* $OpenBSD: envy.c,v 1.43 2010/10/06 21:02:59 ratchov Exp $ */ /* * Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org> * @@ -1674,30 +1674,28 @@ envy_allocm(void *self, int dir, size_t size, int type, int flags) DPRINTF("%s: dmamem_alloc: failed %d\n", DEVNAME(sc), err); goto err_ret; } - err = bus_dmamem_map(sc->pci_dmat, &buf->seg, rsegs, buf->size, &buf->addr, wait | BUS_DMA_COHERENT); if (err) { DPRINTF("%s: dmamem_map: failed %d\n", DEVNAME(sc), err); goto err_free; } - err = bus_dmamap_create(sc->pci_dmat, buf->size, 1, buf->size, 0, wait, &buf->map); if (err) { DPRINTF("%s: dmamap_create: failed %d\n", DEVNAME(sc), err); goto err_unmap; } - err = bus_dmamap_load(sc->pci_dmat, buf->map, buf->addr, buf->size, NULL, wait); if (err) { DPRINTF("%s: dmamap_load: failed %d\n", DEVNAME(sc), err); goto err_destroy; } - bus_space_write_4(sc->mt_iot, sc->mt_ioh, basereg, buf->seg.ds_addr); - DPRINTF("%s: allocated %ld bytes dir=%d, ka=%p, da=%p\n", - DEVNAME(sc), buf->size, dir, buf->addr, (void *)buf->seg.ds_addr); + bus_space_write_4(sc->mt_iot, sc->mt_ioh, basereg, + buf->map->dm_segs[0].ds_addr); + DPRINTF("%s: allocated %zd bytes dir=%d, ka=%p, da=%p\n", DEVNAME(sc), + buf->size, dir, buf->addr, (void *)buf->map->dm_segs[0].ds_addr); return buf->addr; err_destroy: |