Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3a9c2c81eb2024c136cc534df534f93682d516d0

Authored by Benjamin Herrenschmidt
1 parent 449e8df39d
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

memblock: Make memblock_find_region() out of memblock_alloc_region() 

This function will be used to locate a free area to put the new memblock
arrays when attempting to resize them. memblock_alloc_region() is gone,
the two callsites now call memblock_add_region().

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
v2. Fix membase_alloc_nid_region() conversion

Showing 1 changed file with 9 additions and 11 deletions Side-by-side Diff

... ... @@ -309,8 +309,8 @@
309 309 return (addr + (size - 1)) & ~(size - 1);
310 310 }
311 311  
312   -static phys_addr_t __init memblock_alloc_region(phys_addr_t start, phys_addr_t end,
313   - phys_addr_t size, phys_addr_t align)
  312 +static phys_addr_t __init memblock_find_region(phys_addr_t start, phys_addr_t end,
  313 + phys_addr_t size, phys_addr_t align)
314 314 {
315 315 phys_addr_t base, res_base;
316 316 long j;
317 317  
... ... @@ -318,12 +318,8 @@
318 318 base = memblock_align_down((end - size), align);
319 319 while (start <= base) {
320 320 j = memblock_overlaps_region(&memblock.reserved, base, size);
321   - if (j < 0) {
322   - /* this area isn't reserved, take it */
323   - if (memblock_add_region(&memblock.reserved, base, size) < 0)
324   - base = ~(phys_addr_t)0;
  321 + if (j < 0)
325 322 return base;
326   - }
327 323 res_base = memblock.reserved.regions[j].base;
328 324 if (res_base < size)
329 325 break;
... ... @@ -356,8 +352,9 @@
356 352  
357 353 this_end = memblock_nid_range(start, end, &this_nid);
358 354 if (this_nid == nid) {
359   - phys_addr_t ret = memblock_alloc_region(start, this_end, size, align);
360   - if (ret != ~(phys_addr_t)0)
  355 + phys_addr_t ret = memblock_find_region(start, this_end, size, align);
  356 + if (ret != ~(phys_addr_t)0 &&
  357 + memblock_add_region(&memblock.reserved, ret, size) >= 0)
361 358 return ret;
362 359 }
363 360 start = this_end;
... ... @@ -432,8 +429,9 @@
432 429 if (memblocksize < size)
433 430 continue;
434 431 base = min(memblockbase + memblocksize, max_addr);
435   - res_base = memblock_alloc_region(memblockbase, base, size, align);
436   - if (res_base != ~(phys_addr_t)0)
  432 + res_base = memblock_find_region(memblockbase, base, size, align);
  433 + if (res_base != ~(phys_addr_t)0 &&
  434 + memblock_add_region(&memblock.reserved, res_base, size) >= 0)
437 435 return res_base;
438 436 }
439 437 return 0;