diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2015-11-20 18:52:51 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2015-11-20 18:52:51 +0100 |
| commit | 817906fdd1c4509cb4b79160bb0d9ff72db7a604 (patch) | |
| tree | eafe197e4e16ade6641d5c6659c5fe95be9b8239 /pcilib/kmem.c | |
| parent | bba9c619c79175b58359116b52a889e30a632d07 (diff) | |
| download | pcitool-817906fdd1c4509cb4b79160bb0d9ff72db7a604.tar.gz pcitool-817906fdd1c4509cb4b79160bb0d9ff72db7a604.tar.bz2 pcitool-817906fdd1c4509cb4b79160bb0d9ff72db7a604.tar.xz pcitool-817906fdd1c4509cb4b79160bb0d9ff72db7a604.zip | |
Fix reading non DMA-able kernel pages using pcitool
Diffstat (limited to 'pcilib/kmem.c')
| -rw-r--r-- | pcilib/kmem.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/pcilib/kmem.c b/pcilib/kmem.c index 4e240c3..cb3c58c 100644 --- a/pcilib/kmem.c +++ b/pcilib/kmem.c @@ -276,6 +276,8 @@ pcilib_kmem_handle_t *pcilib_alloc_kernel_memory(pcilib_t *ctx, pcilib_kmem_type memcpy(&kbuf->buf.addr, &kbuf->buf.blocks[0], sizeof(pcilib_kmem_addr_t)); } + kbuf->buf.type = type; + kbuf->buf.use = use; kbuf->buf.reused = reused|(persistent?PCILIB_KMEM_REUSE_PERSISTENT:0)|(hardware?PCILIB_KMEM_REUSE_HARDWARE:0); kbuf->prev = NULL; @@ -331,15 +333,25 @@ int pcilib_kmem_sync_block(pcilib_t *ctx, pcilib_kmem_handle_t *k, pcilib_kmem_s kmem_sync_t ks; pcilib_kmem_list_t *kbuf = (pcilib_kmem_list_t*)k; - ks.dir = dir; - ks.handle.handle_id = kbuf->buf.blocks[block].handle_id; - ks.handle.pa = kbuf->buf.blocks[block].pa; - ret = ioctl(ctx->handle, PCIDRIVER_IOC_KMEM_SYNC, &ks); - if (ret) { - pcilib_error("PCIDRIVER_IOC_KMEM_SYNC ioctl have failed"); - return PCILIB_ERROR_FAILED; + switch (kbuf->buf.type) { + case PCILIB_KMEM_TYPE_DMA_S2C_PAGE: + case PCILIB_KMEM_TYPE_DMA_C2S_PAGE: + case PCILIB_KMEM_TYPE_REGION_S2C: + case PCILIB_KMEM_TYPE_REGION_C2S: + ks.dir = dir; + ks.handle.handle_id = kbuf->buf.blocks[block].handle_id; + ks.handle.pa = kbuf->buf.blocks[block].pa; + + ret = ioctl(ctx->handle, PCIDRIVER_IOC_KMEM_SYNC, &ks); + if (ret) { + pcilib_error("PCIDRIVER_IOC_KMEM_SYNC ioctl have failed"); + return PCILIB_ERROR_FAILED; + } + break; + default: + ; } - + return 0; } |