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

Commit 1b42f516 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: enhance early_ioremap() 



 - allow nesting of up to 4 levels

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 64a8f852

arch/x86/mm/ioremap_32.c

+26 −10
Original line number Diff line number Diff line
@@ -291,23 +291,28 @@ static inline void __init early_clear_fixmap(enum fixed_addresses idx) 
		__early_set_fixmap(idx, 0, __pgprot(0));

}





int __initdata early_ioremap_nested;



void __init *early_ioremap(unsigned long phys_addr, unsigned long size)

{

	unsigned long offset, last_addr;

	unsigned int nrpages;

	enum fixed_addresses idx;

	unsigned int nrpages, nesting;

	enum fixed_addresses idx0, idx;



	WARN_ON(system_state != SYSTEM_BOOTING);



	nesting = early_ioremap_nested;



	/* Don't allow wraparound or zero size */

	last_addr = phys_addr + size - 1;

	if (!size || last_addr < phys_addr)

		return NULL;



	/*

	 * Don't remap the low PCI/ISA area, it's always mapped..

	 */

	if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS)

		return phys_to_virt(phys_addr);

	if (nesting >= FIX_BTMAPS_NESTING)

		return NULL;



	early_ioremap_nested++;

	/*

	 * Mappings have to be page-aligned

	 */
@@ -325,14 +330,16 @@ void __init *early_ioremap(unsigned long phys_addr, unsigned long size) 
	/*

	 * Ok, go for it..

	 */

	idx = FIX_BTMAP_BEGIN;

	idx0 = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*nesting;

	idx = idx0;

	while (nrpages > 0) {

		early_set_fixmap(idx, phys_addr);

		phys_addr += PAGE_SIZE;

		--idx;

		--nrpages;

	}

	return (void*) (offset + fix_to_virt(FIX_BTMAP_BEGIN));



	return (void*) (offset + fix_to_virt(idx0));

}



void __init early_iounmap(void *addr, unsigned long size)
@@ -341,17 +348,26 @@ void __init early_iounmap(void *addr, unsigned long size) 
	unsigned long offset;

	unsigned int nrpages;

	enum fixed_addresses idx;

	unsigned int nesting;



	nesting = --early_ioremap_nested;



	virt_addr = (unsigned long)addr;

	if (virt_addr < fix_to_virt(FIX_BTMAP_BEGIN))

		return;



	offset = virt_addr & ~PAGE_MASK;

	nrpages = PAGE_ALIGN(offset + size - 1) >> PAGE_SHIFT;



	idx = FIX_BTMAP_BEGIN;

	idx = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*nesting;

	while (nrpages > 0) {

		early_clear_fixmap(idx);

		--idx;

		--nrpages;

	}

}



void __this_fixmap_does_not_exist(void)

{

	WARN_ON(1);

}

include/asm-x86/fixmap_32.h

+5 −4
Original line number Diff line number Diff line
@@ -92,8 +92,9 @@ enum fixed_addresses { 
	__end_of_permanent_fixed_addresses,

	/* temporary boot-time mappings, used before ioremap() is functional */

#define NR_FIX_BTMAPS		16

#define FIX_BTMAPS_NESTING	4

	FIX_BTMAP_END = __end_of_permanent_fixed_addresses,

	FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS - 1,

	FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_NESTING - 1,

	FIX_WP_TEST,

	__end_of_fixed_addresses

};