ARM: 7693/1: mm: clean-up in order to reduce to call kmap_high_get() (dd0f67f4) · Commits · 戴 / test

arch/arm/mm/dma-mapping.c

+8 −7

Original line number	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 (len + offset > PAGE_SIZE)
		len = PAGE_SIZE - offset;
		vaddr = kmap_high_get(page);
		if (vaddr) {
		vaddr += offset;
		op(vaddr, len, dir);
		kunmap_high(page);
		} else if (cache_is_vipt()) {
		/* unmapped pages might still be cached */

		if (cache_is_vipt_nonaliasing()) {
		vaddr = kmap_atomic(page);
		op(vaddr + offset, len, dir);
		kunmap_atomic(vaddr);
		} else {
		vaddr = kmap_high_get(page);
		if (vaddr) {
		op(vaddr + offset, len, dir);
		kunmap_high(page);
		}
		}
		} else {
		vaddr = page_address(page) + offset;

+9 −6

Original line number	Diff line number	Diff line
		@@ -170,15 +170,18 @@ void __flush_dcache_page(struct address_space mapping, struct page page)
		if (!PageHighMem(page)) {
		__cpuc_flush_dcache_area(page_address(page), PAGE_SIZE);
		} else {
		void *addr = kmap_high_get(page);
		if (addr) {
		__cpuc_flush_dcache_area(addr, PAGE_SIZE);
		kunmap_high(page);
		} else if (cache_is_vipt()) {
		/* unmapped pages might still be cached */
		void *addr;

		if (cache_is_vipt_nonaliasing()) {
		addr = kmap_atomic(page);
		__cpuc_flush_dcache_area(addr, PAGE_SIZE);
		kunmap_atomic(addr);
		} else {
		addr = kmap_high_get(page);
		if (addr) {
		__cpuc_flush_dcache_area(addr, PAGE_SIZE);
		kunmap_high(page);
		}
		}
		}