diff options
author | Ian Lepore <ian@FreeBSD.org> | 2014-11-16 20:34:14 +0000 |
---|---|---|
committer | Ian Lepore <ian@FreeBSD.org> | 2014-11-16 20:34:14 +0000 |
commit | a57275b60189c44c6968159bc712f1debd47d5ba (patch) | |
tree | ae2a68024308bdb8b3ba31a24b7788aed998aea8 /sys/arm/arm | |
parent | 53cecec82eb1ccfc401bdec2e34386c017466e14 (diff) | |
download | src-a57275b60189c44c6968159bc712f1debd47d5ba.tar.gz src-a57275b60189c44c6968159bc712f1debd47d5ba.zip |
Indent a couple lines properly and expand a comment. No functional changes.
Notes
Notes:
svn path=/head/; revision=274596
Diffstat (limited to 'sys/arm/arm')
-rw-r--r-- | sys/arm/arm/busdma_machdep-v6.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/arm/arm/busdma_machdep-v6.c b/sys/arm/arm/busdma_machdep-v6.c index b6629fa335c8..34ba5956b1f5 100644 --- a/sys/arm/arm/busdma_machdep-v6.c +++ b/sys/arm/arm/busdma_machdep-v6.c @@ -1336,7 +1336,7 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op) (void *)bpage->vaddr, bpage->datacount); cpu_dcache_wb_range((vm_offset_t)bpage->vaddr, - bpage->datacount); + bpage->datacount); l2cache_wb_range((vm_offset_t)bpage->vaddr, (vm_offset_t)bpage->busaddr, bpage->datacount); @@ -1390,12 +1390,16 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op) /* * For COHERENT memory no cache maintenance is necessary, but ensure all - * writes have reached memory for the PREWRITE case. + * writes have reached memory for the PREWRITE case. No action is + * needed for a PREREAD without PREWRITE also set, because that would + * imply that the cpu had written to the COHERENT buffer and expected + * the dma device to see that change, and by definition a PREWRITE sync + * is required to make that happen. */ if (map->flags & DMAMAP_COHERENT) { if (op & BUS_DMASYNC_PREWRITE) { - dsb(); - cpu_l2cache_drain_writebuf(); + dsb(); + cpu_l2cache_drain_writebuf(); } return; } |