|
@@ -1543,11 +1543,37 @@ void __init memblock_enforce_memory_limit(phys_addr_t limit)
|
|
|
(phys_addr_t)ULLONG_MAX);
|
|
|
}
|
|
|
|
|
|
+void __init memblock_cap_memory_range(phys_addr_t base, phys_addr_t size)
|
|
|
+{
|
|
|
+ int start_rgn, end_rgn;
|
|
|
+ int i, ret;
|
|
|
+
|
|
|
+ if (!size)
|
|
|
+ return;
|
|
|
+
|
|
|
+ ret = memblock_isolate_range(&memblock.memory, base, size,
|
|
|
+ &start_rgn, &end_rgn);
|
|
|
+ if (ret)
|
|
|
+ return;
|
|
|
+
|
|
|
+ /* remove all the MAP regions */
|
|
|
+ for (i = memblock.memory.cnt - 1; i >= end_rgn; i--)
|
|
|
+ if (!memblock_is_nomap(&memblock.memory.regions[i]))
|
|
|
+ memblock_remove_region(&memblock.memory, i);
|
|
|
+
|
|
|
+ for (i = start_rgn - 1; i >= 0; i--)
|
|
|
+ if (!memblock_is_nomap(&memblock.memory.regions[i]))
|
|
|
+ memblock_remove_region(&memblock.memory, i);
|
|
|
+
|
|
|
+ /* truncate the reserved regions */
|
|
|
+ memblock_remove_range(&memblock.reserved, 0, base);
|
|
|
+ memblock_remove_range(&memblock.reserved,
|
|
|
+ base + size, (phys_addr_t)ULLONG_MAX);
|
|
|
+}
|
|
|
+
|
|
|
void __init memblock_mem_limit_remove_map(phys_addr_t limit)
|
|
|
{
|
|
|
- struct memblock_type *type = &memblock.memory;
|
|
|
phys_addr_t max_addr;
|
|
|
- int i, ret, start_rgn, end_rgn;
|
|
|
|
|
|
if (!limit)
|
|
|
return;
|
|
@@ -1558,19 +1584,7 @@ void __init memblock_mem_limit_remove_map(phys_addr_t limit)
|
|
|
if (max_addr == (phys_addr_t)ULLONG_MAX)
|
|
|
return;
|
|
|
|
|
|
- ret = memblock_isolate_range(type, max_addr, (phys_addr_t)ULLONG_MAX,
|
|
|
- &start_rgn, &end_rgn);
|
|
|
- if (ret)
|
|
|
- return;
|
|
|
-
|
|
|
- /* remove all the MAP regions above the limit */
|
|
|
- for (i = end_rgn - 1; i >= start_rgn; i--) {
|
|
|
- if (!memblock_is_nomap(&type->regions[i]))
|
|
|
- memblock_remove_region(type, i);
|
|
|
- }
|
|
|
- /* truncate the reserved regions */
|
|
|
- memblock_remove_range(&memblock.reserved, max_addr,
|
|
|
- (phys_addr_t)ULLONG_MAX);
|
|
|
+ memblock_cap_memory_range(0, max_addr);
|
|
|
}
|
|
|
|
|
|
static int __init_memblock memblock_search(struct memblock_type *type, phys_addr_t addr)
|