|
@@ -14,28 +14,32 @@
|
|
|
|
|
|
#define LMB_ALLOC_ANYWHERE 0
|
|
|
|
|
|
-void lmb_dump_all_force(struct lmb *lmb)
|
|
|
+static void lmb_dump_region(struct lmb_region *rgn, char *name)
|
|
|
{
|
|
|
- unsigned long i;
|
|
|
+ unsigned long long base, size, end;
|
|
|
+ enum lmb_flags flags;
|
|
|
+ int i;
|
|
|
|
|
|
- printf("lmb_dump_all:\n");
|
|
|
- printf(" memory.cnt = 0x%lx\n", lmb->memory.cnt);
|
|
|
- for (i = 0; i < lmb->memory.cnt; i++) {
|
|
|
- printf(" memory.reg[0x%lx].base = 0x%llx\n", i,
|
|
|
- (unsigned long long)lmb->memory.region[i].base);
|
|
|
- printf(" .size = 0x%llx\n",
|
|
|
- (unsigned long long)lmb->memory.region[i].size);
|
|
|
- }
|
|
|
+ printf(" %s.cnt = 0x%lx\n", name, rgn->cnt);
|
|
|
|
|
|
- printf("\n reserved.cnt = 0x%lx\n", lmb->reserved.cnt);
|
|
|
- for (i = 0; i < lmb->reserved.cnt; i++) {
|
|
|
- printf(" reserved.reg[0x%lx].base = 0x%llx\n", i,
|
|
|
- (unsigned long long)lmb->reserved.region[i].base);
|
|
|
- printf(" .size = 0x%llx\n",
|
|
|
- (unsigned long long)lmb->reserved.region[i].size);
|
|
|
+ for (i = 0; i < rgn->cnt; i++) {
|
|
|
+ base = rgn->region[i].base;
|
|
|
+ size = rgn->region[i].size;
|
|
|
+ end = base + size - 1;
|
|
|
+ flags = rgn->region[i].flags;
|
|
|
+
|
|
|
+ printf(" %s[%d]\t[0x%llx-0x%llx], 0x%08llx bytes flags: %x\n",
|
|
|
+ name, i, base, end, size, flags);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+void lmb_dump_all_force(struct lmb *lmb)
|
|
|
+{
|
|
|
+ printf("lmb_dump_all:\n");
|
|
|
+ lmb_dump_region(&lmb->memory, "memory");
|
|
|
+ lmb_dump_region(&lmb->reserved, "reserved");
|
|
|
+}
|
|
|
+
|
|
|
void lmb_dump_all(struct lmb *lmb)
|
|
|
{
|
|
|
#ifdef DEBUG
|
|
@@ -81,6 +85,7 @@ static void lmb_remove_region(struct lmb_region *rgn, unsigned long r)
|
|
|
for (i = r; i < rgn->cnt - 1; i++) {
|
|
|
rgn->region[i].base = rgn->region[i + 1].base;
|
|
|
rgn->region[i].size = rgn->region[i + 1].size;
|
|
|
+ rgn->region[i].flags = rgn->region[i + 1].flags;
|
|
|
}
|
|
|
rgn->cnt--;
|
|
|
}
|
|
@@ -144,7 +149,8 @@ void lmb_init_and_reserve_range(struct lmb *lmb, phys_addr_t base,
|
|
|
}
|
|
|
|
|
|
/* This routine called with relocation disabled. */
|
|
|
-static long lmb_add_region(struct lmb_region *rgn, phys_addr_t base, phys_size_t size)
|
|
|
+static long lmb_add_region_flags(struct lmb_region *rgn, phys_addr_t base,
|
|
|
+ phys_size_t size, enum lmb_flags flags)
|
|
|
{
|
|
|
unsigned long coalesced = 0;
|
|
|
long adjacent, i;
|
|
@@ -152,6 +158,7 @@ static long lmb_add_region(struct lmb_region *rgn, phys_addr_t base, phys_size_t
|
|
|
if (rgn->cnt == 0) {
|
|
|
rgn->region[0].base = base;
|
|
|
rgn->region[0].size = size;
|
|
|
+ rgn->region[0].flags = flags;
|
|
|
rgn->cnt = 1;
|
|
|
return 0;
|
|
|
}
|
|
@@ -160,18 +167,27 @@ static long lmb_add_region(struct lmb_region *rgn, phys_addr_t base, phys_size_t
|
|
|
for (i = 0; i < rgn->cnt; i++) {
|
|
|
phys_addr_t rgnbase = rgn->region[i].base;
|
|
|
phys_size_t rgnsize = rgn->region[i].size;
|
|
|
+ phys_size_t rgnflags = rgn->region[i].flags;
|
|
|
|
|
|
- if ((rgnbase == base) && (rgnsize == size))
|
|
|
- /* Already have this region, so we're done */
|
|
|
- return 0;
|
|
|
+ if (rgnbase == base && rgnsize == size) {
|
|
|
+ if (flags == rgnflags)
|
|
|
+ /* Already have this region, so we're done */
|
|
|
+ return 0;
|
|
|
+ else
|
|
|
+ return -1; /* regions with new flags */
|
|
|
+ }
|
|
|
|
|
|
adjacent = lmb_addrs_adjacent(base, size, rgnbase, rgnsize);
|
|
|
if (adjacent > 0) {
|
|
|
+ if (flags != rgnflags)
|
|
|
+ break;
|
|
|
rgn->region[i].base -= size;
|
|
|
rgn->region[i].size += size;
|
|
|
coalesced++;
|
|
|
break;
|
|
|
} else if (adjacent < 0) {
|
|
|
+ if (flags != rgnflags)
|
|
|
+ break;
|
|
|
rgn->region[i].size += size;
|
|
|
coalesced++;
|
|
|
break;
|
|
@@ -182,8 +198,10 @@ static long lmb_add_region(struct lmb_region *rgn, phys_addr_t base, phys_size_t
|
|
|
}
|
|
|
|
|
|
if ((i < rgn->cnt - 1) && lmb_regions_adjacent(rgn, i, i + 1)) {
|
|
|
- lmb_coalesce_regions(rgn, i, i + 1);
|
|
|
- coalesced++;
|
|
|
+ if (rgn->region[i].flags == rgn->region[i + 1].flags) {
|
|
|
+ lmb_coalesce_regions(rgn, i, i + 1);
|
|
|
+ coalesced++;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (coalesced)
|
|
@@ -196,9 +214,11 @@ static long lmb_add_region(struct lmb_region *rgn, phys_addr_t base, phys_size_t
|
|
|
if (base < rgn->region[i].base) {
|
|
|
rgn->region[i + 1].base = rgn->region[i].base;
|
|
|
rgn->region[i + 1].size = rgn->region[i].size;
|
|
|
+ rgn->region[i + 1].flags = rgn->region[i].flags;
|
|
|
} else {
|
|
|
rgn->region[i + 1].base = base;
|
|
|
rgn->region[i + 1].size = size;
|
|
|
+ rgn->region[i + 1].flags = flags;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -206,6 +226,7 @@ static long lmb_add_region(struct lmb_region *rgn, phys_addr_t base, phys_size_t
|
|
|
if (base < rgn->region[0].base) {
|
|
|
rgn->region[0].base = base;
|
|
|
rgn->region[0].size = size;
|
|
|
+ rgn->region[0].flags = flags;
|
|
|
}
|
|
|
|
|
|
rgn->cnt++;
|
|
@@ -213,6 +234,12 @@ static long lmb_add_region(struct lmb_region *rgn, phys_addr_t base, phys_size_t
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static long lmb_add_region(struct lmb_region *rgn, phys_addr_t base,
|
|
|
+ phys_size_t size)
|
|
|
+{
|
|
|
+ return lmb_add_region_flags(rgn, base, size, LMB_NONE);
|
|
|
+}
|
|
|
+
|
|
|
/* This routine may be called with relocation disabled. */
|
|
|
long lmb_add(struct lmb *lmb, phys_addr_t base, phys_size_t size)
|
|
|
{
|
|
@@ -267,14 +294,21 @@ long lmb_free(struct lmb *lmb, phys_addr_t base, phys_size_t size)
|
|
|
* beginging of the hole and add the region after hole.
|
|
|
*/
|
|
|
rgn->region[i].size = base - rgn->region[i].base;
|
|
|
- return lmb_add_region(rgn, end + 1, rgnend - end);
|
|
|
+ return lmb_add_region_flags(rgn, end + 1, rgnend - end,
|
|
|
+ rgn->region[i].flags);
|
|
|
}
|
|
|
|
|
|
-long lmb_reserve(struct lmb *lmb, phys_addr_t base, phys_size_t size)
|
|
|
+long lmb_reserve_flags(struct lmb *lmb, phys_addr_t base, phys_size_t size,
|
|
|
+ enum lmb_flags flags)
|
|
|
{
|
|
|
struct lmb_region *_rgn = &(lmb->reserved);
|
|
|
|
|
|
- return lmb_add_region(_rgn, base, size);
|
|
|
+ return lmb_add_region_flags(_rgn, base, size, flags);
|
|
|
+}
|
|
|
+
|
|
|
+long lmb_reserve(struct lmb *lmb, phys_addr_t base, phys_size_t size)
|
|
|
+{
|
|
|
+ return lmb_reserve_flags(lmb, base, size, LMB_NONE);
|
|
|
}
|
|
|
|
|
|
static long lmb_overlaps_region(struct lmb_region *rgn, phys_addr_t base,
|
|
@@ -409,7 +443,7 @@ phys_size_t lmb_get_free_size(struct lmb *lmb, phys_addr_t addr)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-int lmb_is_reserved(struct lmb *lmb, phys_addr_t addr)
|
|
|
+int lmb_is_reserved_flags(struct lmb *lmb, phys_addr_t addr, int flags)
|
|
|
{
|
|
|
int i;
|
|
|
|
|
@@ -417,11 +451,16 @@ int lmb_is_reserved(struct lmb *lmb, phys_addr_t addr)
|
|
|
phys_addr_t upper = lmb->reserved.region[i].base +
|
|
|
lmb->reserved.region[i].size - 1;
|
|
|
if ((addr >= lmb->reserved.region[i].base) && (addr <= upper))
|
|
|
- return 1;
|
|
|
+ return (lmb->reserved.region[i].flags & flags) == flags;
|
|
|
}
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+int lmb_is_reserved(struct lmb *lmb, phys_addr_t addr)
|
|
|
+{
|
|
|
+ return lmb_is_reserved_flags(lmb, addr, LMB_NONE);
|
|
|
+}
|
|
|
+
|
|
|
__weak void board_lmb_reserve(struct lmb *lmb)
|
|
|
{
|
|
|
/* please define platform specific board_lmb_reserve() */
|