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

Commit fd940934 authored by Keith Packard's avatar Keith Packard Committed by Ingo Molnar
Browse files

x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmaps 



Impact: introduce new APIs, separate kmap code from CONFIG_HIGHMEM

This takes the code used for CONFIG_HIGHMEM memory mappings except that
it's designed for dynamic IO resource mapping.

These fixmaps are available even with CONFIG_HIGHMEM turned off.

Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 721d5dfe

arch/x86/include/asm/fixmap.h

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 


extern int fixmaps_set;



extern pte_t *kmap_pte;

extern pgprot_t kmap_prot;

extern pte_t *pkmap_page_table;



void __native_set_fixmap(enum fixed_addresses idx, pte_t pte);

void native_set_fixmap(enum fixed_addresses idx,

		       unsigned long phys, pgprot_t flags);

arch/x86/include/asm/fixmap_32.h

+0 −4
Original line number Diff line number Diff line
@@ -28,10 +28,8 @@ extern unsigned long __FIXADDR_TOP; 
#include <asm/acpi.h>

#include <asm/apicdef.h>

#include <asm/page.h>

#ifdef CONFIG_HIGHMEM

#include <linux/threads.h>

#include <asm/kmap_types.h>

#endif



/*

 * Here we define all the compile-time 'special' virtual
@@ -75,10 +73,8 @@ enum fixed_addresses { 
#ifdef CONFIG_X86_CYCLONE_TIMER

	FIX_CYCLONE_TIMER, /*cyclone timer register*/

#endif

#ifdef CONFIG_HIGHMEM

	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */

	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,

#endif

#ifdef CONFIG_PCI_MMCONFIG

	FIX_PCIE_MCFG,

#endif

arch/x86/include/asm/highmem.h

+1 −4
Original line number Diff line number Diff line
@@ -25,14 +25,11 @@ 
#include <asm/kmap_types.h>

#include <asm/tlbflush.h>

#include <asm/paravirt.h>

#include <asm/fixmap.h>



/* declarations for highmem.c */

extern unsigned long highstart_pfn, highend_pfn;



extern pte_t *kmap_pte;

extern pgprot_t kmap_prot;

extern pte_t *pkmap_page_table;



/*

 * Right now we initialize only a single pte table. It can be extended

 * easily, subsequent pte tables have to be allocated in one physical

arch/x86/mm/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y	:=  init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \

	    pat.o pgtable.o gup.o



obj-$(CONFIG_X86_32)		+= pgtable_32.o

obj-$(CONFIG_X86_32)		+= pgtable_32.o iomap_32.o



obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o

obj-$(CONFIG_X86_PTDUMP)	+= dump_pagetables.o

arch/x86/mm/init_32.c

+1 −2
Original line number Diff line number Diff line
@@ -334,7 +334,6 @@ int devmem_is_allowed(unsigned long pagenr) 
	return 0;

}



#ifdef CONFIG_HIGHMEM

pte_t *kmap_pte;

pgprot_t kmap_prot;
@@ -357,6 +356,7 @@ static void __init kmap_init(void) 
	kmap_prot = PAGE_KERNEL;

}



#ifdef CONFIG_HIGHMEM

static void __init permanent_kmaps_init(pgd_t *pgd_base)

{

	unsigned long vaddr;
@@ -436,7 +436,6 @@ static void __init set_highmem_pages_init(void) 
#endif /* !CONFIG_NUMA */



#else

# define kmap_init()				do { } while (0)

# define permanent_kmaps_init(pgd_base)		do { } while (0)

# define set_highmem_pages_init()	do { } while (0)

#endif /* CONFIG_HIGHMEM */