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

Commit a7bd08c8 authored by Fenkart/Bostandzhyan's avatar Fenkart/Bostandzhyan Committed by Russell King
Browse files

ARM: 5927/1: Make delimiters of DMA area globally visibly. 



Adds DMA area to 'virtual memory map' startup message

Tested-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarAndreas Fenkart <andreas.fenkart@streamunlimited.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent db9ef1af

arch/arm/include/asm/memory.h

+11 −8
Original line number Diff line number Diff line
@@ -76,6 +76,17 @@ 
 */

#define IOREMAP_MAX_ORDER	24



/*

 * Size of DMA-consistent memory region.  Must be multiple of 2M,

 * between 2MB and 14MB inclusive.

 */

#ifndef CONSISTENT_DMA_SIZE

#define CONSISTENT_DMA_SIZE 	SZ_2M

#endif



#define CONSISTENT_END		(0xffe00000UL)

#define CONSISTENT_BASE		(CONSISTENT_END - CONSISTENT_DMA_SIZE)



#else /* CONFIG_MMU */



/*
@@ -112,14 +123,6 @@ 


#endif /* !CONFIG_MMU */



/*

 * Size of DMA-consistent memory region.  Must be multiple of 2M,

 * between 2MB and 14MB inclusive.

 */

#ifndef CONSISTENT_DMA_SIZE

#define CONSISTENT_DMA_SIZE SZ_2M

#endif



/*

 * Physical vs virtual RAM address space conversion.  These are

 * private definitions which should NOT be used outside memory.h

arch/arm/mm/dma-mapping.c

+0 −3
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ 
#error "CONSISTENT_DMA_SIZE must be multiple of 2MiB"

#endif



#define CONSISTENT_END	(0xffe00000)

#define CONSISTENT_BASE	(CONSISTENT_END - CONSISTENT_DMA_SIZE)



#define CONSISTENT_OFFSET(x)	(((unsigned long)(x) - CONSISTENT_BASE) >> PAGE_SHIFT)

#define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - CONSISTENT_BASE) >> PGDIR_SHIFT)

#define NUM_CONSISTENT_PTES (CONSISTENT_DMA_SIZE >> PGDIR_SHIFT)

arch/arm/mm/init.c

+6 −0
Original line number Diff line number Diff line
@@ -651,6 +651,9 @@ void __init mem_init(void) 
	printk(KERN_NOTICE "Virtual kernel memory layout:\n"

			"    vector  : 0x%08lx - 0x%08lx   (%4ld kB)\n"

			"    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"

#ifdef CONFIG_MMU

			"    DMA     : 0x%08lx - 0x%08lx   (%4ld MB)\n"

#endif

			"    vmalloc : 0x%08lx - 0x%08lx   (%4ld MB)\n"

			"    lowmem  : 0x%08lx - 0x%08lx   (%4ld MB)\n"

#ifdef CONFIG_HIGHMEM
@@ -664,6 +667,9 @@ void __init mem_init(void) 
			MLK(UL(CONFIG_VECTORS_BASE), UL(CONFIG_VECTORS_BASE) +

				(PAGE_SIZE)),

			MLK(FIXADDR_START, FIXADDR_TOP),

#ifdef CONFIG_MMU

			MLM(CONSISTENT_BASE, CONSISTENT_END),

#endif

			MLM(VMALLOC_START, (unsigned long)VMALLOC_END),

			MLM(PAGE_OFFSET, (unsigned long)high_memory),

#ifdef CONFIG_HIGHMEM