diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2008-11-10 15:18:48 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:27:20 +0200 |
| commit | a652906986e061b69fee367ff20a87d2a6b16dd3 (patch) | |
| tree | 48a8d48830041215afe8fe8e27eac5c29a926d6e /i386/i386at | |
| parent | 039405897aa8245990bc6249e58a6595debcc21e (diff) | |
2008-11-10 Samuel Thibault <samuel.thibault@ens-lyon.org>
[task #8135 --- ``PAE for GNU Mach']
* i386/configfrag.ac: Add --enable-pae option, which defines PAE.
* i386/i386/i386asm.sym (PDPSHIFT, PDEMASK): New assembly macros.
* i386/i386/locore.S [PAE] (copyout_retry): Use page directory pointer
bits.
* i386/i386at/model_dep.c [PAE] (i386at_init): Set second initial 2MB
page. Enable PAE bit. Set cr3 to page directory pointer table instead
of page directory.
* i386/intel/pmap.c [PAE] (pmap_bootstrap, pmap_create): Allocate 4
pages for dirbase. Setup pdpbase.
[PAE] (pmap_destroy): Free 4 pages from dirbase. Free pdpbase.
* i386/intel/pmap.h [PAE] (pt_entry_t): Typedef to unsigned long long.
[PAE] (PDPSHIFT, PDPNUM, PDPMASK): New macros.
[PAE] (PDESHIFT, PDEMASK, PTEMASK): Set to PAE values.
[PAE] (lin2pdenum, NPDES): Make them take the page directory pointer
index into account too.
[PAE] (struct pmap): Add `pdpbase' member.
(set_dirbase): Remove macro, replaced by...
(set_pmap): New macro, taking a pmap instead of the dirbase.
(PMAP_ACTIVATE_USER): Use set_pmap instead of set_dirbase.
Diffstat (limited to 'i386/i386at')
| -rw-r--r-- | i386/i386at/model_dep.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c index b208cb2..2426cde 100644 --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -279,7 +279,16 @@ i386at_init(void) */ kernel_page_dir[lin2pdenum(0)] = kernel_page_dir[lin2pdenum(LINEAR_MIN_KERNEL_ADDRESS)]; +#if PAE + kernel_page_dir[lin2pdenum(0) + 1] = + kernel_page_dir[lin2pdenum(LINEAR_MIN_KERNEL_ADDRESS) + 1]; + set_cr3((unsigned)kernel_pmap->pdpbase); + if (!CPU_HAS_FEATURE(CPU_FEATURE_PAE)) + panic("CPU doesn't have support for PAE."); + set_cr4(get_cr4() | CR4_PAE); +#else set_cr3((unsigned)kernel_page_dir); +#endif /* PAE */ if (CPU_HAS_FEATURE(CPU_FEATURE_PGE)) set_cr4(get_cr4() | CR4_PGE); set_cr0(get_cr0() | CR0_PG | CR0_WP); @@ -296,7 +305,10 @@ i386at_init(void) /* Get rid of the temporary direct mapping and flush it out of the TLB. */ kernel_page_dir[lin2pdenum(0)] = 0; - set_cr3((unsigned)kernel_page_dir); +#if PAE + kernel_page_dir[lin2pdenum(0) + 1] = 0; +#endif /* PAE */ + flush_tlb(); |