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

Commit 9a2ab3f1 authored by Stephen Warren's avatar Stephen Warren
Browse files

Merge remote-tracking branch 'korg_arm-soc/devel/debug_ll_init' into for-3.8/single-zimage

parents 2658ef15 e5c5f2ad

arch/arm/include/asm/mach/map.h

+7 −0
Original line number Diff line number Diff line
@@ -40,6 +40,13 @@ extern void iotable_init(struct map_desc *, int); 
extern void vm_reserve_area_early(unsigned long addr, unsigned long size,

				  void *caller);



#ifdef CONFIG_DEBUG_LL

extern void debug_ll_addr(unsigned long *paddr, unsigned long *vaddr);

extern void debug_ll_io_init(void);

#else

static inline void debug_ll_io_init(void) {}

#endif



struct mem_type;

extern const struct mem_type *get_mem_type(unsigned int type);

/*

arch/arm/kernel/debug.S

+14 −0
Original line number Diff line number Diff line
@@ -100,6 +100,13 @@ ENTRY(printch) 
		b	1b

ENDPROC(printch)



ENTRY(debug_ll_addr)

		addruart r2, r3, ip

		str	r2, [r0]

		str	r3, [r1]

		mov	pc, lr

ENDPROC(debug_ll_addr)



#else



ENTRY(printascii)
@@ -119,4 +126,11 @@ ENTRY(printch) 
		mov	pc, lr

ENDPROC(printch)



ENTRY(debug_ll_addr)

		mov	r2, #0

		str	r2, [r0]

		str	r2, [r1]

		mov	pc, lr

ENDPROC(debug_ll_addr)



#endif

arch/arm/mm/mmu.c

+16 −0
Original line number Diff line number Diff line
@@ -876,6 +876,22 @@ static void __init pci_reserve_io(void) 
#define pci_reserve_io() do { } while (0)

#endif



#ifdef CONFIG_DEBUG_LL

void __init debug_ll_io_init(void)

{

	struct map_desc map;



	debug_ll_addr(&map.pfn, &map.virtual);

	if (!map.pfn || !map.virtual)

		return;

	map.pfn = __phys_to_pfn(map.pfn);

	map.virtual &= PAGE_MASK;

	map.length = PAGE_SIZE;

	map.type = MT_DEVICE;

	create_mapping(&map);

}

#endif



static void * __initdata vmalloc_min =

	(void *)(VMALLOC_END - (240 << 20) - VMALLOC_OFFSET);