diff options
Diffstat (limited to 'arch/arm/mach-exynos/secmem-allocdev.c')
| -rw-r--r-- | arch/arm/mach-exynos/secmem-allocdev.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/arch/arm/mach-exynos/secmem-allocdev.c b/arch/arm/mach-exynos/secmem-allocdev.c index 1e68e9c..cab2bc5 100644 --- a/arch/arm/mach-exynos/secmem-allocdev.c +++ b/arch/arm/mach-exynos/secmem-allocdev.c @@ -223,14 +223,13 @@ static long secmem_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) return -EFAULT; } - region.virt_addr = kmalloc(region.len, GFP_KERNEL | GFP_DMA); - if (!region.virt_addr) { - printk(KERN_ERR "%s: Get memory address failed. [size : %ld]\n", __func__, region.len); - return -EFAULT; - } - region.phys_addr = virt_to_phys(region.virt_addr); + pr_info("SECMEM_IOC_GET_ADDR: size:%lu\n", region.len); - dma_map_single(secmem.this_device, region.virt_addr, region.len, DMA_TO_DEVICE); + region.virt_addr = dma_alloc_coherent(NULL, region.len, + ®ion.phys_addr, GFP_KERNEL); + if (!region.virt_addr) + panic("SECMEM_IOC_GET_ADDR: dma_alloc_coherent failed! " + "size=%lu\n", region.len); if (copy_to_user((void __user *)arg, ®ion, sizeof(struct secmem_region))) @@ -245,12 +244,14 @@ static long secmem_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) sizeof(struct secmem_region))) return -EFAULT; - if (!region.virt_addr) { - printk(KERN_ERR "Get secmem address error. [address : %x]\n", (uint32_t)region.virt_addr); - return -EFAULT; - } + if (!region.virt_addr) + panic("SECMEM_IOC_RELEASE_ADDR: Get secmem address error" + " [address : %x]\n", (uint32_t)region.virt_addr); + + pr_info("SECMEM_IOC_RELEASE_ADDR: size:%lu\n", region.len); - kfree(region.virt_addr); + dma_free_coherent(NULL, region.len, region.virt_addr, + region.phys_addr); break; } |