mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/arch/arm/mm/pmsa-v8.c
..
..
@@ -94,19 +94,20 @@
94
94
 void __init pmsav8_adjust_lowmem_bounds(void)
95
95
 {
96
96
 	phys_addr_t mem_end;
97
-	struct memblock_region *reg;
97
+	phys_addr_t reg_start, reg_end;
98
98
 	bool first = true;
99
+	u64 i;
99
100
 
100
-	for_each_memblock(memory, reg) {
101
+	for_each_mem_range(i, &reg_start, &reg_end) {
101
102
 		if (first) {
102
103
 			phys_addr_t phys_offset = PHYS_OFFSET;
103
104
 
104
105
 			/*
105
106
 			 * Initially only use memory continuous from
106
107
 			 * PHYS_OFFSET */
107
-			if (reg->base != phys_offset)
108
+			if (reg_start != phys_offset)
108
109
 				panic("First memory bank must be contiguous from PHYS_OFFSET");
109
-			mem_end = reg->base + reg->size;
110
+			mem_end = reg_end;
110
111
 			first = false;
111
112
 		} else {
112
113
 			/*
..
..
@@ -115,8 +116,8 @@
115
116
 			 * blocks separately while iterating)
116
117
 			 */
117
118
 			pr_notice("Ignoring RAM after %pa, memory at %pa ignored\n",
118
-				  &mem_end, &reg->base);
119
-			memblock_remove(reg->base, 0 - reg->base);
119
+				  &mem_end, &reg_start);
120
+			memblock_remove(reg_start, 0 - reg_start);
120
121
 			break;
121
122
 		}
122
123
 	}
..
..
@@ -165,7 +166,7 @@
165
166
 		return -EINVAL;
166
167
 
167
168
 	bar = start;
168
-	lar = (end - 1) & ~(PMSAv8_MINALIGN - 1);;
169
+	lar = (end - 1) & ~(PMSAv8_MINALIGN - 1);
169
170
 
170
171
 	bar |= PMSAv8_AP_PL1RW_PL0RW | PMSAv8_RGN_SHARED;
171
172
 	lar |= PMSAv8_LAR_IDX(PMSAv8_RGN_NORMAL) | PMSAv8_LAR_EN;
..
..
@@ -181,7 +182,7 @@
181
182
 		return -EINVAL;
182
183
 
183
184
 	bar = start;
184
-	lar = (end - 1) & ~(PMSAv8_MINALIGN - 1);;
185
+	lar = (end - 1) & ~(PMSAv8_MINALIGN - 1);
185
186
 
186
187
 	bar |= PMSAv8_AP_PL1RW_PL0RW | PMSAv8_RGN_SHARED | PMSAv8_BAR_XN;
187
188
 	lar |= PMSAv8_LAR_IDX(PMSAv8_RGN_DEVICE_nGnRnE) | PMSAv8_LAR_EN;