staging-media-ipu3-use-vmap-instead-of-reimplementing-it.patch removed from -mm tree
The patch titled
Subject: staging: media: ipu3: use vmap instead of reimplementing it
has been removed from the -mm tree. Its filename was
staging-media-ipu3-use-vmap-instead-of-reimplementing-it.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: staging: media: ipu3: use vmap instead of reimplementing it
Just use vmap instead of messing with vmalloc internals.
---
drivers/staging/media/ipu3/ipu3-css-pool.h | 4 -- drivers/staging/media/ipu3/ipu3-dmamap.c | 30 +++++-------------- 2 files changed, 9 insertions(+), 25 deletions(-)
drivers/staging/media/ipu3/ipu3-css-pool.h renamed from drivers/staging/media/ipu3/ipu3-css-pool.h~staging-media-ipu3-use-vmap-instead-of-reimplementing-it +1 -3
@@ -15,14 +15,12 @@ struct imgu_device;* @size: size of the buffer in bytes. * @vaddr: kernel virtual address. * @daddr: iova dma address to access IPU3. -* @vma: private, a pointer to &struct vm_struct, -* used for imgu_dmamap_free. */ struct imgu_css_map {size_t size;void *vaddr;dma_addr_t daddr; -struct vm_struct *vma; +struct page **pages; };/**
drivers/staging/media/ipu3/ipu3-dmamap.c renamed from drivers/staging/media/ipu3/ipu3-dmamap.c~staging-media-ipu3-use-vmap-instead-of-reimplementing-it +8 -22
@@ -96,6 +96,7 @@ void *imgu_dmamap_alloc(struct imgu_deviunsigned long shift =iova_shift (&imgu->iova_domain);struct device *dev = &imgu->pci_dev->dev;size_t size =PAGE_ALIGN (len); +int count = size >>PAGE_SHIFT ;struct page **pages;dma_addr_t iovaddr;struct iova *iova;
@@ -114,7 +115,7 @@ void *imgu_dmamap_alloc(struct imgu_devi/* Call IOMMU driver to setup pgt */ iovaddr =iova_dma_addr (&imgu->iova_domain, iova); -for (i =0 ; i < size /PAGE_SIZE ; ++i) { +for (i =0 ; i < count; ++i) { rval =imgu_mmu_map (imgu->mmu, iovaddr,page_to_phys (pages[i]),PAGE_SIZE );if (rval)
@@ -123,33 +124,23 @@ void *imgu_dmamap_alloc(struct imgu_devi iovaddr +=PAGE_SIZE ; } -/* Now grab a virtual region */ - map->vma =__get_vm_area (size,VM_USERMAP ,VMALLOC_START ,VMALLOC_END ); -if (!map->vma) + map->vaddr =vmap (pages, count,VM_USERMAP ,PAGE_KERNEL ); +if (!map->vaddr) goto out_unmap; - map->vma->pages = pages; -/* And map it in KVA */ -if (map_vm_area (map->vma,PAGE_KERNEL , pages)) - goto out_vunmap; - + map->pages = pages; map->size = size; map->daddr =iova_dma_addr (&imgu->iova_domain, iova); - map->vaddr = map->vma->addr;dev_dbg (dev,"%s: allocated %zu @ IOVA %pad @ VA %p\n" , __func__, - size, &map->daddr, map->vma->addr); - -return map->vma->addr; + size, &map->daddr, map->vaddr); -out_vunmap: -vunmap (map->vma->addr); +return map->vaddr; out_unmap:imgu_dmamap_free_buffer (pages, size);imgu_mmu_unmap (imgu->mmu,iova_dma_addr (&imgu->iova_domain, iova), i *PAGE_SIZE ); - map->vma =NULL ; out_free_iova:__free_iova (&imgu->iova_domain, iova);
@@ -177,8 +168,6 @@ void imgu_dmamap_unmap(struct imgu_devic*/ void imgu_dmamap_free (struct imgu_device *imgu,struct imgu_css_map *map) { -struct vm_struct *area = map->vma; -dev_dbg (&imgu->pci_dev->dev,"%s: freeing %zu @ IOVA %pad @ VA %p\n" , __func__, map->size, &map->daddr, map->vaddr);
@@ -187,11 +176,8 @@ void imgu_dmamap_free(struct imgu_deviceimgu_dmamap_unmap (imgu, map); -if (WARN_ON (!area) ||WARN_ON (!area->pages)) -return ; - -imgu_dmamap_free_buffer (area->pages, map->size);vunmap (map->vaddr); +imgu_dmamap_free_buffer (map->pages, map->size); map->vaddr =NULL ; }
_
Patches currently in -mm which might be from [email protected] are
exec-simplify-the-copy_strings_kernel-calling-convention.patch exec-open-code-copy_string_kernel.patch amdgpu-a-null-mm-does-not-mean-a-thread-is-a-kthread.patch kernel-move-use_mm-unuse_mm-to-kthreadc.patch kernel-move-use_mm-unuse_mm-to-kthreadc-v2.patch kernel-better-document-the-use_mm-unuse_mm-api-contract.patch kernel-better-document-the-use_mm-unuse_mm-api-contract-v2.patch kernel-set-user_ds-in-kthread_use_mm.patch arm-fix-the-flush_icache_range-arguments-in-set_fiq_handler.patch nds32-unexport-flush_icache_page.patch powerpc-unexport-flush_icache_user_range.patch unicore32-remove-flush_cache_user_range.patch asm-generic-fix-the-inclusion-guards-for-cacheflushh.patch asm-generic-dont-include-linux-mmh-in-cacheflushh.patch asm-generic-dont-include-linux-mmh-in-cacheflushh-fix.patch asm-generic-improve-the-flush_dcache_page-stub.patch alpha-use-asm-generic-cacheflushh.patch arm64-use-asm-generic-cacheflushh.patch c6x-use-asm-generic-cacheflushh.patch hexagon-use-asm-generic-cacheflushh.patch ia64-use-asm-generic-cacheflushh.patch microblaze-use-asm-generic-cacheflushh.patch m68knommu-use-asm-generic-cacheflushh.patch openrisc-use-asm-generic-cacheflushh.patch powerpc-use-asm-generic-cacheflushh.patch riscv-use-asm-generic-cacheflushh.patch armsparcunicore32-remove-flush_icache_user_range.patch mm-rename-flush_icache_user_range-to-flush_icache_user_page.patch asm-generic-add-a-flush_icache_user_range-stub.patch sh-implement-flush_icache_user_range.patch xtensa-implement-flush_icache_user_range.patch arm-rename-flush_cache_user_range-to-flush_icache_user_range.patch m68k-implement-flush_icache_user_range.patch exec-only-build-read_code-when-needed.patch exec-use-flush_icache_user_range-in-read_code.patch binfmt_flat-use-flush_icache_user_range.patch nommu-use-flush_icache_user_range-in-brk-and-mmap.patch module-move-the-set_fs-hack-for-flush_icache_range-to-m68k.patch maccess-unexport-probe_kernel_write-and-probe_user_write.patch maccess-remove-various-unused-weak-aliases.patch maccess-remove-duplicate-kerneldoc-comments.patch maccess-clarify-kerneldoc-comments.patch maccess-update-the-top-of-file-comment.patch maccess-rename-strncpy_from_unsafe_user-to-strncpy_from_user_nofault.patch maccess-rename-strncpy_from_unsafe_strict-to-strncpy_from_kernel_nofault.patch maccess-rename-strnlen_unsafe_user-to-strnlen_user_nofault.patch maccess-remove-probe_read_common-and-probe_write_common.patch maccess-unify-the-probe-kernel-arch-hooks.patch bpf-factor-out-a-bpf_trace_copy_string-helper.patch bpf-handle-the-compat-string-in-bpf_trace_copy_string-better.patch bpf-rework-the-compat-kernel-probe-handling.patch tracing-kprobes-handle-mixed-kernel-userspace-probes-better.patch maccess-remove-strncpy_from_unsafe.patch maccess-always-use-strict-semantics-for-probe_kernel_read.patch maccess-move-user-access-routines-together.patch maccess-allow-architectures-to-provide-kernel-probing-directly.patch x86-use-non-set_fs-based-maccess-routines.patch maccess-return-erange-when-copy_from_kernel_nofault_allowed-fails.patch