aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo F. Padovan <gustavo@las.ic.unicamp.br>2009-02-15 19:48:59 -0500
committerH. Peter Anvin <hpa@zytor.com>2009-02-27 23:57:48 -0500
commitc577b098f9bf467fb05dc279ba83604cb3f7cea0 (patch)
tree8967240a8612eaed8977c1d6ba80d354632bb3c9
parentc78f322ce8cea6052bc99513b57283d4d325a13e (diff)
x86, fixmap: unify fixmap.h
Impact: unification This patch unify fixmap_32.h and fixmap_64.h into fixmap.h. Things that we can't merge now are using CONFIG_X86_{32,64} (e.g.:vsyscall and EFI) Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br> Acked-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat
-rw-r--r--arch/x86/include/asm/fixmap.h149
-rw-r--r--arch/x86/include/asm/fixmap_32.h154
-rw-r--r--arch/x86/include/asm/fixmap_64.h154
3 files changed, 147 insertions, 310 deletions
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index 23696d44a0af..dca8f03da5b2 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -1,11 +1,155 @@
1/*
2 * fixmap.h: compile-time virtual memory allocation
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 1998 Ingo Molnar
9 *
10 * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999
11 * x86_32 and x86_64 integration by Gustavo F. Padovan, February 2009
12 */
13
1#ifndef _ASM_X86_FIXMAP_H 14#ifndef _ASM_X86_FIXMAP_H
2#define _ASM_X86_FIXMAP_H 15#define _ASM_X86_FIXMAP_H
3 16
17#ifndef __ASSEMBLY__
18#include <linux/kernel.h>
19#include <asm/acpi.h>
20#include <asm/apicdef.h>
21#include <asm/page.h>
22#ifdef CONFIG_X86_32
23#include <linux/threads.h>
24#include <asm/kmap_types.h>
25#else
26#include <asm/vsyscall.h>
27#ifdef CONFIG_EFI
28#include <asm/efi.h>
29#endif
30#endif
31
32/*
33 * We can't declare FIXADDR_TOP as variable for x86_64 because vsyscall
34 * uses fixmaps that relies on FIXADDR_TOP for proper address calculation.
35 * Because of this, FIXADDR_TOP x86 integration was left as later work.
36 */
37#ifdef CONFIG_X86_32
38/* used by vmalloc.c, vsyscall.lds.S.
39 *
40 * Leave one empty page between vmalloc'ed areas and
41 * the start of the fixmap.
42 */
43extern unsigned long __FIXADDR_TOP;
44#define FIXADDR_TOP ((unsigned long)__FIXADDR_TOP)
45
46#define FIXADDR_USER_START __fix_to_virt(FIX_VDSO)
47#define FIXADDR_USER_END __fix_to_virt(FIX_VDSO - 1)
48#else
49#define FIXADDR_TOP (VSYSCALL_END-PAGE_SIZE)
50
51/* Only covers 32bit vsyscalls currently. Need another set for 64bit. */
52#define FIXADDR_USER_START ((unsigned long)VSYSCALL32_VSYSCALL)
53#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE)
54#endif
55
56
57/*
58 * Here we define all the compile-time 'special' virtual
59 * addresses. The point is to have a constant address at
60 * compile time, but to set the physical address only
61 * in the boot process.
62 * for x86_32: We allocate these special addresses
63 * from the end of virtual memory (0xfffff000) backwards.
64 * Also this lets us do fail-safe vmalloc(), we
65 * can guarantee that these special addresses and
66 * vmalloc()-ed addresses never overlap.
67 *
68 * These 'compile-time allocated' memory buffers are
69 * fixed-size 4k pages (or larger if used with an increment
70 * higher than 1). Use set_fixmap(idx,phys) to associate
71 * physical memory with fixmap indices.
72 *
73 * TLB entries of such buffers will not be flushed across
74 * task switches.
75 */
76enum fixed_addresses {
4#ifdef CONFIG_X86_32 77#ifdef CONFIG_X86_32
5# include "fixmap_32.h" 78 FIX_HOLE,
79 FIX_VDSO,
6#else 80#else
7# include "fixmap_64.h" 81 VSYSCALL_LAST_PAGE,
82 VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE
83 + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,
84 VSYSCALL_HPET,
8#endif 85#endif
86 FIX_DBGP_BASE,
87 FIX_EARLYCON_MEM_BASE,
88#ifdef CONFIG_X86_LOCAL_APIC
89 FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
90#endif
91#ifdef CONFIG_X86_IO_APIC
92 FIX_IO_APIC_BASE_0,
93 FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,
94#endif
95#ifdef CONFIG_X86_64
96#ifdef CONFIG_EFI
97 FIX_EFI_IO_MAP_LAST_PAGE,
98 FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE
99 + MAX_EFI_IO_PAGES - 1,
100#endif
101#endif
102#ifdef CONFIG_X86_VISWS_APIC
103 FIX_CO_CPU, /* Cobalt timer */
104 FIX_CO_APIC, /* Cobalt APIC Redirection Table */
105 FIX_LI_PCIA, /* Lithium PCI Bridge A */
106 FIX_LI_PCIB, /* Lithium PCI Bridge B */
107#endif
108#ifdef CONFIG_X86_F00F_BUG
109 FIX_F00F_IDT, /* Virtual mapping for IDT */
110#endif
111#ifdef CONFIG_X86_CYCLONE_TIMER
112 FIX_CYCLONE_TIMER, /*cyclone timer register*/
113#endif
114#ifdef CONFIG_X86_32
115 FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
116 FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
117#ifdef CONFIG_PCI_MMCONFIG
118 FIX_PCIE_MCFG,
119#endif
120#endif
121#ifdef CONFIG_PARAVIRT
122 FIX_PARAVIRT_BOOTMAP,
123#endif
124 __end_of_permanent_fixed_addresses,
125#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
126 FIX_OHCI1394_BASE,
127#endif
128 /*
129 * 256 temporary boot-time mappings, used by early_ioremap(),
130 * before ioremap() is functional.
131 *
132 * We round it up to the next 256 pages boundary so that we
133 * can have a single pgd entry and a single pte table:
134 */
135#define NR_FIX_BTMAPS 64
136#define FIX_BTMAPS_SLOTS 4
137 FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 -
138 (__end_of_permanent_fixed_addresses & 255),
139 FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1,
140#ifdef CONFIG_X86_32
141 FIX_WP_TEST,
142#endif
143 __end_of_fixed_addresses
144};
145
146
147extern void reserve_top_address(unsigned long reserve);
148
149#define FIXADDR_SIZE (__end_of_permanent_fixed_addresses << PAGE_SHIFT)
150#define FIXADDR_BOOT_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
151#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
152#define FIXADDR_BOOT_START (FIXADDR_TOP - FIXADDR_BOOT_SIZE)
9 153
10extern int fixmaps_set; 154extern int fixmaps_set;
11 155
@@ -69,4 +213,5 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)
69 BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START); 213 BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
70 return __virt_to_fix(vaddr); 214 return __virt_to_fix(vaddr);
71} 215}
216#endif /* !__ASSEMBLY__ */
72#endif /* _ASM_X86_FIXMAP_H */ 217#endif /* _ASM_X86_FIXMAP_H */
diff --git a/arch/x86/include/asm/fixmap_32.h b/arch/x86/include/asm/fixmap_32.h
deleted file mode 100644
index 8384df78eee6..000000000000
--- a/arch/x86/include/asm/fixmap_32.h
+++ /dev/null
@@ -1,154 +0,0 @@
1/*
2 * fixmap.h: compile-time virtual memory allocation
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 1998 Ingo Molnar
9 *
10 * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999
11 * x86_32 and x86_64 integration by Gustavo F. Padovan, February 2009
12 */
13
14#ifndef _ASM_X86_FIXMAP_32_H
15#define _ASM_X86_FIXMAP_32_H
16
17#ifndef __ASSEMBLY__
18#include <linux/kernel.h>
19#include <asm/acpi.h>
20#include <asm/apicdef.h>
21#include <asm/page.h>
22#ifdef CONFIG_X86_32
23#include <linux/threads.h>
24#include <asm/kmap_types.h>
25#else
26#include <asm/vsyscall.h>
27#ifdef CONFIG_EFI
28#include <asm/efi.h>
29#endif
30#endif
31
32/*
33 * We can't declare FIXADDR_TOP as variable for x86_64 because vsyscall
34 * uses fixmaps that relies on FIXADDR_TOP for proper address calculation.
35 * Because of this, FIXADDR_TOP x86 integration was left as later work.
36 */
37#ifdef CONFIG_X86_32
38/* used by vmalloc.c, vsyscall.lds.S.
39 *
40 * Leave one empty page between vmalloc'ed areas and
41 * the start of the fixmap.
42 */
43extern unsigned long __FIXADDR_TOP;
44#define FIXADDR_TOP ((unsigned long)__FIXADDR_TOP)
45
46#define FIXADDR_USER_START __fix_to_virt(FIX_VDSO)
47#define FIXADDR_USER_END __fix_to_virt(FIX_VDSO - 1)
48#else
49#define FIXADDR_TOP (VSYSCALL_END-PAGE_SIZE)
50
51/* Only covers 32bit vsyscalls currently. Need another set for 64bit. */
52#define FIXADDR_USER_START ((unsigned long)VSYSCALL32_VSYSCALL)
53#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE)
54#endif
55
56/*
57 * Here we define all the compile-time 'special' virtual
58 * addresses. The point is to have a constant address at
59 * compile time, but to set the physical address only
60 * in the boot process.
61 * for x86_32: We allocate these special addresses
62 * from the end of virtual memory (0xfffff000) backwards.
63 * Also this lets us do fail-safe vmalloc(), we
64 * can guarantee that these special addresses and
65 * vmalloc()-ed addresses never overlap.
66 *
67 * These 'compile-time allocated' memory buffers are
68 * fixed-size 4k pages (or larger if used with an increment
69 * higher than 1). Use set_fixmap(idx,phys) to associate
70 * physical memory with fixmap indices.
71 *
72 * TLB entries of such buffers will not be flushed across
73 * task switches.
74 */
75enum fixed_addresses {
76#ifdef CONFIG_X86_32
77 FIX_HOLE,
78 FIX_VDSO,
79#else
80 VSYSCALL_LAST_PAGE,
81 VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE
82 + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,
83 VSYSCALL_HPET,
84#endif
85 FIX_DBGP_BASE,
86 FIX_EARLYCON_MEM_BASE,
87#ifdef CONFIG_X86_LOCAL_APIC
88 FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
89#endif
90#ifdef CONFIG_X86_IO_APIC
91 FIX_IO_APIC_BASE_0,
92 FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,
93#endif
94#ifdef CONFIG_X86_64
95#ifdef CONFIG_EFI
96 FIX_EFI_IO_MAP_LAST_PAGE,
97 FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE
98 + MAX_EFI_IO_PAGES - 1,
99#endif
100#endif
101#ifdef CONFIG_X86_VISWS_APIC
102 FIX_CO_CPU, /* Cobalt timer */
103 FIX_CO_APIC, /* Cobalt APIC Redirection Table */
104 FIX_LI_PCIA, /* Lithium PCI Bridge A */
105 FIX_LI_PCIB, /* Lithium PCI Bridge B */
106#endif
107#ifdef CONFIG_X86_F00F_BUG
108 FIX_F00F_IDT, /* Virtual mapping for IDT */
109#endif
110#ifdef CONFIG_X86_CYCLONE_TIMER
111 FIX_CYCLONE_TIMER, /*cyclone timer register*/
112#endif
113#ifdef CONFIG_X86_32
114 FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
115 FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
116#ifdef CONFIG_PCI_MMCONFIG
117 FIX_PCIE_MCFG,
118#endif
119#endif
120#ifdef CONFIG_PARAVIRT
121 FIX_PARAVIRT_BOOTMAP,
122#endif
123 __end_of_permanent_fixed_addresses,
124#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
125 FIX_OHCI1394_BASE,
126#endif
127 /*
128 * 256 temporary boot-time mappings, used by early_ioremap(),
129 * before ioremap() is functional.
130 *
131 * We round it up to the next 256 pages boundary so that we
132 * can have a single pgd entry and a single pte table:
133 */
134#define NR_FIX_BTMAPS 64
135#define FIX_BTMAPS_SLOTS 4
136 FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 -
137 (__end_of_permanent_fixed_addresses & 255),
138 FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1,
139#ifdef CONFIG_X86_32
140 FIX_WP_TEST,
141#endif
142 __end_of_fixed_addresses
143};
144
145
146extern void reserve_top_address(unsigned long reserve);
147
148#define FIXADDR_SIZE (__end_of_permanent_fixed_addresses << PAGE_SHIFT)
149#define FIXADDR_BOOT_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
150#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
151#define FIXADDR_BOOT_START (FIXADDR_TOP - FIXADDR_BOOT_SIZE)
152
153#endif /* !__ASSEMBLY__ */
154#endif /* _ASM_X86_FIXMAP_32_H */
diff --git a/arch/x86/include/asm/fixmap_64.h b/arch/x86/include/asm/fixmap_64.h
deleted file mode 100644
index 95acae0daa5b..000000000000
--- a/arch/x86/include/asm/fixmap_64.h
+++ /dev/null
@@ -1,154 +0,0 @@
1/*
2 * fixmap.h: compile-time virtual memory allocation
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 1998 Ingo Molnar
9 *
10 * Support of BIGMEM added by Gerhard Wichert, Siemens AG, July 1999
11 * x86_32 and x86_64 integration by Gustavo F. Padovan, February 2009
12 */
13
14#ifndef _ASM_X86_FIXMAP_64_H
15#define _ASM_X86_FIXMAP_64_H
16
17#ifndef __ASSEMBLY__
18#include <linux/kernel.h>
19#include <asm/acpi.h>
20#include <asm/apicdef.h>
21#include <asm/page.h>
22#ifdef CONFIG_X86_32
23#include <linux/threads.h>
24#include <asm/kmap_types.h>
25#else
26#include <asm/vsyscall.h>
27#ifdef CONFIG_EFI
28#include <asm/efi.h>
29#endif
30#endif
31
32/*
33 * We can't declare FIXADDR_TOP as variable for x86_64 because vsyscall
34 * uses fixmaps that relies on FIXADDR_TOP for proper address calculation.
35 * Because of this, FIXADDR_TOP x86 integration was left as later work.
36 */
37#ifdef CONFIG_X86_32
38/* used by vmalloc.c, vsyscall.lds.S.
39 *
40 * Leave one empty page between vmalloc'ed areas and
41 * the start of the fixmap.
42 */
43extern unsigned long __FIXADDR_TOP;
44#define FIXADDR_TOP ((unsigned long)__FIXADDR_TOP)
45
46#define FIXADDR_USER_START __fix_to_virt(FIX_VDSO)
47#define FIXADDR_USER_END __fix_to_virt(FIX_VDSO - 1)
48#else
49#define FIXADDR_TOP (VSYSCALL_END-PAGE_SIZE)
50
51/* Only covers 32bit vsyscalls currently. Need another set for 64bit. */
52#define FIXADDR_USER_START ((unsigned long)VSYSCALL32_VSYSCALL)
53#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE)
54#endif
55
56/*
57 * Here we define all the compile-time 'special' virtual
58 * addresses. The point is to have a constant address at
59 * compile time, but to set the physical address only
60 * in the boot process.
61 * for x86_32: We allocate these special addresses
62 * from the end of virtual memory (0xfffff000) backwards.
63 * Also this lets us do fail-safe vmalloc(), we
64 * can guarantee that these special addresses and
65 * vmalloc()-ed addresses never overlap.
66 *
67 * These 'compile-time allocated' memory buffers are
68 * fixed-size 4k pages (or larger if used with an increment
69 * higher than 1). Use set_fixmap(idx,phys) to associate
70 * physical memory with fixmap indices.
71 *
72 * TLB entries of such buffers will not be flushed across
73 * task switches.
74 */
75enum fixed_addresses {
76#ifdef CONFIG_X86_32
77 FIX_HOLE,
78 FIX_VDSO,
79#else
80 VSYSCALL_LAST_PAGE,
81 VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE
82 + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,
83 VSYSCALL_HPET,
84#endif
85 FIX_DBGP_BASE,
86 FIX_EARLYCON_MEM_BASE,
87#ifdef CONFIG_X86_LOCAL_APIC
88 FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
89#endif
90#ifdef CONFIG_X86_IO_APIC
91 FIX_IO_APIC_BASE_0,
92 FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,
93#endif
94#ifdef CONFIG_X86_64
95#ifdef CONFIG_EFI
96 FIX_EFI_IO_MAP_LAST_PAGE,
97 FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE
98 + MAX_EFI_IO_PAGES - 1,
99#endif
100#endif
101#ifdef CONFIG_X86_VISWS_APIC
102 FIX_CO_CPU, /* Cobalt timer */
103 FIX_CO_APIC, /* Cobalt APIC Redirection Table */
104 FIX_LI_PCIA, /* Lithium PCI Bridge A */
105 FIX_LI_PCIB, /* Lithium PCI Bridge B */
106#endif
107#ifdef CONFIG_X86_F00F_BUG
108 FIX_F00F_IDT, /* Virtual mapping for IDT */
109#endif
110#ifdef CONFIG_X86_CYCLONE_TIMER
111 FIX_CYCLONE_TIMER, /*cyclone timer register*/
112#endif
113#ifdef CONFIG_X86_32
114 FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
115 FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
116#ifdef CONFIG_PCI_MMCONFIG
117 FIX_PCIE_MCFG,
118#endif
119#endif
120#ifdef CONFIG_PARAVIRT
121 FIX_PARAVIRT_BOOTMAP,
122#endif
123 __end_of_permanent_fixed_addresses,
124#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
125 FIX_OHCI1394_BASE,
126#endif
127 /*
128 * 256 temporary boot-time mappings, used by early_ioremap(),
129 * before ioremap() is functional.
130 *
131 * We round it up to the next 256 pages boundary so that we
132 * can have a single pgd entry and a single pte table:
133 */
134#define NR_FIX_BTMAPS 64
135#define FIX_BTMAPS_SLOTS 4
136 FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 -
137 (__end_of_permanent_fixed_addresses & 255),
138 FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1,
139#ifdef CONFIG_X86_32
140 FIX_WP_TEST,
141#endif
142 __end_of_fixed_addresses
143};
144
145
146extern void reserve_top_address(unsigned long reserve);
147
148#define FIXADDR_SIZE (__end_of_permanent_fixed_addresses << PAGE_SHIFT)
149#define FIXADDR_BOOT_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
150#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
151#define FIXADDR_BOOT_START (FIXADDR_TOP - FIXADDR_BOOT_SIZE)
152
153#endif /* !__ASSEMBLY__ */
154#endif /* _ASM_X86_FIXMAP_64_H */
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-18 03:19:45 -0500