Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd0f67f4 authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Russell King
Browse files

ARM: 7693/1: mm: clean-up in order to reduce to call kmap_high_get() 



In kmap_atomic(), kmap_high_get() is invoked for checking already
mapped area. In __flush_dcache_page() and dma_cache_maint_page(),
we explicitly call kmap_high_get() before kmap_atomic()
when cache_is_vipt(), so kmap_high_get() can be invoked twice.
This is useless operation, so remove one.

v2: change cache_is_vipt() to cache_is_vipt_nonaliasing() in order to
be self-documented

Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ae8a8b95

arch/arm/mm/dma-mapping.c

+8 −7
Original line number Original line Diff line number Diff line
@@ -822,16 +822,17 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset, 
		if (PageHighMem(page)) {

		if (PageHighMem(page)) {

			if (len + offset > PAGE_SIZE)

			if (len + offset > PAGE_SIZE)

				len = PAGE_SIZE - offset;

				len = PAGE_SIZE - offset;

			vaddr = kmap_high_get(page);



			if (vaddr) {

			if (cache_is_vipt_nonaliasing()) {

				vaddr += offset;

				op(vaddr, len, dir);

				kunmap_high(page);

			} else if (cache_is_vipt()) {

				/* unmapped pages might still be cached */

				vaddr = kmap_atomic(page);

				vaddr = kmap_atomic(page);

				op(vaddr + offset, len, dir);

				op(vaddr + offset, len, dir);

				kunmap_atomic(vaddr);

				kunmap_atomic(vaddr);

			} else {

				vaddr = kmap_high_get(page);

				if (vaddr) {

					op(vaddr + offset, len, dir);

					kunmap_high(page);

				}

			}

			}

		} else {

		} else {

			vaddr = page_address(page) + offset;

			vaddr = page_address(page) + offset;

arch/arm/mm/flush.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -170,15 +170,18 @@ void __flush_dcache_page(struct address_space *mapping, struct page *page) 
	if (!PageHighMem(page)) {

	if (!PageHighMem(page)) {

		__cpuc_flush_dcache_area(page_address(page), PAGE_SIZE);

		__cpuc_flush_dcache_area(page_address(page), PAGE_SIZE);

	} else {

	} else {

		void *addr = kmap_high_get(page);

		void *addr;

		if (addr) {



			__cpuc_flush_dcache_area(addr, PAGE_SIZE);

		if (cache_is_vipt_nonaliasing()) {

			kunmap_high(page);

		} else if (cache_is_vipt()) {

			/* unmapped pages might still be cached */

			addr = kmap_atomic(page);

			addr = kmap_atomic(page);

			__cpuc_flush_dcache_area(addr, PAGE_SIZE);

			__cpuc_flush_dcache_area(addr, PAGE_SIZE);

			kunmap_atomic(addr);

			kunmap_atomic(addr);

		} else {

			addr = kmap_high_get(page);

			if (addr) {

				__cpuc_flush_dcache_area(addr, PAGE_SIZE);

				kunmap_high(page);

			}

		}

		}

	}

	}