OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

arm/boot: Use qemu_devtree_setprop_sized_cells()

Browse Source 
Replace the opencoded assembly of the reg property array for the
/memory node with a call to qemu_devtree_setprop_sized_cells().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 1373977512-28932-3-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2013-07-16 13:25:06 +01:00
parent 97c38f8c27
commit 70976c41c1
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/arm/boot.c
View File

@ -227,12 +227,10 @@ static void set_kernel_args_old(const struct arm_boot_info *info)
static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo)
{ {
uint32_t *mem_reg_property;
uint32_t mem_reg_propsize;
void *fdt = NULL; void *fdt = NULL;
char *filename; char *filename;
int size, rc; int size, rc;
uint32_t acells, scells, hival; uint32_t acells, scells;
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, binfo->dtb_filename); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, binfo->dtb_filename);
if (!filename) { if (!filename) {
@ -255,29 +253,18 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo)
goto fail; goto fail;
} }
mem_reg_propsize = acells + scells; if (scells < 2 && binfo->ram_size >= (1ULL << 32)) {
mem_reg_property = g_new0(uint32_t, mem_reg_propsize); /* This is user error so deserves a friendlier error message
mem_reg_property[acells - 1] = cpu_to_be32(binfo->loader_start); * than the failure of setprop_sized_cells would provide
hival = cpu_to_be32(binfo->loader_start >> 32); */
if (acells > 1) {
mem_reg_property[acells - 2] = hival;
} else if (hival != 0) {
fprintf(stderr, "qemu: dtb file not compatible with "
"RAM start address > 4GB\n");
goto fail;
}
mem_reg_property[acells + scells - 1] = cpu_to_be32(binfo->ram_size);
hival = cpu_to_be32(binfo->ram_size >> 32);
if (scells > 1) {
mem_reg_property[acells + scells - 2] = hival;
} else if (hival != 0) {
fprintf(stderr, "qemu: dtb file not compatible with " fprintf(stderr, "qemu: dtb file not compatible with "
"RAM size > 4GB\n"); "RAM size > 4GB\n");
goto fail; goto fail;
} }
rc = qemu_devtree_setprop(fdt, "/memory", "reg", mem_reg_property, rc = qemu_devtree_setprop_sized_cells(fdt, "/memory", "reg",
mem_reg_propsize * sizeof(uint32_t)); acells, binfo->loader_start,
scells, binfo->ram_size);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "couldn't set /memory/reg\n"); fprintf(stderr, "couldn't set /memory/reg\n");
goto fail; goto fail;