[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/10] arm/boot: Use qemu_devtree_setprop_sized_cells
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 02/10] arm/boot: Use qemu_devtree_setprop_sized_cells() |
Date: |
Mon, 22 Jul 2013 12:43:39 +0100 |
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 <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
---
hw/arm/boot.c | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index a2e4032..1780316 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -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)
{
- uint32_t *mem_reg_property;
- uint32_t mem_reg_propsize;
void *fdt = NULL;
char *filename;
int size, rc;
- uint32_t acells, scells, hival;
+ uint32_t acells, scells;
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, binfo->dtb_filename);
if (!filename) {
@@ -255,29 +253,18 @@ static int load_dtb(hwaddr addr, const struct
arm_boot_info *binfo)
goto fail;
}
- mem_reg_propsize = acells + scells;
- mem_reg_property = g_new0(uint32_t, mem_reg_propsize);
- mem_reg_property[acells - 1] = cpu_to_be32(binfo->loader_start);
- 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) {
+ if (scells < 2 && binfo->ram_size >= (1ULL << 32)) {
+ /* This is user error so deserves a friendlier error message
+ * than the failure of setprop_sized_cells would provide
+ */
fprintf(stderr, "qemu: dtb file not compatible with "
"RAM size > 4GB\n");
goto fail;
}
- rc = qemu_devtree_setprop(fdt, "/memory", "reg", mem_reg_property,
- mem_reg_propsize * sizeof(uint32_t));
+ rc = qemu_devtree_setprop_sized_cells(fdt, "/memory", "reg",
+ acells, binfo->loader_start,
+ scells, binfo->ram_size);
if (rc < 0) {
fprintf(stderr, "couldn't set /memory/reg\n");
goto fail;
--
1.7.9.5
- [Qemu-devel] [PULL 00/10] arm-devs queue, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 08/10] vexpress: Add virtio-mmio transports, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 10/10] hw/arm: Use 'load_ramdisk()' for loading ramdisks w/ U-Boot header, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 01/10] device_tree: Add qemu_devtree_setprop_sized_cells() utility functions, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 06/10] arm/boot: Allow boards to modify the FDT blob, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 05/10] virtio: Implement MMIO based virtio transport, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 04/10] virtio: Support transports which can specify the vring alignment, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 09/10] hw/loader: Support ramdisk with u-boot header, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 03/10] virtio: Add support for guest setting of queue size, Peter Maydell, 2013/07/22
- [Qemu-devel] [PULL 02/10] arm/boot: Use qemu_devtree_setprop_sized_cells(),
Peter Maydell <=
- [Qemu-devel] [PULL 07/10] vexpress: Make VEDBoardInfo extend arm_boot_info, Peter Maydell, 2013/07/22