diff options
Diffstat (limited to 'src/cpu/x86/pae/pgtbl.c')
| -rw-r--r-- | src/cpu/x86/pae/pgtbl.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/cpu/x86/pae/pgtbl.c b/src/cpu/x86/pae/pgtbl.c index c2fa83d935..1ff9371b98 100644 --- a/src/cpu/x86/pae/pgtbl.c +++ b/src/cpu/x86/pae/pgtbl.c @@ -65,7 +65,8 @@ void *map_2M_page(unsigned long page) struct pde pdp[512]; } __attribute__ ((packed)); - static struct pg_table pgtbl[CONFIG_MAX_CPUS] __attribute__ ((aligned(4096))); + static struct pg_table pgtbl[CONFIG_MAX_CPUS] + __attribute__ ((aligned(4096))); static unsigned long mapped_window[CONFIG_MAX_CPUS]; unsigned long index; unsigned long window; @@ -79,7 +80,9 @@ void *map_2M_page(unsigned long page) paging_off(); if (window > 1) { struct pde *pd, *pdp; - /* Point the page directory pointers at the page directories */ + /* Point the page directory pointers at the page + * directories + */ memset(&pgtbl[index].pdp, 0, sizeof(pgtbl[index].pdp)); pd = pgtbl[index].pd; pdp = pgtbl[index].pdp; @@ -87,14 +90,18 @@ void *map_2M_page(unsigned long page) pdp[1].addr_lo = ((uint32_t)&pd[512*1])|1; pdp[2].addr_lo = ((uint32_t)&pd[512*2])|1; pdp[3].addr_lo = ((uint32_t)&pd[512*3])|1; - /* The first half of the page table is identity mapped */ + /* The first half of the page table is identity mapped + */ for (i = 0; i < 1024; i++) { pd[i].addr_lo = ((i & 0x3ff) << 21) | 0xE3; pd[i].addr_hi = 0; } - /* The second half of the page table holds the mapped page */ + /* The second half of the page table holds the mapped + * page + */ for (i = 1024; i < 2048; i++) { - pd[i].addr_lo = ((window & 1) << 31) | ((i & 0x3ff) << 21) | 0xE3; + pd[i].addr_lo = ((window & 1) << 31) + | ((i & 0x3ff) << 21) | 0xE3; pd[i].addr_hi = (window >> 1); } paging_on(pdp); |