|
@@ -83,33 +83,25 @@ static long __init_memblock memblock_overlaps_region(struct memblock_type *type,
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * memblock_find_in_range_node - find free area in given range and node
|
|
|
+ * __memblock_find_range_top_down - find free area utility, in top-down
|
|
|
* @start: start of candidate range
|
|
|
* @end: end of candidate range, can be %MEMBLOCK_ALLOC_{ANYWHERE|ACCESSIBLE}
|
|
|
* @size: size of free area to find
|
|
|
* @align: alignment of free area to find
|
|
|
* @nid: nid of the free area to find, %MAX_NUMNODES for any node
|
|
|
*
|
|
|
- * Find @size free area aligned to @align in the specified range and node.
|
|
|
+ * Utility called from memblock_find_in_range_node(), find free area top-down.
|
|
|
*
|
|
|
* RETURNS:
|
|
|
* Found address on success, %0 on failure.
|
|
|
*/
|
|
|
-phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,
|
|
|
- phys_addr_t end, phys_addr_t size,
|
|
|
- phys_addr_t align, int nid)
|
|
|
+static phys_addr_t __init_memblock
|
|
|
+__memblock_find_range_top_down(phys_addr_t start, phys_addr_t end,
|
|
|
+ phys_addr_t size, phys_addr_t align, int nid)
|
|
|
{
|
|
|
phys_addr_t this_start, this_end, cand;
|
|
|
u64 i;
|
|
|
|
|
|
- /* pump up @end */
|
|
|
- if (end == MEMBLOCK_ALLOC_ACCESSIBLE)
|
|
|
- end = memblock.current_limit;
|
|
|
-
|
|
|
- /* avoid allocating the first page */
|
|
|
- start = max_t(phys_addr_t, start, PAGE_SIZE);
|
|
|
- end = max(start, end);
|
|
|
-
|
|
|
for_each_free_mem_range_reverse(i, nid, &this_start, &this_end, NULL) {
|
|
|
this_start = clamp(this_start, start, end);
|
|
|
this_end = clamp(this_end, start, end);
|
|
@@ -121,9 +113,38 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,
|
|
|
if (cand >= this_start)
|
|
|
return cand;
|
|
|
}
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+/**
|
|
|
+ * memblock_find_in_range_node - find free area in given range and node
|
|
|
+ * @start: start of candidate range
|
|
|
+ * @end: end of candidate range, can be %MEMBLOCK_ALLOC_{ANYWHERE|ACCESSIBLE}
|
|
|
+ * @size: size of free area to find
|
|
|
+ * @align: alignment of free area to find
|
|
|
+ * @nid: nid of the free area to find, %MAX_NUMNODES for any node
|
|
|
+ *
|
|
|
+ * Find @size free area aligned to @align in the specified range and node.
|
|
|
+ *
|
|
|
+ * RETURNS:
|
|
|
+ * Found address on success, %0 on failure.
|
|
|
+ */
|
|
|
+phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,
|
|
|
+ phys_addr_t end, phys_addr_t size,
|
|
|
+ phys_addr_t align, int nid)
|
|
|
+{
|
|
|
+ /* pump up @end */
|
|
|
+ if (end == MEMBLOCK_ALLOC_ACCESSIBLE)
|
|
|
+ end = memblock.current_limit;
|
|
|
+
|
|
|
+ /* avoid allocating the first page */
|
|
|
+ start = max_t(phys_addr_t, start, PAGE_SIZE);
|
|
|
+ end = max(start, end);
|
|
|
+
|
|
|
+ return __memblock_find_range_top_down(start, end, size, align, nid);
|
|
|
+}
|
|
|
+
|
|
|
/**
|
|
|
* memblock_find_in_range - find free area in given range
|
|
|
* @start: start of candidate range
|