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

Commit ccaf5f05 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

ARM: 5848/1: kill flush_ioremap_region() 



There is not enough users to warrant its existence, and it is actually
an obstacle to progress with the new DMA API which cannot cover this
case properly.

To keep backward compatibility, let's perform the necessary custom
cache maintenance locally in the only driver affected.

Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3067e02f

arch/arm/include/asm/cacheflush.h

+0 −7
Original line number Diff line number Diff line
@@ -465,13 +465,6 @@ static inline void flush_kernel_dcache_page(struct page *page) 
 */

#define flush_icache_page(vma,page)	do { } while (0)



static inline void flush_ioremap_region(unsigned long phys, void __iomem *virt,

	unsigned offset, size_t size)

{

	const void *start = (void __force *)virt + offset;

	dmac_inv_range(start, start + size);

}



/*

 * flush_cache_vmap() is used when creating mappings (eg, via vmap,

 * vmalloc, ioremap etc) in kernel space for pages.  On non-VIPT

arch/arm/mm/proc-syms.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ EXPORT_SYMBOL(__cpuc_flush_user_all); 
EXPORT_SYMBOL(__cpuc_flush_user_range);

EXPORT_SYMBOL(__cpuc_coherent_kern_range);

EXPORT_SYMBOL(__cpuc_flush_dcache_page);

EXPORT_SYMBOL(dmac_inv_range);  /* because of flush_ioremap_region() */

#else

EXPORT_SYMBOL(cpu_cache);

#endif

drivers/mtd/maps/pxa2xx-flash.c

+11 −2
Original line number Diff line number Diff line
@@ -20,14 +20,23 @@ 


#include <asm/io.h>

#include <mach/hardware.h>

#include <asm/cacheflush.h>



#include <asm/mach/flash.h>



#define CACHELINESIZE	32



static void pxa2xx_map_inval_cache(struct map_info *map, unsigned long from,

				      ssize_t len)

{

	flush_ioremap_region(map->phys, map->cached, from, len);

	unsigned long start = (unsigned long)map->cached + from;

	unsigned long end = start + len;



	start &= ~(CACHELINESIZE - 1);

	while (start < end) {

		/* invalidate D cache line */

		asm volatile ("mcr p15, 0, %0, c7, c6, 1" : : "r" (start));

		start += CACHELINESIZE;

	}

}



struct pxa2xx_flash_info {