diff options
author | Suren A. Chilingaryan <csa@suren.me> | 2016-03-02 02:49:28 +0100 |
---|---|---|
committer | Suren A. Chilingaryan <csa@suren.me> | 2016-03-02 02:49:28 +0100 |
commit | 3c58980b3ca558096340e51c215897e8614ba00a (patch) | |
tree | 54d5f8cf48c7331586ed110a548b33b161f8093e /dma/nwl_engine_buffers.h | |
parent | adc657ebcd01ecc2cc5f110453ef00dffde2d5c0 (diff) | |
parent | a5da7db50d02878b6d9c844b18d0d3f8ccf6c62b (diff) | |
download | pcitool-3c58980b3ca558096340e51c215897e8614ba00a.tar.gz pcitool-3c58980b3ca558096340e51c215897e8614ba00a.tar.bz2 pcitool-3c58980b3ca558096340e51c215897e8614ba00a.tar.xz pcitool-3c58980b3ca558096340e51c215897e8614ba00a.zip |
Distinguish between hardware and bus addresses in pcilib and fix cli reading from DMA when very low DMA timeout is set
Diffstat (limited to 'dma/nwl_engine_buffers.h')
-rw-r--r-- | dma/nwl_engine_buffers.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dma/nwl_engine_buffers.h b/dma/nwl_engine_buffers.h index ef1c74f..0cc5343 100644 --- a/dma/nwl_engine_buffers.h +++ b/dma/nwl_engine_buffers.h @@ -121,7 +121,7 @@ static int dma_nwl_allocate_engine_buffers(nwl_dma_t *ctx, pcilib_nwl_engine_con unsigned char *data = (unsigned char*)pcilib_kmem_get_ua(ctx->dmactx.pcilib, ring); - uint32_t ring_pa = pcilib_kmem_get_pa(ctx->dmactx.pcilib, ring); + uint32_t ring_pa = pcilib_kmem_get_ba(ctx->dmactx.pcilib, ring); if (preserve) { if (ectx->desc->direction == PCILIB_DMA_FROM_DEVICE) err = dma_nwl_compute_read_c2s_pointers(ctx, ectx, data, ring_pa); @@ -251,7 +251,7 @@ static int dma_nwl_push_buffer(nwl_dma_t *ctx, pcilib_nwl_engine_context_t *ectx uint32_t val; unsigned char *ring = pcilib_kmem_get_ua(ctx->dmactx.pcilib, ectx->ring); - uint32_t ring_pa = pcilib_kmem_get_pa(ctx->dmactx.pcilib, ectx->ring); + uint32_t ring_pa = pcilib_kmem_get_ba(ctx->dmactx.pcilib, ectx->ring); ring += ectx->head * PCILIB_NWL_DMA_DESCRIPTOR_SIZE; @@ -338,7 +338,7 @@ static int dma_nwl_return_buffer(nwl_dma_t *ctx, pcilib_nwl_engine_context_t *ec uint32_t val; unsigned char *ring = pcilib_kmem_get_ua(ctx->dmactx.pcilib, ectx->ring); - uint32_t ring_pa = pcilib_kmem_get_pa(ctx->dmactx.pcilib, ectx->ring); + uint32_t ring_pa = pcilib_kmem_get_ba(ctx->dmactx.pcilib, ectx->ring); size_t bufsz = pcilib_kmem_get_block_size(ctx->dmactx.pcilib, ectx->pages, ectx->tail); ring += ectx->tail * PCILIB_NWL_DMA_DESCRIPTOR_SIZE; |