redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

x86: enhance early_ioremap() 

- allow nesting of up to 4 levels

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
hifive-unleashed-5.1
Ingo Molnar 2008-01-30 13:33:45 +01:00
parent 64a8f852a2
commit 1b42f51630
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/x86/mm/ioremap_32.c
View File

@ -291,23 +291,28 @@ static inline void __init early_clear_fixmap(enum fixed_addresses idx)
__early_set_fixmap(idx, 0, __pgprot(0)); __early_set_fixmap(idx, 0, __pgprot(0));
} }
int __initdata early_ioremap_nested;
void __init *early_ioremap(unsigned long phys_addr, unsigned long size) void __init *early_ioremap(unsigned long phys_addr, unsigned long size)
{ {
unsigned long offset, last_addr; unsigned long offset, last_addr;
unsigned int nrpages; unsigned int nrpages, nesting;
enum fixed_addresses idx; enum fixed_addresses idx0, idx;
WARN_ON(system_state != SYSTEM_BOOTING);
nesting = early_ioremap_nested;
/* Don't allow wraparound or zero size */ /* Don't allow wraparound or zero size */
last_addr = phys_addr + size - 1; last_addr = phys_addr + size - 1;
if (!size || last_addr < phys_addr) if (!size || last_addr < phys_addr)
return NULL; return NULL;
/* if (nesting >= FIX_BTMAPS_NESTING)
* Don't remap the low PCI/ISA area, it's always mapped.. return NULL;
*/
if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS)
return phys_to_virt(phys_addr);
early_ioremap_nested++;
/* /*
* Mappings have to be page-aligned * 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.. * Ok, go for it..
*/ */
idx = FIX_BTMAP_BEGIN; idx0 = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*nesting;
idx = idx0;
while (nrpages > 0) { while (nrpages > 0) {
early_set_fixmap(idx, phys_addr); early_set_fixmap(idx, phys_addr);
phys_addr += PAGE_SIZE; phys_addr += PAGE_SIZE;
--idx; --idx;
--nrpages; --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) 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 long offset;
unsigned int nrpages; unsigned int nrpages;
enum fixed_addresses idx; enum fixed_addresses idx;
unsigned int nesting;
nesting = --early_ioremap_nested;
virt_addr = (unsigned long)addr; virt_addr = (unsigned long)addr;
if (virt_addr < fix_to_virt(FIX_BTMAP_BEGIN)) if (virt_addr < fix_to_virt(FIX_BTMAP_BEGIN))
return; return;
offset = virt_addr & ~PAGE_MASK; offset = virt_addr & ~PAGE_MASK;
nrpages = PAGE_ALIGN(offset + size - 1) >> PAGE_SHIFT; nrpages = PAGE_ALIGN(offset + size - 1) >> PAGE_SHIFT;
idx = FIX_BTMAP_BEGIN; idx = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*nesting;
while (nrpages > 0) { while (nrpages > 0) {
early_clear_fixmap(idx); early_clear_fixmap(idx);
--idx; --idx;
--nrpages; --nrpages;
} }
} }
void __this_fixmap_does_not_exist(void)
{
WARN_ON(1);
}

9
include/asm-x86/fixmap_32.h
View File

@ -65,7 +65,7 @@ enum fixed_addresses {
#endif #endif
#ifdef CONFIG_X86_VISWS_APIC #ifdef CONFIG_X86_VISWS_APIC
FIX_CO_CPU, /* Cobalt timer */ FIX_CO_CPU, /* Cobalt timer */
FIX_CO_APIC, /* Cobalt APIC Redirection Table */ FIX_CO_APIC, /* Cobalt APIC Redirection Table */
FIX_LI_PCIA, /* Lithium PCI Bridge A */ FIX_LI_PCIA, /* Lithium PCI Bridge A */
FIX_LI_PCIB, /* Lithium PCI Bridge B */ FIX_LI_PCIB, /* Lithium PCI Bridge B */
#endif #endif
@ -74,7 +74,7 @@ enum fixed_addresses {
#endif #endif
#ifdef CONFIG_X86_CYCLONE_TIMER #ifdef CONFIG_X86_CYCLONE_TIMER
FIX_CYCLONE_TIMER, /*cyclone timer register*/ FIX_CYCLONE_TIMER, /*cyclone timer register*/
#endif #endif
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
@ -91,9 +91,10 @@ enum fixed_addresses {
#endif #endif
__end_of_permanent_fixed_addresses, __end_of_permanent_fixed_addresses,
/* temporary boot-time mappings, used before ioremap() is functional */ /* temporary boot-time mappings, used before ioremap() is functional */
#define NR_FIX_BTMAPS 16 #define NR_FIX_BTMAPS 16
#define FIX_BTMAPS_NESTING 4
FIX_BTMAP_END = __end_of_permanent_fixed_addresses, 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, FIX_WP_TEST,
__end_of_fixed_addresses __end_of_fixed_addresses
}; };