| .. | .. |
|---|
| 7 | 7 | #include <linux/errno.h> |
|---|
| 8 | 8 | #include <linux/swap.h> |
|---|
| 9 | 9 | #include <linux/init.h> |
|---|
| 10 | | -#include <linux/bootmem.h> |
|---|
| 10 | +#include <linux/memblock.h> |
|---|
| 11 | 11 | #include <linux/mman.h> |
|---|
| 12 | 12 | #include <linux/nodemask.h> |
|---|
| 13 | 13 | #include <linux/initrd.h> |
|---|
| 14 | 14 | #include <linux/highmem.h> |
|---|
| 15 | | -#include <linux/memblock.h> |
|---|
| 16 | 15 | |
|---|
| 17 | 16 | #include <asm/sections.h> |
|---|
| 18 | 17 | #include <asm/setup.h> |
|---|
| .. | .. |
|---|
| 22 | 21 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); |
|---|
| 23 | 22 | DEFINE_SPINLOCK(anon_alias_lock); |
|---|
| 24 | 23 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; |
|---|
| 25 | | -extern unsigned long phys_initrd_start; |
|---|
| 26 | | -extern unsigned long phys_initrd_size; |
|---|
| 27 | 24 | |
|---|
| 28 | 25 | /* |
|---|
| 29 | 26 | * empty_zero_page is a special page that is used for |
|---|
| .. | .. |
|---|
| 34 | 31 | |
|---|
| 35 | 32 | static void __init zone_sizes_init(void) |
|---|
| 36 | 33 | { |
|---|
| 37 | | - unsigned long zones_size[MAX_NR_ZONES]; |
|---|
| 34 | + unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 }; |
|---|
| 38 | 35 | |
|---|
| 39 | | - /* Clear the zone sizes */ |
|---|
| 40 | | - memset(zones_size, 0, sizeof(zones_size)); |
|---|
| 41 | | - |
|---|
| 42 | | - zones_size[ZONE_NORMAL] = max_low_pfn; |
|---|
| 36 | + max_zone_pfn[ZONE_NORMAL] = max_low_pfn; |
|---|
| 43 | 37 | #ifdef CONFIG_HIGHMEM |
|---|
| 44 | | - zones_size[ZONE_HIGHMEM] = max_pfn; |
|---|
| 38 | + max_zone_pfn[ZONE_HIGHMEM] = max_pfn; |
|---|
| 45 | 39 | #endif |
|---|
| 46 | | - free_area_init(zones_size); |
|---|
| 40 | + free_area_init(max_zone_pfn); |
|---|
| 47 | 41 | |
|---|
| 48 | 42 | } |
|---|
| 49 | 43 | |
|---|
| .. | .. |
|---|
| 57 | 51 | { |
|---|
| 58 | 52 | unsigned long v, p, e; |
|---|
| 59 | 53 | pgd_t *pge; |
|---|
| 54 | + p4d_t *p4e; |
|---|
| 60 | 55 | pud_t *pue; |
|---|
| 61 | 56 | pmd_t *pme; |
|---|
| 62 | 57 | pte_t *pte; |
|---|
| .. | .. |
|---|
| 72 | 67 | |
|---|
| 73 | 68 | while (p < e) { |
|---|
| 74 | 69 | int j; |
|---|
| 75 | | - pue = pud_offset(pge, v); |
|---|
| 70 | + p4e = p4d_offset(pge, v); |
|---|
| 71 | + pue = pud_offset(p4e, v); |
|---|
| 76 | 72 | pme = pmd_offset(pue, v); |
|---|
| 77 | 73 | |
|---|
| 78 | 74 | if ((u32) pue != (u32) pge || (u32) pme != (u32) pge) { |
|---|
| .. | .. |
|---|
| 81 | 77 | } |
|---|
| 82 | 78 | |
|---|
| 83 | 79 | /* Alloc one page for holding PTE's... */ |
|---|
| 84 | | - pte = (pte_t *) __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE)); |
|---|
| 85 | | - memset(pte, 0, PAGE_SIZE); |
|---|
| 80 | + pte = memblock_alloc(PAGE_SIZE, PAGE_SIZE); |
|---|
| 81 | + if (!pte) |
|---|
| 82 | + panic("%s: Failed to allocate %lu bytes align=0x%lx\n", |
|---|
| 83 | + __func__, PAGE_SIZE, PAGE_SIZE); |
|---|
| 86 | 84 | set_pmd(pme, __pmd(__pa(pte) + _PAGE_KERNEL_TABLE)); |
|---|
| 87 | 85 | |
|---|
| 88 | 86 | /* Fill the newly allocated page with PTE'S */ |
|---|
| .. | .. |
|---|
| 100 | 98 | static void __init fixedrange_init(void) |
|---|
| 101 | 99 | { |
|---|
| 102 | 100 | unsigned long vaddr; |
|---|
| 103 | | - pgd_t *pgd; |
|---|
| 104 | | - pud_t *pud; |
|---|
| 105 | 101 | pmd_t *pmd; |
|---|
| 106 | 102 | #ifdef CONFIG_HIGHMEM |
|---|
| 107 | 103 | pte_t *pte; |
|---|
| .. | .. |
|---|
| 111 | 107 | * Fixed mappings: |
|---|
| 112 | 108 | */ |
|---|
| 113 | 109 | vaddr = __fix_to_virt(__end_of_fixed_addresses - 1); |
|---|
| 114 | | - pgd = swapper_pg_dir + pgd_index(vaddr); |
|---|
| 115 | | - pud = pud_offset(pgd, vaddr); |
|---|
| 116 | | - pmd = pmd_offset(pud, vaddr); |
|---|
| 117 | | - fixmap_pmd_p = (pmd_t *) __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE)); |
|---|
| 118 | | - memset(fixmap_pmd_p, 0, PAGE_SIZE); |
|---|
| 110 | + pmd = pmd_off_k(vaddr); |
|---|
| 111 | + fixmap_pmd_p = memblock_alloc(PAGE_SIZE, PAGE_SIZE); |
|---|
| 112 | + if (!fixmap_pmd_p) |
|---|
| 113 | + panic("%s: Failed to allocate %lu bytes align=0x%lx\n", |
|---|
| 114 | + __func__, PAGE_SIZE, PAGE_SIZE); |
|---|
| 119 | 115 | set_pmd(pmd, __pmd(__pa(fixmap_pmd_p) + _PAGE_KERNEL_TABLE)); |
|---|
| 120 | 116 | |
|---|
| 121 | 117 | #ifdef CONFIG_HIGHMEM |
|---|
| .. | .. |
|---|
| 124 | 120 | */ |
|---|
| 125 | 121 | vaddr = PKMAP_BASE; |
|---|
| 126 | 122 | |
|---|
| 127 | | - pgd = swapper_pg_dir + pgd_index(vaddr); |
|---|
| 128 | | - pud = pud_offset(pgd, vaddr); |
|---|
| 129 | | - pmd = pmd_offset(pud, vaddr); |
|---|
| 130 | | - pte = (pte_t *) __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE)); |
|---|
| 131 | | - memset(pte, 0, PAGE_SIZE); |
|---|
| 123 | + pmd = pmd_off_k(vaddr); |
|---|
| 124 | + pte = memblock_alloc(PAGE_SIZE, PAGE_SIZE); |
|---|
| 125 | + if (!pte) |
|---|
| 126 | + panic("%s: Failed to allocate %lu bytes align=0x%lx\n", |
|---|
| 127 | + __func__, PAGE_SIZE, PAGE_SIZE); |
|---|
| 132 | 128 | set_pmd(pmd, __pmd(__pa(pte) + _PAGE_KERNEL_TABLE)); |
|---|
| 133 | 129 | pkmap_page_table = pte; |
|---|
| 134 | 130 | #endif /* CONFIG_HIGHMEM */ |
|---|
| .. | .. |
|---|
| 153 | 149 | fixedrange_init(); |
|---|
| 154 | 150 | |
|---|
| 155 | 151 | /* allocate space for empty_zero_page */ |
|---|
| 156 | | - zero_page = __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE)); |
|---|
| 157 | | - memset(zero_page, 0, PAGE_SIZE); |
|---|
| 152 | + zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE); |
|---|
| 153 | + if (!zero_page) |
|---|
| 154 | + panic("%s: Failed to allocate %lu bytes align=0x%lx\n", |
|---|
| 155 | + __func__, PAGE_SIZE, PAGE_SIZE); |
|---|
| 158 | 156 | zone_sizes_init(); |
|---|
| 159 | 157 | |
|---|
| 160 | 158 | empty_zero_page = virt_to_page(zero_page); |
|---|
| .. | .. |
|---|
| 192 | 190 | free_highmem(); |
|---|
| 193 | 191 | |
|---|
| 194 | 192 | /* this will put all low memory onto the freelists */ |
|---|
| 195 | | - free_all_bootmem(); |
|---|
| 193 | + memblock_free_all(); |
|---|
| 196 | 194 | mem_init_print_info(NULL); |
|---|
| 197 | 195 | |
|---|
| 198 | 196 | pr_info("virtual kernel memory layout:\n" |
|---|
| .. | .. |
|---|
| 247 | 245 | return; |
|---|
| 248 | 246 | } |
|---|
| 249 | 247 | |
|---|
| 250 | | -void free_initmem(void) |
|---|
| 251 | | -{ |
|---|
| 252 | | - free_initmem_default(-1); |
|---|
| 253 | | -} |
|---|
| 254 | | - |
|---|
| 255 | | -#ifdef CONFIG_BLK_DEV_INITRD |
|---|
| 256 | | -void free_initrd_mem(unsigned long start, unsigned long end) |
|---|
| 257 | | -{ |
|---|
| 258 | | - free_reserved_area((void *)start, (void *)end, -1, "initrd"); |
|---|
| 259 | | -} |
|---|
| 260 | | -#endif |
|---|
| 261 | | - |
|---|
| 262 | 248 | void __set_fixmap(enum fixed_addresses idx, |
|---|
| 263 | 249 | phys_addr_t phys, pgprot_t flags) |
|---|
| 264 | 250 | { |
|---|
| .. | .. |
|---|
| 267 | 253 | |
|---|
| 268 | 254 | BUG_ON(idx <= FIX_HOLE || idx >= __end_of_fixed_addresses); |
|---|
| 269 | 255 | |
|---|
| 270 | | - pte = (pte_t *)&fixmap_pmd_p[pte_index(addr)];; |
|---|
| 256 | + pte = (pte_t *)&fixmap_pmd_p[pte_index(addr)]; |
|---|
| 271 | 257 | |
|---|
| 272 | 258 | if (pgprot_val(flags)) { |
|---|
| 273 | 259 | set_pte(pte, pfn_pte(phys >> PAGE_SHIFT, flags)); |
|---|