@@ -197,45 +197,10 @@ static int __init early_mem(char *p)
197
197
}
198
198
early_param ("mem" , early_mem );
199
199
200
- static int __init early_init_dt_scan_usablemem (unsigned long node ,
201
- const char * uname , int depth , void * data )
202
- {
203
- struct memblock_region * usablemem = data ;
204
- const __be32 * reg ;
205
- int len ;
206
-
207
- if (depth != 1 || strcmp (uname , "chosen" ) != 0 )
208
- return 0 ;
209
-
210
- reg = of_get_flat_dt_prop (node , "linux,usable-memory-range" , & len );
211
- if (!reg || (len < (dt_root_addr_cells + dt_root_size_cells )))
212
- return 1 ;
213
-
214
- usablemem -> base = dt_mem_next_cell (dt_root_addr_cells , & reg );
215
- usablemem -> size = dt_mem_next_cell (dt_root_size_cells , & reg );
216
-
217
- return 1 ;
218
- }
219
-
220
- static void __init fdt_enforce_memory_region (void )
221
- {
222
- struct memblock_region reg = {
223
- .size = 0 ,
224
- };
225
-
226
- of_scan_flat_dt (early_init_dt_scan_usablemem , & reg );
227
-
228
- if (reg .size )
229
- memblock_cap_memory_range (reg .base , reg .size );
230
- }
231
-
232
200
void __init arm64_memblock_init (void )
233
201
{
234
202
const s64 linear_region_size = PAGE_END - _PAGE_OFFSET (vabits_actual );
235
203
236
- /* Handle linux,usable-memory-range property */
237
- fdt_enforce_memory_region ();
238
-
239
204
/* Remove memory above our supported physical address size */
240
205
memblock_remove (1ULL << PHYS_MASK_SHIFT , ULLONG_MAX );
241
206
0 commit comments