mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

driver: rknpu: Fix premature table release causing cache flush error

Browse Source 
Signed-off-by: Shuangjie Lin <shuangjie.lin@rock-chips.com>
Change-Id: I3df3dbf3a77e4308a923fa333d137d11d9439be5
This commit is contained in:
Shuangjie Lin
2025-03-24 11:26:24 +08:00
committed by Tao Huang
parent 75965a6c8c
commit 98e08ec41d
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/rknpu/include/rknpu_mem.h
View File

@@ -33,6 +33,7 @@ struct rknpu_mem_object {
struct page **pages;
struct sg_table *sgt;
struct dma_buf *dmabuf;
struct dma_buf_attachment *attachment;
struct list_head head;
unsigned int owner;
};

9
drivers/rknpu/rknpu_drv.c
View File

@@ -301,7 +301,7 @@ static const struct rknpu_config rv1126b_rknpu_config = {
.max_submit_number = (1 << 16) - 1,
.core_mask = 0x1,
.amount_top = &rknpu_top_amount,
.amount_core = &rknpu_core_amount,
.amount_core = NULL,
.state_init = NULL,
.cache_sgt_init = NULL,
};
@@ -569,8 +569,13 @@ static int rknpu_release(struct inode *inode, struct file *file)
vunmap(entry->kv_addr);
entry->kv_addr = NULL;
if (!entry->owner)
if (!entry->owner) {
dma_buf_put(entry->dmabuf);
} else {
dma_buf_unmap_attachment(entry->attachment, entry->sgt,
DMA_BIDIRECTIONAL);
dma_buf_detach(entry->dmabuf, entry->attachment);
}
list_del(&entry->head);
kfree(entry);

14
drivers/rknpu/rknpu_mem.c
View File

@@ -194,6 +194,7 @@ int rknpu_mem_create_ioctl(struct rknpu_device *rknpu_dev, struct file *file,
rknpu_obj->size = PAGE_ALIGN(args.size);
rknpu_obj->dma_addr = phys;
rknpu_obj->sgt = table;
rknpu_obj->attachment = attachment;
args.size = rknpu_obj->size;
args.obj_addr = (__u64)(uintptr_t)rknpu_obj;
@@ -212,9 +213,6 @@ int rknpu_mem_create_ioctl(struct rknpu_device *rknpu_dev, struct file *file,
goto err_unmap_kv_addr;
}
dma_buf_unmap_attachment(attachment, table, DMA_BIDIRECTIONAL);
dma_buf_detach(dmabuf, attachment);
spin_lock(&rknpu_dev->lock);
session = file->private_data;
@@ -300,9 +298,15 @@ int rknpu_mem_destroy_ioctl(struct rknpu_device *rknpu_dev, struct file *file,
vunmap(rknpu_obj->kv_addr);
rknpu_obj->kv_addr = NULL;
if (!rknpu_obj->owner)
if (!rknpu_obj->owner) {
dma_buf_put(rknpu_obj->dmabuf);
} else {
dma_buf_unmap_attachment(rknpu_obj->attachment,
rknpu_obj->sgt,
DMA_BIDIRECTIONAL);
dma_buf_detach(rknpu_obj->dmabuf,
rknpu_obj->attachment);
}
kfree(rknpu_obj);
}