移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/arch/openrisc/mm/init.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * OpenRISC idle.c
3
4
  *
..
..
@@ -8,11 +9,6 @@
8
9
  * Modifications for the OpenRISC architecture:
9
10
  * Copyright (C) 2003 Matjaz Breskvar <phoenix@bsemi.com>
10
11
  * Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>
11
- *
12
- *      This program is free software; you can redistribute it and/or
13
- *      modify it under the terms of the GNU General Public License
14
- *      as published by the Free Software Foundation; either version
15
- *      2 of the License, or (at your option) any later version.
16
12
  */
17
13
 
18
14
 #include <linux/signal.h>
..
..
@@ -26,21 +22,17 @@
26
22
 #include <linux/mm.h>
27
23
 #include <linux/swap.h>
28
24
 #include <linux/smp.h>
29
-#include <linux/bootmem.h>
25
+#include <linux/memblock.h>
30
26
 #include <linux/init.h>
31
27
 #include <linux/delay.h>
32
28
 #include <linux/blkdev.h>	/* for initrd_* */
33
29
 #include <linux/pagemap.h>
34
-#include <linux/memblock.h>
35
30
 
36
-#include <asm/segment.h>
37
31
 #include <asm/pgalloc.h>
38
-#include <asm/pgtable.h>
39
32
 #include <asm/dma.h>
40
33
 #include <asm/io.h>
41
34
 #include <asm/tlb.h>
42
35
 #include <asm/mmu_context.h>
43
-#include <asm/kmap_types.h>
44
36
 #include <asm/fixmap.h>
45
37
 #include <asm/tlbflush.h>
46
38
 #include <asm/sections.h>
..
..
@@ -51,17 +43,14 @@
51
43
 
52
44
 static void __init zone_sizes_init(void)
53
45
 {
54
-	unsigned long zones_size[MAX_NR_ZONES];
55
-
56
-	/* Clear the zone sizes */
57
-	memset(zones_size, 0, sizeof(zones_size));
46
+	unsigned long max_zone_pfn[MAX_NR_ZONES] = { 0 };
58
47
 
59
48
 	/*
60
49
 	 * We use only ZONE_NORMAL
61
50
 	 */
62
-	zones_size[ZONE_NORMAL] = max_low_pfn;
51
+	max_zone_pfn[ZONE_NORMAL] = max_low_pfn;
63
52
 
64
-	free_area_init(zones_size);
53
+	free_area_init(max_zone_pfn);
65
54
 }
66
55
 
67
56
 extern const char _s_kernel_ro[], _e_kernel_ro[];
..
..
@@ -74,29 +63,32 @@
74
63
  */
75
64
 static void __init map_ram(void)
76
65
 {
66
+	phys_addr_t start, end;
77
67
 	unsigned long v, p, e;
78
68
 	pgprot_t prot;
79
69
 	pgd_t *pge;
70
+	p4d_t *p4e;
80
71
 	pud_t *pue;
81
72
 	pmd_t *pme;
82
73
 	pte_t *pte;
74
+	u64 i;
83
75
 	/* These mark extents of read-only kernel pages...
84
76
 	 * ...from vmlinux.lds.S
85
77
 	 */
86
-	struct memblock_region *region;
87
78
 
88
79
 	v = PAGE_OFFSET;
89
80
 
90
-	for_each_memblock(memory, region) {
91
-		p = (u32) region->base & PAGE_MASK;
92
-		e = p + (u32) region->size;
81
+	for_each_mem_range(i, &start, &end) {
82
+		p = (u32) start & PAGE_MASK;
83
+		e = (u32) end;
93
84
 
94
85
 		v = (u32) __va(p);
95
86
 		pge = pgd_offset_k(v);
96
87
 
97
88
 		while (p < e) {
98
89
 			int j;
99
-			pue = pud_offset(pge, v);
90
+			p4e = p4d_offset(pge, v);
91
+			pue = pud_offset(p4e, v);
100
92
 			pme = pmd_offset(pue, v);
101
93
 
102
94
 			if ((u32) pue != (u32) pge || (u32) pme != (u32) pge) {
..
..
@@ -106,7 +98,10 @@
106
98
 			}
107
99
 
108
100
 			/* Alloc one page for holding PTE's... */
109
-			pte = (pte_t *) __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE));
101
+			pte = memblock_alloc_raw(PAGE_SIZE, PAGE_SIZE);
102
+			if (!pte)
103
+				panic("%s: Failed to allocate page for PTEs\n",
104
+				      __func__);
110
105
 			set_pmd(pme, __pmd(_KERNPG_TABLE + __pa(pte)));
111
106
 
112
107
 			/* Fill the newly allocated page with PTE'S */
..
..
@@ -125,7 +120,7 @@
125
120
 		}
126
121
 
127
122
 		printk(KERN_INFO "%s: Memory: 0x%x-0x%x\n", __func__,
128
-		       region->base, region->base + region->size);
123
+		       start, end);
129
124
 	}
130
125
 }
131
126
 
..
..
@@ -213,23 +208,11 @@
213
208
 	memset((void *)empty_zero_page, 0, PAGE_SIZE);
214
209
 
215
210
 	/* this will put all low memory onto the freelists */
216
-	free_all_bootmem();
211
+	memblock_free_all();
217
212
 
218
213
 	mem_init_print_info(NULL);
219
214
 
220
215
 	printk("mem_init_done ...........................................\n");
221
216
 	mem_init_done = 1;
222
217
 	return;
223
-}
224
-
225
-#ifdef CONFIG_BLK_DEV_INITRD
226
-void free_initrd_mem(unsigned long start, unsigned long end)
227
-{
228
-	free_reserved_area((void *)start, (void *)end, -1, "initrd");
229
-}
230
-#endif
231
-
232
-void free_initmem(void)
233
-{
234
-	free_initmem_default(-1);
235
218
 }