Merge "arm: dma-mapping: flush highmem mappings" (51856490) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm/Kconfig

+4 −0

Original line number	Diff line number	Diff line
		@@ -241,6 +241,9 @@ config NEED_RET_TO_USER
		config ARCH_MTD_XIP
		bool

		config ARCH_WANT_KMAP_ATOMIC_FLUSH
		bool

		config VECTORS_BASE
		hex
		default 0xffff0000 if MMU \|\| CPU_HIGH_VECTOR
		@@ -568,6 +571,7 @@ config ARCH_QCOM
		select SPARSE_IRQ
		select USE_OF
		select PINCTRL
		select ARCH_WANT_KMAP_ATOMIC_FLUSH
		help
		Support for Qualcomm MSM/QSD based systems. This runs on the
		apps processor of the MSM/QSD and depends on a shared memory

arch/arm/mm/dma-mapping.c

+27 −11

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ static void *
		__dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot,
		const void *caller);

		static void __dma_free_remap(void *cpu_addr, size_t size);
		static void __dma_free_remap(void *cpu_addr, size_t size, bool warn);

		static inline pgprot_t __get_dma_pgprot(unsigned long attrs, pgprot_t prot);

		@@ -392,10 +392,10 @@ __dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot,
		prot, caller);
		}

		static void __dma_free_remap(void *cpu_addr, size_t size)
		static void __dma_free_remap(void *cpu_addr, size_t size, bool no_warn)
		{
		dma_common_free_remap(cpu_addr, size,
		VM_ARM_DMA_CONSISTENT \| VM_USERMAP, false);
		VM_ARM_DMA_CONSISTENT \| VM_USERMAP, no_warn);
		}

		#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_256K
		@@ -583,12 +583,14 @@ static void __dma_remap(struct page *page, size_t size, pgprot_t prot,
		flush_tlb_kernel_range(start, end);
		}


		#define NO_KERNEL_MAPPING_DUMMY 0x2222
		static void __alloc_remap_buffer(struct device dev, size_t size, gfp_t gfp,
		pgprot_t prot, struct page **ret_page,
		const void *caller, bool want_vaddr)
		{
		struct page *page;
		void *ptr = NULL;
		void ptr = (void )NO_KERNEL_MAPPING_DUMMY;
		/*
		* __alloc_remap_buffer is only called when the device is
		* non-coherent
		@@ -663,11 +665,25 @@ static void __alloc_from_contiguous(struct device dev, size_t size,
		__dma_clear_buffer(page, size, coherent_flag);

		if (PageHighMem(page)) {
		ptr = __dma_alloc_remap(page, size, GFP_KERNEL, prot, caller);
		if (!want_vaddr) {
		/*
		* Something non-NULL needs to be returned here. Give
		* back a dummy address that is unmapped to catch
		* clients trying to use the address incorrectly
		*/
		ptr = (void *)NO_KERNEL_MAPPING_DUMMY;

		/* also flush out the stale highmem mappings */
		kmap_flush_unused();
		kmap_atomic_flush_unused();
		} else {
		ptr = __dma_alloc_remap(page, size, GFP_KERNEL, prot,
		caller);
		if (!ptr) {
		dma_release_from_contiguous(dev, page, count);
		return NULL;
		}
		}
		} else {
		__dma_remap(page, size, prot, want_vaddr);
		ptr = page_address(page);
		@@ -681,7 +697,7 @@ static void __free_from_contiguous(struct device dev, struct page page,
		void *cpu_addr, size_t size, bool want_vaddr)
		{
		if (PageHighMem(page))
		__dma_free_remap(cpu_addr, size);
		__dma_free_remap(cpu_addr, size, true);
		else
		__dma_remap(page, size, PAGE_KERNEL, true);
		dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT);
		@@ -777,7 +793,7 @@ static void remap_allocator_alloc(struct arm_dma_alloc_args args,
		static void remap_allocator_free(struct arm_dma_free_args *args)
		{
		if (args->want_vaddr)
		__dma_free_remap(args->cpu_addr, args->size);
		__dma_free_remap(args->cpu_addr, args->size, false);

		__dma_free_buffer(args->page, args->size);
		}
		@@ -864,7 +880,7 @@ static void __dma_alloc(struct device dev, size_t size, dma_addr_t *handle,
		kfree(buf);
		}

		return args.want_vaddr ? addr : page;
		return addr;
		}

		/*

arch/arm/mm/highmem.c

+56 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		* published by the Free Software Foundation.
		*/

		#include <linux/cpu.h>
		#include <linux/module.h>
		#include <linux/highmem.h>
		#include <linux/interrupt.h>
		@@ -147,3 +148,58 @@ void *kmap_atomic_pfn(unsigned long pfn)

		return (void *)vaddr;
		}

		#ifdef CONFIG_ARCH_WANT_KMAP_ATOMIC_FLUSH
		static void kmap_remove_unused_cpu(int cpu)
		{
		int start_idx, idx, type;

		pagefault_disable();
		type = kmap_atomic_idx();
		start_idx = type + 1 + KM_TYPE_NR * cpu;

		for (idx = start_idx; idx < KM_TYPE_NR + KM_TYPE_NR * cpu; idx++) {
		unsigned long vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
		pte_t ptep;

		ptep = get_top_pte(vaddr);
		if (ptep)
		set_top_pte(vaddr, __pte(0));
		}
		pagefault_enable();
		}

		static void kmap_remove_unused(void *unused)
		{
		kmap_remove_unused_cpu(smp_processor_id());
		}

		void kmap_atomic_flush_unused(void)
		{
		on_each_cpu(kmap_remove_unused, NULL, 1);
		}

		static int hotplug_kmap_atomic_callback(struct notifier_block *nfb,
		unsigned long action, void *hcpu)
		{
		switch (action & (~CPU_TASKS_FROZEN)) {
		case CPU_DYING:
		kmap_remove_unused_cpu((int)hcpu);
		break;
		default:
		break;
		}

		return NOTIFY_OK;
		}

		static struct notifier_block hotplug_kmap_atomic_notifier = {
		.notifier_call = hotplug_kmap_atomic_callback,
		};

		static int __init init_kmap_atomic(void)
		{
		return register_hotcpu_notifier(&hotplug_kmap_atomic_notifier);
		}
		early_initcall(init_kmap_atomic);
		#endif