x86: Add io_map_atomic on 32-bit using fixmaps
PATCH 1/1 x86: Add io_map_atomic on 32-bit using fixmaps
From: Keith Packard <[email protected]>
This steals 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 Keith Packard <[email protected]>
Signed-off-by Eric Anholt <[email protected]>
--- arch/x86/include/asm/fixmap.h | 4 ++ arch/x86/include/asm/fixmap_32.h | 4 -- arch/x86/include/asm/highmem.h | 5 +-- arch/x86/mm/Makefile | 2 +- arch/x86/mm/init_32.c | 3 +- arch/x86/mm/iomap_32.c | 59 ++++++++++++++++++++++++++++++++++++++ include/asm-x86/iomap.h | 30 +++++++++++++++++++ 7 files changed, 96 insertions(+), 11 deletions(-) create mode 100644 arch/x86/mm/iomap_32.c create mode 100644 include/asm-x86/iomap.h
arch/x86/include/asm/fixmap.h +4 -0
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@ 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
@@ -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 */
arch/x86/mm/iomap_32.c new file +59 -0
59 lines not on this page · raw message
include/asm-x86/iomap.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Copyright © 2008 Ingo Molnar +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +*/ + +#include <linux/fs.h> +#include <linux/mm.h> +#include <linux/uaccess.h> +#include <asm/cacheflush.h> +#include <asm/pgtable.h> +#include <asm/tlbflush.h> + +void * +iomap_atomic_prot_pfn (unsigned long pfn,enum km_type type,pgprot_t prot); + +void +iounmap_atomic (void *kvaddr,enum km_type type);
Signature · 1 line
1.5.6.5