[PATCH kvm-unit-tests v2 05/12] arm/arm64: setup: don't allow gaps in phys range

[Andrew Jones <drjones@redhat.com>]

Set the basic range parameters PHYS_OFFSET and PHYS_END to the
primary memory region range parameters to ensure there are no
gaps, as the regions in the device tree may not be contiguous.
If a unit test wants to use memory in another region, then it
can get it from mem_regions.

Signed-off-by: Andrew Jones <drjones@redhat.com>
---
 lib/arm/setup.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/arm/setup.c b/lib/arm/setup.c
index 326e78f15ecd..04169da179bc 100644
--- a/lib/arm/setup.c
+++ b/lib/arm/setup.c
@@ -75,7 +75,7 @@ static void mem_init(phys_addr_t freemem_start)
 	nr_regs = dt_get_memory_params(regs, NR_MEM_REGIONS);
 	assert(nr_regs > 0);
 
-	primary.end = 0;
+	primary = (struct mem_region){ 0 };
 
 	for (i = 0; i < nr_regs; ++i) {
 		mem_regions[i].start = regs[i].addr;
@@ -102,8 +102,8 @@ static void mem_init(phys_addr_t freemem_start)
 	assert(primary.end != 0);
 	assert(!(mem.start & ~PHYS_MASK) && !((mem.end - 1) & ~PHYS_MASK));
 
-	__phys_offset = mem.start;	/* PHYS_OFFSET */
-	__phys_end = mem.end;		/* PHYS_END */
+	__phys_offset = primary.start;	/* PHYS_OFFSET */
+	__phys_end = primary.end;	/* PHYS_END */
 
 	phys_alloc_init(freemem_start, primary.end - freemem_start);
 	phys_alloc_set_minimum_alignment(SMP_CACHE_BYTES);
-- 
2.13.6