Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 464fd83e841a16f4ea1325b33eb08170ef5cd1f4

Authored by Kevin Cernekee
Committed by Ralf Baechle
1 parent 273f2d7e64
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

MIPS: Limit fixrange_init() to the FIXMAP region 

fixrange_init() allocates page tables for all addresses higher than
FIXADDR_TOP.  On processors that override the default FIXADDR_TOP
address of 0xfffe_0000, this can consume up to 4 pages (1 page per 4MB)
for pgd's that are never used.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1980/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff

... ... @@ -277,11 +277,11 @@
277 277 k = __pmd_offset(vaddr);
278 278 pgd = pgd_base + i;
279 279  
280   - for ( ; (i < PTRS_PER_PGD) && (vaddr != end); pgd++, i++) {
  280 + for ( ; (i < PTRS_PER_PGD) && (vaddr < end); pgd++, i++) {
281 281 pud = (pud_t *)pgd;
282   - for ( ; (j < PTRS_PER_PUD) && (vaddr != end); pud++, j++) {
  282 + for ( ; (j < PTRS_PER_PUD) && (vaddr < end); pud++, j++) {
283 283 pmd = (pmd_t *)pud;
284   - for (; (k < PTRS_PER_PMD) && (vaddr != end); pmd++, k++) {
  284 + for (; (k < PTRS_PER_PMD) && (vaddr < end); pmd++, k++) {
285 285 if (pmd_none(*pmd)) {
286 286 pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
287 287 set_pmd(pmd, __pmd((unsigned long)pte));
arch/mips/mm/pgtable-32.c
Diff comments   View file @ 464fd83
... ... @@ -52,7 +52,7 @@
52 52 * Fixed mappings:
53 53 */
54 54 vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK;
55   - fixrange_init(vaddr, 0, pgd_base);
  55 + fixrange_init(vaddr, vaddr + FIXADDR_SIZE, pgd_base);
56 56  
57 57 #ifdef CONFIG_HIGHMEM
58 58 /*
arch/mips/mm/pgtable-64.c
Diff comments   View file @ 464fd83
... ... @@ -76,6 +76,6 @@
76 76 * Fixed mappings:
77 77 */
78 78 vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK;
79   - fixrange_init(vaddr, 0, pgd_base);
  79 + fixrange_init(vaddr, vaddr + FIXADDR_SIZE, pgd_base);
80 80 }